From 09e1b99fa0132816f21e704ea06abc61fde522ed Mon Sep 17 00:00:00 2001 From: Krystian Szymukowicz Date: Sat, 23 Nov 2024 17:29:24 +0100 Subject: [PATCH 1/3] [BUGFIX] Fix api.t3api.ddev.site urls not working. --- .ddev/apache/20.conf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.ddev/apache/20.conf b/.ddev/apache/20.conf index bc84016..2735e99 100644 --- a/.ddev/apache/20.conf +++ b/.ddev/apache/20.conf @@ -1,7 +1,7 @@ ServerName sub.t3api.ddev.site ServerAlias *.t3api.ddev.site - ServerAlias *-api.t3api.ddev.site + ServerAlias *.api.t3api.ddev.site DocumentRoot /var/www/html/.test AllowOverride All @@ -9,8 +9,9 @@ RewriteEngine On - RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.t3api\.ddev\.site$ - RewriteRule ^(.*)$ /var/www/html/.test/%1/public/$1 [L] + RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.t3api\.ddev\.site$ [OR] + RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.api\.t3api\.ddev\.site$ + RewriteRule ^(.*)$ /var/www/html/.test/%1/public/$1 [L] RewriteCond %{HTTP:X-Forwarded-Proto} =https RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d @@ -24,7 +25,7 @@ ServerName sub.t3api.ddev.site ServerAlias *.t3api.ddev.site - ServerAlias *-api.t3api.ddev.site + ServerAlias *.api.t3api.ddev.site DocumentRoot /var/www/html/.test AllowOverride All @@ -32,7 +33,8 @@ RewriteEngine On - RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.t3api\.ddev\.site$ + RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.t3api\.ddev\.site$ [OR] + RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.api\.t3api\.ddev\.site$ RewriteRule ^(.*)$ /var/www/html/.test/%1/public/$1 [L] RewriteCond %{HTTP:X-Forwarded-Proto} =https From c92748a7a8822ef67bcded2111ab6dee56be9fe1 Mon Sep 17 00:00:00 2001 From: Krystian Szymukowicz Date: Sat, 23 Nov 2024 17:31:10 +0100 Subject: [PATCH 2/3] [BUGFIX] Change ddev additional_hostnames "*.t3api" to TYPO3 specific hosts so it is possible to work without internet out of the box. --- .ddev/config.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index aaafdab..c5f6fcf 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -7,8 +7,10 @@ router_http_port: "80" router_https_port: "443" xdebug_enabled: false additional_hostnames: - - '*.t3api' - - '*.api.t3api' + - 12.t3api + - 12.api.t3api + - 13.t3api + - 13.api.t3api additional_fqdns: [] database: type: mariadb From 2117b25347f1373f4b38e45e221c48042e8512ae Mon Sep 17 00:00:00 2001 From: Krystian Szymukowicz Date: Sat, 23 Nov 2024 17:36:04 +0100 Subject: [PATCH 3/3] [TASK] Update helhum/typo3-console, georgringer/news for TYPO3 13 LTS. --- .ddev/commands/web/.install-12 | 4 +- .ddev/commands/web/.install-13 | 19 ++++---- .../patches/typo3-cms-core-review-85198.patch | 48 ------------------- 3 files changed, 10 insertions(+), 61 deletions(-) delete mode 100644 .ddev/test/files/patches/typo3-cms-core-review-85198.patch diff --git a/.ddev/commands/web/.install-12 b/.ddev/commands/web/.install-12 index f5b9ef9..d98db9b 100755 --- a/.ddev/commands/web/.install-12 +++ b/.ddev/commands/web/.install-12 @@ -14,8 +14,8 @@ composer req typo3/cms-backend:'^12.4' typo3/cms-core:'^12.4' typo3/cms-extbase: typo3/cms-fluid:'^12.4' typo3/cms-frontend:'^12.4' typo3/cms-recycler:'^12.4' typo3/cms-tstemplate:'^12.4' \ typo3/cms-info:'^12.4' typo3/cms-lowlevel:'^12.4' typo3/cms-rte-ckeditor:'^12.4' typo3/cms-impexp:'^12.4' \ typo3/cms-install:'^12.4' \ - helhum/typo3-console:'^8.1' \ - cweagans/composer-patches:'^1.7.3' georgringer/news:'dev-12-13' \ + helhum/typo3-console:'^8.2.1' \ + cweagans/composer-patches:'^1.7.3' georgringer/news:'^12.1' \ sourcebroker/t3apinews:'^1.0.0' v/site:'^1.0.0' \ sourcebroker/t3api:'@dev' \ --no-progress --no-interaction --working-dir "$BASE_PATH" diff --git a/.ddev/commands/web/.install-13 b/.ddev/commands/web/.install-13 index 598fd31..3265e2e 100755 --- a/.ddev/commands/web/.install-13 +++ b/.ddev/commands/web/.install-13 @@ -10,17 +10,14 @@ set -e source .ddev/test/utils-install.sh install_start "13" -# remove next two lines later after stable version of helhum/typo3-console START -composer config repositories.helhum/typo3-console vcs https://github.com/bmack/TYPO3-Console --working-dir $BASE_PATH -cp ".ddev/test/files/patches/typo3-cms-core-review-85198.patch" $BASE_PATH/patches/ composer req typo3/cms-backend:'^13.3' typo3/cms-core:'^13.3' typo3/cms-extbase:'^13.3' typo3/cms-filelist:'^13.3' \ - typo3/cms-fluid:'^13.3' typo3/cms-frontend:'^13.3' typo3/cms-recycler:'^13.3' typo3/cms-tstemplate:'^13.3' \ - typo3/cms-info:'^13.3' typo3/cms-lowlevel:'^13.3' typo3/cms-rte-ckeditor:'^13.3' typo3/cms-impexp:'^13.3' \ - typo3/cms-install:'^13.3' \ - helhum/typo3-console:'dev-issue/1169' \ - cweagans/composer-patches:'^1.7.3' georgringer/news:'dev-12-13' \ - sourcebroker/t3apinews:'^1.0.0' v/site:'^1.0.0' \ - sourcebroker/t3api:'@dev' \ - --no-progress --no-interaction --working-dir "$BASE_PATH" + typo3/cms-fluid:'^13.3' typo3/cms-frontend:'^13.3' typo3/cms-recycler:'^13.3' typo3/cms-tstemplate:'^13.3' \ + typo3/cms-info:'^13.3' typo3/cms-lowlevel:'^13.3' typo3/cms-rte-ckeditor:'^13.3' typo3/cms-impexp:'^13.3' \ + typo3/cms-install:'^13.3' \ + helhum/typo3-console:'^8.2.1' \ + cweagans/composer-patches:'^1.7.3' georgringer/news:'^12.1' \ + sourcebroker/t3apinews:'^1.0.0' v/site:'^1.0.0' \ + sourcebroker/t3api:'@dev' \ + --no-progress --no-interaction --working-dir "$BASE_PATH" install_end diff --git a/.ddev/test/files/patches/typo3-cms-core-review-85198.patch b/.ddev/test/files/patches/typo3-cms-core-review-85198.patch deleted file mode 100644 index 7cd385b..0000000 --- a/.ddev/test/files/patches/typo3-cms-core-review-85198.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c7b62d663c886c7448f91fe7e263b63f97a3aa9b Mon Sep 17 00:00:00 2001 -From: Garvin Hicking -Date: Wed, 10 Jul 2024 09:56:38 +0200 -Subject: [PATCH] [BUGFIX] Fix composer PackageArtifact packagePath resolve for root pkgs - -With #103898 the handling of `handleRootPackage()` was streamlined. - -This lead to root packages' paths not being set to the base dir -of the composer installation any more. - -The missing code is now added again. - -Resolves: #104345 -Related: #103898 -Releases: main, 12.4 -Change-Id: I8c66d88ffcacddc2c825964d393d7446db551e68 -Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/85198 -Tested-by: Nikita Hovratov -Tested-by: core-ci -Reviewed-by: Nikita Hovratov -Tested-by: Helmut Hummel -Reviewed-by: Helmut Hummel ---- - -diff --git a/Classes/Composer/PackageArtifactBuilder.php b/Classes/Composer/PackageArtifactBuilder.php -index 1a4848a..7aab94d 100644 ---- a/Classes/Composer/PackageArtifactBuilder.php -+++ b/Classes/Composer/PackageArtifactBuilder.php -@@ -181,7 +181,7 @@ - $usedExtensionKeys = []; - - return array_map( -- function (array $packageAndPath) use (&$usedExtensionKeys): array { -+ function (array $packageAndPath) use ($rootPackage, &$usedExtensionKeys): array { - [$composerPackage, $packagePath] = $packageAndPath; - $packageName = $composerPackage->getName(); - $packagePath = GeneralUtility::fixWindowsFilePath($packagePath); -@@ -210,6 +210,10 @@ - $usedExtensionKeys[$extensionKey] = $packageName; - unset($this->availableComposerPackageKeys[$packageName]); - $this->composerNameToPackageKeyMap[$packageName] = $extensionKey; -+ if ($composerPackage === $rootPackage) { -+ // The root package's path is the Composer base dir -+ $packagePath = $this->config->get('base-dir'); -+ } - // Add extension key to the package map for later reference - return [$composerPackage, $packagePath, $extensionKey]; - },