Merged branch '1.0'

ibexa · Dec 13, 2021 · ff06e8d · ff06e8d
2 parents 13a57f9 + ceac090
commit ff06e8d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,23 +8,43 @@ on:
   pull_request:
 
 jobs:
+  cs_fix:
+    name: Run code style check
+    runs-on: "ubuntu-20.04"
+    strategy:
+      matrix:
+        php:
+          - '8.0'
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP Action
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+          extensions: 'pdo_sqlite, gd'
+          tools: cs2pr
+
+      - uses: "ramsey/composer-install@v1"
+        with:
+          dependency-versions: "highest"
+
+      - name: Run code style check
+        run: composer run-script check-cs -- --format=checkstyle | cs2pr
+
   tests:
     name: Tests
     runs-on: "ubuntu-20.04"
     timeout-minutes: 10
-    continue-on-error: ${{ matrix.experimental }}
 
     strategy:
       fail-fast: false
       matrix:
         php:
           - '7.4'
-        composer_options: [ "" ]
-        experimental: [false]
-        include:
-          - php: '8.0'
-            composer_options: "--ignore-platform-req php"
-            experimental: true
+          - '8.0'
+          - '8.1'
 
     steps:
       - uses: actions/checkout@v2
@@ -40,13 +60,9 @@ jobs:
       - uses: "ramsey/composer-install@v1"
         with:
           dependency-versions: "highest"
-          composer-options: "${{ matrix.composer_options }}"
 
       - name: Setup problem matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run PHPStan analysis
         run: composer run-script phpstan
-
-      - name: Run code style check
-        run: composer run-script check-cs -- --format=checkstyle | cs2pr
diff --git a/composer.json b/composer.json
@@ -10,14 +10,14 @@
         }
     ],
     "require": {
-        "php": "^7.4",
+        "php": "^7.4 || ^8.0",
         "composer-plugin-api": "^2.0",
         "composer/semver": "^3.2"
     },
     "require-dev": {
         "composer/composer": "^2.0.8",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "0.12.57",
+        "phpstan/phpstan": "0.12.92",
         "phpstan/phpstan-phpunit": "^0.12.16",
         "phpstan/phpstan-webmozart-assert": "^0.12.7",
         "symfony/dotenv": "^5.2",