Introduce PHP 8

michbeck · Dec 26, 2020 · bdacd54 · bdacd54
1 parent a0f7a24
commit bdacd54
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,12 +14,15 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: [ '7.2', '7.4' ]
+                php-version: [ '7.2', '7.4', '8.0' ]
                 db-type: [ sqlite, mysql, pgsql, agnostic ]
                 symfony-version: [ '3-min', '3-max', '4-min', '4-max', '5-min', '5-max' ]
+                exclude:
+                  - php-version: '8.0'
+                    symfony-version: '4-min'
         steps:
             - name: Install PostgreSQL latest
-              if: matrix.db-type == 'pgsql' && matrix.php-version == '7.4'
+              if: matrix.db-type == 'pgsql' && matrix.php-version != '7.2'
               uses: CasperWA/postgresql-action@v1.2
               with:
                   postgresql db: 'propel-tests'
@@ -36,7 +39,7 @@ jobs:
                   postgresql password: 'postgres'
 
             - name: Install MariaDb latest
-              if: matrix.db-type == 'mysql' && matrix.php-version == '7.4'
+              if: matrix.db-type == 'mysql' && matrix.php-version != '7.2'
               uses: getong/mariadb-action@v1.1
 
             - name: Install MariaDb min

diff --git a/composer.json b/composer.json
@@ -54,11 +54,19 @@
         "psalm": "vendor/bin/psalm.phar --show-info=false",
         "psalm-update-baseline": "vendor/bin/psalm.phar --update-baseline",
         "psalm-set-baseline": "vendor/bin/psalm.phar --set-baseline=psalm-baseline.xml",
-        "psalm-update-report": "vendor/bin/psalm.phar --report=psalm-report.xml"
+        "psalm-update-report": "vendor/bin/psalm.phar --report=psalm-report.xml",
+        "test": "phpunit --colors=always",
+        "test:agnostic": "@test -c tests/agnostic.phpunit.xml",
+        "test:mysql": "@test -c tests/mysql.phpunit.xml",
+        "test:sqlite": "@test -c tests/sqlite.phpunit.xml",
+        "test:pgsql": "@test -c tests/pgsql.phpunit.xml"
     },
     "extra": {
         "branch-alias": {
             "dev-master": "2.0-dev"
         }
+    },
+    "config": {
+        "process-timeout": 0
     }
 }
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/src/Propel/Runtime/Collection/CollectionIterator.php b/src/Propel/Runtime/Collection/CollectionIterator.php
@@ -235,7 +235,6 @@ public function append($value)
      */
     public function asort($sort_flags = SORT_REGULAR)
     {
-        /* @phpstan-ignore-next-line */
         parent::asort($sort_flags);
         $this->refreshPositions();
     }
@@ -247,7 +246,6 @@ public function asort($sort_flags = SORT_REGULAR)
      */
     public function ksort($sort_flags = SORT_REGULAR)
     {
-        /* @phpstan-ignore-next-line */
         parent::ksort($sort_flags);
         $this->refreshPositions();
     }