Raise minimum PHP requirements to ^8.0 (#83)

vjik · web-flow · commit 8d3370a0a1cb · 2021-07-01T17:34:30.000+03:00
diff --git a/.editorconfig b/.editorconfig
@@ -12,3 +12,6 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,7 @@ name: build
 jobs:
   tests:
     name: PHP ${{ matrix.php }}-${{ matrix.os }}
+
     env:
       extensions: fileinfo, pdo, pdo_sqlite
       key: cache-v1
@@ -20,7 +21,6 @@ jobs:
           - windows-latest
 
         php:
-          - "7.4"
           - "8.0"
 
     steps:
@@ -52,13 +52,11 @@ jobs:
           restore-keys: |
             php${{ matrix.php }}-composer-
 
-      - name: Install dependencies with composer php 7.4
-        if: matrix.php == '7.4'
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+      - name: Update composer
+        run: composer self-update
 
-      - name: Install dependencies with composer php 8.0
-        if: matrix.php == '8.0'
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ignore-platform-reqs --ansi
+      - name: Install dependencies with composer
+        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run tests with codeception
         run: |
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -16,7 +16,7 @@ jobs:
           - ubuntu-latest
 
         php:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: Checkout
@@ -40,8 +40,11 @@ jobs:
           restore-keys: |
             php${{ matrix.php }}-composer-
 
+      - name: Update composer
+        run: composer self-update
+
       - name: Install dependencies with composer
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
+        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Static analysis
         run: vendor/bin/psalm --shepherd --stats --output-format=checkstyle | cs2pr --graceful-warnings --colorize
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,36 +1,38 @@
 checks:
-    php: true
+  php: true
 
 filter:
-    paths:
-        - "src/*"
-    excluded_paths:
-        - "src/ApplicationRunner.php"
+  paths:
+    - "src/*"
+  excluded_paths:
+    - "src/ApplicationRunner.php"
 
 build:
-    nodes:
-        analysis:
-            environment:
-                php: 7.4.12
+  nodes:
+    analysis:
+      environment:
+        php: 8.0.6
 
-            tests:
-                override:
-                    - php-scrutinizer-run
+      tests:
+        override:
+          - php-scrutinizer-run
 
-        tests-and-coverage:
-            environment:
-                php: 7.4.12
+    tests-and-coverage:
+      environment:
+        php:
+          version: 8.0.6
+          ini:
+            xdebug.mode: coverage
 
-            dependencies:
-                override:
-                    - composer self-update
-                    - composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+      dependencies:
+        override:
+          - composer self-update
+          - composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
-            tests:
-                override:
-                    -
-                        command: php -S 127.0.0.1:8080 -t public public/index-test.php > ./runtime/yii.log 2>&1 & vendor/bin/codecept run acceptance --coverage-xml --env github-ci
-                        on_node: 1
-                        coverage:
-                            file: tests/_output/coverage.xml
-                            format: php-clover
+      tests:
+        override:
+          - command: php -S 127.0.0.1:8080 -t public public/index-test.php > ./runtime/yii.log 2>&1 & vendor/bin/codecept run acceptance --coverage-xml --env github-ci
+            on_node: 1
+            coverage:
+              file: tests/_output/coverage.xml
+              format: php-clover
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.0",
         "cebe/markdown": "^1.2@dev",
         "cycle/orm": "^1.2",
         "cycle/proxy-factory": "^1.2",
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     php:
         container_name: yii-php
-        image: yiisoftware/yii-php:7.4-fpm
+        image: yiisoftware/yii-php:8.0-fpm
         working_dir: /app
         volumes:
             - ./:/app
