Merge 0ec3879 into 1a81156

api-platform · Mar 4, 2021 · 98cbdec · 98cbdec
2 parents 1a81156 + 0ec3879
commit 98cbdec
Show file tree

Hide file tree

Showing 579 changed files with 22,140 additions and 2,224 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,7 +8,6 @@
 /features export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
-/phpunit_mongodb.xml export-ignore
 /tests export-ignore
 /update-js.sh export-ignore
 /yarn.lock export-ignore
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+tidelift: "packagist/api-platform/core"
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: intl, bcmath, curl, openssl, mbstring 
           ini-values: memory_limit=-1
-          tools: flex, pecl, composer, flex, php-cs-fixer
+          tools: pecl, composer, php-cs-fixer
           coverage: none
       - name: Run PHP-CS-Fixer fix
         run: php-cs-fixer fix --dry-run --diff --ansi
@@ -51,7 +51,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex, phpstan
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring
           coverage: none
           ini-values: memory_limit=-1
@@ -87,7 +87,7 @@ jobs:
       - name: Run PHPStan analysis
         env:
           SYMFONY_PHPUNIT_VERSION: '9.4'
-        run: phpstan analyse --no-interaction --no-progress --no-interaction --ansi
+        run: ./vendor/bin/phpstan analyse --no-interaction --no-progress --no-interaction --ansi
 
   phpunit:
     name: PHPUnit (PHP ${{ matrix.php }})
@@ -112,8 +112,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
-          extensions: intl, bcmath, curl, openssl, mbstring 
+          tools: pecl, composer
+          extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite
           coverage: pcov
           ini-values: memory_limit=-1
       - name: Get composer cache directory
@@ -207,7 +207,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite
           coverage: pcov
           ini-values: memory_limit=-1
@@ -322,7 +322,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring 
           coverage: none
           ini-values: memory_limit=-1
@@ -362,7 +362,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite
           coverage: none
           ini-values: memory_limit=-1
@@ -384,7 +384,7 @@ jobs:
       - name: Clear test app cache
         run: tests/Fixtures/app/console cache:clear --ansi
       - name: Run Behat tests
-        run: vendor/bin/behat --out=std --format=progress --profile=default --no-interaction
+        run: vendor/bin/behat --out=std --format=progress --profile=default --no-interaction --tags '~@!lowest'
 
   postgresql:
     name: Behat (PHP ${{ matrix.php }}) (PostgreSQL)
@@ -412,7 +412,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring, pdo_pgsql
           coverage: none
           ini-values: memory_limit=-1
@@ -460,7 +460,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring, pdo_mysql
           coverage: none
           ini-values: memory_limit=-1
@@ -485,7 +485,7 @@ jobs:
         run: vendor/bin/behat --out=std --format=progress --profile=default --no-interaction
 
   mongodb:
-    name: Behat (PHP ${{ matrix.php }}) (MongoDB)
+    name: PHPUnit + Behat (PHP ${{ matrix.php }}) (MongoDB)
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
@@ -506,8 +506,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
-          extensions: intl, bcmath, curl, openssl, mbstring 
+          tools: pecl, composer
+          extensions: intl, bcmath, curl, openssl, mbstring, mongodb
           coverage: none
           ini-values: memory_limit=-1
       - name: Get composer cache directory
@@ -522,15 +522,15 @@ jobs:
       - name: Update project dependencies
         run: |
           composer update --no-interaction --no-progress --ansi
-          composer why doctrine/reflection
-      # - name: Require Symfony Uid
-      #   run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
+          # composer why doctrine/reflection
+      - name: Require Symfony Uid
+        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
       - name: Install PHPUnit
         run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
         run: tests/Fixtures/app/console cache:clear --ansi
-      - name: Run PHPUnit
-        run: vendor/bin/simple-phpunit
+      - name: Run PHPUnit tests
+        run: vendor/bin/simple-phpunit --group mongodb
       - name: Run Behat tests
         run: vendor/bin/behat -vv --out=std --format=progress --profile=mongodb --no-interaction
 
@@ -562,7 +562,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring, mongodb
           coverage: none
           ini-values: memory_limit=-1
@@ -585,8 +585,6 @@ jobs:
         run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
         run: tests/Fixtures/app/console cache:clear --ansi
-      - name: Run PHPUnit tests
-        run: vendor/bin/simple-phpunit
       - name: Run Behat tests
         run: vendor/bin/behat --out=std --format=progress --profile=elasticsearch --no-interaction
 
@@ -600,15 +598,15 @@ jobs:
           - '7.4'
       fail-fast: false
     env:
-      SYMFONY_DEPRECATIONS_HELPER: max[total]=7
+      SYMFONY_DEPRECATIONS_HELPER: max[total]=0
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring 
           coverage: none
           ini-values: memory_limit=-1
@@ -639,18 +637,20 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.4'
+          - '8.0'
         symfony:
-          - '5.2'
+          - '5.3'
       fail-fast: false
+    env:
+      SYMFONY_DEPRECATIONS_HELPER: max[direct]=0
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
-          tools: flex, pecl, composer, flex
+          php-version: '8.0'
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring 
           coverage: none
           ini-values: memory_limit=-1
@@ -670,7 +670,7 @@ jobs:
       - name: Update project dependencies
         run: composer update --no-interaction --no-progress --ansi
       - name: Require Symfony Uid
-        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
+        run: composer require symfony/uid symfony/intl --dev --no-interaction --no-progress --ansi
       - name: Flag held back Symfony packages
         env:
           symfony_version: ${{ matrix.symfony }}
@@ -699,18 +699,18 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.4'
+          - '8.0'
         symfony:
-          - '5.2'
+          - '5.3'
       fail-fast: false
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
-          tools: flex, pecl, composer, flex
+          php-version: '8.0'
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring 
           coverage: none
           ini-values: memory_limit=-1
@@ -720,8 +720,7 @@ jobs:
         id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Allow unstable project dependencies
-        run: |
-          jq '. + {"minimum-stability": "dev"}' composer.json | sponge composer.json
+        run: composer config minimum-stability dev
       - name: Cache dependencies
         uses: actions/cache@v2
         with:
@@ -763,6 +762,7 @@ jobs:
       matrix:
         php:
           - '7.4'
+          - '8.0'
       fail-fast: false
     env:
       APP_ENV: sqlite
@@ -774,7 +774,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite
           coverage: none
           ini-values: memory_limit=-1
@@ -787,10 +787,14 @@ jobs:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
+      - name: Set Composer platform config
+        if: (startsWith(matrix.php, '8.0'))
+        run: |
+            composer config platform.php 7.4.99
       - name: Update project dependencies
-        run: composer update --no-interaction --no-progress --ansi --ignore-platform-reqs
+        run: composer update --no-interaction --no-progress --ansi
       - name: Require Symfony Uid
-        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi --ignore-platform-reqs
+        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
       - name: Install phpunit
         run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
@@ -806,6 +810,7 @@ jobs:
       matrix:
         php:
           - '7.4'
+          - '8.0'
       fail-fast: false
     env:
       APP_ENV: sqlite
@@ -817,7 +822,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: flex, pecl, composer, flex
+          tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite
           coverage: none
           ini-values: memory_limit=-1
@@ -830,13 +835,18 @@ jobs:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
+      - name: Set Composer platform config
+        if: (startsWith(matrix.php, '8.0'))
+        run: |
+            composer config platform.php 7.4.99
       - name: Update project dependencies
-        run: composer update --no-interaction --no-progress --ansi --ignore-platform-reqs
+        run: composer update --no-interaction --no-progress --ansi
       - name: Require Symfony Uid
-        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi --ignore-platform-reqs
+        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
       - name: Install phpunit
         run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
         run: tests/Fixtures/app/console cache:clear --ansi
       - name: Run Behat tests
         run: vendor/bin/behat --out=std --format=progress --profile=default --no-interaction
+
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -16,6 +16,12 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude([
         'tests/Fixtures/app/var',
     ])
+    ->notPath('src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php')
+    ->notPath('src/Annotation/ApiFilter.php') // temporary
+    ->notPath('src/Annotation/ApiProperty.php') // temporary
+    ->notPath('src/Annotation/ApiResource.php') // temporary
+    ->notPath('src/Annotation/ApiSubresource.php') // temporary
+    ->notPath('tests/Fixtures/TestBundle/Entity/DummyPhp8.php') // temporary
     ->append([
         'tests/Fixtures/app/console',
     ]);
@@ -29,14 +35,15 @@ return PhpCsFixer\Config::create()
         '@PHPUnit60Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
+        'single_line_comment_style' => false, // Temporary fix for compatibility with PHP 8 attributes, see https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/5284
+        'comment_to_phpdoc' => true, // Temporary fix for compatibility with PHP 8 attributes, see https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/5284
         'align_multiline_comment' => [
             'comment_type' => 'phpdocs_like',
         ],
         'array_indentation' => true,
         'array_syntax' => [
             'syntax' => 'short',
         ],
-        'comment_to_phpdoc' => true,
         'compact_nullable_typehint' => true,
         'doctrine_annotation_array_assignment' => [
             'operator' => '=',