Merge pull request #42 from visto9259/1.4.x

Added support for PHP 8.3
LM-Commons · Aug 14, 2024 · 99d0681 · 99d0681
2 parents 5e99f6e + 22f54b6
commit 99d0681
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -1,7 +1,8 @@
-name: Build
+name: Continuous Integration
 
 on:
   push:
+    # Avoid running tests on changes to documentation
     paths-ignore:
       - 'docs/**'
   pull_request:
@@ -12,12 +13,12 @@ jobs:
   build:
     strategy:
       matrix:
-        php_version: ['8.1', '8.2']
-        deps: ['lowest', 'latest']
+        php_version: ['8.1', '8.2', '8.3']
+        deps: ['--prefer-lowest', '--prefer-dist']
         include:
           - code-coverage: 'yes'
             php_version: '8.2'
-            deps: 'latest'
+            deps: ''
 
     runs-on: ubuntu-latest
 
@@ -48,13 +49,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-php--${{matrix.php_version}}
 
-      - name: Install/update dependencies lowest
-        if: ${{ matrix.deps == 'lowest' }}
-        run: composer update --prefer-lowest --prefer-stable --no-progress
-
-      - name: Install/update dependencies latest
-        if: ${{ matrix.deps == 'latest' }}
-        run: composer update --no-progress
+      - name: Install/update dependencies
+        run: composer update ${{matrix.deps}}
 
       - name: Run PHPUnit test suite with coverage
         if: ${{ matrix.code-coverage == 'yes' }}
@@ -64,3 +60,7 @@ jobs:
         if: ${{ matrix.code-coverage != 'yes' }}
         run: composer test
 
+      - name: Upload coverage results to Coverall
+        if: ${{ matrix.code-coverage == 'yes' }}
+        uses: coverallsapp/github-action@v2
+
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         }
     },
     "require": {
-        "php": "^8.1 | ^8.2",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "laminas/laminas-eventmanager": "^2.6.4 || ^3.2.1",
         "laminas/laminas-http": "^2.10",
         "laminas/laminas-mvc": "^2.7.15 || ^3.1.1",
@@ -47,8 +47,7 @@
         "laminas/laminas-view": "^2.8.1",
         "phpunit/phpunit": "^9.5.0",
         "php-coveralls/php-coveralls": "^2.1",
-        "squizlabs/php_codesniffer": "^3.4",
-        "laminas/laminas-component-installer": "^3.4"
+        "squizlabs/php_codesniffer": "^3.4"
     },
     "autoload": {
         "psr-4": {
@@ -60,14 +59,16 @@
             "LmcCorsTest\\": "tests/"
         }
     },
-    "replace": {
-        "laminas-commons/lmc-cors": "v1.0.1"
-    },
     "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit",
-        "test-coverage": "phpunit --coverage-clover build/logs/clover.xml",
+        "test-coverage": "phpunit --colors=always --coverage-clover build/logs/clover.xml",
+        "test-coverage-html": "phpunit --colors=always --coverage-html build/html",
         "upload-coverage": "php-coveralls -v"
     },
     "config": {