chore(sync): pull upstream 37aaf5f through ceb9f23

.dockerignore

@@ -0,0 +1,2 @@
+# ignore all by default
+*

.editorconfig

@@ -0,0 +1,18 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
+
+[Makefile]
+indent_style = tab

.env.dist

@@ -0,0 +1,22 @@
+AWS_KEY=
+AWS_SECRET=
+AWS_BUCKET=
+
+AZURE_ACCOUNT=
+AZURE_KEY=
+AZURE_CONTAINER=
+
+FTP_HOST=ftp
+FTP_PORT=21
+FTP_USER=gaufrette
+FTP_PASSWORD=gaufrette
+FTP_BASE_DIR=/gaufrette
+
+MONGO_URI=mongodb://mongodb:27017
+MONGO_DBNAME=gridfs_test
+
+SFTP_HOST=sftp
+SFTP_PORT=22
+SFTP_USER=gaufrette
+SFTP_PASSWORD=gaufrette
+SFTP_BASE_DIR=gaufrette

.gitattributes

@@ -0,0 +1,15 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.github export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/phpstan.neon.dist export-ignore
+/phpstan-baseline.neon export-ignore
+/.editorconfig export-ignore
+/.travis.yml export-ignore
+/appveyor.yml export-ignore
+/psalm.baseline.xml export-ignore
+/psalm.xml export-ignore
+/bin export-ignore
+/doc export-ignore
+/docker export-ignore
+/tests export-ignore

.github/workflows/.editorconfig

@@ -0,0 +1,2 @@
+[*.yml]
+indent_size = 2

.github/workflows/bc.yml

@@ -0,0 +1,10 @@
+on: [push, pull_request]
+name: Roave
+jobs:
+  roave_bc_check:
+    name: BC Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Roave BC Check
+        uses: docker://nyholm/roave-bc-check-ga

.github/workflows/ci.yml

@@ -0,0 +1,76 @@
+name: Tests
+on: [push, pull_request]
+
+jobs:
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 10
+      matrix:
+        php: ['7.4', '8.0', '8.1']
+
+    steps:
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+          tools: flex
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Download dependencies
+        run: |
+          composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
+
+      - name: Remove PHPSpec adapter tests
+        run: make remove-phpspec
+
+      - name: PHPSpec
+        run: php vendor/bin/phpspec run -fpretty --verbose
+
+      - name: PHPUnit
+        run: php vendor/bin/phpunit
+
+  adapter:
+    name: Adapter
+    runs-on: ubuntu-latest
+    strategy:
+      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' }
+
+    steps:
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.run.php }}
+          coverage: none
+          tools: flex
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Download dependencies
+        run: |
+          composer req ${{ matrix.run.packages }} --no-update
+          composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
+
+      - name: PHPSpec
+        if: ${{ matrix.run.phpspec }}
+        run: php vendor/bin/phpspec run -fpretty --verbose ${{ matrix.run.phpspec }}
+
+      - name: PHPUnit
+        run: php vendor/bin/phpunit

.github/workflows/static.yml

@@ -0,0 +1,80 @@
+on: [push, pull_request]
+name: Static analysis
+
+jobs:
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: mongo, mbstring, fileinfo
+          tools: composer:v2
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Download dependencies
+        run: |
+          make require-all
+          composer require --dev --no-update phpstan/phpstan:1.8.8
+          composer update --no-interaction --prefer-dist
+
+      - name: PHPStan
+        run: |
+          ./vendor/bin/phpstan --version
+          ./vendor/bin/phpstan analyse
+
+
+  php-cs-fixer:
+    name: PHP-CS-Fixer
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: mongo, mbstring, fileinfo
+          tools: composer:v2
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Download dependencies
+        run: |
+          make require-all
+          composer update --no-interaction --prefer-dist
+
+      - name: PHP-CS-Fixer
+        run: |
+          ./vendor/bin/php-cs-fixer --version
+          ./vendor/bin/php-cs-fixer fix --diff --dry-run --show-progress=none
+
+  psalm:
+    name: Psalm
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          extensions: mongo, mbstring, fileinfo
+          tools: composer:v2
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Download dependencies
+        run: |
+          make require-all
+          composer require --dev --no-update psalm/phar:3.16
+          composer update --no-interaction --prefer-dist
+
+      - name: Psalm
+        run: |
+          ./vendor/bin/psalm.phar --version
+          ./vendor/bin/psalm.phar --output-format=github --no-progress --show-info=false --stats

.gitignore

@@ -1,6 +1,13 @@
-vendor/
+bin/*
+!bin/tests
+!bin/tests-all
+composer.lock
+doc/.couscous
+.env
+.php_cs.cache
+.php-cs-fixer.cache
 phpunit.xml
 tests/adapters/*
 !tests/adapters/*.dist
-bin/*
-!bin/configure_test_env.sh
+vendor/
+tests/Gaufrette/Functional/adapters/*.php

.php-cs-fixer.dist.php

@@ -0,0 +1,41 @@
+<?php
+
+return (new PhpCsFixer\Config())
+    ->setFinder(PhpCsFixer\Finder::create()
+        ->exclude('vendor')
+        ->in(__DIR__)
+    )
+    ->setRules([
+        '@PSR1' => true,
+        '@PSR2' => true,
+        'array_syntax' => [ 'syntax' => 'short' ],
+        'binary_operator_spaces' => true,
+        'blank_line_before_statement' => true,
+        'cast_spaces' => true,
+        'combine_consecutive_unsets' => true,
+        'concat_space' => [ 'spacing' => 'one' ],
+        'linebreak_after_opening_tag' => true,
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_break_comment' => false,
+        'no_extra_blank_lines' => true,
+        'no_spaces_around_offset' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'normalize_index_brace' => true,
+        'PedroTroller/phpspec' => true,
+        'phpdoc_indent' => true,
+        'phpdoc_to_comment' => true,
+        'phpdoc_trim' => true,
+        'single_quote' => true,
+        'ternary_to_null_coalescing' => true,
+        'trailing_comma_in_multiline' => ['elements' => ['arrays']],
+        'trim_array_spaces' => true,
+    ])
+    ->registerCustomFixers(new PedroTroller\CS\Fixer\Fixers())
+;

.travis.yml

@@ -1,13 +1,46 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-
-before_script:
-  - ./bin/configure_test_env.sh
-  - composer self-update && composer install --dev --prefer-source
-
-script:
-  - php bin/phpspec run -fpretty --verbose
-  - bin/phpunit
+language: php
+
+sudo: required
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
+services:
+  - mongodb
+  - docker
+
+env:
+  - MONGO_URI="mongodb://127.0.0.1:27017"
+    MONGO_DBNAME="gridfs_test"
+    SFTP_HOST=localhost
+    SFTP_PORT=2222
+    SFTP_USER=gaufrette
+    SFTP_PASSWORD=gaufrette
+    SFTP_BASE_DIR=gaufrette
+    FTP_HOST=localhost
+    FTP_PORT=21
+    FTP_USER=gaufrette
+    FTP_PASSWORD=gaufrette
+    FTP_BASE_DIR=/gaufrette/
+
+matrix:
+  include:
+    - php: '7.1'
+    - php: '7.2'
+    - php: '7.3'
+    - php: '7.4'
+
+before_install:
+  - echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
+  - phpenv config-rm xdebug.ini || echo "xdebug not available"
+  - docker run -p ${SFTP_PORT}:22 -d atmoz/sftp:alpine ${SFTP_USER}:${SFTP_PASSWORD}:::${SFTP_BASE_DIR}
+  - docker run -d --name ftpd_server -p ${FTP_PORT}:21 -p 30000-30009:30000-30009 -e "PUBLICHOST=${FTP_HOST}" stilliard/pure-ftpd
+  - docker exec -it ftpd_server sh -c "(echo ${FTP_PASSWORD}; echo ${FTP_PASSWORD}) | pure-pw useradd ${FTP_USER} -f /etc/pure-ftpd/passwd/pureftpd.passwd -m -u ftpuser -d /home/ftpusers/${FTP_USER}"
+
+install:
+  - make require-all-legacy
+  - composer update --prefer-dist --no-progress --no-suggest --ansi
+
+script:
+  - php vendor/bin/phpunit --verbose