Test against PHP 8.3

.editorconfig

@@ -8,5 +8,5 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.yml]
+[{*.yaml,*.yml,*.neon,*.json}]
 indent_size = 2

.gitattributes

@@ -1,6 +1,13 @@
+* text=auto
+
+.editorconfig export-ignore
 .gitattributes export-ignore
+.github export-ignore
 .gitignore export-ignore
-.travis.yml export-ignore
+docker-compose.yml export-ignore
+Dockerfile export-ignore
 Makefile export-ignore
+phpcs.xml
+phpstan.neon export-ignore
 phpunit.xml export-ignore
 tests/ export-ignore

.github/workflows/code-style.yml

@@ -5,17 +5,17 @@ on:
 - pull_request
 
 jobs:
-  phpstan:
-    name: PHPCS
-    runs-on: ubuntu-20.04
+  phpcs:
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: "8.1"
+        coverage: none
+        php-version: "8.3"
         ini-values: memory_limit=-1
-        tools: composer:v2, phpcs
-    - name: Run PHPCS
-      run: phpcs
+        tools: phpcs, cs2pr
+    - name: Run PHP Code Sniffer
+      run: phpcs -q --report=checkstyle | cs2pr

.github/workflows/static-analysis.yml

@@ -6,19 +6,19 @@ on:
 
 jobs:
   phpstan:
-    name: PHPStan
-    runs-on: ubuntu-20.04
+    name: phpstan
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: "8.1"
+        php-version: "8.3"
         ini-values: memory_limit=-1
         tools: composer:v2
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.composer/cache
@@ -28,5 +28,5 @@ jobs:
     - name: Install dependencies
       run: composer install --no-interaction --no-progress
 
-    - name: Run PHPStan
+    - name: Analyze
       run: vendor/bin/phpstan

.github/workflows/test.yml

@@ -7,25 +7,26 @@ on:
 jobs:
   phpunit:
     name: phpunit
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php-version:
         - "8.1"
         - "8.2"
+        - "8.3"
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:
         coverage: xdebug
         php-version: "${{ matrix.php-version }}"
-        ini-values: apc.enable_cli=1, memory_limit=-1
+        ini-values: memory_limit=-1
         tools: composer:v2
         extensions: apcu
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.composer/cache
@@ -40,7 +41,7 @@ jobs:
       run: make test-coveralls
 
     - name: Upload code coverage
-      if: ${{ matrix.php-version == '8.1' }}
+      if: ${{ matrix.php-version == '8.3' }}
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |

.gitignore

@@ -1,4 +1,4 @@
-.phpunit.result.cache
+.phpunit.cache
 build
 composer.lock
 vendor

CODE_OF_CONDUCT.md

@@ -1,4 +1,3 @@
-
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
@@ -61,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
+<[email protected]>.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
@@ -119,16 +118,15 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 version 2.0, available at
 [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
 
-Community Impact Guidelines were inspired by 
+Community Impact Guidelines were inspired by
 [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
 at [https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org
 [v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
 [Mozilla CoC]: https://github.com/mozilla/diversity
 [FAQ]: https://www.contributor-covenant.org/faq
 [translations]: https://www.contributor-covenant.org/translations
-

CONTRIBUTING.md

@@ -2,13 +2,13 @@
 
 Contributions are **welcome** and will be fully **credited**.
 
-We accept contributions via Pull Requests on [Github](https://github.com/ICanBoogie/Inflector).
+We accept contributions via Pull Requests.
 
 ## Pull Requests
 
 - **Code style** — We're following a [Coding Standard][]. Check the code style with `make lint`.
 - **Code health** — We're using [PHPStan][] to analyse the code, with maximum scrutiny. Check the code with `make lint`.
-- **Add tests!** — Your contribution won't be accepted if it doesn't have tests.
+- **Add tests!** — Your contribution won't be accepted if it does not have tests.
 - **Document any change in behaviour** — Make sure the `README.md` and any other relevant documentation are kept
   up-to-date.
 - **Consider our release cycle** — We follow [SemVer v2.0.0](http://semver.org/). Randomly breaking public APIs is not

Dockerfile

@@ -1,8 +1,9 @@
-FROM php:8.1-cli-buster
+ARG PHP_VERSION
+FROM php:${PHP_VERSION}-cli-bookworm
 
 RUN apt-get update && \
 	apt-get install -y autoconf pkg-config && \
-    pecl channel-update pecl.php.net && \
+	pecl channel-update pecl.php.net && \
 	pecl install xdebug && \
 	docker-php-ext-enable opcache xdebug
 
@@ -22,7 +23,7 @@ ENV COMPOSER_ALLOW_SUPERUSER 1
 
 RUN apt-get update && \
 	apt-get install unzip && \
-    curl -s https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet && \
+	curl -s https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet && \
 	mv composer.phar /usr/local/bin/composer && \
 	echo 'export PATH="$HOME/.composer/vendor/bin:$PATH"\n' >> /root/.bashrc
 

LICENSE

@@ -1,7 +1,7 @@
 The icanboogie/bind-symfony-dependency-injection package is free software.
 It is released under the terms of the following BSD License.
 
-Copyright (c) 2017-2022 by Olivier Laviale
+Copyright (c) 2017-2024 by Olivier Laviale
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

Makefile

@@ -12,40 +12,48 @@ usage:
 vendor:
 	@composer install
 
-.PHONY: update
-update:
-	@composer update
-
-.PHONY: autoload
-autoload: vendor
-	@composer dump-autoload
+# testing
 
+.PHONY: test-dependencies
 test-dependencies: vendor
 
 .PHONY: test
-test: test-dependencies clean-sandbox
-	@$(PHPUNIT)
+test: test-dependencies test-cleanup
+	@$(PHPUNIT) $(ARGS)
 
 .PHONY: test-coverage
 test-coverage: test-dependencies
 	@mkdir -p build/coverage
-	@$(PHPUNIT) --coverage-html ../build/coverage
+	@XDEBUG_MODE=coverage $(PHPUNIT) --coverage-html ../build/coverage
 
 .PHONY: test-coveralls
 test-coveralls: test-dependencies
 	@mkdir -p build/logs
-	@$(PHPUNIT) --coverage-clover ../build/logs/clover.xml
+	@XDEBUG_MODE=coverage $(PHPUNIT) --coverage-clover ../build/logs/clover.xml
+
+.PHONY: test-cleanup
+test-cleanup:
+	@rm -rf tests/sandbox/*
 
 .PHONY: test-container
-test-container:
-	@-docker-compose run --rm app bash
+test-container: test-container-81
+
+.PHONY: test-container-81
+test-container-81:
+	@-docker-compose run --rm app81 bash
+	@docker-compose down -v
+
+.PHONY: test-container-82
+test-container-82:
+	@-docker-compose run --rm app82 bash
+	@docker-compose down -v
+
+.PHONY: test-container-83
+test-container-83:
+	@-docker-compose run --rm app83 bash
 	@docker-compose down -v
 
 .PHONY: lint
 lint:
 	@XDEBUG_MODE=off phpcs -s
 	@XDEBUG_MODE=off vendor/bin/phpstan
-
-.PHONY: clean-sandbox
-clean-sandbox:
-	@rm -f ./tests/sandbox/*

README.md

@@ -133,16 +133,16 @@ return fn(ConfigBuilder $config) => $config
 
 The project is continuously tested by [GitHub actions](https://github.com/ICanBoogie/bind-symfony-dependency-injection/actions).
 
-[![Tests](https://github.com/ICanBoogie/bind-symfony-dependency-injection/workflows/test/badge.svg?branch=master)](https://github.com/ICanBoogie/bind-symfony-dependency-injection/actions?query=workflow%3Atest)
-[![Static Analysis](https://github.com/ICanBoogie/bind-symfony-dependency-injection/workflows/static-analysis/badge.svg?branch=master)](https://github.com/ICanBoogie/bind-symfony-dependency-injection/actions?query=workflow%3Astatic-analysis)
-[![Code Style](https://github.com/ICanBoogie/bind-symfony-dependency-injection/workflows/code-style/badge.svg?branch=master)](https://github.com/ICanBoogie/bind-symfony-dependency-injection/actions?query=workflow%3Acode-style)
+[![Tests](https://github.com/ICanBoogie/bind-symfony-dependency-injection/workflows/test/badge.svg)](https://github.com/ICanBoogie/bind-symfony-dependency-injection/actions?query=workflow%3Atest)
+[![Static Analysis](https://github.com/ICanBoogie/bind-symfony-dependency-injection/workflows/static-analysis/badge.svg)](https://github.com/ICanBoogie/bind-symfony-dependency-injection/actions?query=workflow%3Astatic-analysis)
+[![Code Style](https://github.com/ICanBoogie/bind-symfony-dependency-injection/workflows/code-style/badge.svg)](https://github.com/ICanBoogie/bind-symfony-dependency-injection/actions?query=workflow%3Acode-style)
 
 
 
 ## Code of Conduct
 
-This project adheres to a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project and its
-community, you are expected to uphold this code.
+This project adheres to a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in
+this project and its community, you are expected to uphold this code.
 
 
 
@@ -152,14 +152,6 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 
 
-## Testing
-
-Run `make test-container` to create and log into the test container, then run `make test` to run the
-test suite. Alternatively, run `make test-coverage` to run the test suite with test coverage. Open
-`build/coverage/index.html` to see the breakdown of the code coverage.
-
-
-
 ## License
 
 **icanboogie/bind-symfony-dependency-injection** is released under the [BSD-3-Clause](LICENSE).