diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 699a0ff..0cd0af8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,12 +46,13 @@ jobs: - name: Install Dependencies - move old composer.json run: | mv composer.json composer.json-orig + composer config vendor-dir Resources/Private/Php composer require phpoffice/phpspreadsheet ^1.29 --ignore-platform-reqs --no-progress mv composer.json-orig composer.json rm composer.lock - name: Install tailor - run: composer global require typo3/tailor --prefer-dist --no-progress --no-suggest + run: composer global require typo3/tailor --prefer-dist --no-progress - name: Publish to TER run: php ~/.composer/vendor/bin/tailor ter:publish --comment "${{ steps.get-comment.outputs.comment }}" ${{ steps.get-version.outputs.version }} diff --git a/composer.json b/composer.json index 3555c66..b6faa04 100755 --- a/composer.json +++ b/composer.json @@ -22,16 +22,16 @@ "ext-pdo": "*" }, "require-dev": { - "typo3/cms-fluid-styled-content": "^11.5 || ^12.2", - "typo3/cms-tstemplate": "^11.5 || ^12.2", - "typo3/cms-install": "^11.5 || ^12.2", - "typo3/cms-lowlevel": "^11.5 || ^12.2", - "typo3/cms-backend": "^11.5 || ^12.2", - "friendsoftypo3/tt-address": "^7", + "armin/editorconfig-cli": "^1.5", "friendsofphp/php-cs-fixer": "^3.0", + "friendsoftypo3/tt-address": "^7", "phpstan/phpstan": "^1.3", "phpunit/phpunit": "^9.5", - "armin/editorconfig-cli": "^1.5" + "typo3/cms-backend": "^11.5 || ^12.2", + "typo3/cms-fluid-styled-content": "^11.5 || ^12.2", + "typo3/cms-install": "^11.5 || ^12.2", + "typo3/cms-lowlevel": "^11.5 || ^12.2", + "typo3/cms-tstemplate": "^11.5 || ^12.2" }, "extra": { "typo3/cms": { @@ -62,7 +62,6 @@ "typo3/cms-composer-installers": true, "typo3/class-alias-loader": true }, - "vendor-dir": "vendor", "bin-dir": "bin", "optimize-autoloader": true, "sort-packages": true diff --git a/ext_emconf.php b/ext_emconf.php index efa1a72..0fd307b 100755 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -8,8 +8,7 @@ 'author_email' => 'typo3@calien.de', 'author_company' => '', 'state' => 'beta', - 'clearCacheOnLoad' => 0, - 'version' => '3.1.6', + 'version' => '3.1.7', 'constraints' => [ 'depends' => [ 'typo3' => '11.5.0-11.5.99', @@ -22,15 +21,15 @@ 'autoload' => [ 'psr-4' => [ 'Calien\\Xlsexport\\' => 'Classes', - 'ZipStream\\' => 'vendor/maennchen/zipstream-php/src', - 'Symfony\\Polyfill\\Mbstring\\' => 'vendor/symfony/polyfill-mbstring', - 'Psr\\SimpleCache\\' => 'vendor/psr/simple-cache/src', - 'Psr\\Http\\Message\\' => 'vendor/psr/http-message/src', - 'Psr\\Http\\Client\\' => 'vendor/psr/http-client/src', - 'PhpOffice\\PhpSpreadsheet\\' => 'vendor/phpoffice/phpspreadsheet/src', - 'MyCLabs\\Enum\\' => 'vendor/myclabs/php-enum/src', - 'Matrix\\' => 'vendor/markbaker/matrix/classes/src', - 'Complex\\' => 'vendor/markbaker/complex/classes/src', + 'ZipStream\\' => 'Resources/Private/Php/maennchen/zipstream-php/src', + 'Symfony\\Polyfill\\Mbstring\\' => 'Resources/Private/Php/symfony/polyfill-mbstring', + 'Psr\\SimpleCache\\' => 'Resources/Private/Php/psr/simple-cache/src', + 'Psr\\Http\\Message\\' => 'Resources/Private/Php/psr/http-message/src', + 'Psr\\Http\\Client\\' => 'Resources/Private/Php/psr/http-client/src', + 'PhpOffice\\PhpSpreadsheet\\' => 'Resources/Private/Php/phpoffice/phpspreadsheet/src', + 'MyCLabs\\Enum\\' => 'Resources/Private/Php/myclabs/php-enum/src', + 'Matrix\\' => 'Resources/Private/Php/markbaker/matrix/classes/src', + 'Complex\\' => 'Resources/Private/Php/markbaker/complex/classes/src', ], ], ];