Update dependencies (#23)

a2lix · Oct 14, 2020 · d7f4bec · d7f4bec
1 parent ea50b7c
commit d7f4bec
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,8 +4,7 @@ on: ["push", "pull_request"]
 
 env:
     COMPOSER_ALLOW_SUPERUSER: '1'
-    SYMFONY_PHPUNIT_VERSION: 8.5
-    SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT: 1
+    SYMFONY_PHPUNIT_VERSION: 9
     SYMFONY_DEPRECATIONS_HELPER: max[self]=0
 
 jobs:
@@ -22,14 +21,18 @@ jobs:
               uses: actions/checkout@v2
             - name: Install Composer
               run: wget -qO - https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --quiet
-            - name: Cache Composer dependencies
-              uses: actions/cache@v1
+            - name: Update Composer v2
+              run: composer self-update --preview
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
               with:
-                path: ~/.composer/cache
-                key: composer-php${{ matrix.php }}-highest-
+                path: ${{ steps.composer-cache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
                 restore-keys: |
-                   composer-php${{ matrix.php }}-highest-
-                   composer-
+                  ${{ runner.os }}-composer-
             - name: Validate Composer
               run: composer validate
             - name: Install xsl PHP extension
@@ -54,26 +57,32 @@ jobs:
         strategy:
             matrix:
                 php:
-                    - '7.2'
                     - '7.3'
                     - '7.4'
+                    - '8.0-rc'
                 dependencies:
-                    - lowest
-                    - highest
+                    - 'highest'
+                include:
+                    -   php: '7.2'
+                        dependencies: 'lowest'
             fail-fast: false
         steps:
             - name: Checkout
               uses: actions/checkout@v2
             - name: Install Composer
               run: wget -qO - https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --quiet
-            - name: Cache Composer dependencies
-              uses: actions/cache@v1
+ #           - name: Update Composer v2
+ #             run: composer self-update --preview
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
               with:
-                path: ~/.composer/cache
-                key: composer-php${{ matrix.php }}-${{ matrix.dependencies }}-
+                path: ${{ steps.composer-cache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
                 restore-keys: |
-                    composer-php${{ matrix.php }}-${{ matrix.dependencies }}-
-                    composer-
+                  ${{ runner.os }}-composer-
             - name: Install xsl PHP extension
               run: |
                 apk add $PHPIZE_DEPS libxslt-dev
@@ -91,14 +100,10 @@ jobs:
         name: Coverage (PHP ${{ matrix.php }})
         runs-on: ubuntu-latest
         container:
-            image: php:${{ matrix.php }}-alpine
+            image: php:7.4-alpine
             options: >-
               --tmpfs /tmp:exec
               --tmpfs /var/tmp:exec
-        strategy:
-            matrix:
-                php:
-                    - '7.4'
         steps:
             - name: Checkout
               uses: actions/checkout@v2
@@ -109,14 +114,18 @@ jobs:
                 docker-php-ext-enable pcov
             - name: Install Composer
               run: wget -qO - https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --quiet
-            - name: Cache Composer dependencies
-              uses: actions/cache@v1
+            - name: Update Composer v2
+              run: composer self-update --preview
+            - name: Get Composer Cache Directory
+              id: composer-cache
+              run: |
+                echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - uses: actions/cache@v2
               with:
-                path: ~/.composer/cache
-                key: composer-php${{ matrix.php }}-highest-
+                path: ${{ steps.composer-cache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
                 restore-keys: |
-                    composer-php${{ matrix.php }}-highest-
-                    composer-
+                  ${{ runner.os }}-composer-
             - name: Install xsl PHP extension
               run: |
                 apk add $PHPIZE_DEPS libxslt-dev

diff --git a/composer.json b/composer.json
@@ -16,22 +16,22 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": ">=7.2.5",
         "symfony/config": "^3.4.30|^4.3|^5.0",
         "symfony/dependency-injection": "^3.4.30|^4.3|^5.0",
         "symfony/doctrine-bridge": "^3.4.30|^4.3|^5.0",
         "symfony/form": "^3.4.30|^4.3|^5.0",
         "symfony/http-kernel": "^3.4.30|^4.3|^5.0",
-        "doctrine/persistence": "^1.3.7"
+        "doctrine/persistence": "^1.3|^2.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.7",
-        "edgedesign/phpqa": "^1.23",
+        "edgedesign/phpqa": "^1.23.3",
         "friendsofphp/php-cs-fixer": "^2.15",
-        "phpstan/phpstan": "^0.11.19",
+        "phpstan/phpstan": "^0.12",
         "sensiolabs/security-checker": "^6.0",
         "symfony/phpunit-bridge": "^4.3|^5.0",
-        "symfony/validator": "^3.4.30|^4.3",
+        "symfony/validator": "^3.4.30|^4.3|^5.0",
         "vimeo/psalm": "^3.6"
     },
     "suggest": {
@@ -45,7 +45,7 @@
             "psalm"
         ],
         "phpunit": [
-            "SYMFONY_DEPRECATIONS_HELPER=max[self]=0 SYMFONY_PHPUNIT_VERSION=8.5 SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 simple-phpunit"
+            "SYMFONY_PHPUNIT_VERSION=9 SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 simple-phpunit"
         ]
     },
     "config": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,6 +9,7 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <server name="SYMFONY_PHPUNIT_VERSION" value="9" />
     </php>
 
     <listeners>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     >
         <php>
             <ini name="error_reporting" value="-1" />
+            <server name="SYMFONY_PHPUNIT_VERSION" value="9" />
         </php>
         <listeners>
@@ Expand Down @@