Upgraded php version & deployment setup

polymorphine · Aug 10, 2022 · 51ba71c · 51ba71c
2 parents 952e932 + 968b295
commit 51ba71c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,11 +3,12 @@ on: [push, pull_request]
 
 jobs:
   full-build:
+    name: "Coding standards & coverage tests"
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest]
-        php-versions: ["7.4"]
+        operating-system: ['ubuntu-latest']
+        php-versions: ['7.4']
     env:
       extensions: pcov, dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
       key: cache-v2
@@ -36,23 +37,20 @@ jobs:
           ini-values: assert.exception=1, zend.assertions=1
       - name: "Validate composer.json"
         run: composer validate
-      - name: "Set composer cache directory"
-        id: composer-cache-full-build
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: "Setup composer cache"
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache-full-build.outputs.dir }}
-          key: ${{ runner.os }}-composer-full-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-full-
+          path: ~/.composer/cache
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
       - name: "Install highest dependencies"
         run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-stable
       - name: "Coding standard Php-CS-Fixer checks"
         run: vendor/bin/php-cs-fixer --dry-run -v --config=cs-fixer.php.dist --path-mode=intersection fix src tests
       - name: "Coding standard CodeSniffer checks"
         run: |
           vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml src
-          vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml tests
+          vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml --ignore=*/CodeSamples/* tests
       - name: "Run PhpUnit tests with coverage"
         run: |
           mkdir -p build/logs
@@ -63,16 +61,19 @@ jobs:
           COVERALLS_RUN_LOCALLY: 1
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
-  lowest-build:
+  php-os-builds:
+    name: "PHP 8 tests"
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest]
-        php-versions: ["7.4"]
+        operating-system: ['ubuntu-latest', 'windows-latest', 'macos-latest']
+        php-versions: ['8.0', '8.1']
     env:
       extensions: dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
       key: cache-v2
     steps:
+      - name: "Turn off git EOL conversion"
+        run: git config --global core.autocrlf false
       - name: "Checkout"
         uses: actions/checkout@v2
       - name: "Setup PHP extensions cache environment"
@@ -95,16 +96,13 @@ jobs:
           coverage: none
           extensions: ${{ env.extensions }}
           ini-values: assert.exception=1, zend.assertions=1
-      - name: "Set composer cache directory"
-        id: composer-cache-lowest-build
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: "Setup composer cache"
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache-lowest-build.outputs.dir }}
-          key: ${{ runner.os }}-composer-low-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-low-
-      - name: "Install lowest dependencies"
-        run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-stable --prefer-lowest
+          path: ~/.composer/cache
+          key: ${{ runner.os }}-php${{ matrix.php-versions }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-php${{ matrix.php-versions }}-composer-
+      - name: "Install highest dependencies"
+        run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-stable
       - name: "Run PhpUnit tests (no coverage)"
         run: vendor/bin/phpunit --no-coverage
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.4",
+        "php": "^7.4 || ^8.0",
         "psr/http-message": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/http-server-middleware": "^1.0",
@@ -30,5 +30,12 @@
         "psr-4": {
             "Polymorphine\\Routing\\Tests\\": "tests/"
         }
+    },
+    "scripts": {
+        "test-cs": [
+            "vendor/bin/php-cs-fixer --dry-run -v --config=cs-fixer.php.dist --path-mode=intersection fix src tests",
+            "vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml src",
+            "vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml --ignore=*/CodeSamples/* tests"
+        ]
     }
 }