Switch to "yoast/phpunit-polyfills" 2.0

console-helpers · Mar 28, 2024 · ba4aaed · ba4aaed
1 parent 5e5529b
commit ba4aaed
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 72 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
 	 *