Merge pull request #148 from tomasnorre/php81-compat

Nimut · Jan 18, 2022 · a43c986 · a43c986
2 parents f2d1362 + 388d788
commit a43c986
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 
 language: php
 
@@ -24,7 +24,7 @@ jobs:
     fast_finish: true
     allow_failures:
         -   if: type != cron
-            env: TYPO3=dev-master
+            env: TYPO3=dev-main
         -   if: type != cron
             env: TYPO3=10.4.x-dev
         -   if: type != cron
@@ -72,6 +72,9 @@ jobs:
                     echo;
                     echo;
                     find . -name \*.php ! -path "./.Build/*" | parallel --gnu php -d display_errors=stderr -l {} > /dev/null \;;
+            php: 8.1.0
+            env: TYPO3=^11.5
+        -   <<: *tests
             php: 8.0
             env: TYPO3=^11.5
         -   <<: *tests
@@ -106,6 +109,8 @@ jobs:
                 - cd tests/Packages/testbase/
                 - composer install
                 - grep "Testbase extension for nimut/testing-framework" .Build/public/typo3conf/ext/testbase/composer.json
+            php: 8.1.0
+        -   <<: *prepare
             php: 8.0
         -   <<: *prepare
             php: 7.4
@@ -185,14 +190,17 @@ jobs:
                 - if php -i | grep -v TRAVIS_CMD | grep -q xdebug; then phpenv config-rm xdebug.ini; fi
                 - composer config minimum-stability dev
                 - composer config prefer-stable true
-            php: 8.0
-            env: TYPO3=dev-master
+            php: 8.1.0
+            env: TYPO3=dev-main
+        -   <<: *dev-tests
+            php: 8.1.0
+            env: TYPO3=11.5.x-dev
         -   <<: *dev-tests
             php: 8.0
             env: TYPO3=11.5.x-dev
         -   <<: *dev-tests
             php: 7.4
-            env: TYPO3=dev-master
+            env: TYPO3=dev-main
         -   <<: *dev-tests
             php: 7.4
             env: TYPO3=11.5.x-dev
@@ -221,14 +229,20 @@ jobs:
             install:
                 - composer require --no-progress --no-suggest --prefer-lowest nimut/typo3-complete:"$TYPO3"
                 - git checkout composer.json
+            php: 8.1.0
+            env: TYPO3=dev-main
+        -   <<: *lowest-tests
+            php: 8.1.0
+            env: TYPO3=11.5.x-dev
+        -   <<: *lowest-tests
             php: 8.0
-            env: TYPO3=dev-master
+            env: TYPO3=dev-main
         -   <<: *lowest-tests
             php: 8.0
             env: TYPO3=11.5.x-dev
         -   <<: *lowest-tests
             php: 7.4
-            env: TYPO3=dev-master
+            env: TYPO3=dev-main
         -   <<: *lowest-tests
             php: 7.4
             env: TYPO3=11.5.x-dev

diff --git a/composer.json b/composer.json
@@ -28,15 +28,15 @@
         }
     ],
     "require": {
-        "php": ">= 7.2, < 7.5 || ~8.0.0",
-        "typo3/cms-backend": "^9.5.13 || ^10.4 || ^11.5 || dev-master",
-        "typo3/cms-core": "^9.5.13 || ^10.4 || ^11.5 || dev-master",
-        "typo3/cms-extbase": "^9.5.13 || ^10.4 || ^11.5 || dev-master",
-        "typo3/cms-fluid": "^9.5.13 || ^10.4 || ^11.5 || dev-master",
-        "typo3/cms-frontend": "^9.5.13 || ^10.4 || ^11.5 || dev-master",
-        "typo3/cms-install": "^9.5.13 || ^10.4 || ^11.5 || dev-master",
-        "typo3/cms-recordlist": "^9.5.13 || ^10.4 || ^11.5 || dev-master",
-        "phpunit/phpunit": "^8.5 || ^9.5",
+        "php": "^7.2 || ^8.0",
+        "typo3/cms-backend": "^9.5.13 || ^10.4 || ^11.5 || dev-main",
+        "typo3/cms-core": "^9.5.13 || ^10.4 || ^11.5 || dev-main",
+        "typo3/cms-extbase": "^9.5.13 || ^10.4 || ^11.5 || dev-main",
+        "typo3/cms-fluid": "^9.5.13 || ^10.4 || ^11.5 || dev-main",
+        "typo3/cms-frontend": "^9.5.13 || ^10.4 || ^11.5 || dev-main",
+        "typo3/cms-install": "^9.5.13 || ^10.4 || ^11.5 || dev-main",
+        "typo3/cms-recordlist": "^9.5.13 || ^10.4 || ^11.5 || dev-main",
+        "phpunit/phpunit": "^8.5.22 || ^9.5",
         "mikey179/vfsstream": "^1.6.7"
     },
     "require-dev": {

diff --git a/tests/Packages/testbase/composer.json b/tests/Packages/testbase/composer.json
@@ -24,8 +24,8 @@
         }
     ],
     "require": {
-        "typo3/cms-core": "^9.5.13 || ^10.4 || ~11.0 || dev-master",
-        "typo3/cms-fluid": "^9.5.13 || ^10.4 || ~11.0 || dev-master"
+        "typo3/cms-core": "^9.5.13 || ^10.4 || ~11.0 || dev-main",
+        "typo3/cms-fluid": "^9.5.13 || ^10.4 || ~11.0 || dev-main"
     },
     "require-dev": {
         "nimut/testing-framework": "@dev"