Merge branch 'release/13.4.0'

astehlik · Oct 15, 2024 · 1c33122 · 1c33122
2 parents 7e70428 + 098e004
commit 1c33122
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -133,7 +133,7 @@ jobs:
           php_version: ${{ env.MAIN_PHP_VERSION }}
       - run: |
           bash bin/t3_run_tests.sh -s unit -p ${{ env.MAIN_PHP_VERSION }} -X coverage -- --coverage-clover Logs/clover-unit.xml --coverage-filter ../Classes
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage-phpunit
           path: Logs/clover-unit.xml
@@ -150,7 +150,7 @@ jobs:
           php_version: ${{ env.MAIN_PHP_VERSION }}
       - run: |
           bash bin/t3_run_tests.sh -s functional -d mariadb -p ${{ env.MAIN_PHP_VERSION }} -X coverage -- --coverage-clover Logs/clover-functional.xml --coverage-filter ../Classes
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage-functional
           path: Logs/clover-functional.xml
@@ -167,10 +167,10 @@ jobs:
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: coverage-phpunit
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: coverage-functional
       - run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace PHPSTORM_META {
+    use Psr\Container\ContainerInterface;
+
+    override(
+        TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(0),
+        map(
+            [
+                '' => '@',
+            ]
+        )
+    );
+
+    override(
+        ContainerInterface::get(0),
+        map(
+            [
+                '' => '@',
+            ]
+        )
+    );
+}
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -25,7 +25,7 @@ project     = URL shortener / TinyURLs
 # ...   (recommended) version, displayed next to title (desktop) and in <meta name="book-version"
 # .................................................................................
 
-release     = 13.2.0
+release     = 13.4.0
 
 # .................................................................................
 # ...  (recommended) displayed in footer

diff --git a/composer.json b/composer.json
@@ -11,20 +11,10 @@
     ],
     "require": {
         "php": "^8.2",
-        "typo3/cms-core": "~13.2.1"
+        "typo3/cms-core": "~13.4.0"
     },
     "require-dev": {
-        "bnf/phpstan-psr-container": "^1.0",
-        "de-swebhosting/php-codestyle": "^5.2",
-        "de-swebhosting/typo3-extension-buildtools": "dev-TYPO3_13",
-        "ergebnis/composer-normalize": "^2.42",
-        "friendsofphp/php-cs-fixer": "^3.54",
-        "friendsoftypo3/phpstan-typo3": "^0.9.0",
-        "michielroos/typo3scan": "^1.7",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "squizlabs/php_codesniffer": "^3.9",
-        "typo3/testing-framework": "dev-main"
+        "de-swebhosting/typo3-extension-buildtools": "dev-TYPO3_13"
     },
     "autoload": {
         "psr-4": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -12,11 +12,11 @@
     'author' => 'Alexander Stehlik',
     'author_email' => '[email protected]',
     'author_company' => '',
-    'version' => '13.2.0',
+    'version' => '13.4.0',
     'constraints' => [
         'depends' => [
             'php' => '8.2.0-8.3.99',
-            'typo3' => '13.2.0-13.2.99',
+            'typo3' => '13.4.0-13.4.99',
         ],
         'conflicts' => [],
         'suggests' => [],