Lower number of ci jobs and upgrade phpstan (#162)

norkunas · Dec 2, 2021 · 17ee48b · 17ee48b
1 parent 310ad8b
commit 17ee48b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
             - name: "Setup PHP"
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   tools: cs2pr
             - name: "Install dependencies with composer"
               run: |
@@ -51,24 +51,18 @@ jobs:
                       symfony-version: 4.4.*
                     - php-version: 8.0
                       symfony-version: 4.4.*
+                    - php-version: 8.1
+                      symfony-version: 4.4.*
                     - php-version: 7.4
-                      symfony-version: 5.3.*
-                    - php-version: 8.0
-                      symfony-version: 5.3.*
-                    - php-version: 8.0
                       symfony-version: 5.4.*
-                      dev: true
                     - php-version: 8.0
-                      symfony-version: 6.0.*
-                      dev: true
-                    - php-version: 8.1
-                      symfony-version: 5.3.*
+                      symfony-version: 5.4.*
                     - php-version: 8.1
                       symfony-version: 5.4.*
-                      dev: true
+                    - php-version: 8.0
+                      symfony-version: 6.0.*
                     - php-version: 8.1
                       symfony-version: 6.0.*
-                      dev: true
         steps:
             - name: "Checkout"
               uses: actions/checkout@v2
@@ -77,14 +71,10 @@ jobs:
               with:
                   coverage: none
                   php-version: ${{ matrix.php-version }}
-            - name: "Configure minimum stability"
-              if: matrix.dev
-              run: |
-                  composer config minimum-stability dev
-                  composer remove --dev friendsofphp/php-cs-fixer
             - name: "Install dependencies (fixed Symfony version) with composer"
               if: matrix.symfony-version
               run: |
+                  composer remove --dev friendsofphp/php-cs-fixer
                   composer require symfony/options-resolver:${{ matrix.symfony-version }} --no-interaction --no-update
                   composer update --no-interaction --no-progress --no-suggest
             - name: "Install dependencies (lowest dependencies) with composer"
@@ -103,8 +93,8 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - php-version: 8.0
-                      symfony-version: 5.3.*
+                    - php-version: 8.1
+                      symfony-version: 6.0.*
         steps:
             - name: "Checkout"
               uses: actions/checkout@v2
@@ -115,6 +105,7 @@ jobs:
                   php-version: ${{ matrix.php-version }}
             - name: "Install dependencies with composer"
               run: |
+                  composer remove --dev friendsofphp/php-cs-fixer
                   composer require symfony/options-resolver:${{ matrix.symfony-version }} --no-interaction --no-update
                   composer update --no-interaction --no-progress --no-suggest
             - name: "Run tests with phpunit/phpunit"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 2.8.0
+
+- add external user id auth hash in device to enable identity verification
+- Allow Symfony 6
+
 ## Version 2.7.0
 
 - Additional SMS related fields (on the Notifications payload)

diff --git a/composer.json b/composer.json
@@ -20,10 +20,10 @@
         "symfony/options-resolver": "^4.4|^5.0|^6.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.1",
+        "friendsofphp/php-cs-fixer": "^3.3",
         "nyholm/psr7": "^1.2",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0",
         "symfony/http-client": "^5.0|^6.0",
         "symfony/phpunit-bridge": "^5.3|^6.0"
     },

diff --git a/src/AbstractApi.php b/src/AbstractApi.php
@@ -32,6 +32,7 @@ protected function createRequest(string $method, string $uri): RequestInterface
 
     /**
      * @param mixed $value
+     * @phpstan-param int<1, max> $maxDepth
      */
     protected function createStream($value, int $flags = null, int $maxDepth = 512): StreamInterface
     {