Merge pull request #455 from Yoast/feature/v8

[FEATURE] New major version 8
Yoast · Oct 4, 2021 · 4ae867e · 4ae867e
2 parents 1d5ee47 + c93ce5e
commit 4ae867e
Show file tree

Hide file tree

Showing 161 changed files with 4,897 additions and 11,182 deletions.
diff --git a/.Build/ExcludeFromPackaging.php b/.Build/ExcludeFromPackaging.php
@@ -46,7 +46,6 @@
         'php_cs',
         'phplint.yml',
         'phpstan.neon',
-        'phpstan.cms8.neon',
         'phpstan.cms9.neon',
         'phpstan.cms10.neon',
         'phpunit.xml',

diff --git a/.Build/create_ter_package.sh b/.Build/create_ter_package.sh
diff --git a/.Build/get_version_of_extension.php b/.Build/get_version_of_extension.php
diff --git a/.ddev/apache/apache-site.conf b/.ddev/apache/apache-site.conf
@@ -84,12 +84,10 @@ ServerName yoast-seo.ddev.site
     RewriteCond    %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
     RewriteRule    ^(.+[^/])$           https://%{HTTP_HOST}$1/ [redirect,last]
 
-    SetEnvIf X-Forwarded-Proto "https" HTTPS=on
-
-    DocumentRoot /var/www/html/v8/public
-    ServerAlias v8.yoast-seo.ddev.site
+    DocumentRoot /var/www/html/v9/public
+    ServerAlias v9.yoast-seo.ddev.site
 
-    <Directory "/var/www/html/v8/">
+    <Directory "/var/www/html/v9/">
   		AllowOverride All
   		Allow from All
 	</Directory>
@@ -105,10 +103,10 @@ ServerName yoast-seo.ddev.site
     RewriteCond    %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
     RewriteRule    ^(.+[^/])$           https://%{HTTP_HOST}$1/ [redirect,last]
 
-    DocumentRoot /var/www/html/v9/public
-    ServerAlias v9.yoast-seo.ddev.site
+    DocumentRoot /var/www/html/v10/public
+    ServerAlias v10.yoast-seo.ddev.site
 
-    <Directory "/var/www/html/v9/">
+    <Directory "/var/www/html/v10/">
   		AllowOverride All
   		Allow from All
 	</Directory>
@@ -124,10 +122,10 @@ ServerName yoast-seo.ddev.site
     RewriteCond    %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
     RewriteRule    ^(.+[^/])$           https://%{HTTP_HOST}$1/ [redirect,last]
 
-    DocumentRoot /var/www/html/v10/public
-    ServerAlias v10.yoast-seo.ddev.site
+    DocumentRoot /var/www/html/v11/public
+    ServerAlias v11.yoast-seo.ddev.site
 
-    <Directory "/var/www/html/v10/">
+    <Directory "/var/www/html/v11/">
   		AllowOverride All
   		Allow from All
 	</Directory>

diff --git a/.ddev/commands/web/install-all b/.ddev/commands/web/install-all
@@ -2,6 +2,6 @@
 
 ABSOLUTE_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}/.")"
 
+$ABSOLUTE_PATH/install-v11
 $ABSOLUTE_PATH/install-v10
 $ABSOLUTE_PATH/install-v9
-$ABSOLUTE_PATH/install-v8
diff --git a/.ddev/commands/web/install-v10 b/.ddev/commands/web/install-v10
@@ -6,7 +6,7 @@ rm -rf /var/www/html/$VERSION/*
 composer init -n -d /var/www/html/$VERSION
 composer config extra.typo3/cms.web-dir public -d /var/www/html/$VERSION
 composer config repositories.$EXTENSION_KEY path ../../$EXTENSION_KEY -d /var/www/html/$VERSION
-composer req t3/cms:'^10.4' typo3/cms-seo:'^10.4' $PACKAGE_NAME:'*@dev' --no-progress --no-suggest -n -d /var/www/html/$VERSION
+composer req t3/cms:'^10.4' $PACKAGE_NAME:'*@dev' --no-progress --no-suggest -n -d /var/www/html/$VERSION
 
 
 cd /var/www/html/$VERSION

diff --git a/.ddev/commands/web/install-v8 → .ddev/commands/web/install-v11 b/.ddev/commands/web/install-v8 → .ddev/commands/web/install-v11
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-VERSION=v8
+VERSION=v11
 
 rm -rf /var/www/html/$VERSION/*
 composer init -n -d /var/www/html/$VERSION
 composer config extra.typo3/cms.web-dir public -d /var/www/html/$VERSION
 composer config repositories.$EXTENSION_KEY path ../../$EXTENSION_KEY -d /var/www/html/$VERSION
-composer req t3/cms:'^8.7' $PACKAGE_NAME:'*@dev' --no-progress --no-suggest -n -d /var/www/html/$VERSION
+composer req t3/cms:'^11.0' $PACKAGE_NAME:'*@dev' --no-progress --no-suggest -n -d /var/www/html/$VERSION
 
 
 cd /var/www/html/$VERSION
@@ -17,7 +17,6 @@ vendor/bin/typo3cms configuration:set 'BE/debug' 1
 vendor/bin/typo3cms configuration:set 'FE/debug' 1
 vendor/bin/typo3cms configuration:set 'SYS/devIPmask' '*'
 vendor/bin/typo3cms configuration:set 'SYS/displayErrors' 1
-vendor/bin/typo3cms configuration:set 'SYS/systemLogLevel' 0
 vendor/bin/typo3cms configuration:set 'SYS/trustedHostsPattern' '.*.*'
 vendor/bin/typo3cms configuration:set 'MAIL/transport' 'smtp'
 vendor/bin/typo3cms configuration:set 'MAIL/transport_smtp_server' 'localhost:1025'
@@ -26,16 +25,9 @@ vendor/bin/typo3cms configuration:set 'GFX/processor_path' '/usr/bin/'
 vendor/bin/typo3cms configuration:set 'GFX/processor_path_lzw' '/usr/bin/'
 vendor/bin/typo3cms install:generatepackagestates
 
-vendor/bin/typo3cms cache:flush
-
-composer req dmitryd/typo3-realurl:^2.6
-vendor/bin/typo3cms extension:setup realurl
-vendor/bin/typo3cms install:generatepackagestates
-vendor/bin/typo3cms extension:setup realurl
-vendor/bin/typo3cms database:updateschema
+sed -i -e "s/base: ht\//base: \//g" /var/www/html/$VERSION/config/sites/main/config.yaml
+sed -i -e 's/base: \/en\//base: \//g' /var/www/html/$VERSION/config/sites/main/config.yaml
 
-cp ../v9/public/.htaccess ./public
-cp ~/realurl_conf.php ./public/typo3conf
 cp ~/favicon.ico ./public
 
-mysql -uroot -proot v8 < ~/v8.sql
+vendor/bin/typo3cms cache:flush
diff --git a/.ddev/commands/web/install-v9 b/.ddev/commands/web/install-v9
@@ -6,7 +6,7 @@ rm -rf /var/www/html/$VERSION/*
 composer init -n -d /var/www/html/$VERSION
 composer config extra.typo3/cms.web-dir public -d /var/www/html/$VERSION
 composer config repositories.$EXTENSION_KEY path ../../$EXTENSION_KEY -d /var/www/html/$VERSION
-composer req t3/cms:'^9.5' typo3/cms-seo:'^9.5' $PACKAGE_NAME:'*@dev' --no-progress --no-suggest -n -d /var/www/html/$VERSION
+composer req t3/cms:'^9.5' $PACKAGE_NAME:'*@dev' --no-progress --no-suggest -n -d /var/www/html/$VERSION
 
 
 cd /var/www/html/$VERSION

diff --git a/.ddev/config.yaml b/.ddev/config.yaml
@@ -2,22 +2,22 @@ name: yoast-seo
 type: php
 docroot: ~
 no_project_mount: true
-php_version: "7.2"
+php_version: "7.4"
 webserver_type: apache-fpm
 router_http_port: "80"
 router_https_port: "443"
 xdebug_enabled: false
 additional_hostnames:
-    - v8.yoast-seo
     - v9.yoast-seo
     - v10.yoast-seo
+    - v11.yoast-seo
 additional_fqdns: []
 provider: default
 use_dns_when_possible: true
 nfs_mount_enabled: true
 omit_containers:
     - dba
 extra_services:
-    - v8-data
     - v9-data
     - v10-data
+    - v11-data
diff --git a/.ddev/docker-compose.web.yaml b/.ddev/docker-compose.web.yaml
@@ -22,13 +22,13 @@ services:
               source: ../
               target: /var/www/yoast_seo
               consistency: cached
-            - v8-data:/var/www/html/v8
             - v9-data:/var/www/html/v9
             - v10-data:/var/www/html/v10
+            - v11-data:/var/www/html/v11
 volumes:
-    v8-data:
-        name: "${DDEV_SITENAME}-v8-data"
     v9-data:
         name: "${DDEV_SITENAME}-v9-data"
     v10-data:
         name: "${DDEV_SITENAME}-v10-data"
+    v11-data:
+        name: "${DDEV_SITENAME}-v11-data"
diff --git a/.ddev/homeadditions/realurl_conf.php b/.ddev/homeadditions/realurl_conf.php