Merge branch 'develop' into implement_composer

.ddev/commands/web/build-frontend.sh

@@ -4,6 +4,5 @@
 ## Usage: build-frontend
 ## Example: "ddev build-frontend"
 
-npm --prefix private/typo3conf/ext/t3olayout/Build install
+npm --prefix private/typo3conf/ext/t3olayout/Build ci
 npm --prefix private/typo3conf/ext/t3olayout/Build run-script build
-rm -Rf private/typo3conf/ext/t3olayout/Build/node_modules

composer.json

@@ -52,8 +52,7 @@
     }
   ],
   "require": {
-    "apache-solr-for-typo3/solr": "dev-master",
-    "codeception/codeception": "^4.0",
+    "apache-solr-for-typo3/solr": "^11.0",
     "cweagans/composer-patches": "^1.6",
     "derhansen/sf_event_mgt": "^5.0",
     "georgringer/news": "^8.0",
@@ -74,6 +73,7 @@
     "yoast-seo-for-typo3/yoast_seo": "^6.0"
   },
   "require-dev": {
+    "codeception/codeception": "^4.0",
     "ichhabrecht/filefill": "^3.2",
     "punktde/codeception-cli": "^2.0.0",
     "punktde/codeception-webdriver": "^2.0.0",

config/sites/t3org/config.yaml

@@ -129,15 +129,16 @@ routeEnhancers:
         type: StaticRangeMapper
         start: '1'
         end: '100'
+  PageTypeSuffix:
+    type: PageType
+    map:
+      sitemap.xml: 1533906435
+      yoast-snippetpreview.json: 1480321830
 routes:
   -
     route: robots.txt
     type: staticText
     content: "User-agent: *\r\nAllow: /\r\n\r\n# folders\r\nDisallow: /typo3/\r\nDisallow: /typo3conf/\r\nAllow: /typo3conf/ext/\r\nAllow: /typo3temp/\r\n\r\n# parameters\r\nDisallow: /*?id=*               # non speaking URLs\r\nDisallow: /*cHash               # no cHash\r\nDisallow: /*tx_powermail_pi1    # no powermail thanks pages\r\nDisallow: /*tx_form_formframework    # no forms\r\n\r\n# sitemap\r\nSitemap: https://typo3.org/?type=1533906435\r\n"
-  -
-    route: sitemap.xml
-    type: uri
-    source: 'https://typo3.org/?type=1533906435'
 solr_enabled_read: true
 solr_host_read: solr
 solr_path_read: /solr/

extensions/t3org_layout/Classes/Hook/DataHandlerHook.php

@@ -107,7 +107,7 @@ class DataHandlerHook
     {
         $slug = $params['slug'];
         if ($params['record']['startdate']) {
-            $slug = date('Ymd', strtotime($params['record']['startdate'])) . '-' . $params['record']['title'];
+            $slug = date('Ymd', strtotime($params['record']['startdate'])) . '-' . str_replace('/', '-', $params['record']['title']);
         }
 
         return $slug;

extensions/t3org_layout/Configuration/TypoScript/Ext/Sitemap.typoscript

+@import 'EXT:seo/Configuration/TypoScript/XmlSitemap'
+@import 'EXT:news/Configuration/TypoScript/Sitemap'
+plugin.tx_seo {
+    config {
+        xmlSitemap {
+            sitemaps {
+                pages {
+                    config {
+                        excludedDoktypes = 3, 4, 5, 6, 7, 199, 254, 255
+                        additionalWhere = AND (no_index = 0)
+                    }
+                }
+                news {
+                    provider = TYPO3\CMS\Seo\XmlSitemap\RecordsXmlSitemapDataProvider
+                    config {
+                        table = tx_news_domain_model_news
+                        additionalWhere =
+                        sortField = sorting
+                        lastModifiedField = tstamp
+                        pid = 179
+                        recursive = 2
+                        url {
+                            pageId = 185
+                            fieldToParameterMap {
+                                uid = tx_news_pi1[news]
+                            }
+
+                            additionalGetParameters {
+                                tx_news_pi1.controller = News
+                                tx_news_pi1.action = detail
+                            }
+
+                            useCacheHash = 1
+                        }
+                    }
+                }
+                events {
+                    provider = TYPO3\CMS\Seo\XmlSitemap\RecordsXmlSitemapDataProvider
+                    config {
+                        table = tx_sfeventmgt_domain_model_event
+                        sortField = tstamp
+                        lastModifiedField = tstamp
+                        pid = 180,43,461
+                        recursive = 2
+                        url {
+                            pageId = 230
+                            fieldToParameterMap {
+                                uid = tx_sfeventmgt_pievent[event]
+                            }
+                            additionalGetParameters {
+                                tx_sfeventmgt_pievent.controller = Event
+                                tx_sfeventmgt_pievent.action = detail
+                            }
+                            useCacheHash = 1
+                        }
+                    }
+                }
+
+
+            }
+        }
+    }
+}