From 5a993099c450d0c189de3bd22e093d8b0d2a7be5 Mon Sep 17 00:00:00 2001 From: Marc Bastian Heinrichs Date: Wed, 20 Dec 2023 15:24:55 +0100 Subject: [PATCH 1/8] [BUGFIX] Support autoloaders registered as classname Resolves: #35 --- Classes/Event/RegisterAutoloaderEvent.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Classes/Event/RegisterAutoloaderEvent.php b/Classes/Event/RegisterAutoloaderEvent.php index 1a5a192..c5ed398 100644 --- a/Classes/Event/RegisterAutoloaderEvent.php +++ b/Classes/Event/RegisterAutoloaderEvent.php @@ -42,7 +42,8 @@ protected function autoloaderAlreadyRegistered(array $autoloader): bool foreach ($currentAutoLoaders as $currentAutoLoader) { if ( is_array($currentAutoLoader) - && get_class($currentAutoLoader[0]) === $autoloaderClass + && ((is_object($currentAutoLoader[0]) && get_class($currentAutoLoader[0]) === $autoloaderClass) || + (is_string($currentAutoLoader[0]) && $currentAutoLoader[0] === $autoloaderClass)) ) { $result = true; break; From aad3fe1513d9877d99c84f725d121720ee5fce8c Mon Sep 17 00:00:00 2001 From: Sebastian Fischer Date: Wed, 20 Dec 2023 15:56:39 +0100 Subject: [PATCH 2/8] Reformat according to CGL --- Classes/Event/RegisterAutoloaderEvent.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Classes/Event/RegisterAutoloaderEvent.php b/Classes/Event/RegisterAutoloaderEvent.php index c5ed398..ee2a143 100644 --- a/Classes/Event/RegisterAutoloaderEvent.php +++ b/Classes/Event/RegisterAutoloaderEvent.php @@ -42,8 +42,10 @@ protected function autoloaderAlreadyRegistered(array $autoloader): bool foreach ($currentAutoLoaders as $currentAutoLoader) { if ( is_array($currentAutoLoader) - && ((is_object($currentAutoLoader[0]) && get_class($currentAutoLoader[0]) === $autoloaderClass) || - (is_string($currentAutoLoader[0]) && $currentAutoLoader[0] === $autoloaderClass)) + && ( + (is_object($currentAutoLoader[0]) && get_class($currentAutoLoader[0]) === $autoloaderClass) + || (is_string($currentAutoLoader[0]) && $currentAutoLoader[0] === $autoloaderClass) + ) ) { $result = true; break; From 7eda3d53d103665629bb9d8c7e2c6a9c092d63a2 Mon Sep 17 00:00:00 2001 From: Sebastian Fischer Date: Wed, 27 Dec 2023 17:31:35 +0100 Subject: [PATCH 3/8] Update ext_emconf.php Change depends in ext_emconf --- ext_emconf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext_emconf.php b/ext_emconf.php index c56ad69..738ad28 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -12,7 +12,7 @@ 'version' => '10.1.0', 'constraints' => [ 'depends' => [ - 'typo3' => '11.0.0-12.2.99', + 'typo3' => '11.5.0-12.4.99', ], ], ]; From d3e5877c0bd3cd580774dd1be12c36f6bf816cb1 Mon Sep 17 00:00:00 2001 From: Sebastian Fischer Date: Fri, 5 Jan 2024 17:06:06 +0100 Subject: [PATCH 4/8] Remove WIP comment --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index e5d6ae2..cbdf40f 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,6 @@ [![Monthly Downloads](https://poser.pugx.org/evoweb/extender/d/monthly)](https://packagist.org/packages/evoweb/extender) [![Total Downloads](https://poser.pugx.org/evoweb/extender/downloads)](https://packagist.org/packages/evoweb/extender) -# !IMPORTANT WIP -Currently, the extending process gets refactored. Please don't use it in -productive projects. - ## Installation ### via Composer From dcd62942c0b3e238c2ca5980c112d20a8195567d Mon Sep 17 00:00:00 2001 From: Sebastian Fischer Date: Fri, 5 Jan 2024 17:20:38 +0100 Subject: [PATCH 5/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cbdf40f..7c4ff83 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ### via Composer -The recommended way to install TYPO3 Console is by using [Composer](https://getcomposer.org): +The recommended way to install EXT:extender is by using [Composer](https://getcomposer.org): composer require evoweb/extender From 7821f1653092c9ea617026a6d77cf26485b2bbd7 Mon Sep 17 00:00:00 2001 From: Sebastian Fischer Date: Fri, 9 Feb 2024 16:26:02 +0100 Subject: [PATCH 6/8] Add additional composer constraints --- composer.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 68dff85..dc3107a 100644 --- a/composer.json +++ b/composer.json @@ -26,16 +26,20 @@ } }, "require": { + "typo3/cms-core": "^11.5 || ^12.4 || 12.4.x-dev || dev-main", "nikic/php-parser": "^4.13.2 || ^4.15.4", - "typo3/cms-core": "^11.5 || ^12.4 || dev-main" + "psr/container": "^2.0", + "psr/event-dispatcher": "^1.0", + "symfony/console": "^6.4 || ^7.0", + "symfony/dependency-injection": "^6.4 || ^7.0" }, "require-dev": { "evoweb/base_extension": "*", "evoweb/extending_extension": "*", "phpunit/phpunit": "^9.5.10 || ^10.1.1", "symfony/polyfill-php80": "^1.16", - "typo3/cms-extensionmanager": "^11.5 || ^12.4 || dev-main", - "typo3/testing-framework": "^6.16.9 || ^8.0.2 || dev-main" + "typo3/cms-extensionmanager": "^11.5 || ^12.4 || 12.4.x-dev || dev-main", + "typo3/testing-framework": "^6.16.9 || ^8.0.2 || 12.4.x-dev || dev-main" }, "extra": { "typo3/cms": { From 8c01db7bfc74b5852274bf79dd220d3839b6e1ab Mon Sep 17 00:00:00 2001 From: Sebastian Fischer Date: Fri, 9 Feb 2024 16:57:47 +0100 Subject: [PATCH 7/8] Update github action config --- .github/workflows/ci.yml | 10 +++++----- composer.json | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6c3ab0..d8a5ae5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,10 +11,10 @@ jobs: resources: name: Resources tests - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Test documentation build run: Build/Scripts/additionalTests.sh -s buildDocumentation @@ -74,7 +74,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: PHP lint run: | @@ -120,12 +120,12 @@ jobs: needs: [ resources, testsuite ] if: startsWith(github.ref, 'refs/tags/') - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest name: TYPO3 TER release steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Publish to TER uses: tomasnorre/typo3-upload-ter@v2 diff --git a/composer.json b/composer.json index dc3107a..a7b2596 100644 --- a/composer.json +++ b/composer.json @@ -28,10 +28,10 @@ "require": { "typo3/cms-core": "^11.5 || ^12.4 || 12.4.x-dev || dev-main", "nikic/php-parser": "^4.13.2 || ^4.15.4", - "psr/container": "^2.0", + "psr/container": "^1.1 || ^2.0", "psr/event-dispatcher": "^1.0", - "symfony/console": "^6.4 || ^7.0", - "symfony/dependency-injection": "^6.4 || ^7.0" + "symfony/console": "^5.4 || ^6.4 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0" }, "require-dev": { "evoweb/base_extension": "*", From aa553def85f00306dfc79df6460b2f006e937619 Mon Sep 17 00:00:00 2001 From: Sebastian Fischer Date: Wed, 6 Mar 2024 19:45:27 +0100 Subject: [PATCH 8/8] Raise verion number --- Documentation/Settings.cfg | 4 ++-- ext_emconf.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index 4428fec..6e6d0c7 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -1,8 +1,8 @@ [general] project = extender -version = 10.1.0 -release = 10.1.0 +version = 10.1.1 +release = 10.1.1 copyright = since 2014 by evoWeb # code highlight https://app.codeimage.dev/ diff --git a/ext_emconf.php b/ext_emconf.php index 738ad28..16090d4 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -9,7 +9,7 @@ 'author_email' => 'extender@evoweb.de', 'author_company' => 'evoWeb', 'state' => 'stable', - 'version' => '10.1.0', + 'version' => '10.1.1', 'constraints' => [ 'depends' => [ 'typo3' => '11.5.0-12.4.99',