From bc8303fe5f6d1dc6eb4d24c700318f8a6a69bffa Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 25 Oct 2022 16:48:12 +0900 Subject: [PATCH] Composer update --- www/vendor/composer/autoload_classmap.php | 2 + www/vendor/composer/autoload_static.php | 2 + www/vendor/composer/installed.json | 68 ++++---- www/vendor/composer/installed.php | 24 +-- www/vendor/phpunit/phpunit/ChangeLog-8.5.md | 9 +- www/vendor/phpunit/phpunit/ChangeLog-9.5.md | 11 ++ www/vendor/phpunit/phpunit/LICENSE | 46 +++-- www/vendor/phpunit/phpunit/SECURITY.md | 11 ++ www/vendor/phpunit/phpunit/composer.json | 6 +- .../phpunit/phpunit/src/Framework/Assert.php | 6 + .../src/Framework/Assert/Functions.php | 7 + .../src/Framework/Constraint/Constraint.php | 1 + .../src/Framework/Constraint/IsIdentical.php | 13 +- .../Exception/DuplicateMethodException.php | 3 + .../IncompatibleReturnValueException.php | 3 + .../ReturnValueNotConfiguredException.php | 2 + .../src/Framework/MockObject/Generator.php | 2 + .../src/Framework/MockObject/Invocation.php | 72 ++++---- .../src/Framework/MockObject/MockMethod.php | 72 +------- .../MockObject/Rule/InvokedAtIndex.php | 1 + .../phpunit/src/Framework/TestCase.php | 27 ++- .../TestListenerDefaultImplementation.php | 1 + .../phpunit/src/Framework/TestResult.php | 2 + .../phpunit/src/Framework/TestSuite.php | 1 + .../src/Runner/DefaultTestResultCache.php | 1 + .../src/Runner/Extension/ExtensionHandler.php | 1 + .../src/Runner/Extension/PharLoader.php | 2 + .../phpunit/phpunit/src/Runner/Version.php | 2 +- .../src/TextUI/CliArguments/Configuration.php | 1 + .../phpunit/phpunit/src/TextUI/Command.php | 3 + .../CodeCoverage/CodeCoverage.php | 1 + .../CodeCoverage/Filter/Directory.php | 1 + .../Filter/DirectoryCollection.php | 1 + .../CodeCoverage/Report/Clover.php | 1 + .../CodeCoverage/Report/Cobertura.php | 1 + .../CodeCoverage/Report/Crap4j.php | 1 + .../CodeCoverage/Report/Html.php | 1 + .../CodeCoverage/Report/Php.php | 1 + .../CodeCoverage/Report/Text.php | 1 + .../CodeCoverage/Report/Xml.php | 1 + .../TextUI/XmlConfiguration/Configuration.php | 1 + .../XmlConfiguration/Filesystem/Directory.php | 1 + .../Filesystem/DirectoryCollection.php | 1 + .../XmlConfiguration/Filesystem/File.php | 1 + .../Filesystem/FileCollection.php | 1 + .../TextUI/XmlConfiguration/Group/Group.php | 1 + .../Group/GroupCollection.php | 1 + .../TextUI/XmlConfiguration/Group/Groups.php | 1 + .../TextUI/XmlConfiguration/Logging/Junit.php | 1 + .../XmlConfiguration/Logging/Logging.php | 1 + .../XmlConfiguration/Logging/TeamCity.php | 1 + .../XmlConfiguration/Logging/TestDox/Html.php | 1 + .../XmlConfiguration/Logging/TestDox/Text.php | 1 + .../XmlConfiguration/Logging/TestDox/Xml.php | 1 + .../TextUI/XmlConfiguration/Logging/Text.php | 1 + .../MoveWhitelistExcludesToCoverage.php | 2 + .../TextUI/XmlConfiguration/PHP/Constant.php | 1 + .../PHP/ConstantCollection.php | 1 + .../XmlConfiguration/PHP/IniSetting.php | 1 + .../PHP/IniSettingCollection.php | 1 + .../src/TextUI/XmlConfiguration/PHP/Php.php | 1 + .../TextUI/XmlConfiguration/PHP/Variable.php | 1 + .../PHP/VariableCollection.php | 1 + .../XmlConfiguration/PHPUnit/Extension.php | 2 + .../PHPUnit/ExtensionCollection.php | 1 + .../XmlConfiguration/PHPUnit/PHPUnit.php | 1 + .../TestSuite/TestDirectory.php | 1 + .../TestSuite/TestDirectoryCollection.php | 1 + .../XmlConfiguration/TestSuite/TestFile.php | 1 + .../TestSuite/TestFileCollection.php | 1 + .../XmlConfiguration/TestSuite/TestSuite.php | 1 + .../TestSuite/TestSuiteCollection.php | 1 + .../phpunit/src/Util/Annotation/Registry.php | 2 + .../phpunit/phpunit/src/Util/Cloner.php | 34 ++++ .../phpunit/phpunit/src/Util/FileLoader.php | 1 + www/vendor/phpunit/phpunit/src/Util/Test.php | 6 + www/vendor/phpunit/phpunit/src/Util/Type.php | 13 -- .../src/Util/VersionComparisonOperator.php | 1 + .../phpunit/src/Util/Xml/SnapshotNodeList.php | 1 + .../phpunit/src/Util/XmlTestListRenderer.php | 3 +- www/vendor/sebastian/comparator/ChangeLog.md | 41 ++++- .../comparator/src/DoubleComparator.php | 2 + .../sebastian/comparator/src/Factory.php | 1 - .../comparator/src/NumericComparator.php | 4 +- .../comparator/src/ScalarComparator.php | 3 +- www/vendor/sebastian/exporter/ChangeLog.md | 14 ++ .../sebastian/exporter/src/Exporter.php | 20 ++- www/vendor/sebastian/type/ChangeLog.md | 10 ++ www/vendor/sebastian/type/composer.json | 2 +- www/vendor/sebastian/type/src/Parameter.php | 42 +++++ .../sebastian/type/src/ReflectionMapper.php | 163 +++++++++++++----- .../sebastian/type/src/type/CallableType.php | 3 + .../sebastian/type/src/type/FalseType.php | 3 + .../type/src/type/GenericObjectType.php | 3 + .../type/src/type/IntersectionType.php | 13 +- .../sebastian/type/src/type/IterableType.php | 3 + .../sebastian/type/src/type/MixedType.php | 3 + .../sebastian/type/src/type/NeverType.php | 3 + .../sebastian/type/src/type/NullType.php | 3 + .../sebastian/type/src/type/ObjectType.php | 3 + .../sebastian/type/src/type/SimpleType.php | 3 + .../sebastian/type/src/type/StaticType.php | 3 + .../sebastian/type/src/type/TrueType.php | 3 + www/vendor/sebastian/type/src/type/Type.php | 45 +++++ .../sebastian/type/src/type/UnionType.php | 30 +++- .../sebastian/type/src/type/UnknownType.php | 3 + .../sebastian/type/src/type/VoidType.php | 3 + 107 files changed, 673 insertions(+), 263 deletions(-) create mode 100644 www/vendor/phpunit/phpunit/SECURITY.md create mode 100644 www/vendor/phpunit/phpunit/src/Util/Cloner.php create mode 100644 www/vendor/sebastian/type/src/Parameter.php diff --git a/www/vendor/composer/autoload_classmap.php b/www/vendor/composer/autoload_classmap.php index 0ffc765e..2fd25375 100644 --- a/www/vendor/composer/autoload_classmap.php +++ b/www/vendor/composer/autoload_classmap.php @@ -367,6 +367,7 @@ return array( 'PHPUnit\\Util\\Annotation\\DocBlock' => $vendorDir . '/phpunit/phpunit/src/Util/Annotation/DocBlock.php', 'PHPUnit\\Util\\Annotation\\Registry' => $vendorDir . '/phpunit/phpunit/src/Util/Annotation/Registry.php', 'PHPUnit\\Util\\Blacklist' => $vendorDir . '/phpunit/phpunit/src/Util/Blacklist.php', + 'PHPUnit\\Util\\Cloner' => $vendorDir . '/phpunit/phpunit/src/Util/Cloner.php', 'PHPUnit\\Util\\Color' => $vendorDir . '/phpunit/phpunit/src/Util/Color.php', 'PHPUnit\\Util\\ErrorHandler' => $vendorDir . '/phpunit/phpunit/src/Util/ErrorHandler.php', 'PHPUnit\\Util\\Exception' => $vendorDir . '/phpunit/phpunit/src/Util/Exception.php', @@ -668,6 +669,7 @@ return array( 'SebastianBergmann\\Type\\NeverType' => $vendorDir . '/sebastian/type/src/type/NeverType.php', 'SebastianBergmann\\Type\\NullType' => $vendorDir . '/sebastian/type/src/type/NullType.php', 'SebastianBergmann\\Type\\ObjectType' => $vendorDir . '/sebastian/type/src/type/ObjectType.php', + 'SebastianBergmann\\Type\\Parameter' => $vendorDir . '/sebastian/type/src/Parameter.php', 'SebastianBergmann\\Type\\ReflectionMapper' => $vendorDir . '/sebastian/type/src/ReflectionMapper.php', 'SebastianBergmann\\Type\\RuntimeException' => $vendorDir . '/sebastian/type/src/exception/RuntimeException.php', 'SebastianBergmann\\Type\\SimpleType' => $vendorDir . '/sebastian/type/src/type/SimpleType.php', diff --git a/www/vendor/composer/autoload_static.php b/www/vendor/composer/autoload_static.php index aef4ee86..2be26ba8 100644 --- a/www/vendor/composer/autoload_static.php +++ b/www/vendor/composer/autoload_static.php @@ -400,6 +400,7 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9 'PHPUnit\\Util\\Annotation\\DocBlock' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Annotation/DocBlock.php', 'PHPUnit\\Util\\Annotation\\Registry' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Annotation/Registry.php', 'PHPUnit\\Util\\Blacklist' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Blacklist.php', + 'PHPUnit\\Util\\Cloner' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Cloner.php', 'PHPUnit\\Util\\Color' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Color.php', 'PHPUnit\\Util\\ErrorHandler' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/ErrorHandler.php', 'PHPUnit\\Util\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Exception.php', @@ -701,6 +702,7 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9 'SebastianBergmann\\Type\\NeverType' => __DIR__ . '/..' . '/sebastian/type/src/type/NeverType.php', 'SebastianBergmann\\Type\\NullType' => __DIR__ . '/..' . '/sebastian/type/src/type/NullType.php', 'SebastianBergmann\\Type\\ObjectType' => __DIR__ . '/..' . '/sebastian/type/src/type/ObjectType.php', + 'SebastianBergmann\\Type\\Parameter' => __DIR__ . '/..' . '/sebastian/type/src/Parameter.php', 'SebastianBergmann\\Type\\ReflectionMapper' => __DIR__ . '/..' . '/sebastian/type/src/ReflectionMapper.php', 'SebastianBergmann\\Type\\RuntimeException' => __DIR__ . '/..' . '/sebastian/type/src/exception/RuntimeException.php', 'SebastianBergmann\\Type\\SimpleType' => __DIR__ . '/..' . '/sebastian/type/src/type/SimpleType.php', diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index 12ea5d37..c66a0aab 100644 --- a/www/vendor/composer/installed.json +++ b/www/vendor/composer/installed.json @@ -646,17 +646,17 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.24", - "version_normalized": "9.5.24.0", + "version": "9.5.25", + "version_normalized": "9.5.25.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", "shasum": "" }, "require": { @@ -678,21 +678,21 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.1", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, "suggest": { "ext-soap": "*", "ext-xdebug": "*" }, - "time": "2022-08-30T07:42:16+00:00", + "time": "2022-09-25T03:44:45+00:00", "bin": [ "phpunit" ], @@ -731,7 +731,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" }, "funding": [ { @@ -741,6 +741,10 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], "install-path": "../phpunit/phpunit" @@ -923,17 +927,17 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", - "version_normalized": "4.0.6.0", + "version": "4.0.8", + "version_normalized": "4.0.8.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -944,7 +948,7 @@ "require-dev": { "phpunit/phpunit": "^9.3" }, - "time": "2020-10-26T15:49:45+00:00", + "time": "2022-09-14T12:41:17+00:00", "type": "library", "extra": { "branch-alias": { @@ -988,7 +992,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -1195,17 +1199,17 @@ }, { "name": "sebastian/exporter", - "version": "4.0.4", - "version_normalized": "4.0.4.0", + "version": "4.0.5", + "version_normalized": "4.0.5.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -1216,7 +1220,7 @@ "ext-mbstring": "*", "phpunit/phpunit": "^9.3" }, - "time": "2021-11-11T14:18:36+00:00", + "time": "2022-09-14T06:03:37+00:00", "type": "library", "extra": { "branch-alias": { @@ -1263,7 +1267,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -1644,17 +1648,17 @@ }, { "name": "sebastian/type", - "version": "3.1.0", - "version_normalized": "3.1.0.0", + "version": "3.2.0", + "version_normalized": "3.2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb44e1cc6e557418387ad815780360057e40753e" + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e", - "reference": "fb44e1cc6e557418387ad815780360057e40753e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", "shasum": "" }, "require": { @@ -1663,11 +1667,11 @@ "require-dev": { "phpunit/phpunit": "^9.5" }, - "time": "2022-08-29T06:55:37+00:00", + "time": "2022-09-12T14:47:03+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "installation-source": "dist", @@ -1691,7 +1695,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.1.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" }, "funding": [ { diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index b3d80c62..1c13839c 100644 --- a/www/vendor/composer/installed.php +++ b/www/vendor/composer/installed.php @@ -110,12 +110,12 @@ 'dev_requirement' => true, ), 'phpunit/phpunit' => array( - 'pretty_version' => '9.5.24', - 'version' => '9.5.24.0', + 'pretty_version' => '9.5.25', + 'version' => '9.5.25.0', 'type' => 'library', 'install_path' => __DIR__ . '/../phpunit/phpunit', 'aliases' => array(), - 'reference' => 'd0aa6097bef9fd42458a9b3c49da32c6ce6129c5', + 'reference' => '3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d', 'dev_requirement' => true, ), 'sebastian/cli-parser' => array( @@ -146,12 +146,12 @@ 'dev_requirement' => true, ), 'sebastian/comparator' => array( - 'pretty_version' => '4.0.6', - 'version' => '4.0.6.0', + 'pretty_version' => '4.0.8', + 'version' => '4.0.8.0', 'type' => 'library', 'install_path' => __DIR__ . '/../sebastian/comparator', 'aliases' => array(), - 'reference' => '55f4261989e546dc112258c7a75935a81a7ce382', + 'reference' => 'fa0f136dd2334583309d32b62544682ee972b51a', 'dev_requirement' => true, ), 'sebastian/complexity' => array( @@ -182,12 +182,12 @@ 'dev_requirement' => true, ), 'sebastian/exporter' => array( - 'pretty_version' => '4.0.4', - 'version' => '4.0.4.0', + 'pretty_version' => '4.0.5', + 'version' => '4.0.5.0', 'type' => 'library', 'install_path' => __DIR__ . '/../sebastian/exporter', 'aliases' => array(), - 'reference' => '65e8b7db476c5dd267e65eea9cab77584d3cfff9', + 'reference' => 'ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d', 'dev_requirement' => true, ), 'sebastian/global-state' => array( @@ -245,12 +245,12 @@ 'dev_requirement' => true, ), 'sebastian/type' => array( - 'pretty_version' => '3.1.0', - 'version' => '3.1.0.0', + 'pretty_version' => '3.2.0', + 'version' => '3.2.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../sebastian/type', 'aliases' => array(), - 'reference' => 'fb44e1cc6e557418387ad815780360057e40753e', + 'reference' => 'fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e', 'dev_requirement' => true, ), 'sebastian/version' => array( diff --git a/www/vendor/phpunit/phpunit/ChangeLog-8.5.md b/www/vendor/phpunit/phpunit/ChangeLog-8.5.md index 11287e37..eb6460f6 100644 --- a/www/vendor/phpunit/phpunit/ChangeLog-8.5.md +++ b/www/vendor/phpunit/phpunit/ChangeLog-8.5.md @@ -2,11 +2,16 @@ All notable changes of the PHPUnit 8.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. -## [8.5.30] - 2022-MM-DD +## [8.5.30] - 2022-09-25 + +### Changed + +* The configuration generator now asks for a cache directory ### Fixed * [#4913](https://github.com/sebastianbergmann/phpunit/issues/4913): Failed `assert()` should show a backtrace +* [#4966](https://github.com/sebastianbergmann/phpunit/issues/4966): `TestCase::assertSame()` (and related exact comparisons) must compare `float` exactly ## [8.5.29] - 2022-08-22 @@ -245,7 +250,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil * [#3967](https://github.com/sebastianbergmann/phpunit/issues/3967): Cannot double interface that extends interface that extends `\Throwable` * [#3968](https://github.com/sebastianbergmann/phpunit/pull/3968): Test class run in a separate PHP process are passing when `exit` called inside -[8.5.30]: https://github.com/sebastianbergmann/phpunit/compare/8.5.29...8.5 +[8.5.30]: https://github.com/sebastianbergmann/phpunit/compare/8.5.29...8.5.30 [8.5.29]: https://github.com/sebastianbergmann/phpunit/compare/8.5.28...8.5.29 [8.5.28]: https://github.com/sebastianbergmann/phpunit/compare/8.5.27...8.5.28 [8.5.27]: https://github.com/sebastianbergmann/phpunit/compare/8.5.26...8.5.27 diff --git a/www/vendor/phpunit/phpunit/ChangeLog-9.5.md b/www/vendor/phpunit/phpunit/ChangeLog-9.5.md index 9b536346..0a01f03f 100644 --- a/www/vendor/phpunit/phpunit/ChangeLog-9.5.md +++ b/www/vendor/phpunit/phpunit/ChangeLog-9.5.md @@ -2,6 +2,16 @@ All notable changes of the PHPUnit 9.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. +## [9.5.25] - 2022-09-25 + +### Added + +* [#5042](https://github.com/sebastianbergmann/phpunit/issues/5042): Support Disjunctive Normal Form types + +### Fixed + +* [#4966](https://github.com/sebastianbergmann/phpunit/issues/4966): `TestCase::assertSame()` (and related exact comparisons) must compare `float` exactly + ## [9.5.24] - 2022-08-30 ### Added @@ -190,6 +200,7 @@ All notable changes of the PHPUnit 9.5 release series are documented in this fil * [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly +[9.5.25]: https://github.com/sebastianbergmann/phpunit/compare/9.5.24...9.5.25 [9.5.24]: https://github.com/sebastianbergmann/phpunit/compare/9.5.23...9.5.24 [9.5.23]: https://github.com/sebastianbergmann/phpunit/compare/9.5.22...9.5.23 [9.5.22]: https://github.com/sebastianbergmann/phpunit/compare/9.5.21...9.5.22 diff --git a/www/vendor/phpunit/phpunit/LICENSE b/www/vendor/phpunit/phpunit/LICENSE index 78ff6219..567141f2 100644 --- a/www/vendor/phpunit/phpunit/LICENSE +++ b/www/vendor/phpunit/phpunit/LICENSE @@ -1,33 +1,29 @@ -PHPUnit +BSD 3-Clause License -Copyright (c) 2001-2022, Sebastian Bergmann . +Copyright (c) 2001-2022, Sebastian Bergmann All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: +modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. - * Neither the name of Sebastian Bergmann nor the names of his - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/www/vendor/phpunit/phpunit/SECURITY.md b/www/vendor/phpunit/phpunit/SECURITY.md new file mode 100644 index 00000000..dcc15385 --- /dev/null +++ b/www/vendor/phpunit/phpunit/SECURITY.md @@ -0,0 +1,11 @@ +# Security Policy + +PHPUnit is a framework for writing as well as a commandline tool for running tests. Writing and running tests is a development-time activity. There is no reason why PHPUnit should be installed on a webserver. + +**If you upload PHPUnit to a webserver then your deployment process is broken. On a more general note, if your `vendor` directory is publicly accessible on your webserver then your deployment process is also broken.** + +Please note that if you upload PHPUnit to a webserver "bad things" may happen. [You have been warned.](https://thephp.cc/articles/phpunit-a-security-risk) + +## Security Contact Information + +After the above, if you still would like to report a security vulnerability, please email `sebastian@phpunit.de`. diff --git a/www/vendor/phpunit/phpunit/composer.json b/www/vendor/phpunit/phpunit/composer.json index 1e8cf969..be0af53f 100644 --- a/www/vendor/phpunit/phpunit/composer.json +++ b/www/vendor/phpunit/phpunit/composer.json @@ -39,14 +39,14 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.1", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, "config": { diff --git a/www/vendor/phpunit/phpunit/src/Framework/Assert.php b/www/vendor/phpunit/phpunit/src/Framework/Assert.php index 8053f284..97321e35 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/Assert.php +++ b/www/vendor/phpunit/phpunit/src/Framework/Assert.php @@ -1321,7 +1321,9 @@ abstract class Assert * @throws ExpectationFailedException * * @psalm-template ExpectedType + * * @psalm-param ExpectedType $expected + * * @psalm-assert =ExpectedType $actual */ public static function assertSame($expected, $actual, string $message = ''): void @@ -1364,7 +1366,9 @@ abstract class Assert * @throws ExpectationFailedException * * @psalm-template ExpectedType of object + * * @psalm-param class-string $expected + * * @psalm-assert =ExpectedType $actual */ public static function assertInstanceOf(string $expected, $actual, string $message = ''): void @@ -1388,7 +1392,9 @@ abstract class Assert * @throws ExpectationFailedException * * @psalm-template ExpectedType of object + * * @psalm-param class-string $expected + * * @psalm-assert !ExpectedType $actual */ public static function assertNotInstanceOf(string $expected, $actual, string $message = ''): void diff --git a/www/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php b/www/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php index 7c4831d0..5b8c50ed 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php +++ b/www/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php @@ -10,6 +10,7 @@ namespace PHPUnit\Framework; use function func_get_args; +use function function_exists; use ArrayAccess; use Countable; use DOMDocument; @@ -1453,7 +1454,9 @@ if (!function_exists('PHPUnit\Framework\assertSame')) { * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException * * @psalm-template ExpectedType + * * @psalm-param ExpectedType $expected + * * @psalm-assert =ExpectedType $actual * * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit @@ -1494,7 +1497,9 @@ if (!function_exists('PHPUnit\Framework\assertInstanceOf')) { * @throws Exception * * @psalm-template ExpectedType of object + * * @psalm-param class-string $expected + * * @psalm-assert =ExpectedType $actual * * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit @@ -1516,7 +1521,9 @@ if (!function_exists('PHPUnit\Framework\assertNotInstanceOf')) { * @throws Exception * * @psalm-template ExpectedType of object + * * @psalm-param class-string $expected + * * @psalm-assert !ExpectedType $actual * * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php index f4fab056..5f772b4d 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php +++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php @@ -82,6 +82,7 @@ abstract class Constraint implements Countable, SelfDescribing * This method can be overridden to implement the evaluation algorithm. * * @param mixed $other value or object to evaluate + * * @codeCoverageIgnore */ protected function matches($other): bool diff --git a/www/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php b/www/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php index 565f1a3a..fde43d9e 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php +++ b/www/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php @@ -9,13 +9,8 @@ */ namespace PHPUnit\Framework\Constraint; -use const PHP_FLOAT_EPSILON; -use function abs; use function get_class; use function is_array; -use function is_float; -use function is_infinite; -use function is_nan; use function is_object; use function is_string; use function sprintf; @@ -52,13 +47,7 @@ final class IsIdentical extends Constraint */ public function evaluate($other, string $description = '', bool $returnResult = false): ?bool { - if (is_float($this->value) && is_float($other) && - !is_infinite($this->value) && !is_infinite($other) && - !is_nan($this->value) && !is_nan($other)) { - $success = abs($this->value - $other) < PHP_FLOAT_EPSILON; - } else { - $success = $this->value === $other; - } + $success = $this->value === $other; if ($returnResult) { return $success; diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/DuplicateMethodException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/DuplicateMethodException.php index 864523ac..1216b45d 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/DuplicateMethodException.php +++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/DuplicateMethodException.php @@ -9,6 +9,9 @@ */ namespace PHPUnit\Framework\MockObject; +use function array_diff_assoc; +use function array_unique; +use function implode; use function sprintf; /** diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php index 00febaf5..eec79213 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php +++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/IncompatibleReturnValueException.php @@ -9,6 +9,9 @@ */ namespace PHPUnit\Framework\MockObject; +use function get_class; +use function gettype; +use function is_object; use function sprintf; /** diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php index 8121e369..2c16c1dc 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php +++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Exception/ReturnValueNotConfiguredException.php @@ -9,6 +9,8 @@ */ namespace PHPUnit\Framework\MockObject; +use function sprintf; + /** * @internal This class is not covered by the backward compatibility promise for PHPUnit */ diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php index ff74cb6b..2aa59909 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php +++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php @@ -291,7 +291,9 @@ EOT; * Concrete methods to mock can be specified with the $mockedMethods parameter. * * @psalm-template RealInstanceType of object + * * @psalm-param class-string $originalClassName + * * @psalm-return MockObject&RealInstanceType * * @throws \PHPUnit\Framework\InvalidArgumentException diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Invocation.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Invocation.php index 6a71dad2..418d6a07 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Invocation.php +++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Invocation.php @@ -13,6 +13,8 @@ use function array_map; use function explode; use function get_class; use function implode; +use function in_array; +use function interface_exists; use function is_object; use function sprintf; use function strpos; @@ -20,7 +22,7 @@ use function strtolower; use function substr; use Doctrine\Instantiator\Instantiator; use PHPUnit\Framework\SelfDescribing; -use PHPUnit\Util\Type; +use PHPUnit\Util\Cloner; use SebastianBergmann\Exporter\Exporter; use stdClass; use Throwable; @@ -90,7 +92,7 @@ final class Invocation implements SelfDescribing foreach ($this->parameters as $key => $value) { if (is_object($value)) { - $this->parameters[$key] = $this->cloneObject($value); + $this->parameters[$key] = Cloner::clone($value); } } } @@ -121,12 +123,17 @@ final class Invocation implements SelfDescribing return null; } - $intersection = false; - $union = false; + $intersection = false; + $union = false; + $unionContainsIntersections = false; if (strpos($this->returnType, '|') !== false) { $types = explode('|', $this->returnType); $union = true; + + if (strpos($this->returnType, '(') !== false) { + $unionContainsIntersections = true; + } } elseif (strpos($this->returnType, '&') !== false) { $types = explode('&', $this->returnType); $intersection = true; @@ -136,7 +143,7 @@ final class Invocation implements SelfDescribing $types = array_map('strtolower', $types); - if (!$intersection) { + if (!$intersection && !$unionContainsIntersections) { if (in_array('', $types, true) || in_array('null', $types, true) || in_array('mixed', $types, true) || @@ -220,38 +227,28 @@ final class Invocation implements SelfDescribing } } + if ($intersection && $this->onlyInterfaces($types)) { + try { + return (new Generator)->getMockForInterfaces($types); + } catch (Throwable $t) { + throw new RuntimeException( + sprintf( + 'Return value for %s::%s() cannot be generated: %s', + $this->className, + $this->methodName, + $t->getMessage(), + ), + (int) $t->getCode(), + ); + } + } + $reason = ''; if ($union) { $reason = ' because the declared return type is a union'; } elseif ($intersection) { $reason = ' because the declared return type is an intersection'; - - $onlyInterfaces = true; - - foreach ($types as $type) { - if (!interface_exists($type)) { - $onlyInterfaces = false; - - break; - } - } - - if ($onlyInterfaces) { - try { - return (new Generator)->getMockForInterfaces($types); - } catch (Throwable $t) { - throw new RuntimeException( - sprintf( - 'Return value for %s::%s() cannot be generated: %s', - $this->className, - $this->methodName, - $t->getMessage(), - ), - (int) $t->getCode(), - ); - } - } } throw new RuntimeException( @@ -288,12 +285,17 @@ final class Invocation implements SelfDescribing return $this->object; } - private function cloneObject(object $original): object + /** + * @psalm-param non-empty-list $types + */ + private function onlyInterfaces(array $types): bool { - if (Type::isCloneable($original)) { - return clone $original; + foreach ($types as $type) { + if (!interface_exists($type)) { + return false; + } } - return $original; + return true; } } diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php index 09a14e60..923125a4 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php +++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php @@ -23,11 +23,8 @@ use function substr; use function substr_count; use function trim; use function var_export; -use ReflectionIntersectionType; use ReflectionMethod; -use ReflectionNamedType; use ReflectionParameter; -use ReflectionUnionType; use SebastianBergmann\Template\Exception as TemplateException; use SebastianBergmann\Template\Template; use SebastianBergmann\Type\ReflectionMapper; @@ -274,6 +271,7 @@ final class MockMethod private static function getMethodParametersForDeclaration(ReflectionMethod $method): string { $parameters = []; + $types = (new ReflectionMapper)->fromParameterTypes($method); foreach ($method->getParameters() as $i => $parameter) { $name = '$' . $parameter->getName(); @@ -285,19 +283,16 @@ final class MockMethod $name = '$arg' . $i; } - $nullable = ''; $default = ''; $reference = ''; $typeDeclaration = ''; - $type = null; - $typeName = null; - if ($parameter->hasType()) { - $type = $parameter->getType(); + if (!$types[$i]->type()->isUnknown()) { + $typeDeclaration = $types[$i]->type()->asString() . ' '; + } - if ($type instanceof ReflectionNamedType) { - $typeName = $type->getName(); - } + if ($parameter->isPassedByReference()) { + $reference = '&'; } if ($parameter->isVariadic()) { @@ -308,34 +303,7 @@ final class MockMethod $default = ' = null'; } - if ($type !== null) { - if ($typeName !== 'mixed' && - $typeName !== 'null' && - !$type instanceof ReflectionIntersectionType && - !$type instanceof ReflectionUnionType && - $parameter->allowsNull()) { - $nullable = '?'; - } - - if ($typeName === 'self') { - $typeDeclaration = $method->getDeclaringClass()->getName() . ' '; - } elseif ($typeName !== null) { - $typeDeclaration = $typeName . ' '; - } elseif ($type instanceof ReflectionUnionType) { - $typeDeclaration = self::unionTypeAsString( - $type, - $method->getDeclaringClass()->getName() - ); - } elseif ($type instanceof ReflectionIntersectionType) { - $typeDeclaration = self::intersectionTypeAsString($type); - } - } - - if ($parameter->isPassedByReference()) { - $reference = '&'; - } - - $parameters[] = $nullable . $typeDeclaration . $reference . $name . $default; + $parameters[] = $typeDeclaration . $reference . $name . $default; } return implode(', ', $parameters); @@ -409,30 +377,4 @@ final class MockMethod } // @codeCoverageIgnoreEnd } - - private static function unionTypeAsString(ReflectionUnionType $union, string $self): string - { - $types = []; - - foreach ($union->getTypes() as $type) { - if ((string) $type === 'self') { - $types[] = $self; - } else { - $types[] = $type; - } - } - - return implode('|', $types) . ' '; - } - - private static function intersectionTypeAsString(ReflectionIntersectionType $intersection): string - { - $types = []; - - foreach ($intersection->getTypes() as $type) { - $types[] = $type; - } - - return implode('&', $types) . ' '; - } } diff --git a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtIndex.php b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtIndex.php index 2a6625e2..9b51f4ef 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtIndex.php +++ b/www/vendor/phpunit/phpunit/src/Framework/MockObject/Rule/InvokedAtIndex.php @@ -17,6 +17,7 @@ use PHPUnit\Framework\MockObject\Invocation as BaseInvocation; * @internal This class is not covered by the backward compatibility promise for PHPUnit * * @deprecated https://github.com/sebastianbergmann/phpunit/issues/4297 + * * @codeCoverageIgnore */ final class InvokedAtIndex extends InvocationOrder diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestCase.php b/www/vendor/phpunit/phpunit/src/Framework/TestCase.php index 59bf4ec6..29acb5e3 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/TestCase.php +++ b/www/vendor/phpunit/phpunit/src/Framework/TestCase.php @@ -91,11 +91,11 @@ use PHPUnit\Framework\MockObject\Stub\ReturnStub; use PHPUnit\Framework\MockObject\Stub\ReturnValueMap as ReturnValueMapStub; use PHPUnit\Runner\BaseTestRunner; use PHPUnit\Runner\PhptTestCase; +use PHPUnit\Util\Cloner; use PHPUnit\Util\Exception as UtilException; use PHPUnit\Util\GlobalState; use PHPUnit\Util\PHP\AbstractPhpProcess; use PHPUnit\Util\Test as TestUtil; -use PHPUnit\Util\Type; use Prophecy\Exception\Prediction\PredictionException; use Prophecy\Prophecy\MethodProphecy; use Prophecy\Prophecy\ObjectProphecy; @@ -417,6 +417,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * at the given index. * * @deprecated https://github.com/sebastianbergmann/phpunit/issues/4297 + * * @codeCoverageIgnore */ public static function at(int $index): InvokedAtIndexMatcher @@ -912,7 +913,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * Returns a builder object to create mock objects using a fluent interface. * * @psalm-template RealInstanceType of object + * * @psalm-param class-string $className + * * @psalm-return MockBuilder */ public function getMockBuilder(string $className): MockBuilder @@ -1699,7 +1702,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * Makes configurable stub for the specified class. * * @psalm-template RealInstanceType of object + * * @psalm-param class-string $originalClassName + * * @psalm-return Stub&RealInstanceType */ protected function createStub(string $originalClassName): Stub @@ -1711,7 +1716,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * Returns a mock object for the specified class. * * @psalm-template RealInstanceType of object + * * @psalm-param class-string $originalClassName + * * @psalm-return MockObject&RealInstanceType */ protected function createMock(string $originalClassName): MockObject @@ -1723,7 +1730,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * Returns a configured mock object for the specified class. * * @psalm-template RealInstanceType of object + * * @psalm-param class-string $originalClassName + * * @psalm-return MockObject&RealInstanceType */ protected function createConfiguredMock(string $originalClassName, array $configuration): MockObject @@ -1743,7 +1752,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * @param string[] $methods * * @psalm-template RealInstanceType of object + * * @psalm-param class-string $originalClassName + * * @psalm-return MockObject&RealInstanceType */ protected function createPartialMock(string $originalClassName, array $methods): MockObject @@ -1791,7 +1802,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * Returns a test proxy for the specified class. * * @psalm-template RealInstanceType of object + * * @psalm-param class-string $originalClassName + * * @psalm-return MockObject&RealInstanceType */ protected function createTestProxy(string $originalClassName, array $constructorArguments = []): MockObject @@ -1808,7 +1821,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * @param null|array $methods $methods * * @psalm-template RealInstanceType of object + * * @psalm-param class-string|string $originalClassName + * * @psalm-return class-string */ protected function getMockClass(string $originalClassName, $methods = [], array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = false, bool $callOriginalClone = true, bool $callAutoload = true, bool $cloneArguments = false): string @@ -1835,7 +1850,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * To mock concrete methods, use the 7th parameter ($mockedMethods). * * @psalm-template RealInstanceType of object + * * @psalm-param class-string $originalClassName + * * @psalm-return MockObject&RealInstanceType */ protected function getMockForAbstractClass(string $originalClassName, array $arguments = [], string $mockClassName = '', bool $callOriginalConstructor = true, bool $callOriginalClone = true, bool $callAutoload = true, array $mockedMethods = [], bool $cloneArguments = false): MockObject @@ -1862,7 +1879,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T * Returns a mock object based on the given WSDL file. * * @psalm-template RealInstanceType of object + * * @psalm-param class-string|string $originalClassName + * * @psalm-return MockObject&RealInstanceType */ protected function getMockFromWsdl(string $wsdlFile, string $originalClassName = '', string $mockClassName = '', array $methods = [], bool $callOriginalConstructor = true, array $options = []): MockObject @@ -2434,9 +2453,7 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T } else { foreach ($testArguments as $testArgument) { if ($testArgument instanceof MockObject) { - if (Type::isCloneable($testArgument)) { - $testArgument = clone $testArgument; - } + $testArgument = Cloner::clone($testArgument); $this->registerMockObject($testArgument); } elseif (is_array($testArgument) && !in_array($testArgument, $visited, true)) { @@ -2569,7 +2586,9 @@ abstract class TestCase extends Assert implements Reorderable, SelfDescribing, T /** * @psalm-template RealInstanceType of object + * * @psalm-param class-string $originalClassName + * * @psalm-return MockObject&RealInstanceType */ private function createMockObject(string $originalClassName): MockObject diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestListenerDefaultImplementation.php b/www/vendor/phpunit/phpunit/src/Framework/TestListenerDefaultImplementation.php index 3e56708b..5731d98d 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/TestListenerDefaultImplementation.php +++ b/www/vendor/phpunit/phpunit/src/Framework/TestListenerDefaultImplementation.php @@ -13,6 +13,7 @@ use Throwable; /** * @deprecated The `TestListener` interface is deprecated + * * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit */ trait TestListenerDefaultImplementation diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestResult.php b/www/vendor/phpunit/phpunit/src/Framework/TestResult.php index 794b5136..f5302f6c 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/TestResult.php +++ b/www/vendor/phpunit/phpunit/src/Framework/TestResult.php @@ -10,7 +10,9 @@ namespace PHPUnit\Framework; use const PHP_EOL; +use function class_exists; use function count; +use function extension_loaded; use function function_exists; use function get_class; use function sprintf; diff --git a/www/vendor/phpunit/phpunit/src/Framework/TestSuite.php b/www/vendor/phpunit/phpunit/src/Framework/TestSuite.php index a1b3c4a4..db463295 100644 --- a/www/vendor/phpunit/phpunit/src/Framework/TestSuite.php +++ b/www/vendor/phpunit/phpunit/src/Framework/TestSuite.php @@ -13,6 +13,7 @@ use const PHP_EOL; use function array_keys; use function array_map; use function array_merge; +use function array_slice; use function array_unique; use function basename; use function call_user_func; diff --git a/www/vendor/phpunit/phpunit/src/Runner/DefaultTestResultCache.php b/www/vendor/phpunit/phpunit/src/Runner/DefaultTestResultCache.php index 19278cc0..cc22b250 100644 --- a/www/vendor/phpunit/phpunit/src/Runner/DefaultTestResultCache.php +++ b/www/vendor/phpunit/phpunit/src/Runner/DefaultTestResultCache.php @@ -21,6 +21,7 @@ use function is_dir; use function is_file; use function json_decode; use function json_encode; +use function sprintf; use PHPUnit\Util\Filesystem; /** diff --git a/www/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionHandler.php b/www/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionHandler.php index 286f717e..b64f1238 100644 --- a/www/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionHandler.php +++ b/www/vendor/phpunit/phpunit/src/Runner/Extension/ExtensionHandler.php @@ -100,6 +100,7 @@ final class ExtensionHandler if ($extensionConfiguration->hasSourceFile()) { /** * @noinspection PhpIncludeInspection + * * @psalm-suppress UnresolvableInclude */ require_once $extensionConfiguration->sourceFile(); diff --git a/www/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php b/www/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php index adc4cd77..e76e12ce 100644 --- a/www/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php +++ b/www/vendor/phpunit/phpunit/src/Runner/Extension/PharLoader.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Runner\Extension; +use function is_file; use PharIo\Manifest\ApplicationName; use PharIo\Manifest\Exception as ManifestException; use PharIo\Manifest\ManifestLoader; @@ -60,6 +61,7 @@ final class PharLoader /** * @noinspection PhpIncludeInspection + * * @psalm-suppress UnresolvableInclude */ require $file; diff --git a/www/vendor/phpunit/phpunit/src/Runner/Version.php b/www/vendor/phpunit/phpunit/src/Runner/Version.php index 3afe74e0..a2cd239d 100644 --- a/www/vendor/phpunit/phpunit/src/Runner/Version.php +++ b/www/vendor/phpunit/phpunit/src/Runner/Version.php @@ -41,7 +41,7 @@ final class Version } if (self::$version === '') { - self::$version = (new VersionId('9.5.24', dirname(__DIR__, 2)))->getVersion(); + self::$version = (new VersionId('9.5.25', dirname(__DIR__, 2)))->getVersion(); } return self::$version; diff --git a/www/vendor/phpunit/phpunit/src/TextUI/CliArguments/Configuration.php b/www/vendor/phpunit/phpunit/src/TextUI/CliArguments/Configuration.php index b220dd7a..51bf5cb8 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/CliArguments/Configuration.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/CliArguments/Configuration.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\Extension; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Configuration diff --git a/www/vendor/phpunit/phpunit/src/TextUI/Command.php b/www/vendor/phpunit/phpunit/src/TextUI/Command.php index df8ac0f9..8097bbf3 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/Command.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/Command.php @@ -24,6 +24,7 @@ use function get_class; use function getcwd; use function ini_get; use function ini_set; +use function is_array; use function is_callable; use function is_dir; use function is_file; @@ -437,6 +438,7 @@ class Command if ($loaderFile) { /** * @noinspection PhpIncludeInspection + * * @psalm-suppress UnresolvableInclude */ require $loaderFile; @@ -498,6 +500,7 @@ class Command if ($printerFile) { /** * @noinspection PhpIncludeInspection + * * @psalm-suppress UnresolvableInclude */ require $printerFile; diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php index 33cbea32..80abfac7 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php @@ -24,6 +24,7 @@ use PHPUnit\TextUI\XmlConfiguration\FileCollection; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class CodeCoverage diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Filter/Directory.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Filter/Directory.php index 3bf99c39..91659f4d 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Filter/Directory.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Filter/Directory.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration\CodeCoverage\Filter; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Directory diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Filter/DirectoryCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Filter/DirectoryCollection.php index 803ccda2..6a267f80 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Filter/DirectoryCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Filter/DirectoryCollection.php @@ -15,6 +15,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class DirectoryCollection implements Countable, IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Clover.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Clover.php index e7ff407b..b1094ec3 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Clover.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Clover.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Clover diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Cobertura.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Cobertura.php index e6ee7c9f..f831ac09 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Cobertura.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Cobertura.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Cobertura diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Crap4j.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Crap4j.php index fd4d4291..4904775d 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Crap4j.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Crap4j.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Crap4j diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Html.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Html.php index 7084ffe5..ce3d0284 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Html.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Html.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\Directory; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Html diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Php.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Php.php index d86b6621..dc5d32ea 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Php.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Php.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Php diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Text.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Text.php index b7e9f3da..cb7470d3 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Text.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Text.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Text diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Xml.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Xml.php index 977685c4..34073bd5 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Xml.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/CodeCoverage/Report/Xml.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\Directory; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Xml diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Configuration.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Configuration.php index 8f102e3b..4067e2f8 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Configuration.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Configuration.php @@ -15,6 +15,7 @@ use PHPUnit\Util\Xml\ValidationResult; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Configuration diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/Directory.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/Directory.php index 1629603b..b0fdf64f 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/Directory.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/Directory.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Directory diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/DirectoryCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/DirectoryCollection.php index c8ae5964..c904f60a 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/DirectoryCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/DirectoryCollection.php @@ -15,6 +15,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class DirectoryCollection implements Countable, IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/File.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/File.php index 0af5000d..6bdd1c24 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/File.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/File.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class File diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/FileCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/FileCollection.php index bfc1e33e..df0746d6 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/FileCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Filesystem/FileCollection.php @@ -15,6 +15,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class FileCollection implements Countable, IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/Group.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/Group.php index e5984405..bb0d9252 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/Group.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/Group.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Group diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/GroupCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/GroupCollection.php index 2ad9fef6..fabf8646 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/GroupCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/GroupCollection.php @@ -13,6 +13,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class GroupCollection implements IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/Groups.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/Groups.php index 9004fe43..0604ce32 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/Groups.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Group/Groups.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Groups diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Junit.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Junit.php index efde962d..9fca1852 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Junit.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Junit.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Junit diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Logging.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Logging.php index cdceced5..bce03019 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Logging.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Logging.php @@ -16,6 +16,7 @@ use PHPUnit\TextUI\XmlConfiguration\Logging\TestDox\Xml as TestDoxXml; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Logging diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TeamCity.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TeamCity.php index 03b2b56a..804a7ea6 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TeamCity.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TeamCity.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class TeamCity diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Html.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Html.php index 310040b2..5b198352 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Html.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Html.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Html diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Text.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Text.php index 59d37e9b..5c742d3a 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Text.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Text.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Text diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Xml.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Xml.php index b8c1576c..92dd3b7b 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Xml.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/TestDox/Xml.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Xml diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Text.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Text.php index 2769ec96..fd37942f 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Text.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Logging/Text.php @@ -13,6 +13,7 @@ use PHPUnit\TextUI\XmlConfiguration\File; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Text diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php index d8958cf4..c55315fa 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/Migration/Migrations/MoveWhitelistExcludesToCoverage.php @@ -9,6 +9,8 @@ */ namespace PHPUnit\TextUI\XmlConfiguration; +use function assert; +use function in_array; use DOMDocument; use DOMElement; use PHPUnit\Util\Xml\SnapshotNodeList; diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Constant.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Constant.php index e9b28b9e..6d4bc94c 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Constant.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Constant.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Constant diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/ConstantCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/ConstantCollection.php index 51c14715..6a0332a9 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/ConstantCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/ConstantCollection.php @@ -15,6 +15,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class ConstantCollection implements Countable, IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/IniSetting.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/IniSetting.php index 58cf735b..4786618d 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/IniSetting.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/IniSetting.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class IniSetting diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/IniSettingCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/IniSettingCollection.php index 216d85ae..9266f231 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/IniSettingCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/IniSettingCollection.php @@ -15,6 +15,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class IniSettingCollection implements Countable, IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Php.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Php.php index 26897e35..c1e9c6fd 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Php.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Php.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Php diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Variable.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Variable.php index c2684e28..37c572ae 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Variable.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/Variable.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Variable diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/VariableCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/VariableCollection.php index e8499216..9efefc47 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/VariableCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHP/VariableCollection.php @@ -15,6 +15,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class VariableCollection implements Countable, IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/Extension.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/Extension.php index 77c5b2d0..09fe8cc9 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/Extension.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/Extension.php @@ -11,12 +11,14 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class Extension { /** * @var string + * * @psalm-var class-string */ private $className; diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/ExtensionCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/ExtensionCollection.php index 45be2eee..61b37b53 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/ExtensionCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/ExtensionCollection.php @@ -13,6 +13,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class ExtensionCollection implements IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/PHPUnit.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/PHPUnit.php index edf298dd..5b3ce9b8 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/PHPUnit.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/PHPUnit/PHPUnit.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class PHPUnit diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestDirectory.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestDirectory.php index 263d02ea..ecefbb7c 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestDirectory.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestDirectory.php @@ -13,6 +13,7 @@ use PHPUnit\Util\VersionComparisonOperator; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class TestDirectory diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestDirectoryCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestDirectoryCollection.php index 10111af0..9a0d0778 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestDirectoryCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestDirectoryCollection.php @@ -15,6 +15,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class TestDirectoryCollection implements Countable, IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestFile.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestFile.php index 2e69450c..21d1cf7b 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestFile.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestFile.php @@ -13,6 +13,7 @@ use PHPUnit\Util\VersionComparisonOperator; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class TestFile diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestFileCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestFileCollection.php index 791ddf71..a60a29f8 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestFileCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestFileCollection.php @@ -15,6 +15,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class TestFileCollection implements Countable, IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestSuite.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestSuite.php index 4a609821..035376cb 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestSuite.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestSuite.php @@ -11,6 +11,7 @@ namespace PHPUnit\TextUI\XmlConfiguration; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class TestSuite diff --git a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestSuiteCollection.php b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestSuiteCollection.php index 124609d7..cbd824d2 100644 --- a/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestSuiteCollection.php +++ b/www/vendor/phpunit/phpunit/src/TextUI/XmlConfiguration/TestSuite/TestSuiteCollection.php @@ -15,6 +15,7 @@ use IteratorAggregate; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class TestSuiteCollection implements Countable, IteratorAggregate diff --git a/www/vendor/phpunit/phpunit/src/Util/Annotation/Registry.php b/www/vendor/phpunit/phpunit/src/Util/Annotation/Registry.php index 8df14cfc..798305be 100644 --- a/www/vendor/phpunit/phpunit/src/Util/Annotation/Registry.php +++ b/www/vendor/phpunit/phpunit/src/Util/Annotation/Registry.php @@ -43,6 +43,7 @@ final class Registry /** * @throws Exception + * * @psalm-param class-string $class */ public function forClassName(string $class): DocBlock @@ -68,6 +69,7 @@ final class Registry /** * @throws Exception + * * @psalm-param class-string $classInHierarchy */ public function forMethod(string $classInHierarchy, string $method): DocBlock diff --git a/www/vendor/phpunit/phpunit/src/Util/Cloner.php b/www/vendor/phpunit/phpunit/src/Util/Cloner.php new file mode 100644 index 00000000..38bd59ff --- /dev/null +++ b/www/vendor/phpunit/phpunit/src/Util/Cloner.php @@ -0,0 +1,34 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +namespace PHPUnit\Util; + +use Throwable; + +/** + * @internal This class is not covered by the backward compatibility promise for PHPUnit + */ +final class Cloner +{ + /** + * @psalm-template OriginalType + * + * @psalm-param OriginalType $original + * + * @psalm-return OriginalType + */ + public static function clone(object $original): object + { + try { + return clone $original; + } catch (Throwable $t) { + return $original; + } + } +} diff --git a/www/vendor/phpunit/phpunit/src/Util/FileLoader.php b/www/vendor/phpunit/phpunit/src/Util/FileLoader.php index 73287072..8abdc91c 100644 --- a/www/vendor/phpunit/phpunit/src/Util/FileLoader.php +++ b/www/vendor/phpunit/phpunit/src/Util/FileLoader.php @@ -60,6 +60,7 @@ final class FileLoader /** * @noinspection PhpIncludeInspection + * * @psalm-suppress UnresolvableInclude */ include_once $filename; diff --git a/www/vendor/phpunit/phpunit/src/Util/Test.php b/www/vendor/phpunit/phpunit/src/Util/Test.php index 773b0ef0..b8c06ef3 100644 --- a/www/vendor/phpunit/phpunit/src/Util/Test.php +++ b/www/vendor/phpunit/phpunit/src/Util/Test.php @@ -112,6 +112,7 @@ final class Test * @throws CodeCoverageException * * @return array|bool + * * @psalm-param class-string $className */ public static function getLinesToBeCovered(string $className, string $methodName) @@ -132,6 +133,7 @@ final class Test * Returns lines of code specified with the @uses annotation. * * @throws CodeCoverageException + * * @psalm-param class-string $className */ public static function getLinesToBeUsed(string $className, string $methodName): array @@ -173,6 +175,7 @@ final class Test /** * @throws Exception + * * @psalm-param class-string $className */ public static function getRequirements(string $className, string $methodName): array @@ -188,6 +191,7 @@ final class Test * * @throws Exception * @throws Warning + * * @psalm-param class-string $className */ public static function getMissingRequirements(string $className, string $methodName): array @@ -316,6 +320,7 @@ final class Test * Returns the provided data for a method. * * @throws Exception + * * @psalm-param class-string $className */ public static function getProvidedData(string $className, string $methodName): ?array @@ -592,6 +597,7 @@ final class Test /** * @throws CodeCoverageException + * * @psalm-param class-string $className */ private static function getLinesToBeCoveredOrUsed(string $className, string $methodName, string $mode): array diff --git a/www/vendor/phpunit/phpunit/src/Util/Type.php b/www/vendor/phpunit/phpunit/src/Util/Type.php index 01a6b193..ec6a1d78 100644 --- a/www/vendor/phpunit/phpunit/src/Util/Type.php +++ b/www/vendor/phpunit/phpunit/src/Util/Type.php @@ -9,8 +9,6 @@ */ namespace PHPUnit\Util; -use Throwable; - /** * @internal This class is not covered by the backward compatibility promise for PHPUnit */ @@ -38,15 +36,4 @@ final class Type return false; } } - - public static function isCloneable(object $object): bool - { - try { - $clone = clone $object; - } catch (Throwable $t) { - return false; - } - - return $clone instanceof $object; - } } diff --git a/www/vendor/phpunit/phpunit/src/Util/VersionComparisonOperator.php b/www/vendor/phpunit/phpunit/src/Util/VersionComparisonOperator.php index 175ecd2d..77e67470 100644 --- a/www/vendor/phpunit/phpunit/src/Util/VersionComparisonOperator.php +++ b/www/vendor/phpunit/phpunit/src/Util/VersionComparisonOperator.php @@ -14,6 +14,7 @@ use function sprintf; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit + * * @psalm-immutable */ final class VersionComparisonOperator diff --git a/www/vendor/phpunit/phpunit/src/Util/Xml/SnapshotNodeList.php b/www/vendor/phpunit/phpunit/src/Util/Xml/SnapshotNodeList.php index fdc95abb..ebc3285a 100644 --- a/www/vendor/phpunit/phpunit/src/Util/Xml/SnapshotNodeList.php +++ b/www/vendor/phpunit/phpunit/src/Util/Xml/SnapshotNodeList.php @@ -9,6 +9,7 @@ */ namespace PHPUnit\Util\Xml; +use function count; use ArrayIterator; use Countable; use DOMNode; diff --git a/www/vendor/phpunit/phpunit/src/Util/XmlTestListRenderer.php b/www/vendor/phpunit/phpunit/src/Util/XmlTestListRenderer.php index d92e1fe2..b16ef0b7 100644 --- a/www/vendor/phpunit/phpunit/src/Util/XmlTestListRenderer.php +++ b/www/vendor/phpunit/phpunit/src/Util/XmlTestListRenderer.php @@ -32,7 +32,7 @@ final class XmlTestListRenderer $writer->openMemory(); $writer->setIndent(true); - $writer->startDocument(); + $writer->startDocument('1.0', 'UTF-8'); $writer->startElement('tests'); $currentTestCase = null; @@ -84,6 +84,7 @@ final class XmlTestListRenderer } $writer->endElement(); + $writer->endDocument(); return $writer->outputMemory(); } diff --git a/www/vendor/sebastian/comparator/ChangeLog.md b/www/vendor/sebastian/comparator/ChangeLog.md index 64c0251c..17557536 100644 --- a/www/vendor/sebastian/comparator/ChangeLog.md +++ b/www/vendor/sebastian/comparator/ChangeLog.md @@ -2,6 +2,18 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [4.0.8] - 2022-09-14 + +### Fixed + +* [#102](https://github.com/sebastianbergmann/comparator/pull/102): Fix `float` comparison precision + +## [4.0.7] - 2022-09-14 + +### Fixed + +* [#99](https://github.com/sebastianbergmann/comparator/pull/99): Fix weak comparison between `'0'` and `false` + ## [4.0.6] - 2020-10-26 ### Fixed @@ -44,6 +56,24 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt * Removed support for PHP 7.1 and PHP 7.2 +## [3.0.5] - 2022-09-14 + +### Fixed + +* [#102](https://github.com/sebastianbergmann/comparator/pull/102): Fix `float` comparison precision + +## [3.0.4] - 2022-09-14 + +### Fixed + +* [#99](https://github.com/sebastianbergmann/comparator/pull/99): Fix weak comparison between `'0'` and `false` + +## [3.0.3] - 2020-11-30 + +### Changed + +* Changed PHP version constraint in `composer.json` from `^7.1` to `>=7.1` + ## [3.0.2] - 2018-07-12 ### Changed @@ -61,7 +91,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt ### Fixed -* Fixed [#48](https://github.com/sebastianbergmann/comparator/issues/48): `DateTimeComparator` does not support fractional second deltas +* [#48](https://github.com/sebastianbergmann/comparator/issues/48): `DateTimeComparator` does not support fractional second deltas ### Removed @@ -83,7 +113,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt ### Fixed -* Fixed [phpunit/#2923](https://github.com/sebastianbergmann/phpunit/issues/2923): Unexpected failed date matching +* [phpunit/#2923](https://github.com/sebastianbergmann/phpunit/issues/2923): Unexpected failed date matching ## [2.1.0] - 2017-11-03 @@ -92,13 +122,18 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt * Added `SebastianBergmann\Comparator\Factory::reset()` to unregister all non-default comparators * Added support for `phpunit/phpunit-mock-objects` version `^5.0` +[4.0.8]: https://github.com/sebastianbergmann/comparator/compare/4.0.7...4.0.8 +[4.0.7]: https://github.com/sebastianbergmann/comparator/compare/4.0.6...4.0.7 [4.0.6]: https://github.com/sebastianbergmann/comparator/compare/4.0.5...4.0.6 [4.0.5]: https://github.com/sebastianbergmann/comparator/compare/4.0.4...4.0.5 [4.0.4]: https://github.com/sebastianbergmann/comparator/compare/4.0.3...4.0.4 [4.0.3]: https://github.com/sebastianbergmann/comparator/compare/4.0.2...4.0.3 [4.0.2]: https://github.com/sebastianbergmann/comparator/compare/4.0.1...4.0.2 [4.0.1]: https://github.com/sebastianbergmann/comparator/compare/4.0.0...4.0.1 -[4.0.0]: https://github.com/sebastianbergmann/comparator/compare/3.0.2...4.0.0 +[4.0.0]: https://github.com/sebastianbergmann/comparator/compare/3.0.5...4.0.0 +[3.0.5]: https://github.com/sebastianbergmann/comparator/compare/3.0.4...3.0.5 +[3.0.4]: https://github.com/sebastianbergmann/comparator/compare/3.0.3...3.0.4 +[3.0.3]: https://github.com/sebastianbergmann/comparator/compare/3.0.2...3.0.3 [3.0.2]: https://github.com/sebastianbergmann/comparator/compare/3.0.1...3.0.2 [3.0.1]: https://github.com/sebastianbergmann/comparator/compare/3.0.0...3.0.1 [3.0.0]: https://github.com/sebastianbergmann/comparator/compare/2.1.3...3.0.0 diff --git a/www/vendor/sebastian/comparator/src/DoubleComparator.php b/www/vendor/sebastian/comparator/src/DoubleComparator.php index d90b9e06..42352219 100644 --- a/www/vendor/sebastian/comparator/src/DoubleComparator.php +++ b/www/vendor/sebastian/comparator/src/DoubleComparator.php @@ -14,6 +14,8 @@ use function is_numeric; /** * Compares doubles for equality. + * + * @deprecated since v3.0.5 and v4.0.8 */ class DoubleComparator extends NumericComparator { diff --git a/www/vendor/sebastian/comparator/src/Factory.php b/www/vendor/sebastian/comparator/src/Factory.php index 5b16366f..6a8b5b44 100644 --- a/www/vendor/sebastian/comparator/src/Factory.php +++ b/www/vendor/sebastian/comparator/src/Factory.php @@ -127,7 +127,6 @@ class Factory $this->registerDefaultComparator(new ObjectComparator); $this->registerDefaultComparator(new ResourceComparator); $this->registerDefaultComparator(new ArrayComparator); - $this->registerDefaultComparator(new DoubleComparator); $this->registerDefaultComparator(new NumericComparator); $this->registerDefaultComparator(new ScalarComparator); $this->registerDefaultComparator(new TypeComparator); diff --git a/www/vendor/sebastian/comparator/src/NumericComparator.php b/www/vendor/sebastian/comparator/src/NumericComparator.php index 12e6721d..841881c9 100644 --- a/www/vendor/sebastian/comparator/src/NumericComparator.php +++ b/www/vendor/sebastian/comparator/src/NumericComparator.php @@ -32,10 +32,8 @@ class NumericComparator extends ScalarComparator */ public function accepts($expected, $actual) { - // all numerical values, but not if one of them is a double - // or both of them are strings + // all numerical values, but not if both of them are strings return is_numeric($expected) && is_numeric($actual) && - !(is_float($expected) || is_float($actual)) && !(is_string($expected) && is_string($actual)); } diff --git a/www/vendor/sebastian/comparator/src/ScalarComparator.php b/www/vendor/sebastian/comparator/src/ScalarComparator.php index 08ded922..7f131229 100644 --- a/www/vendor/sebastian/comparator/src/ScalarComparator.php +++ b/www/vendor/sebastian/comparator/src/ScalarComparator.php @@ -9,6 +9,7 @@ */ namespace SebastianBergmann\Comparator; +use function is_bool; use function is_object; use function is_scalar; use function is_string; @@ -58,7 +59,7 @@ class ScalarComparator extends Comparator // always compare as strings to avoid strange behaviour // otherwise 0 == 'Foobar' - if (is_string($expected) || is_string($actual)) { + if ((is_string($expected) && !is_bool($actual)) || (is_string($actual) && !is_bool($expected))) { $expectedToCompare = (string) $expectedToCompare; $actualToCompare = (string) $actualToCompare; diff --git a/www/vendor/sebastian/exporter/ChangeLog.md b/www/vendor/sebastian/exporter/ChangeLog.md index c691e81a..91a4220d 100644 --- a/www/vendor/sebastian/exporter/ChangeLog.md +++ b/www/vendor/sebastian/exporter/ChangeLog.md @@ -2,6 +2,12 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. +## [4.0.5] - 2022-09-14 + +### Fixed + +* [#47](https://github.com/sebastianbergmann/exporter/pull/47): Fix `float` export precision + ## [4.0.4] - 2021-11-11 ### Changed @@ -32,6 +38,12 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt * This component is no longer supported on PHP 7.0, PHP 7.1, and PHP 7.2 +## [3.1.5] - 2022-09-14 + +### Fixed + +* [#47](https://github.com/sebastianbergmann/exporter/pull/47): Fix `float` export precision + ## [3.1.4] - 2021-11-11 ### Changed @@ -54,11 +66,13 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt * Remove HHVM-specific code that is no longer needed +[4.0.5]: https://github.com/sebastianbergmann/exporter/compare/4.0.4...4.0.5 [4.0.4]: https://github.com/sebastianbergmann/exporter/compare/4.0.3...4.0.4 [4.0.3]: https://github.com/sebastianbergmann/exporter/compare/4.0.2...4.0.3 [4.0.2]: https://github.com/sebastianbergmann/exporter/compare/4.0.1...4.0.2 [4.0.1]: https://github.com/sebastianbergmann/exporter/compare/4.0.0...4.0.1 [4.0.0]: https://github.com/sebastianbergmann/exporter/compare/3.1.2...4.0.0 +[3.1.5]: https://github.com/sebastianbergmann/exporter/compare/3.1.4...3.1.5 [3.1.4]: https://github.com/sebastianbergmann/exporter/compare/3.1.3...3.1.4 [3.1.3]: https://github.com/sebastianbergmann/exporter/compare/3.1.2...3.1.3 [3.1.2]: https://github.com/sebastianbergmann/exporter/compare/3.1.1...3.1.2 diff --git a/www/vendor/sebastian/exporter/src/Exporter.php b/www/vendor/sebastian/exporter/src/Exporter.php index 692a0b21..ca006ad6 100644 --- a/www/vendor/sebastian/exporter/src/Exporter.php +++ b/www/vendor/sebastian/exporter/src/Exporter.php @@ -16,6 +16,8 @@ use function get_class; use function get_resource_type; use function gettype; use function implode; +use function ini_get; +use function ini_set; use function is_array; use function is_float; use function is_object; @@ -232,8 +234,22 @@ class Exporter return 'false'; } - if (is_float($value) && (float) ((int) $value) === $value) { - return "{$value}.0"; + if (is_float($value)) { + $precisionBackup = ini_get('precision'); + + ini_set('precision', '-1'); + + try { + $valueStr = (string) $value; + + if ((string) (int) $value === $valueStr) { + return $valueStr . '.0'; + } + + return $valueStr; + } finally { + ini_set('precision', $precisionBackup); + } } if (gettype($value) === 'resource (closed)') { diff --git a/www/vendor/sebastian/type/ChangeLog.md b/www/vendor/sebastian/type/ChangeLog.md index 2d87fc38..834681f9 100644 --- a/www/vendor/sebastian/type/ChangeLog.md +++ b/www/vendor/sebastian/type/ChangeLog.md @@ -2,6 +2,15 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles. +## [3.2.0] - 2022-09-12 + +### Added + +* [#25](https://github.com/sebastianbergmann/type/issues/25): Support Disjunctive Normal Form types +* Added `ReflectionMapper::fromParameterTypes()` +* Added `IntersectionType::types()` and `UnionType::types()` +* Added `UnionType::containsIntersectionTypes()` + ## [3.1.0] - 2022-08-29 ### Added @@ -130,6 +139,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt * Initial release based on [code contributed by Michel Hartmann to PHPUnit](https://github.com/sebastianbergmann/phpunit/pull/3673) +[3.2.0]: https://github.com/sebastianbergmann/type/compare/3.1.0...3.2.0 [3.1.0]: https://github.com/sebastianbergmann/type/compare/3.0.0...3.1.0 [3.0.0]: https://github.com/sebastianbergmann/type/compare/2.3.4...3.0.0 [2.3.4]: https://github.com/sebastianbergmann/type/compare/ca39369c41313ed12c071ed38ecda8fcdb248859...2.3.4 diff --git a/www/vendor/sebastian/type/composer.json b/www/vendor/sebastian/type/composer.json index cccfab29..a0865c93 100644 --- a/www/vendor/sebastian/type/composer.json +++ b/www/vendor/sebastian/type/composer.json @@ -44,7 +44,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } } } diff --git a/www/vendor/sebastian/type/src/Parameter.php b/www/vendor/sebastian/type/src/Parameter.php new file mode 100644 index 00000000..1adb061e --- /dev/null +++ b/www/vendor/sebastian/type/src/Parameter.php @@ -0,0 +1,42 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +namespace SebastianBergmann\Type; + +final class Parameter +{ + /** + * @psalm-var non-empty-string + */ + private $name; + + /** + * @var Type + */ + private $type; + + /** + * @psalm-param non-empty-string $name + */ + public function __construct(string $name, Type $type) + { + $this->name = $name; + $this->type = $type; + } + + public function name(): string + { + return $this->name; + } + + public function type(): Type + { + return $this->type; + } +} diff --git a/www/vendor/sebastian/type/src/ReflectionMapper.php b/www/vendor/sebastian/type/src/ReflectionMapper.php index d9b6cb1e..32099b4b 100644 --- a/www/vendor/sebastian/type/src/ReflectionMapper.php +++ b/www/vendor/sebastian/type/src/ReflectionMapper.php @@ -19,6 +19,55 @@ use ReflectionUnionType; final class ReflectionMapper { + /** + * @psalm-return list + */ + public function fromParameterTypes(ReflectionFunctionAbstract $functionOrMethod): array + { + $parameters = []; + + foreach ($functionOrMethod->getParameters() as $parameter) { + $name = $parameter->getName(); + + assert($name !== ''); + + if (!$parameter->hasType()) { + $parameters[] = new Parameter($name, new UnknownType); + + continue; + } + + $type = $parameter->getType(); + + if ($type instanceof ReflectionNamedType) { + $parameters[] = new Parameter( + $name, + $this->mapNamedType($type, $functionOrMethod) + ); + + continue; + } + + if ($type instanceof ReflectionUnionType) { + $parameters[] = new Parameter( + $name, + $this->mapUnionType($type, $functionOrMethod) + ); + + continue; + } + + if ($type instanceof ReflectionIntersectionType) { + $parameters[] = new Parameter( + $name, + $this->mapIntersectionType($type, $functionOrMethod) + ); + } + } + + return $parameters; + } + public function fromReturnType(ReflectionFunctionAbstract $functionOrMethod): Type { if (!$this->hasReturnType($functionOrMethod)) { @@ -30,54 +79,78 @@ final class ReflectionMapper assert($returnType instanceof ReflectionNamedType || $returnType instanceof ReflectionUnionType || $returnType instanceof ReflectionIntersectionType); if ($returnType instanceof ReflectionNamedType) { - if ($functionOrMethod instanceof ReflectionMethod && $returnType->getName() === 'self') { - return ObjectType::fromName( - $functionOrMethod->getDeclaringClass()->getName(), - $returnType->allowsNull() - ); - } - - if ($functionOrMethod instanceof ReflectionMethod && $returnType->getName() === 'static') { - return new StaticType( - TypeName::fromReflection($functionOrMethod->getDeclaringClass()), - $returnType->allowsNull() - ); - } - - if ($returnType->getName() === 'mixed') { - return new MixedType; - } - - if ($functionOrMethod instanceof ReflectionMethod && $returnType->getName() === 'parent') { - return ObjectType::fromName( - $functionOrMethod->getDeclaringClass()->getParentClass()->getName(), - $returnType->allowsNull() - ); - } - - return Type::fromName( - $returnType->getName(), - $returnType->allowsNull() - ); - } - - assert($returnType instanceof ReflectionUnionType || $returnType instanceof ReflectionIntersectionType); - - $types = []; - - foreach ($returnType->getTypes() as $type) { - if ($functionOrMethod instanceof ReflectionMethod && $type->getName() === 'self') { - $types[] = ObjectType::fromName( - $functionOrMethod->getDeclaringClass()->getName(), - false - ); - } else { - $types[] = Type::fromName($type->getName(), false); - } + return $this->mapNamedType($returnType, $functionOrMethod); } if ($returnType instanceof ReflectionUnionType) { - return new UnionType(...$types); + return $this->mapUnionType($returnType, $functionOrMethod); + } + + if ($returnType instanceof ReflectionIntersectionType) { + return $this->mapIntersectionType($returnType, $functionOrMethod); + } + } + + private function mapNamedType(ReflectionNamedType $type, ReflectionFunctionAbstract $functionOrMethod): Type + { + if ($functionOrMethod instanceof ReflectionMethod && $type->getName() === 'self') { + return ObjectType::fromName( + $functionOrMethod->getDeclaringClass()->getName(), + $type->allowsNull() + ); + } + + if ($functionOrMethod instanceof ReflectionMethod && $type->getName() === 'static') { + return new StaticType( + TypeName::fromReflection($functionOrMethod->getDeclaringClass()), + $type->allowsNull() + ); + } + + if ($type->getName() === 'mixed') { + return new MixedType; + } + + if ($functionOrMethod instanceof ReflectionMethod && $type->getName() === 'parent') { + return ObjectType::fromName( + $functionOrMethod->getDeclaringClass()->getParentClass()->getName(), + $type->allowsNull() + ); + } + + return Type::fromName( + $type->getName(), + $type->allowsNull() + ); + } + + private function mapUnionType(ReflectionUnionType $type, ReflectionFunctionAbstract $functionOrMethod): Type + { + $types = []; + + foreach ($type->getTypes() as $_type) { + assert($_type instanceof ReflectionNamedType || $_type instanceof ReflectionIntersectionType); + + if ($_type instanceof ReflectionNamedType) { + $types[] = $this->mapNamedType($_type, $functionOrMethod); + + continue; + } + + $types[] = $this->mapIntersectionType($_type, $functionOrMethod); + } + + return new UnionType(...$types); + } + + private function mapIntersectionType(ReflectionIntersectionType $type, ReflectionFunctionAbstract $functionOrMethod): Type + { + $types = []; + + foreach ($type->getTypes() as $_type) { + assert($_type instanceof ReflectionNamedType); + + $types[] = $this->mapNamedType($_type, $functionOrMethod); } return new IntersectionType(...$types); diff --git a/www/vendor/sebastian/type/src/type/CallableType.php b/www/vendor/sebastian/type/src/type/CallableType.php index 90f5073b..553f1559 100644 --- a/www/vendor/sebastian/type/src/type/CallableType.php +++ b/www/vendor/sebastian/type/src/type/CallableType.php @@ -84,6 +84,9 @@ final class CallableType extends Type return $this->allowsNull; } + /** + * @psalm-assert-if-true CallableType $this + */ public function isCallable(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/FalseType.php b/www/vendor/sebastian/type/src/type/FalseType.php index 652b828e..f417fb69 100644 --- a/www/vendor/sebastian/type/src/type/FalseType.php +++ b/www/vendor/sebastian/type/src/type/FalseType.php @@ -32,6 +32,9 @@ final class FalseType extends Type return false; } + /** + * @psalm-assert-if-true FalseType $this + */ public function isFalse(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/GenericObjectType.php b/www/vendor/sebastian/type/src/type/GenericObjectType.php index 1609b326..d06963f0 100644 --- a/www/vendor/sebastian/type/src/type/GenericObjectType.php +++ b/www/vendor/sebastian/type/src/type/GenericObjectType.php @@ -44,6 +44,9 @@ final class GenericObjectType extends Type return $this->allowsNull; } + /** + * @psalm-assert-if-true GenericObjectType $this + */ public function isGenericObject(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/IntersectionType.php b/www/vendor/sebastian/type/src/type/IntersectionType.php index c4f83f45..4ac72ac9 100644 --- a/www/vendor/sebastian/type/src/type/IntersectionType.php +++ b/www/vendor/sebastian/type/src/type/IntersectionType.php @@ -18,7 +18,7 @@ use function sort; final class IntersectionType extends Type { /** - * @psalm-var list + * @psalm-var non-empty-list */ private $types; @@ -62,11 +62,22 @@ final class IntersectionType extends Type return false; } + /** + * @psalm-assert-if-true IntersectionType $this + */ public function isIntersection(): bool { return true; } + /** + * @psalm-return non-empty-list + */ + public function types(): array + { + return $this->types; + } + /** * @throws RuntimeException */ diff --git a/www/vendor/sebastian/type/src/type/IterableType.php b/www/vendor/sebastian/type/src/type/IterableType.php index eb64895a..7b2a58fa 100644 --- a/www/vendor/sebastian/type/src/type/IterableType.php +++ b/www/vendor/sebastian/type/src/type/IterableType.php @@ -74,6 +74,9 @@ final class IterableType extends Type return $this->allowsNull; } + /** + * @psalm-assert-if-true IterableType $this + */ public function isIterable(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/MixedType.php b/www/vendor/sebastian/type/src/type/MixedType.php index 23e8a7ba..a1412e45 100644 --- a/www/vendor/sebastian/type/src/type/MixedType.php +++ b/www/vendor/sebastian/type/src/type/MixedType.php @@ -31,6 +31,9 @@ final class MixedType extends Type return true; } + /** + * @psalm-assert-if-true MixedType $this + */ public function isMixed(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/NeverType.php b/www/vendor/sebastian/type/src/type/NeverType.php index e2892a59..6c144743 100644 --- a/www/vendor/sebastian/type/src/type/NeverType.php +++ b/www/vendor/sebastian/type/src/type/NeverType.php @@ -26,6 +26,9 @@ final class NeverType extends Type return false; } + /** + * @psalm-assert-if-true NeverType $this + */ public function isNever(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/NullType.php b/www/vendor/sebastian/type/src/type/NullType.php index 1cfa8fcb..93834eab 100644 --- a/www/vendor/sebastian/type/src/type/NullType.php +++ b/www/vendor/sebastian/type/src/type/NullType.php @@ -31,6 +31,9 @@ final class NullType extends Type return true; } + /** + * @psalm-assert-if-true NullType $this + */ public function isNull(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/ObjectType.php b/www/vendor/sebastian/type/src/type/ObjectType.php index 8d5fdb90..44febb27 100644 --- a/www/vendor/sebastian/type/src/type/ObjectType.php +++ b/www/vendor/sebastian/type/src/type/ObjectType.php @@ -64,6 +64,9 @@ final class ObjectType extends Type return $this->className; } + /** + * @psalm-assert-if-true ObjectType $this + */ public function isObject(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/SimpleType.php b/www/vendor/sebastian/type/src/type/SimpleType.php index 5bfd23b7..4dce75da 100644 --- a/www/vendor/sebastian/type/src/type/SimpleType.php +++ b/www/vendor/sebastian/type/src/type/SimpleType.php @@ -71,6 +71,9 @@ final class SimpleType extends Type return $this->value; } + /** + * @psalm-assert-if-true SimpleType $this + */ public function isSimple(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/StaticType.php b/www/vendor/sebastian/type/src/type/StaticType.php index 0fb043b1..cbc13f5f 100644 --- a/www/vendor/sebastian/type/src/type/StaticType.php +++ b/www/vendor/sebastian/type/src/type/StaticType.php @@ -58,6 +58,9 @@ final class StaticType extends Type return $this->allowsNull; } + /** + * @psalm-assert-if-true StaticType $this + */ public function isStatic(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/TrueType.php b/www/vendor/sebastian/type/src/type/TrueType.php index 02e47d45..94e5be99 100644 --- a/www/vendor/sebastian/type/src/type/TrueType.php +++ b/www/vendor/sebastian/type/src/type/TrueType.php @@ -32,6 +32,9 @@ final class TrueType extends Type return false; } + /** + * @psalm-assert-if-true TrueType $this + */ public function isTrue(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/Type.php b/www/vendor/sebastian/type/src/type/Type.php index 51baf764..e7536683 100644 --- a/www/vendor/sebastian/type/src/type/Type.php +++ b/www/vendor/sebastian/type/src/type/Type.php @@ -98,76 +98,121 @@ abstract class Type return ($this->allowsNull() ? '?' : '') . $this->name(); } + /** + * @psalm-assert-if-true CallableType $this + */ public function isCallable(): bool { return false; } + /** + * @psalm-assert-if-true TrueType $this + */ public function isTrue(): bool { return false; } + /** + * @psalm-assert-if-true FalseType $this + */ public function isFalse(): bool { return false; } + /** + * @psalm-assert-if-true GenericObjectType $this + */ public function isGenericObject(): bool { return false; } + /** + * @psalm-assert-if-true IntersectionType $this + */ public function isIntersection(): bool { return false; } + /** + * @psalm-assert-if-true IterableType $this + */ public function isIterable(): bool { return false; } + /** + * @psalm-assert-if-true MixedType $this + */ public function isMixed(): bool { return false; } + /** + * @psalm-assert-if-true NeverType $this + */ public function isNever(): bool { return false; } + /** + * @psalm-assert-if-true NullType $this + */ public function isNull(): bool { return false; } + /** + * @psalm-assert-if-true ObjectType $this + */ public function isObject(): bool { return false; } + /** + * @psalm-assert-if-true SimpleType $this + */ public function isSimple(): bool { return false; } + /** + * @psalm-assert-if-true StaticType $this + */ public function isStatic(): bool { return false; } + /** + * @psalm-assert-if-true UnionType $this + */ public function isUnion(): bool { return false; } + /** + * @psalm-assert-if-true UnknownType $this + */ public function isUnknown(): bool { return false; } + /** + * @psalm-assert-if-true VoidType $this + */ public function isVoid(): bool { return false; diff --git a/www/vendor/sebastian/type/src/type/UnionType.php b/www/vendor/sebastian/type/src/type/UnionType.php index bdb9f1da..427729c5 100644 --- a/www/vendor/sebastian/type/src/type/UnionType.php +++ b/www/vendor/sebastian/type/src/type/UnionType.php @@ -16,7 +16,7 @@ use function sort; final class UnionType extends Type { /** - * @psalm-var list + * @psalm-var non-empty-list */ private $types; @@ -52,6 +52,12 @@ final class UnionType extends Type $types = []; foreach ($this->types as $type) { + if ($type->isIntersection()) { + $types[] = '(' . $type->name() . ')'; + + continue; + } + $types[] = $type->name(); } @@ -71,11 +77,33 @@ final class UnionType extends Type return false; } + /** + * @psalm-assert-if-true UnionType $this + */ public function isUnion(): bool { return true; } + public function containsIntersectionTypes(): bool + { + foreach ($this->types as $type) { + if ($type->isIntersection()) { + return true; + } + } + + return false; + } + + /** + * @psalm-return non-empty-list + */ + public function types(): array + { + return $this->types; + } + /** * @throws RuntimeException */ diff --git a/www/vendor/sebastian/type/src/type/UnknownType.php b/www/vendor/sebastian/type/src/type/UnknownType.php index 6df0379b..dc274407 100644 --- a/www/vendor/sebastian/type/src/type/UnknownType.php +++ b/www/vendor/sebastian/type/src/type/UnknownType.php @@ -31,6 +31,9 @@ final class UnknownType extends Type return true; } + /** + * @psalm-assert-if-true UnknownType $this + */ public function isUnknown(): bool { return true; diff --git a/www/vendor/sebastian/type/src/type/VoidType.php b/www/vendor/sebastian/type/src/type/VoidType.php index 5f674cfd..f740fe29 100644 --- a/www/vendor/sebastian/type/src/type/VoidType.php +++ b/www/vendor/sebastian/type/src/type/VoidType.php @@ -26,6 +26,9 @@ final class VoidType extends Type return false; } + /** + * @psalm-assert-if-true VoidType $this + */ public function isVoid(): bool { return true;