Merge branch 'master' into weird-behavior-of-has-page-fields

Author: mcg-web

.appveyor.yml

@@ -11,10 +11,10 @@ init:
 
 install:
     - ps: Set-Service wuauserv -StartupType Manual
-    - cinst -y php --version=7.4
+    - cinst -y php --version=8.0
     - cinst -y composer
     - refreshenv
-    - cd c:\tools\php74
+    - cd c:\tools\php80
     - copy php.ini-production php.ini /Y
     - echo date.timezone="UTC" >> php.ini
     - echo extension_dir=ext >> php.ini

.dockerignore

@@ -1,10 +1,7 @@
 /*
-!/lib/
 !/src/
 !/tests/
-!/benchmarks/
 !/composer.json
 !/phpunit.xml.*
 !/phpstan*.neon
 !/.php_cs.*
-!/phpbench.json

.gitattributes

@@ -1,6 +1,7 @@
+/docs export-ignore
 /tests export-ignore
 /benchmarks export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.editorconfig export-ignore
+.* export-ignore
+*.neon export-ignore
 phpunit.xml.dist export-ignore
+Dockerfile export-ignore

.github/dependabot.yml

@@ -3,5 +3,5 @@ updates:
     - package-ecosystem: composer
       directory: '/'
       schedule:
-          interval: monthly
+          interval: daily
       open-pull-requests-limit: 5

.github/workflows/ci.yml

@@ -2,167 +2,114 @@ name: CI
 
 on:
   pull_request:
-    branches:
-      - "*.*"
-      - master
   push:
     branches:
       - "*.*"
       - master
-
-env:
-  COMPOSER_ROOT_VERSION: "1.4"
+  schedule:
+    - cron: "0 4 * * *"
 
 jobs:
-  build:
-    runs-on: ubuntu-16.04
+  tests:
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
+        php-version:
+          - '8.0'
+          - '8.1'
+        symfony-version:
+          - '5.4.*'
+          - '6.0.*'
+        dependencies:
+          - 'lowest'
+          - 'highest'
+        remove-dependencies: [ '' ]
+        coverage: [ 'none' ]
         include:
-          - php-version: 7.4
-            symfony-version: "4.4.*"
-
-          - php-version: 7.4
-            symfony-version: "4.4.*"
-            validator: false
-
-          - php-version: 7.4
-            symfony-version: "5.0.*"
-
-          - php-version: 7.4
-            symfony-version: "5.1.*"
-
-          - php-version: 7.4
-            symfony-version: "5.2.*"
-
-          - php-version: 8.0
-            symfony-version: "5.2.*"
-
-    name: "PHP ${{ matrix.php-version }} / Symfony ${{ matrix.symfony-version }} Test"
-
+          - php-version: '8.0'
+            symfony-version: '5.4.*'
+            dependencies: 'lowest'
+            remove-dependencies: '--dev symfony/validator doctrine/orm doctrine/annotations'
+          - php-version: '8.1'
+            symfony-version: '5.4.*'
+            dependencies: 'lowest'
+            coverage: "pcov"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 50
 
-      - name: "Install PHP without coverage"
+      - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
+          tools: flex
           php-version: "${{ matrix.php-version }}"
-          coverage: "none"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
+          coverage: "${{ matrix.coverage }}"
 
       - name: "Change stability"
-        if: matrix.stability != ''
-        run: perl -pi -e 's/^}$/,"minimum-stability":"'"${{ matrix.minimum-stability }}"'"}/' composer.json
-
-      - name: "Symfony version"
-        if: matrix.symfony-version != ''
-        run: perl -pi -e 's#"(symfony/.*)":\s*".*"#"$1":"'"${{ matrix.symfony-version }}"'"#' composer.json
-
-      - name: "PhpUnit version"
-        if: matrix.phpunit-version != ''
-        run: composer req "phpunit/phpunit:${{ matrix.phpunit-version }}" --dev --no-update
+        if: "matrix.stability != ''"
+        run: perl -pi -e 's/^}$/,"minimum-stability":"'"${{ matrix.minimum-stability }}"'"}/' composer.json && cat composer.json
 
       - name: "Webonyx GraphQL version"
-        if: matrix.graphql-version != ''
-        run: composer req "webonyx/graphql-php:${{ matrix.graphql-version }}" --dev --no-update
+        if: "matrix.graphql-version != ''"
+        run: composer require "webonyx/graphql-php:${{ matrix.graphql-version }}" --dev --no-update
 
-      - name: "Disabled validator if needed"
-        if: matrix.validator == false
-        run: composer remove "symfony/validator" --dev --no-update;
+      - name: Remove dependencies
+        if: "matrix.remove-dependencies != ''"
+        run: composer remove --no-update ${{ matrix.remove-dependencies }}
 
       - name: "Install dependencies"
-        run: composer update --no-interaction --no-progress ${{ matrix.composer-flags }}
-
-      - name: "Set USE_EXPERIMENTAL_EXECUTOR if needed"
-        if: matrix.experimental-executor != ''
-        run: export USE_EXPERIMENTAL_EXECUTOR=${{ matrix.experimental-executor }}
-
-      - name: "Set SYMFONY_DEPRECATIONS_HELPER if needed"
-        if: matrix.symfony-deprecation-helper != ''
-        run: export SYMFONY_DEPRECATIONS_HELPER=${{ matrix.symfony-deprecation-helper }}
+        uses: ramsey/composer-install@v2
+        with:
+          dependency-versions: ${{ matrix.dependencies }}
+        env:
+          SYMFONY_REQUIRE: "${{ matrix.symfony-version }}"
 
       - name: "Run tests"
         run: composer test
 
+      - name: "Upload coverage results to Coveralls"
+        if: "matrix.coverage == 'pcov'"
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.5.1/php-coveralls.phar
+          php php-coveralls.phar --coverage_clover=build/logs/clover.xml -v
   coding-standard:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     name: Coding Standard
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 50
 
-      - name: "Install PHP without coverage"
+      - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "7.4"
-          coverage: "none"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
+          tools: flex
+          php-version: "8.1"
 
       - name: "Install dependencies"
-        run: composer update --no-interaction --no-progress
+        uses: ramsey/composer-install@v2
 
       - name: "Check coding standard"
         run: composer check-cs
 
-  benchmark:
-    runs-on: ubuntu-16.04
-    name: Benchmark
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 50
-
-      - name: "Install PHP without coverage"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "7.4"
-          coverage: "none"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
-
-      - name: "Install dependencies"
-        run: composer update --no-interaction --no-progress
-
-      - name: "Run benchmark"
-        run: composer bench
-
   static-analysis:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     name: "Static analysis"
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - '8.1'
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 50
 
-      - name: "Install PHP with coverage"
+      - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "7.4"
+          php-version: ${{ matrix.php-version }}
           coverage: "none"
 
       - name: "Cache dependencies installed with composer"
@@ -173,49 +120,7 @@ jobs:
           restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
 
       - name: "Install dependencies"
-        run: composer update --no-interaction --no-progress
+        uses: ramsey/composer-install@v2
 
       - name: "Run static-analysis"
         run: composer static-analysis
-
-  coverage:
-    runs-on: ubuntu-16.04
-    name: "Coverage"
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 50
-
-      - name: "Install PHP with coverage"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "8.0"
-          ini-values: pcov.directory=.
-          coverage: "pcov"
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
-
-      - name: "Install Ocular as depencies"
-        run: composer req "scrutinizer/ocular" --dev --no-update
-
-      - name: "Install dependencies"
-        run: composer update --no-interaction --no-progress
-
-      - name: "Run tests with coverage"
-        run: bin/phpunit --color=always -v --debug --coverage-clover=build/logs/clover.xml
-
-      - name: "Upload coverage results to Scrutinizer"
-        run: vendor/scrutinizer/ocular/bin/ocular code-coverage:upload --format=php-clover build/logs/clover.xml
-
-      - name: "Upload coverage results to Coveralls"
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          composer global require php-coveralls/php-coveralls
-          php-coveralls --coverage_clover=build/logs/clover.xml -v

.gitignore

@@ -5,9 +5,8 @@ phpunit.xml
 /bin
 composer.lock
 composer.phar
-.php_cs.cache
-.php_cs
-.phpunit.result.cache
+/.php-cs-fixer.php
+/*.cache
 
 phpbench.phar
 phpbench.phar.*

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -6,23 +6,34 @@
     ->in([__DIR__.'/src', __DIR__.'/tests'])
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules(
         [
             '@Symfony' => true,
-            '@PHP74Migration' => true,
-            '@PHP74Migration:risky' => true,
+            '@PHP80Migration' => true,
+            '@PHP80Migration:risky' => true,
             'ordered_imports' => ['imports_order' => ['class', 'function', 'const']],
-            'general_phpdoc_annotation_remove' => ['author', 'category', 'copyright', 'created', 'license', 'package', 'since', 'subpackage', 'version'],
+            'general_phpdoc_annotation_remove' => [
+                'annotations' => [
+                    'author',
+                    'category',
+                    'copyright',
+                    'created',
+                    'license',
+                    'package',
+                    'since',
+                    'subpackage',
+                    'version',
+                ],
+            ],
             'fully_qualified_strict_types' => true,
             'single_line_throw' => false,
             'phpdoc_to_comment' => false,
             'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
             'global_namespace_import' => ['import_functions' => true, 'import_classes' => true, 'import_constants' => true],
             'phpdoc_summary' => false,
-            'hash_to_slash_comment' => false,
             'single_line_comment_style' => false,
-            'phpdoc_no_alias_tag' => ['type' => 'var'],
+            'phpdoc_no_alias_tag' => ['replacements' => ['type' => 'var']],
             'no_mixed_echo_print' => ['use' => 'echo'],
         ]
     )