diff --git a/composer.json b/composer.json
index d41b44fe..47cc7c04 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
"symfony/filesystem": "^6.3.1"
},
"require-dev": {
- "infection/infection": "^0.26",
+ "infection/infection": "^0.27",
"lcobucci/coding-standard": "^11.0.0",
"mikey179/vfsstream": "^1.6.11",
"phpstan/extension-installer": "^1.2.0",
@@ -31,7 +31,7 @@
"phpstan/phpstan-deprecation-rules": "^1.1.3",
"phpstan/phpstan-phpunit": "^1.3.11",
"phpstan/phpstan-strict-rules": "^1.5.1",
- "phpunit/phpunit": "^10.0.19",
+ "phpunit/phpunit": "^10.2",
"squizlabs/php_codesniffer": "^3.7.2",
"symfony/yaml": "^6.3.3"
},
diff --git a/composer.lock b/composer.lock
index 3ac445f1..46b921d9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "d0c45b42f3eb25c460822577a6823f56",
+ "content-hash": "f05e7191f2cab0bcc05ff2c5fc868424",
"packages": [
{
"name": "psr/cache",
@@ -1367,16 +1367,16 @@
},
{
"name": "fidry/cpu-core-counter",
- "version": "0.4.1",
+ "version": "0.5.1",
"source": {
"type": "git",
"url": "https://github.com/theofidry/cpu-core-counter.git",
- "reference": "79261cc280aded96d098e1b0e0ba0c4881b432c2"
+ "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/79261cc280aded96d098e1b0e0ba0c4881b432c2",
- "reference": "79261cc280aded96d098e1b0e0ba0c4881b432c2",
+ "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
+ "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
"shasum": ""
},
"require": {
@@ -1416,7 +1416,7 @@
],
"support": {
"issues": "https://github.com/theofidry/cpu-core-counter/issues",
- "source": "https://github.com/theofidry/cpu-core-counter/tree/0.4.1"
+ "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1"
},
"funding": [
{
@@ -1424,7 +1424,7 @@
"type": "github"
}
],
- "time": "2022-12-16T22:01:02+00:00"
+ "time": "2022-12-24T12:35:10+00:00"
},
{
"name": "infection/abstract-testframework-adapter",
@@ -1605,16 +1605,16 @@
},
{
"name": "infection/infection",
- "version": "0.26.19",
+ "version": "0.27.0",
"source": {
"type": "git",
"url": "https://github.com/infection/infection.git",
- "reference": "bd7351c88f3a797ea8977e68fe6a3f4d4c5f457f"
+ "reference": "a9ff8171577d98b887d7f16428edd81ff69ce887"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/infection/infection/zipball/bd7351c88f3a797ea8977e68fe6a3f4d4c5f457f",
- "reference": "bd7351c88f3a797ea8977e68fe6a3f4d4c5f457f",
+ "url": "https://api.github.com/repos/infection/infection/zipball/a9ff8171577d98b887d7f16428edd81ff69ce887",
+ "reference": "a9ff8171577d98b887d7f16428edd81ff69ce887",
"shasum": ""
},
"require": {
@@ -1625,14 +1625,14 @@
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
- "fidry/cpu-core-counter": "^0.4.0",
+ "fidry/cpu-core-counter": "^0.4.0 || ^0.5.0",
"infection/abstract-testframework-adapter": "^0.5.0",
"infection/extension-installer": "^0.1.0",
"infection/include-interceptor": "^0.2.5",
"justinrainbow/json-schema": "^5.2.10",
"nikic/php-parser": "^4.15.1",
"ondram/ci-detector": "^4.1.0",
- "php": "^8.0",
+ "php": "^8.1",
"sanmai/later": "^0.1.1",
"sanmai/pipeline": "^5.1 || ^6",
"sebastian/diff": "^3.0.2 || ^4.0 || ^5.0",
@@ -1644,6 +1644,7 @@
"webmozart/assert": "^1.11"
},
"conflict": {
+ "antecedent/patchwork": "<2.1.25",
"dg/bypass-finals": "<1.4.1",
"phpunit/php-code-coverage": ">9,<9.1.4 || >9.2.17,<9.2.21"
},
@@ -1652,13 +1653,16 @@
"ext-simplexml": "*",
"fidry/makefile": "^0.2.0",
"helmich/phpunit-json-assert": "^3.0",
+ "phpspec/prophecy": "^1.15",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/extension-installer": "^1.1.0",
- "phpstan/phpstan": "^1.3.0",
+ "phpstan/phpstan": "^1.10.15",
"phpstan/phpstan-phpunit": "^1.0.0",
"phpstan/phpstan-strict-rules": "^1.1.0",
"phpstan/phpstan-webmozart-assert": "^1.0.2",
"phpunit/phpunit": "^9.5.5",
+ "rector/rector": "^0.16.0",
+ "sidz/phpstan-rules": "^0.2.1",
"symfony/phpunit-bridge": "^5.4 || ^6.0",
"symfony/yaml": "^5.4 || ^6.0",
"thecodingmachine/phpstan-safe-rule": "^1.2.0"
@@ -1717,7 +1721,7 @@
],
"support": {
"issues": "https://github.com/infection/infection/issues",
- "source": "https://github.com/infection/infection/tree/0.26.19"
+ "source": "https://github.com/infection/infection/tree/0.27.0"
},
"funding": [
{
@@ -1729,7 +1733,7 @@
"type": "open_collective"
}
],
- "time": "2023-02-05T21:47:26+00:00"
+ "time": "2023-05-16T05:28:04+00:00"
},
{
"name": "justinrainbow/json-schema",
@@ -1962,16 +1966,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.15.4",
+ "version": "v4.16.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
+ "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
- "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
+ "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
"shasum": ""
},
"require": {
@@ -2012,9 +2016,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
},
- "time": "2023-03-05T19:49:14+00:00"
+ "time": "2023-06-25T14:52:30+00:00"
},
{
"name": "ondram/ci-detector",
@@ -2207,22 +2211,22 @@
},
{
"name": "phpstan/extension-installer",
- "version": "1.2.0",
+ "version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/extension-installer.git",
- "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40"
+ "reference": "f45734bfb9984c6c56c4486b71230355f066a58a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
- "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
+ "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f45734bfb9984c6c56c4486b71230355f066a58a",
+ "reference": "f45734bfb9984c6c56c4486b71230355f066a58a",
"shasum": ""
},
"require": {
"composer-plugin-api": "^2.0",
"php": "^7.2 || ^8.0",
- "phpstan/phpstan": "^1.8.0"
+ "phpstan/phpstan": "^1.9.0"
},
"require-dev": {
"composer/composer": "^2.0",
@@ -2245,9 +2249,9 @@
"description": "Composer plugin for automatic installation of PHPStan extensions",
"support": {
"issues": "https://github.com/phpstan/extension-installer/issues",
- "source": "https://github.com/phpstan/extension-installer/tree/1.2.0"
+ "source": "https://github.com/phpstan/extension-installer/tree/1.3.1"
},
- "time": "2022-10-17T12:59:16+00:00"
+ "time": "2023-05-24T08:59:17+00:00"
},
{
"name": "phpstan/phpdoc-parser",
@@ -2509,16 +2513,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "10.0.2",
+ "version": "10.1.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "20800e84296ea4732f9a125e08ce86b4004ae3e4"
+ "reference": "be1fe461fdc917de2a29a452ccf2657d325b443d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/20800e84296ea4732f9a125e08ce86b4004ae3e4",
- "reference": "20800e84296ea4732f9a125e08ce86b4004ae3e4",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/be1fe461fdc917de2a29a452ccf2657d325b443d",
+ "reference": "be1fe461fdc917de2a29a452ccf2657d325b443d",
"shasum": ""
},
"require": {
@@ -2537,7 +2541,7 @@
"theseer/tokenizer": "^1.2.0"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^10.1"
},
"suggest": {
"ext-pcov": "PHP extension that provides line coverage",
@@ -2546,7 +2550,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "10.0-dev"
+ "dev-main": "10.1-dev"
}
},
"autoload": {
@@ -2574,7 +2578,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.0.2"
+ "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.3"
},
"funding": [
{
@@ -2582,20 +2587,20 @@
"type": "github"
}
],
- "time": "2023-03-06T13:00:19+00:00"
+ "time": "2023-07-26T13:45:28+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "4.0.1",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd"
+ "reference": "5647d65443818959172645e7ed999217360654b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
- "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/5647d65443818959172645e7ed999217360654b6",
+ "reference": "5647d65443818959172645e7ed999217360654b6",
"shasum": ""
},
"require": {
@@ -2634,7 +2639,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
- "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.0.1"
+ "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+ "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.0.2"
},
"funding": [
{
@@ -2642,7 +2648,7 @@
"type": "github"
}
],
- "time": "2023-02-10T16:53:14+00:00"
+ "time": "2023-05-07T09:13:23+00:00"
},
{
"name": "phpunit/php-invoker",
@@ -2827,16 +2833,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "10.0.19",
+ "version": "10.2.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "20c23e85c86e5c06d63538ba464e8054f4744e62"
+ "reference": "1c17815c129f133f3019cc18e8d0c8622e6d9bcd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20c23e85c86e5c06d63538ba464e8054f4744e62",
- "reference": "20c23e85c86e5c06d63538ba464e8054f4744e62",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1c17815c129f133f3019cc18e8d0c8622e6d9bcd",
+ "reference": "1c17815c129f133f3019cc18e8d0c8622e6d9bcd",
"shasum": ""
},
"require": {
@@ -2850,7 +2856,7 @@
"phar-io/manifest": "^2.0.3",
"phar-io/version": "^3.0.2",
"php": ">=8.1",
- "phpunit/php-code-coverage": "^10.0",
+ "phpunit/php-code-coverage": "^10.1.1",
"phpunit/php-file-iterator": "^4.0",
"phpunit/php-invoker": "^4.0",
"phpunit/php-text-template": "^3.0",
@@ -2876,7 +2882,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "10.0-dev"
+ "dev-main": "10.2-dev"
}
},
"autoload": {
@@ -2908,7 +2914,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.19"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.6"
},
"funding": [
{
@@ -2924,7 +2930,7 @@
"type": "tidelift"
}
],
- "time": "2023-03-27T11:46:33+00:00"
+ "time": "2023-07-17T12:08:28+00:00"
},
{
"name": "sanmai/later",
@@ -2986,30 +2992,30 @@
},
{
"name": "sanmai/pipeline",
- "version": "v6.4",
+ "version": "v6.8.1",
"source": {
"type": "git",
"url": "https://github.com/sanmai/pipeline.git",
- "reference": "9260c4d05da37d67a69075858f41a6e7fff43743"
+ "reference": "2e88e466dd49f20c10a15330b3953d4d49c326e3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sanmai/pipeline/zipball/9260c4d05da37d67a69075858f41a6e7fff43743",
- "reference": "9260c4d05da37d67a69075858f41a6e7fff43743",
+ "url": "https://api.github.com/repos/sanmai/pipeline/zipball/2e88e466dd49f20c10a15330b3953d4d49c326e3",
+ "reference": "2e88e466dd49f20c10a15330b3953d4d49c326e3",
"shasum": ""
},
"require": {
- "php": "^7.1 || ^8.0"
+ "php": "^7.4 || ^8.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.8",
- "friendsofphp/php-cs-fixer": "^3",
+ "friendsofphp/php-cs-fixer": "^3.17",
"infection/infection": ">=0.10.5",
"league/pipeline": "^0.3 || ^1.0",
"phan/phan": ">=1.1",
"php-coveralls/php-coveralls": "^2.4.1",
"phpstan/phpstan": ">=0.10",
- "phpunit/phpunit": "^7.4 || ^8.1 || ^9.4",
+ "phpunit/phpunit": ">=9.4",
"vimeo/psalm": ">=2"
},
"type": "library",
@@ -3039,7 +3045,7 @@
"description": "General-purpose collections pipeline",
"support": {
"issues": "https://github.com/sanmai/pipeline/issues",
- "source": "https://github.com/sanmai/pipeline/tree/v6.4"
+ "source": "https://github.com/sanmai/pipeline/tree/v6.8.1"
},
"funding": [
{
@@ -3047,7 +3053,7 @@
"type": "github"
}
],
- "time": "2023-04-12T06:45:27+00:00"
+ "time": "2023-06-15T09:14:47+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -3351,16 +3357,16 @@
},
{
"name": "sebastian/diff",
- "version": "5.0.1",
+ "version": "5.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02"
+ "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/aae9a0a43bff37bd5d8d0311426c87bf36153f02",
- "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
+ "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
"shasum": ""
},
"require": {
@@ -3406,7 +3412,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
"security": "https://github.com/sebastianbergmann/diff/security/policy",
- "source": "https://github.com/sebastianbergmann/diff/tree/5.0.1"
+ "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3"
},
"funding": [
{
@@ -3414,7 +3420,7 @@
"type": "github"
}
],
- "time": "2023-03-23T05:12:41+00:00"
+ "time": "2023-05-01T07:48:21+00:00"
},
{
"name": "sebastian/environment",
@@ -3559,16 +3565,16 @@
},
{
"name": "sebastian/global-state",
- "version": "6.0.0",
+ "version": "6.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "aab257c712de87b90194febd52e4d184551c2d44"
+ "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/aab257c712de87b90194febd52e4d184551c2d44",
- "reference": "aab257c712de87b90194febd52e4d184551c2d44",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4",
+ "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4",
"shasum": ""
},
"require": {
@@ -3608,7 +3614,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/global-state/issues",
- "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.0"
+ "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+ "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1"
},
"funding": [
{
@@ -3616,7 +3623,7 @@
"type": "github"
}
],
- "time": "2023-02-03T07:07:38+00:00"
+ "time": "2023-07-19T07:19:23+00:00"
},
{
"name": "sebastian/lines-of-code",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 003dc7b2..de308577 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,15 +11,15 @@
beStrictAboutCoverageMetadata="true"
displayDetailsOnTestsThatTriggerDeprecations="true"
>
-
-
- src
-
-
-
test
+
+
diff --git a/test/ContainerBuilderTest.php b/test/ContainerBuilderTest.php
index 18cc9d1f..5e707f18 100644
--- a/test/ContainerBuilderTest.php
+++ b/test/ContainerBuilderTest.php
@@ -26,15 +26,14 @@
#[PHPUnit\UsesClass(Xml::class)]
final class ContainerBuilderTest extends TestCase
{
- /** @var Generator&MockObject */
- private Generator $generator;
+ private Generator&MockObject $generator;
private ContainerConfiguration $config;
private ParameterBag $parameterBag;
#[PHPUnit\Before]
public function configureDependencies(): void
{
- $this->generator = $this->getMockForAbstractClass(Generator::class, [], '', false, true, true, ['generate']);
+ $this->generator = $this->createMock(Generator::class);
$this->config = new ContainerConfiguration('Me\\MyApp');
$this->parameterBag = new ParameterBag();
}
@@ -105,7 +104,7 @@ public function constructShouldReceiveTheDependenciesAsArguments(): void
public function setGeneratorShouldChangeTheAttributeAndReturnSelf(): void
{
$builder = new ContainerBuilder($this->config, $this->generator, $this->parameterBag);
- $generator = $this->getMockForAbstractClass(Generator::class, [], '', false);
+ $generator = $this->createMock(Generator::class);
$expected = new ContainerBuilder($this->config, $generator, $this->parameterBag);
// @phpstan-ignore-next-line method is deprecated and will be removed in the next major version
diff --git a/test/GeneratorTest.php b/test/GeneratorTest.php
index 4f3af354..1ed474c0 100644
--- a/test/GeneratorTest.php
+++ b/test/GeneratorTest.php
@@ -40,10 +40,7 @@ public function initializeContainerShouldAddTheConfigurationFileAsAResource(): v
#[PHPUnit\Test]
public function initializeContainerCanOptionallyUseACustomClass(): void
{
- $generator = $this->getMockForAbstractClass(
- Generator::class,
- [__FILE__, CustomContainerBuilderForTests::class],
- );
+ $generator = new Yaml(__FILE__, CustomContainerBuilderForTests::class);
self::assertInstanceOf(
CustomContainerBuilderForTests::class,