Merge remote-tracking branch 'origin/7.3.x' into 7.2.x-merge-up-into-…

…7.3.x_5GRbHxfj
lcobucci · Apr 3, 2023 · fb35021 · fb35021
2 parents 4e9ec1f + 71d06d5
commit fb35021
Show file tree

Hide file tree

Showing 31 changed files with 693 additions and 1,177 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/backwards-compatibility.yml b/.github/workflows/backwards-compatibility.yml
@@ -0,0 +1,43 @@
+name: "Backwards compatibility check"
+
+on:
+  pull_request:
+
+jobs:
+  bc-check:
+    name: "Backwards compatibility check"
+
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+        with:
+          fetch-depth: 0
+
+      - name: "Install PHP"
+        uses: "shivammathur/[email protected]"
+        with:
+          php-version: "8.2"
+          ini-values: memory_limit=-1
+          tools: composer:v2, cs2pr
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "composer_cache_dir=$(composer global config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: "Cache dependencies"
+        uses: "actions/[email protected]"
+        with:
+          path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
+          key: "php-8.2-bc-break-check-${{ hashFiles('.github/workflows/backwards-compatibility.yml') }}"
+          restore-keys: "php-8.2-bc-break-check-"
+
+      - name: "Install dependencies"
+        run: composer global require roave/backward-compatibility-check
+
+      - name: "BC Check"
+        run: |
+          ~/.composer/vendor/bin/roave-backward-compatibility-check --from=${{ github.event.pull_request.base.sha }} --format=github-actions
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -15,16 +15,16 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.0"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.4.0"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.16.0"
+        uses: "shivammathur/setup-php@2.24.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
@@ -36,7 +36,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: "Cache dependencies"
-        uses: "actions/cache@v2.1.7"
+        uses: "actions/cache@v3.3.1"
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"

diff --git a/.github/workflows/composer-json-lint.yml b/.github/workflows/composer-json-lint.yml
@@ -15,16 +15,16 @@ jobs:
         dependencies:
           - "highest"
         php-version:
-          - "8.0"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.4.0"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.16.0"
+        uses: "shivammathur/setup-php@2.24.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
@@ -36,7 +36,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: "Cache dependencies"
-        uses: "actions/cache@v2.1.7"
+        uses: "actions/cache@v3.3.1"
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
@@ -60,10 +60,8 @@ jobs:
       - name: "Normalize composer.json"
         run: "composer-normalize --dry-run"
 
-      # Disabling it for now (doesn't run on PHP 8)
-      #
-      #- name: "Check composer.json explicit dependencies"
-      #  run: "composer-require-checker check --config-file=$(realpath composer-require-checker.json)"
+      - name: "Check composer.json explicit dependencies"
+        run: "composer-require-checker check --config-file=$(realpath composer-require-checker.json)"
 
       - name: "Check composer.json unused dependencies"
         run: "composer-unused"
diff --git a/.github/workflows/merge-bot.yml b/.github/workflows/merge-bot.yml
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -15,16 +15,16 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.0"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.4.0"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.16.0"
+        uses: "shivammathur/setup-php@2.24.0"
         with:
           coverage: "xdebug"
           php-version: "${{ matrix.php-version }}"
@@ -36,7 +36,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: "Cache dependencies"
-        uses: "actions/cache@v2.1.7"
+        uses: "actions/cache@v3.3.1"
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
@@ -58,4 +58,4 @@ jobs:
         run: "make infection PHPUNIT_FLAGS=--coverage-clover=coverage.xml INFECTION_FLAGS=--logger-github"
 
       - name: "Upload Code Coverage"
-        uses: "codecov/codecov-action@v2.1.0"
+        uses: "codecov/codecov-action@v3.1.1"
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -18,17 +18,16 @@ jobs:
           - "locked"
           - "development"
         php-version:
-          - "8.0"
-          - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.4.0"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.16.0"
+        uses: "shivammathur/setup-php@2.24.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
@@ -40,7 +39,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: "Cache dependencies"
-        uses: "actions/cache@v2.1.7"
+        uses: "actions/cache@v3.3.1"
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
@@ -75,16 +74,16 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.2"
+          - "8.3"
         operating-system:
           - "ubuntu-latest"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.4.0"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.16.0"
+        uses: "shivammathur/setup-php@2.24.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
@@ -96,7 +95,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: "Cache dependencies"
-        uses: "actions/cache@v2.1.7"
+        uses: "actions/cache@v3.3.1"
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"

diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.4.0"
+        uses: "actions/checkout@v3"
 
       - name: "Release"
-        uses: "laminas/automatic-releases@1.13.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:release"
         env:
@@ -28,7 +28,7 @@ jobs:
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
       - name: "Create Merge-Up Pull Request"
-        uses: "laminas/automatic-releases@1.13.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:create-merge-up-pull-request"
         env:
@@ -39,7 +39,7 @@ jobs:
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
       - name: "Create and/or Switch to new Release Branch"
-        uses: "laminas/automatic-releases@1.13.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
         env:
@@ -50,7 +50,7 @@ jobs:
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
       - name: "Bump Changelog Version On Originating Release Branch"
-        uses: "laminas/automatic-releases@1.13.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:bump-changelog"
         env:
@@ -61,7 +61,7 @@ jobs:
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
       - name: "Create new milestones"
-        uses: "laminas/automatic-releases@1.13.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:create-milestones"
         env:

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -15,16 +15,16 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.0"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.4.0"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
-        uses: "shivammathur/setup-php@2.16.0"
+        uses: "shivammathur/setup-php@2.24.0"
         with:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
@@ -36,7 +36,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: "Cache dependencies"
-        uses: "actions/cache@v2.1.7"
+        uses: "actions/cache@v3.3.1"
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"

diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,5 @@
 /phpstan.neon
 /.phpcs.cache
 /infection.log
-/.phpunit.result.cache
+/.phpunit.cache
 /build
diff --git a/Makefile b/Makefile
@@ -16,8 +16,8 @@ phpunit:
 
 .PHONY: infection
 infection:
-	@vendor/bin/phpunit --coverage-xml=build/coverage-xml --log-junit=build/junit.xml $(PHPUNIT_FLAGS)
-	@vendor/bin/infection -s --threads=$(PARALLELISM) --coverage=build $(INFECTION_FLAGS)
+	@php -d zend.assertions=1 -d xdebug.mode=coverage vendor/bin/phpunit --coverage-xml=build/coverage-xml --log-junit=build/junit.xml $(PHPUNIT_FLAGS)
+	@php -d zend.assertions=1 vendor/bin/infection -s --threads=$(PARALLELISM) --coverage=build $(INFECTION_FLAGS)
 
 .PHONY: phpcbf
 phpcbf:
@@ -29,5 +29,5 @@ phpcs:
 
 .PHONY: phpstan
 phpstan:
-	@vendor/bin/phpstan analyse --memory-limit=-1
+	@php -d xdebug.mode=off vendor/bin/phpstan analyse --memory-limit=-1
 
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Latest Stable Version]](https://packagist.org/packages/lcobucci/di-builder)
 [![Unstable Version]](https://packagist.org/packages/lcobucci/di-builder)
 
-[![Build Status]](https://github.com/lcobucci/di-builder/actions?query=workflow%3A%22PHPUnit%20Tests%22+branch%3A7.1.x)
+[![Build Status]](https://github.com/lcobucci/di-builder/actions?query=workflow%3A%22PHPUnit%20Tests%22+branch%3A7.3.x)
 [![Code Coverage]](https://codecov.io/gh/lcobucci/di-builder)
 
 Library that makes easier the creation of compiled containers using the [Symfony DI Component].
@@ -28,7 +28,7 @@ The project is licensed under the BSD-3-Clause license, see [LICENSE] file.
 [Total Downloads]: https://img.shields.io/packagist/dt/lcobucci/di-builder.svg?style=flat-square
 [Latest Stable Version]: https://img.shields.io/packagist/v/lcobucci/di-builder.svg?style=flat-square
 [Unstable Version]: https://img.shields.io/packagist/vpre/lcobucci/di-builder.svg?style=flat-square
-[Build Status]: https://img.shields.io/github/workflow/status/lcobucci/di-builder/PHPUnit%20tests/7.1.x?style=flat-square
+[Build Status]: https://img.shields.io/github/actions/workflow/status/lcobucci/di-builder/phpunit.yml?branch=7.3.x&style=flat-square
 [Code Coverage]: https://codecov.io/gh/lcobucci/di-builder/branch/7.1.x/graph/badge.svg
 [Symfony DI Component]: http://symfony.com/doc/current/components/dependency_injection/introduction.html
 [Packagist]: http://packagist.org/packages/lcobucci/di-builder

diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -0,0 +1,5 @@
+{
+  "symbol-whitelist": [
+    "Symfony\\Bridge\\ProxyManager\\LazyProxy\\PhpDumper\\ProxyDumper"
+  ]
+}