@@ -23,10 +23,10 @@ |
||
| 23 | 23 | use TAbstractTestSuiteBody; |
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | - * @inheritDoc |
|
| 27 | - */ |
|
| 28 | - public function run(\PHPUnit_Framework_TestResult $result = null) |
|
| 29 | - { |
|
| 26 | + * @inheritDoc |
|
| 27 | + */ |
|
| 28 | + public function run(\PHPUnit_Framework_TestResult $result = null) |
|
| 29 | + { |
|
| 30 | 30 | return $this->runCompat($result); |
| 31 | 31 | } |
| 32 | 32 | |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | use PHPUnit\Framework\TestSuite; |
| 15 | 15 | |
| 16 | -if ( version_compare($runner_version, '5.0.0', '<') ) { |
|
| 16 | +if (version_compare($runner_version, '5.0.0', '<')) { |
|
| 17 | 17 | /** |
| 18 | 18 | * Implementation for PHPUnit 4 |
| 19 | 19 | */ |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | -elseif ( version_compare($runner_version, '6.0.0', '<') ) { |
|
| 43 | +elseif (version_compare($runner_version, '6.0.0', '<')) { |
|
| 44 | 44 | /** |
| 45 | 45 | * Implementation for PHPUnit 5 |
| 46 | 46 | */ |
@@ -33,8 +33,7 @@ |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | } |
| 36 | -} |
|
| 37 | -elseif ( version_compare($runner_version, '6.0.0', '<') ) { |
|
| 36 | +} elseif ( version_compare($runner_version, '6.0.0', '<') ) { |
|
| 38 | 37 | /** |
| 39 | 38 | * Implementation for PHPUnit 5 |
| 40 | 39 | */ |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | use PHPUnit\Framework\TestResult; |
| 15 | 15 | use PHPUnit\Runner\Version; |
| 16 | 16 | |
| 17 | -if ( \class_exists('PHPUnit\Runner\Version') ) { |
|
| 17 | +if (\class_exists('PHPUnit\Runner\Version')) { |
|
| 18 | 18 | $runner_version = Version::id(); |
| 19 | 19 | } |
| 20 | 20 | else { |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | |
| 52 | -if ( version_compare($runner_version, '6.0.0', '<') ) { |
|
| 52 | +if (version_compare($runner_version, '6.0.0', '<')) { |
|
| 53 | 53 | require_once __DIR__ . '/AbstractTestSuite5.php'; |
| 54 | 54 | } |
| 55 | 55 | else { |
@@ -16,8 +16,7 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | if ( \class_exists('PHPUnit\Runner\Version') ) { |
| 18 | 18 | $runner_version = Version::id(); |
| 19 | -} |
|
| 20 | -else { |
|
| 19 | +} else { |
|
| 21 | 20 | $runner_version = \PHPUnit_Runner_Version::id(); |
| 22 | 21 | } |
| 23 | 22 | |
@@ -51,7 +50,6 @@ discard block |
||
| 51 | 50 | |
| 52 | 51 | if ( version_compare($runner_version, '6.0.0', '<') ) { |
| 53 | 52 | require_once __DIR__ . '/AbstractTestSuite5.php'; |
| 54 | -} |
|
| 55 | -else { |
|
| 53 | +} else { |
|
| 56 | 54 | require_once __DIR__ . '/AbstractTestSuite7.php'; |
| 57 | 55 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | use PHPUnit\Runner\Version; |
| 15 | 15 | |
| 16 | -if ( \class_exists('\PHPUnit_Framework_IncompleteTestError') ) { |
|
| 16 | +if (\class_exists('\PHPUnit_Framework_IncompleteTestError')) { |
|
| 17 | 17 | \class_alias( |
| 18 | 18 | '\PHPUnit_Framework_IncompleteTestError', |
| 19 | 19 | '\ConsoleHelpers\PHPUnitCompat\Framework\IncompleteTestError' |
@@ -26,14 +26,14 @@ discard block |
||
| 26 | 26 | ); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | -if ( class_exists('\PHPUnit_Framework_SkippedTestError') ) { |
|
| 29 | +if (class_exists('\PHPUnit_Framework_SkippedTestError')) { |
|
| 30 | 30 | \class_alias('\PHPUnit_Framework_SkippedTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\SkippedTestError'); |
| 31 | 31 | } |
| 32 | 32 | else { |
| 33 | 33 | \class_alias('\PHPUnit\Framework\SkippedTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\SkippedTestError'); |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | -if ( class_exists('\PHPUnit_Framework_TestSuite_DataProvider') ) { |
|
| 36 | +if (class_exists('\PHPUnit_Framework_TestSuite_DataProvider')) { |
|
| 37 | 37 | \class_alias( |
| 38 | 38 | '\PHPUnit_Framework_TestSuite_DataProvider', |
| 39 | 39 | '\ConsoleHelpers\PHPUnitCompat\Framework\DataProviderTestSuite' |
@@ -46,21 +46,21 @@ discard block |
||
| 46 | 46 | ); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | -if ( class_exists('\PHPUnit_Framework_TestResult') ) { |
|
| 49 | +if (class_exists('\PHPUnit_Framework_TestResult')) { |
|
| 50 | 50 | \class_alias('\PHPUnit_Framework_TestResult', '\ConsoleHelpers\PHPUnitCompat\Framework\TestResult'); |
| 51 | 51 | } |
| 52 | 52 | else { |
| 53 | 53 | \class_alias('\PHPUnit\Framework\TestResult', '\ConsoleHelpers\PHPUnitCompat\Framework\TestResult'); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | -if ( class_exists('\PHPUnit_Framework_Test') ) { |
|
| 56 | +if (class_exists('\PHPUnit_Framework_Test')) { |
|
| 57 | 57 | \class_alias('\PHPUnit_Framework_Test', '\ConsoleHelpers\PHPUnitCompat\Framework\Test'); |
| 58 | 58 | } |
| 59 | 59 | else { |
| 60 | 60 | \class_alias('\PHPUnit\Framework\Test', '\ConsoleHelpers\PHPUnitCompat\Framework\Test'); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | -if ( class_exists('\PHP_CodeCoverage') ) { |
|
| 63 | +if (class_exists('\PHP_CodeCoverage')) { |
|
| 64 | 64 | \class_alias('\PHP_CodeCoverage', '\aik099\SebastianBergmann\CodeCoverage\CodeCoverage'); |
| 65 | 65 | } |
| 66 | 66 | else { |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | ); |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | -if ( \interface_exists('\PHP_CodeCoverage_Driver') ) { |
|
| 73 | +if (\interface_exists('\PHP_CodeCoverage_Driver')) { |
|
| 74 | 74 | \class_alias('\PHP_CodeCoverage_Driver', '\aik099\SebastianBergmann\CodeCoverage\Driver\Driver'); |
| 75 | 75 | } |
| 76 | 76 | else { |
@@ -80,14 +80,14 @@ discard block |
||
| 80 | 80 | ); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | -if ( class_exists('\PHP_CodeCoverage_Filter') ) { |
|
| 83 | +if (class_exists('\PHP_CodeCoverage_Filter')) { |
|
| 84 | 84 | \class_alias('\PHP_CodeCoverage_Filter', '\aik099\SebastianBergmann\CodeCoverage\Filter'); |
| 85 | 85 | } |
| 86 | 86 | else { |
| 87 | 87 | \class_alias('\SebastianBergmann\CodeCoverage\Filter', '\aik099\SebastianBergmann\CodeCoverage\Filter'); |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | -if ( \class_exists('PHPUnit\Runner\Version') ) { |
|
| 90 | +if (\class_exists('PHPUnit\Runner\Version')) { |
|
| 91 | 91 | $runner_version = Version::id(); |
| 92 | 92 | } |
| 93 | 93 | else { |
@@ -117,14 +117,14 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | protected function verifyMockeryExpectations() |
| 119 | 119 | { |
| 120 | - if ( !\class_exists('Mockery') ) { |
|
| 120 | + if (!\class_exists('Mockery')) { |
|
| 121 | 121 | return; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | // Add Mockery expectations to assertion count. |
| 125 | 125 | $container = \Mockery::getContainer(); |
| 126 | 126 | |
| 127 | - if ( $container !== null ) { |
|
| 127 | + if ($container !== null) { |
|
| 128 | 128 | $this->addToAssertionCount($container->mockery_getExpectationCount()); |
| 129 | 129 | } |
| 130 | 130 | |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | -if ( version_compare($runner_version, '6.0.0', '<') ) { |
|
| 137 | +if (version_compare($runner_version, '6.0.0', '<')) { |
|
| 138 | 138 | require_once __DIR__ . '/AbstractTestCase5.php'; |
| 139 | 139 | } |
| 140 | 140 | else { |
@@ -18,8 +18,7 @@ discard block |
||
| 18 | 18 | '\PHPUnit_Framework_IncompleteTestError', |
| 19 | 19 | '\ConsoleHelpers\PHPUnitCompat\Framework\IncompleteTestError' |
| 20 | 20 | ); |
| 21 | -} |
|
| 22 | -else { |
|
| 21 | +} else { |
|
| 23 | 22 | \class_alias( |
| 24 | 23 | '\PHPUnit\Framework\IncompleteTestError', |
| 25 | 24 | '\ConsoleHelpers\PHPUnitCompat\Framework\IncompleteTestError' |
@@ -28,8 +27,7 @@ discard block |
||
| 28 | 27 | |
| 29 | 28 | if ( class_exists('\PHPUnit_Framework_SkippedTestError') ) { |
| 30 | 29 | \class_alias('\PHPUnit_Framework_SkippedTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\SkippedTestError'); |
| 31 | -} |
|
| 32 | -else { |
|
| 30 | +} else { |
|
| 33 | 31 | \class_alias('\PHPUnit\Framework\SkippedTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\SkippedTestError'); |
| 34 | 32 | } |
| 35 | 33 | |
@@ -38,8 +36,7 @@ discard block |
||
| 38 | 36 | '\PHPUnit_Framework_TestSuite_DataProvider', |
| 39 | 37 | '\ConsoleHelpers\PHPUnitCompat\Framework\DataProviderTestSuite' |
| 40 | 38 | ); |
| 41 | -} |
|
| 42 | -else { |
|
| 39 | +} else { |
|
| 43 | 40 | \class_alias( |
| 44 | 41 | '\PHPUnit\Framework\DataProviderTestSuite', |
| 45 | 42 | '\ConsoleHelpers\PHPUnitCompat\Framework\DataProviderTestSuite' |
@@ -48,22 +45,19 @@ discard block |
||
| 48 | 45 | |
| 49 | 46 | if ( class_exists('\PHPUnit_Framework_TestResult') ) { |
| 50 | 47 | \class_alias('\PHPUnit_Framework_TestResult', '\ConsoleHelpers\PHPUnitCompat\Framework\TestResult'); |
| 51 | -} |
|
| 52 | -else { |
|
| 48 | +} else { |
|
| 53 | 49 | \class_alias('\PHPUnit\Framework\TestResult', '\ConsoleHelpers\PHPUnitCompat\Framework\TestResult'); |
| 54 | 50 | } |
| 55 | 51 | |
| 56 | 52 | if ( class_exists('\PHPUnit_Framework_Test') ) { |
| 57 | 53 | \class_alias('\PHPUnit_Framework_Test', '\ConsoleHelpers\PHPUnitCompat\Framework\Test'); |
| 58 | -} |
|
| 59 | -else { |
|
| 54 | +} else { |
|
| 60 | 55 | \class_alias('\PHPUnit\Framework\Test', '\ConsoleHelpers\PHPUnitCompat\Framework\Test'); |
| 61 | 56 | } |
| 62 | 57 | |
| 63 | 58 | if ( class_exists('\PHP_CodeCoverage') ) { |
| 64 | 59 | \class_alias('\PHP_CodeCoverage', '\aik099\SebastianBergmann\CodeCoverage\CodeCoverage'); |
| 65 | -} |
|
| 66 | -else { |
|
| 60 | +} else { |
|
| 67 | 61 | \class_alias( |
| 68 | 62 | '\SebastianBergmann\CodeCoverage\CodeCoverage', |
| 69 | 63 | '\aik099\SebastianBergmann\CodeCoverage\CodeCoverage' |
@@ -72,8 +66,7 @@ discard block |
||
| 72 | 66 | |
| 73 | 67 | if ( \interface_exists('\PHP_CodeCoverage_Driver') ) { |
| 74 | 68 | \class_alias('\PHP_CodeCoverage_Driver', '\aik099\SebastianBergmann\CodeCoverage\Driver\Driver'); |
| 75 | -} |
|
| 76 | -else { |
|
| 69 | +} else { |
|
| 77 | 70 | \class_alias( |
| 78 | 71 | '\SebastianBergmann\CodeCoverage\Driver\Driver', |
| 79 | 72 | '\aik099\SebastianBergmann\CodeCoverage\Driver\Driver' |
@@ -82,15 +75,13 @@ discard block |
||
| 82 | 75 | |
| 83 | 76 | if ( class_exists('\PHP_CodeCoverage_Filter') ) { |
| 84 | 77 | \class_alias('\PHP_CodeCoverage_Filter', '\aik099\SebastianBergmann\CodeCoverage\Filter'); |
| 85 | -} |
|
| 86 | -else { |
|
| 78 | +} else { |
|
| 87 | 79 | \class_alias('\SebastianBergmann\CodeCoverage\Filter', '\aik099\SebastianBergmann\CodeCoverage\Filter'); |
| 88 | 80 | } |
| 89 | 81 | |
| 90 | 82 | if ( \class_exists('PHPUnit\Runner\Version') ) { |
| 91 | 83 | $runner_version = Version::id(); |
| 92 | -} |
|
| 93 | -else { |
|
| 84 | +} else { |
|
| 94 | 85 | $runner_version = \PHPUnit_Runner_Version::id(); |
| 95 | 86 | } |
| 96 | 87 | |
@@ -136,7 +127,6 @@ discard block |
||
| 136 | 127 | |
| 137 | 128 | if ( version_compare($runner_version, '6.0.0', '<') ) { |
| 138 | 129 | require_once __DIR__ . '/AbstractTestCase5.php'; |
| 139 | -} |
|
| 140 | -else { |
|
| 130 | +} else { |
|
| 141 | 131 | require_once __DIR__ . '/AbstractTestCase7.php'; |
| 142 | 132 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | use PHPUnit\Framework\TestResult; |
| 15 | 15 | use PHPUnit\Framework\TestSuite; |
| 16 | 16 | |
| 17 | -if ( version_compare($runner_version, '7.0.0', '<') ) { |
|
| 17 | +if (version_compare($runner_version, '7.0.0', '<')) { |
|
| 18 | 18 | /** |
| 19 | 19 | * Implementation for PHPUnit 6 |
| 20 | 20 | */ |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | -elseif ( version_compare($runner_version, '8.0.0', '<') ) { |
|
| 44 | +elseif (version_compare($runner_version, '8.0.0', '<')) { |
|
| 45 | 45 | /** |
| 46 | 46 | * Implementation for PHPUnit 7 |
| 47 | 47 | */ |
@@ -33,8 +33,7 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | } |
| 36 | -} |
|
| 37 | -elseif ( version_compare($runner_version, '8.0.0', '<') ) { |
|
| 36 | +} elseif ( version_compare($runner_version, '8.0.0', '<') ) { |
|
| 38 | 37 | /** |
| 39 | 38 | * Implementation for PHPUnit 7 |
| 40 | 39 | */ |
@@ -54,8 +53,7 @@ discard block |
||
| 54 | 53 | } |
| 55 | 54 | |
| 56 | 55 | } |
| 57 | -} |
|
| 58 | -else { |
|
| 56 | +} else { |
|
| 59 | 57 | /** |
| 60 | 58 | * Implementation for PHPUnit 8+ |
| 61 | 59 | */ |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | use PHPUnit\Framework\TestCase; |
| 15 | 15 | |
| 16 | -if ( version_compare($runner_version, '7.0.0', '<') ) { |
|
| 16 | +if (version_compare($runner_version, '7.0.0', '<')) { |
|
| 17 | 17 | /** |
| 18 | 18 | * Implementation for PHPUnit 6 |
| 19 | 19 | */ |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | -elseif ( version_compare($runner_version, '8.0.0', '<') ) { |
|
| 37 | +elseif (version_compare($runner_version, '8.0.0', '<')) { |
|
| 38 | 38 | /** |
| 39 | 39 | * Implementation for PHPUnit 7 |
| 40 | 40 | */ |
@@ -33,8 +33,7 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | } |
| 36 | -} |
|
| 37 | -elseif ( version_compare($runner_version, '8.0.0', '<') ) { |
|
| 36 | +} elseif ( version_compare($runner_version, '8.0.0', '<') ) { |
|
| 38 | 37 | /** |
| 39 | 38 | * Implementation for PHPUnit 7 |
| 40 | 39 | */ |
@@ -54,8 +53,7 @@ discard block |
||
| 54 | 53 | } |
| 55 | 54 | |
| 56 | 55 | } |
| 57 | -} |
|
| 58 | -else { |
|
| 56 | +} else { |
|
| 59 | 57 | /** |
| 60 | 58 | * Implementation for PHPUnit 8+ |
| 61 | 59 | */ |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | use PHPUnit\Framework\TestCase; |
| 15 | 15 | |
| 16 | -if ( version_compare($runner_version, '5.0.0', '<') ) { |
|
| 16 | +if (version_compare($runner_version, '5.0.0', '<')) { |
|
| 17 | 17 | /** |
| 18 | 18 | * Implementation for PHPUnit 4 |
| 19 | 19 | */ |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | -elseif ( version_compare($runner_version, '6.0.0', '<') ) { |
|
| 37 | +elseif (version_compare($runner_version, '6.0.0', '<')) { |
|
| 38 | 38 | /** |
| 39 | 39 | * Implementation for PHPUnit 5 |
| 40 | 40 | */ |
@@ -33,8 +33,7 @@ |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | } |
| 36 | -} |
|
| 37 | -elseif ( version_compare($runner_version, '6.0.0', '<') ) { |
|
| 36 | +} elseif ( version_compare($runner_version, '6.0.0', '<') ) { |
|
| 38 | 37 | /** |
| 39 | 38 | * Implementation for PHPUnit 5 |
| 40 | 39 | */ |