From ba4aaed5e7945541ebaaa3cadfb3a5bfa1df4cad Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 28 Mar 2024 20:29:31 +0200 Subject: [PATCH] Switch to "yoast/phpunit-polyfills" 2.0 --- composer.json | 2 +- composer.lock | 42 +++++++++---------- tests/SVNBuddy/Cache/CacheManagerTest.php | 2 - .../Config/AbstractConfigSettingTest.php | 3 -- tests/SVNBuddy/Config/CommandConfigTest.php | 3 -- .../Config/IntegerConfigSettingTest.php | 3 -- .../Config/PathsConfigSettingTest.php | 3 -- .../Config/RegExpsConfigSettingTest.php | 3 -- .../Database/StatementProfilerTest.php | 3 -- .../MergeSourceDetectorAggregatorTest.php | 3 -- .../MergeTemplateFactoryTest.php | 3 -- .../Connector/CommandFactoryTest.php | 3 -- .../Repository/Connector/ConnectorTest.php | 3 -- .../Parser/RevisionListParserTest.php | 3 -- .../AbstractDatabaseAwareTestCase.php | 3 -- .../RevisionLog/RevisionLogTest.php | 3 -- .../Repository/RevisionUrlBuilderTest.php | 3 -- .../WorkingCopyConflictTrackerTest.php | 3 -- .../Repository/WorkingCopyResolverTest.php | 3 -- 19 files changed, 22 insertions(+), 72 deletions(-) diff --git a/composer.json b/composer.json index c387cc4..4b2d447 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ }, "require-dev": { "aik099/coding-standard": "dev-master", - "yoast/phpunit-polyfills": "^1.0", + "yoast/phpunit-polyfills": "^2.0", "phpspec/prophecy": "^1.10", "console-helpers/prophecy-phpunit": "^2.0@dev" }, diff --git a/composer.lock b/composer.lock index e8e7a7a..5ea5049 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "66b1ff215e4cc47db939a91a8d8e67b4", + "content-hash": "089e63225eaa4a0c884e6c056745db6b", "packages": [ { "name": "aura/sql", @@ -68,16 +68,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.6", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "90d087e988ff194065333d16bc5cf649872d9cdb" + "reference": "18fc0ab083a48f85bfee31f3786537353b8a8403" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/90d087e988ff194065333d16bc5cf649872d9cdb", - "reference": "90d087e988ff194065333d16bc5cf649872d9cdb", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/18fc0ab083a48f85bfee31f3786537353b8a8403", + "reference": "18fc0ab083a48f85bfee31f3786537353b8a8403", "shasum": "" }, "require": { @@ -89,7 +89,7 @@ "phpstan/phpstan": "^0.12.55", "psr/log": "^1.0", "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { @@ -124,7 +124,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.6" + "source": "https://github.com/composer/ca-bundle/tree/1.4.2" }, "funding": [ { @@ -140,7 +140,7 @@ "type": "tidelift" } ], - "time": "2023-06-06T12:02:59+00:00" + "time": "2024-03-14T13:20:33+00:00" }, { "name": "console-helpers/console-kit", @@ -1786,16 +1786,16 @@ }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54", + "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54", "shasum": "" }, "require": { @@ -1829,7 +1829,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.3" }, "funding": [ { @@ -1837,7 +1837,7 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2024-03-01T13:45:45+00:00" }, { "name": "sebastian/comparator", @@ -2548,21 +2548,21 @@ }, { "name": "yoast/phpunit-polyfills", - "version": "1.1.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/Yoast/PHPUnit-Polyfills.git", - "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212" + "reference": "c758753e8f9dac251fed396a73c8305af3f17922" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/224e4a1329c03d8bad520e3fc4ec980034a4b212", - "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212", + "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/c758753e8f9dac251fed396a73c8305af3f17922", + "reference": "c758753e8f9dac251fed396a73c8305af3f17922", "shasum": "" }, "require": { - "php": ">=5.4", - "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + "php": ">=5.6", + "phpunit/phpunit": "^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" }, "require-dev": { "yoast/yoastcs": "^2.3.0" @@ -2604,7 +2604,7 @@ "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues", "source": "https://github.com/Yoast/PHPUnit-Polyfills" }, - "time": "2023-08-19T14:25:08+00:00" + "time": "2023-06-06T20:28:24+00:00" } ], "aliases": [], diff --git a/tests/SVNBuddy/Cache/CacheManagerTest.php b/tests/SVNBuddy/Cache/CacheManagerTest.php index 395b485..d3f2e15 100644 --- a/tests/SVNBuddy/Cache/CacheManagerTest.php +++ b/tests/SVNBuddy/Cache/CacheManagerTest.php @@ -16,12 +16,10 @@ use Prophecy\PhpUnit\ProphecyTrait; use Prophecy\Prophecy\ObjectProphecy; use Tests\ConsoleHelpers\ConsoleKit\WorkingDirectoryAwareTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; class CacheManagerTest extends WorkingDirectoryAwareTestCase { - use ExpectException; use ProphecyTrait; /** diff --git a/tests/SVNBuddy/Config/AbstractConfigSettingTest.php b/tests/SVNBuddy/Config/AbstractConfigSettingTest.php index f2157b8..e9c5bfd 100644 --- a/tests/SVNBuddy/Config/AbstractConfigSettingTest.php +++ b/tests/SVNBuddy/Config/AbstractConfigSettingTest.php @@ -14,13 +14,10 @@ use ConsoleHelpers\ConsoleKit\Config\ConfigEditor; use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; abstract class AbstractConfigSettingTest extends AbstractTestCase { - use ExpectException; - /** * Config editor * diff --git a/tests/SVNBuddy/Config/CommandConfigTest.php b/tests/SVNBuddy/Config/CommandConfigTest.php index a5638a1..6f17a65 100644 --- a/tests/SVNBuddy/Config/CommandConfigTest.php +++ b/tests/SVNBuddy/Config/CommandConfigTest.php @@ -16,13 +16,10 @@ use ConsoleHelpers\SVNBuddy\Config\StringConfigSetting; use Prophecy\Prophecy\ObjectProphecy; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; class CommandConfigTest extends AbstractTestCase { - use ExpectException; - /** * Config editor. * diff --git a/tests/SVNBuddy/Config/IntegerConfigSettingTest.php b/tests/SVNBuddy/Config/IntegerConfigSettingTest.php index 2c636d7..f957cc0 100644 --- a/tests/SVNBuddy/Config/IntegerConfigSettingTest.php +++ b/tests/SVNBuddy/Config/IntegerConfigSettingTest.php @@ -12,14 +12,11 @@ use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; use ConsoleHelpers\SVNBuddy\Config\IntegerConfigSetting; class IntegerConfigSettingTest extends AbstractConfigSettingTest { - use ExpectException; - /** * @before * @return void diff --git a/tests/SVNBuddy/Config/PathsConfigSettingTest.php b/tests/SVNBuddy/Config/PathsConfigSettingTest.php index 933ee68..74d0b83 100644 --- a/tests/SVNBuddy/Config/PathsConfigSettingTest.php +++ b/tests/SVNBuddy/Config/PathsConfigSettingTest.php @@ -12,14 +12,11 @@ use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; use ConsoleHelpers\SVNBuddy\Config\PathsConfigSetting; class PathsConfigSettingTest extends ArrayConfigSettingTest { - use ExpectException; - /** * Temp folder. * diff --git a/tests/SVNBuddy/Config/RegExpsConfigSettingTest.php b/tests/SVNBuddy/Config/RegExpsConfigSettingTest.php index 9557282..33b32af 100644 --- a/tests/SVNBuddy/Config/RegExpsConfigSettingTest.php +++ b/tests/SVNBuddy/Config/RegExpsConfigSettingTest.php @@ -12,14 +12,11 @@ use ConsoleHelpers\SVNBuddy\Config\AbstractConfigSetting; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; use ConsoleHelpers\SVNBuddy\Config\RegExpsConfigSetting; class RegExpsConfigSettingTest extends ArrayConfigSettingTest { - use ExpectException; - /** * @before * @return void diff --git a/tests/SVNBuddy/Database/StatementProfilerTest.php b/tests/SVNBuddy/Database/StatementProfilerTest.php index 97db648..e3e50cb 100644 --- a/tests/SVNBuddy/Database/StatementProfilerTest.php +++ b/tests/SVNBuddy/Database/StatementProfilerTest.php @@ -14,13 +14,10 @@ use ConsoleHelpers\SVNBuddy\Database\StatementProfiler; use Prophecy\Argument; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; class StatementProfilerTest extends AbstractTestCase { - use ExpectException; - /** * Statement profiler. * diff --git a/tests/SVNBuddy/MergeSourceDetector/MergeSourceDetectorAggregatorTest.php b/tests/SVNBuddy/MergeSourceDetector/MergeSourceDetectorAggregatorTest.php index 0f1972c..75dddd0 100644 --- a/tests/SVNBuddy/MergeSourceDetector/MergeSourceDetectorAggregatorTest.php +++ b/tests/SVNBuddy/MergeSourceDetector/MergeSourceDetectorAggregatorTest.php @@ -13,14 +13,11 @@ use ConsoleHelpers\SVNBuddy\MergeSourceDetector\MergeSourceDetectorAggregator; use Prophecy\Prophecy\ObjectProphecy; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; use ConsoleHelpers\SVNBuddy\MergeSourceDetector\AbstractMergeSourceDetector; class MergeSourceDetectorAggregatorTest extends AbstractMergeSourceDetectorTestCase { - use ExpectException; - /** * Detectors. * diff --git a/tests/SVNBuddy/Repository/CommitMessage/MergeTemplateFactoryTest.php b/tests/SVNBuddy/Repository/CommitMessage/MergeTemplateFactoryTest.php index 43efb36..9aca0c8 100644 --- a/tests/SVNBuddy/Repository/CommitMessage/MergeTemplateFactoryTest.php +++ b/tests/SVNBuddy/Repository/CommitMessage/MergeTemplateFactoryTest.php @@ -13,13 +13,10 @@ use ConsoleHelpers\SVNBuddy\Repository\CommitMessage\MergeTemplateFactory; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; class MergeTemplateFactoryTest extends AbstractTestCase { - use ExpectException; - /** * Merge template factory. * diff --git a/tests/SVNBuddy/Repository/Connector/CommandFactoryTest.php b/tests/SVNBuddy/Repository/Connector/CommandFactoryTest.php index 10c9111..21af881 100644 --- a/tests/SVNBuddy/Repository/Connector/CommandFactoryTest.php +++ b/tests/SVNBuddy/Repository/Connector/CommandFactoryTest.php @@ -16,7 +16,6 @@ use Prophecy\Argument; use Prophecy\Prophecy\ObjectProphecy; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; use ConsoleHelpers\ConsoleKit\Config\ConfigEditor; use ConsoleHelpers\ConsoleKit\ConsoleIO; use ConsoleHelpers\SVNBuddy\Process\IProcessFactory; @@ -26,8 +25,6 @@ class CommandFactoryTest extends AbstractTestCase { - use ExpectException; - /** * Config editor. * diff --git a/tests/SVNBuddy/Repository/Connector/ConnectorTest.php b/tests/SVNBuddy/Repository/Connector/ConnectorTest.php index a5a22c2..37d7e8c 100644 --- a/tests/SVNBuddy/Repository/Connector/ConnectorTest.php +++ b/tests/SVNBuddy/Repository/Connector/ConnectorTest.php @@ -16,7 +16,6 @@ use Prophecy\Argument; use Prophecy\Prophecy\ObjectProphecy; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; use ConsoleHelpers\ConsoleKit\Config\ConfigEditor; use ConsoleHelpers\ConsoleKit\ConsoleIO; use ConsoleHelpers\SVNBuddy\Repository\Connector\CommandFactory; @@ -26,8 +25,6 @@ class ConnectorTest extends AbstractTestCase { - use ExpectException; - const DUMMY_REPO = 'svn://repository.com/path/to/project'; /** diff --git a/tests/SVNBuddy/Repository/Parser/RevisionListParserTest.php b/tests/SVNBuddy/Repository/Parser/RevisionListParserTest.php index 5524415..f816689 100644 --- a/tests/SVNBuddy/Repository/Parser/RevisionListParserTest.php +++ b/tests/SVNBuddy/Repository/Parser/RevisionListParserTest.php @@ -13,13 +13,10 @@ use ConsoleHelpers\SVNBuddy\Repository\Parser\RevisionListParser; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; class RevisionListParserTest extends AbstractTestCase { - use ExpectException; - /** * Repository connector. * diff --git a/tests/SVNBuddy/Repository/RevisionLog/AbstractDatabaseAwareTestCase.php b/tests/SVNBuddy/Repository/RevisionLog/AbstractDatabaseAwareTestCase.php index 2ef8d76..436f87b 100644 --- a/tests/SVNBuddy/Repository/RevisionLog/AbstractDatabaseAwareTestCase.php +++ b/tests/SVNBuddy/Repository/RevisionLog/AbstractDatabaseAwareTestCase.php @@ -15,13 +15,10 @@ use ConsoleHelpers\SVNBuddy\Container; use ConsoleHelpers\DatabaseMigration\MigrationContext; use Tests\ConsoleHelpers\SVNBuddy\Database\AbstractDatabaseAwareTestCase as BaseAbstractDatabaseAwareTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; abstract class AbstractDatabaseAwareTestCase extends BaseAbstractDatabaseAwareTestCase { - use ExpectException; - /** * Creates database for testing with correct db structure. * diff --git a/tests/SVNBuddy/Repository/RevisionLog/RevisionLogTest.php b/tests/SVNBuddy/Repository/RevisionLog/RevisionLogTest.php index 874d2cd..27fe4e8 100644 --- a/tests/SVNBuddy/Repository/RevisionLog/RevisionLogTest.php +++ b/tests/SVNBuddy/Repository/RevisionLog/RevisionLogTest.php @@ -23,7 +23,6 @@ use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; use Tests\ConsoleHelpers\SVNBuddy\ProphecyToken\ProgressBarOutputToken; use Tests\ConsoleHelpers\SVNBuddy\ProphecyToken\SimpleXMLElementToken; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; use ConsoleHelpers\SVNBuddy\Repository\Connector\Connector; use ConsoleHelpers\SVNBuddy\Repository\RevisionLog\Plugin\IRepositoryCollectorPlugin; use ConsoleHelpers\SVNBuddy\Repository\RevisionLog\Plugin\IDatabaseCollectorPlugin; @@ -32,8 +31,6 @@ class RevisionLogTest extends AbstractTestCase { - use ExpectException; - /** * Repository connector. * diff --git a/tests/SVNBuddy/Repository/RevisionUrlBuilderTest.php b/tests/SVNBuddy/Repository/RevisionUrlBuilderTest.php index 60f62a5..c45e577 100644 --- a/tests/SVNBuddy/Repository/RevisionUrlBuilderTest.php +++ b/tests/SVNBuddy/Repository/RevisionUrlBuilderTest.php @@ -16,13 +16,10 @@ use ConsoleHelpers\SVNBuddy\Repository\RevisionUrlBuilder; use Prophecy\Prophecy\ObjectProphecy; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; class RevisionUrlBuilderTest extends AbstractTestCase { - use ExpectException; - /** * Repository connector. * diff --git a/tests/SVNBuddy/Repository/WorkingCopyConflictTrackerTest.php b/tests/SVNBuddy/Repository/WorkingCopyConflictTrackerTest.php index a6afc4d..4134cf9 100644 --- a/tests/SVNBuddy/Repository/WorkingCopyConflictTrackerTest.php +++ b/tests/SVNBuddy/Repository/WorkingCopyConflictTrackerTest.php @@ -16,13 +16,10 @@ use Prophecy\Argument; use Prophecy\Prophecy\ObjectProphecy; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; class WorkingCopyConflictTrackerTest extends AbstractTestCase { - use ExpectException; - /** * Repository connector. * diff --git a/tests/SVNBuddy/Repository/WorkingCopyResolverTest.php b/tests/SVNBuddy/Repository/WorkingCopyResolverTest.php index 3657ce5..262156e 100644 --- a/tests/SVNBuddy/Repository/WorkingCopyResolverTest.php +++ b/tests/SVNBuddy/Repository/WorkingCopyResolverTest.php @@ -14,13 +14,10 @@ use ConsoleHelpers\SVNBuddy\Repository\WorkingCopyResolver; use Prophecy\Prophecy\ObjectProphecy; use Tests\ConsoleHelpers\SVNBuddy\AbstractTestCase; -use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; class WorkingCopyResolverTest extends AbstractTestCase { - use ExpectException; - /** * Repository connector. *