Merge branch 'v0.12.0' into chore/remove-psalm

KnpLabs · Oct 30, 2023 · 80da901 · 80da901
2 parents b9c2117 + 0cb8b54
commit 80da901
Show file tree

Hide file tree

Showing 65 changed files with 639 additions and 1,497 deletions.
diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml
@@ -5,6 +5,10 @@ jobs:
     name: BC Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Composer install
+        run: composer require --dev roave/backward-compatibility-check
       - name: Roave BC Check
-        uses: docker://nyholm/roave-bc-check-ga
+        run: vendor/bin/roave-backward-compatibility-check --format=github-actions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        php: ['7.4', '8.0', '8.1']
+        php: ['8.0', '8.1', '8.2']
 
     steps:
       - name: Set up PHP
@@ -42,15 +42,15 @@ jobs:
       max-parallel: 10
       matrix:
         run:
-          - { php: '8.1', packages: 'async-aws/simple-s3:^1.0', phpspec: 'spec/Gaufrette/Adapter/AsyncAwsS3Spec.php' }
-          - { php: '8.1', packages: 'aws/aws-sdk-php:^3.158', phpspec: 'spec/Gaufrette/Adapter/AwsS3Spec.php' }
-          - { php: '8.1', packages: 'google/apiclient:^2.12', phpspec: 'spec/Gaufrette/Adapter/GoogleCloudStorageSpec.php' }
-          - { php: '8.1', packages: 'doctrine/dbal:^2.3', phpspec: 'spec/Gaufrette/Adapter/DoctrineDbalSpec.php' }
-          - { php: '8.1', packages: 'doctrine/dbal:^3.4', phpspec: 'spec/Gaufrette/Adapter/DoctrineDbalSpec.php' }
-          - { php: '8.1', packages: 'league/flysystem:^1.0', phpspec: 'spec/Gaufrette/Adapter/FlysystemSpec.php' }
-          - { php: '8.1', packages: 'microsoft/azure-storage-blob:^1.0', phpspec: 'spec/Gaufrette/Adapter/AzureBlobStore' }
-          - { php: '8.1', packages: 'mongodb/mongodb:^1.1', phpspec: 'spec/Gaufrette/Adapter/GridFSSpec.php' }
-          - { php: '8.1', packages: 'phpseclib/phpseclib:^2.0', phpspec: 'spec/Gaufrette/Adapter/PhpseclibSftpSpec.php' }
+          - { php: '8.2', packages: 'async-aws/simple-s3:^1.0', phpspec: 'spec/Gaufrette/Adapter/AsyncAwsS3Spec.php' }
+          - { php: '8.2', packages: 'aws/aws-sdk-php:^3.158', phpspec: 'spec/Gaufrette/Adapter/AwsS3Spec.php' }
+          - { php: '8.2', packages: 'google/apiclient:^2.12', phpspec: 'spec/Gaufrette/Adapter/GoogleCloudStorageSpec.php' }
+          - { php: '8.2', packages: 'doctrine/dbal:^2.3', phpspec: 'spec/Gaufrette/Adapter/DoctrineDbalSpec.php' }
+          - { php: '8.2', packages: 'doctrine/dbal:^3.4', phpspec: 'spec/Gaufrette/Adapter/DoctrineDbalSpec.php' }
+          - { php: '8.2', packages: 'league/flysystem:^1.0', phpspec: 'spec/Gaufrette/Adapter/FlysystemSpec.php' }
+          - { php: '8.2', packages: 'microsoft/azure-storage-blob:^1.0', phpspec: 'spec/Gaufrette/Adapter/AzureBlobStore' }
+          - { php: '8.2', packages: 'mongodb/mongodb:^1.1', phpspec: 'spec/Gaufrette/Adapter/GridFSSpec.php' }
+          - { php: '8.2', packages: 'phpseclib/phpseclib:^2.0', phpspec: 'spec/Gaufrette/Adapter/PhpseclibSftpSpec.php' }
 
     steps:
       - name: Set up PHP

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           extensions: mongo, mbstring, fileinfo
           tools: composer:v2
 
@@ -20,7 +20,7 @@ jobs:
       - name: Download dependencies
         run: |
           make require-all
-          composer require --dev --no-update phpstan/phpstan:1.8.8
+          composer require --dev --no-update phpstan/phpstan:1.10.39
           composer update --no-interaction --prefer-dist
 
       - name: PHPStan
@@ -37,7 +37,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.0'
           extensions: mongo, mbstring, fileinfo
           tools: composer:v2
 

diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0"
+        "php": "^8.0"
     },
     "conflict": {
         "microsoft/windowsazure": "<0.4.3"
@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.10.x-dev"
+            "dev-fix-php82-deprecated": "0.12.x-dev"
         }
     },
     "archive": {

diff --git a/spec/Gaufrette/Adapter/AsyncAwsS3Spec.php b/spec/Gaufrette/Adapter/AsyncAwsS3Spec.php
@@ -8,9 +8,6 @@
 
 class AsyncAwsS3Spec extends ObjectBehavior
 {
-    /**
-     * @param \AsyncAws\SimpleS3\SimpleS3Client $service
-     */
     function let(SimpleS3Client $service)
     {
         $this->beConstructedWith($service, 'bucketName');

diff --git a/spec/Gaufrette/Adapter/AwsS3Spec.php b/spec/Gaufrette/Adapter/AwsS3Spec.php
@@ -8,9 +8,6 @@
 
 class AwsS3Spec extends ObjectBehavior
 {
-    /**
-     * @param \Aws\S3\S3Client $service
-     */
     function let(S3Client $service)
     {
         $this->beConstructedWith($service, 'bucketName');