Merge pull request #24 from MacPaw/develop

Release
MacPaw · Feb 8, 2024 · c66b206 · c66b206
2 parents b37364b + 1b8a69e
commit c66b206
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
     run:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
         strategy:
             fail-fast: false
             matrix:
@@ -21,10 +21,15 @@ jobs:
                     - '6.0.*'
                     - '6.1.*'
                     - '6.2.*'
+                    - '7.0.*'
+                exclude:
+                    - php: '8.1'
+                      symfony-versions: '7.0.*'
                 include:
                     - description: 'Log Code Coverage'
-                      php: '8.1'
+                      php: '8.2'
                       coverage: 'xdebug'
+                      symfony-versions: '^7.0'
 
         name: PHP ${{ matrix.php }} ${{ matrix.description }}
         steps:
@@ -62,6 +67,7 @@ jobs:
                   composer require symfony/dependency-injection:${{ matrix.symfony-versions }} --no-update --no-scripts
                   composer require symfony/http-kernel:${{ matrix.symfony-versions }} --no-update --no-scripts
                   composer require --dev symfony/console:${{ matrix.symfony-versions }} --no-update --no-scripts
+                  composer require --dev symfony/property-access:${{ matrix.symfony-versions }} --no-update --no-scripts
 
             - name: Install dependencies
               run: composer install

diff --git a/composer.json b/composer.json
@@ -34,15 +34,16 @@
         "doctrine/doctrine-fixtures-bundle": "^3.0",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "theofidry/alice-data-fixtures": "^1.0",
-        "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
-        "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0"
+        "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0 || ^7.0",
+        "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.2",
         "phpunit/phpunit": "^9.5",
         "slevomat/coding-standard": "^7.0",
         "squizlabs/php_codesniffer": "^3.6",
-        "symfony/console": "^4.4 || ^5.4 || ^6.0"
+        "symfony/console": "^4.4 || ^5.4 || ^6.0 || ^7.0",
+        "symfony/property-access": "^4.4 || ^5.4 || ^6.0 || ^7.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -19,11 +19,6 @@
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
     <coverage>
         <include>
             <directory>./src</directory>