Merge pull request #985 from acelaya-forks/feature/php8-deps

Feature/php8 deps

.github/workflows/ci.yml

@@ -60,10 +60,7 @@ jobs:
           extensions: swoole-4.5.9
           coverage: pcov
           ini-values: pcov.directory=module
-      - if: ${{ matrix.php-version == '8.0' }}
+      - run: composer install --no-interaction --prefer-dist
-        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
-      - if: ${{ matrix.php-version != '8.0' }}
-        run: composer install --no-interaction --prefer-dist
       - run: composer test:unit:ci
       - uses: actions/upload-artifact@v2
         if: ${{ matrix.php-version == '7.4' }}
@@ -89,10 +86,7 @@ jobs:
           extensions: swoole-4.5.9
           coverage: pcov
           ini-values: pcov.directory=module
-      - if: ${{ matrix.php-version == '8.0' }}
+      - run: composer install --no-interaction --prefer-dist
-        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
-      - if: ${{ matrix.php-version != '8.0' }}
-        run: composer install --no-interaction --prefer-dist
       - run: composer test:db:sqlite:ci
       - uses: actions/upload-artifact@v2
         if: ${{ matrix.php-version == '7.4' }}
@@ -119,10 +113,7 @@ jobs:
           tools: composer
           extensions: swoole-4.5.9
           coverage: none
-      - if: ${{ matrix.php-version == '8.0' }}
+      - run: composer install --no-interaction --prefer-dist
-        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
-      - if: ${{ matrix.php-version != '8.0' }}
-        run: composer install --no-interaction --prefer-dist
       - run: composer test:db:mysql
 
   db-tests-maria:
@@ -142,10 +133,7 @@ jobs:
           tools: composer
           extensions: swoole-4.5.9
           coverage: none
-      - if: ${{ matrix.php-version == '8.0' }}
+      - run: composer install --no-interaction --prefer-dist
-        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
-      - if: ${{ matrix.php-version != '8.0' }}
-        run: composer install --no-interaction --prefer-dist
       - run: composer test:db:maria
 
   db-tests-postgres:
@@ -165,10 +153,7 @@ jobs:
           tools: composer
           extensions: swoole-4.5.9
           coverage: none
-      - if: ${{ matrix.php-version == '8.0' }}
+      - run: composer install --no-interaction --prefer-dist
-        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
-      - if: ${{ matrix.php-version != '8.0' }}
-        run: composer install --no-interaction --prefer-dist
       - run: composer test:db:postgres
 
   db-tests-ms:
@@ -190,17 +175,13 @@ jobs:
           tools: composer
           extensions: swoole-4.5.9, pdo_sqlsrv-5.9.0beta2
           coverage: none
-      - if: ${{ matrix.php-version == '8.0' }}
+      - run: composer install --no-interaction --prefer-dist
-        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
-      - if: ${{ matrix.php-version != '8.0' }}
-        run: composer install --no-interaction --prefer-dist
       - name: Create test database
         run: docker-compose exec -T shlink_db_ms /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Passw0rd!' -Q "CREATE DATABASE shlink_test;"
       - run: composer test:db:ms
 
   api-tests:
     runs-on: ubuntu-20.04
-    continue-on-error: ${{ matrix.php-version == '8.0' }}
     strategy:
       matrix:
         php-version: ['7.4', '8.0']
@@ -217,10 +198,7 @@ jobs:
           extensions: swoole-4.5.9
           coverage: pcov
           ini-values: pcov.directory=module
-      - if: ${{ matrix.php-version == '8.0' }}
+      - run: composer install --no-interaction --prefer-dist
-        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
-      - if: ${{ matrix.php-version != '8.0' }}
-        run: composer install --no-interaction --prefer-dist
       - run: bin/test/run-api-tests.sh
       - uses: actions/upload-artifact@v2
         if: ${{ matrix.php-version == '7.4' }}
@@ -250,10 +228,7 @@ jobs:
           extensions: swoole-4.5.9
           coverage: pcov
           ini-values: pcov.directory=module
-      - if: ${{ matrix.php-version == '8.0' }}
+      - run: composer install --no-interaction --prefer-dist
-        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
-      - if: ${{ matrix.php-version != '8.0' }}
-        run: composer install --no-interaction --prefer-dist
       - uses: actions/download-artifact@v2
         with:
           path: build

composer.json

@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.4",
+        "php": "^7.4 || ^8.0",
         "ext-json": "*",
         "ext-pdo": "*",
         "akrabat/ip-address-middleware": "^2.0",
@@ -34,10 +34,10 @@
         "lcobucci/jwt": "^4.0",
         "league/uri": "^6.2",
         "lstrojny/functional-php": "^1.15",
-        "mezzio/mezzio": "^3.2",
+        "mezzio/mezzio": "^3.3",
         "mezzio/mezzio-fastroute": "^3.1",
         "mezzio/mezzio-helpers": "^5.3",
-        "mezzio/mezzio-problem-details": "^1.1",
+        "mezzio/mezzio-problem-details": "^1.3",
         "mezzio/mezzio-swoole": "^3.1",
         "monolog/monolog": "^2.0",
         "nikolaposa/monolog-factory": "^3.1",

phpunit-api.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.4/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="./config/test/bootstrap_api_tests.php"
     colors="true"
 >

phpunit-db.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.4/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="./config/test/bootstrap_db_tests.php"
     colors="true"
 >

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.4/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="./vendor/autoload.php"
     colors="true"
 >