@@ -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__ . '/AbstractPHPUnitCompatibilityTestSuite5.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__ . '/AbstractPHPUnitCompatibilityTestSuite5.php'; |
54 | -} |
|
55 | -else { |
|
53 | +} else { |
|
56 | 54 | require_once __DIR__ . '/AbstractPHPUnitCompatibilityTestSuite7.php'; |
57 | 55 | } |
@@ -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 | */ |
@@ -13,63 +13,63 @@ 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('\PHPUnit_Framework_IncompleteTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\IncompleteTestError'); |
18 | 18 | } |
19 | 19 | else { |
20 | 20 | \class_alias('\PHPUnit\Framework\IncompleteTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\IncompleteTestError'); |
21 | 21 | } |
22 | 22 | |
23 | -if ( class_exists('\PHPUnit_Framework_SkippedTestError') ) { |
|
23 | +if (class_exists('\PHPUnit_Framework_SkippedTestError')) { |
|
24 | 24 | \class_alias('\PHPUnit_Framework_SkippedTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\SkippedTestError'); |
25 | 25 | } |
26 | 26 | else { |
27 | 27 | \class_alias('\PHPUnit\Framework\SkippedTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\SkippedTestError'); |
28 | 28 | } |
29 | 29 | |
30 | -if ( class_exists('\PHPUnit_Framework_TestSuite_DataProvider') ) { |
|
30 | +if (class_exists('\PHPUnit_Framework_TestSuite_DataProvider')) { |
|
31 | 31 | \class_alias('\PHPUnit_Framework_TestSuite_DataProvider', '\ConsoleHelpers\PHPUnitCompat\Framework\DataProviderTestSuite'); |
32 | 32 | } |
33 | 33 | else { |
34 | 34 | \class_alias('\PHPUnit\Framework\DataProviderTestSuite', '\ConsoleHelpers\PHPUnitCompat\Framework\DataProviderTestSuite'); |
35 | 35 | } |
36 | 36 | |
37 | -if ( class_exists('\PHPUnit_Framework_TestResult') ) { |
|
37 | +if (class_exists('\PHPUnit_Framework_TestResult')) { |
|
38 | 38 | \class_alias('\PHPUnit_Framework_TestResult', '\ConsoleHelpers\PHPUnitCompat\Framework\TestResult'); |
39 | 39 | } |
40 | 40 | else { |
41 | 41 | \class_alias('\PHPUnit\Framework\TestResult', '\ConsoleHelpers\PHPUnitCompat\Framework\TestResult'); |
42 | 42 | } |
43 | 43 | |
44 | -if ( class_exists('\PHPUnit_Framework_Test') ) { |
|
44 | +if (class_exists('\PHPUnit_Framework_Test')) { |
|
45 | 45 | \class_alias('\PHPUnit_Framework_Test', '\ConsoleHelpers\PHPUnitCompat\Framework\Test'); |
46 | 46 | } |
47 | 47 | else { |
48 | 48 | \class_alias('\PHPUnit\Framework\Test', '\ConsoleHelpers\PHPUnitCompat\Framework\Test'); |
49 | 49 | } |
50 | 50 | |
51 | -if ( class_exists('\PHP_CodeCoverage') ) { |
|
51 | +if (class_exists('\PHP_CodeCoverage')) { |
|
52 | 52 | \class_alias('\PHP_CodeCoverage', '\aik099\SebastianBergmann\CodeCoverage\CodeCoverage'); |
53 | 53 | } |
54 | 54 | else { |
55 | 55 | \class_alias('\SebastianBergmann\CodeCoverage\CodeCoverage', '\aik099\SebastianBergmann\CodeCoverage\CodeCoverage'); |
56 | 56 | } |
57 | 57 | |
58 | -if ( \interface_exists('\PHP_CodeCoverage_Driver') ) { |
|
58 | +if (\interface_exists('\PHP_CodeCoverage_Driver')) { |
|
59 | 59 | \class_alias('\PHP_CodeCoverage_Driver', '\aik099\SebastianBergmann\CodeCoverage\Driver\Driver'); |
60 | 60 | } |
61 | 61 | else { |
62 | 62 | \class_alias('\SebastianBergmann\CodeCoverage\Driver\Driver', '\aik099\SebastianBergmann\CodeCoverage\Driver\Driver'); |
63 | 63 | } |
64 | 64 | |
65 | -if ( class_exists('\PHP_CodeCoverage_Filter') ) { |
|
65 | +if (class_exists('\PHP_CodeCoverage_Filter')) { |
|
66 | 66 | \class_alias('\PHP_CodeCoverage_Filter', '\aik099\SebastianBergmann\CodeCoverage\Filter'); |
67 | 67 | } |
68 | 68 | else { |
69 | 69 | \class_alias('\SebastianBergmann\CodeCoverage\Filter', '\aik099\SebastianBergmann\CodeCoverage\Filter'); |
70 | 70 | } |
71 | 71 | |
72 | -if ( \class_exists('PHPUnit\Runner\Version') ) { |
|
72 | +if (\class_exists('PHPUnit\Runner\Version')) { |
|
73 | 73 | $runner_version = Version::id(); |
74 | 74 | } |
75 | 75 | else { |
@@ -97,9 +97,9 @@ discard block |
||
97 | 97 | */ |
98 | 98 | protected function verifyMockeryExpectations() |
99 | 99 | { |
100 | - if ( \class_exists('Mockery') ) { |
|
100 | + if (\class_exists('Mockery')) { |
|
101 | 101 | // Add Mockery expectations to assertion count. |
102 | - if ( ($container = \Mockery::getContainer()) !== null ) { |
|
102 | + if (($container = \Mockery::getContainer()) !== null) { |
|
103 | 103 | $this->addToAssertionCount($container->mockery_getExpectationCount()); |
104 | 104 | } |
105 | 105 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | } |
112 | 112 | |
113 | 113 | |
114 | -if ( version_compare($runner_version, '6.0.0', '<') ) { |
|
114 | +if (version_compare($runner_version, '6.0.0', '<')) { |
|
115 | 115 | require_once __DIR__ . '/AbstractPHPUnitCompatibilityTestCase5.php'; |
116 | 116 | } |
117 | 117 | else { |
@@ -15,64 +15,55 @@ discard block |
||
15 | 15 | |
16 | 16 | if ( \class_exists('\PHPUnit_Framework_IncompleteTestError') ) { |
17 | 17 | \class_alias('\PHPUnit_Framework_IncompleteTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\IncompleteTestError'); |
18 | -} |
|
19 | -else { |
|
18 | +} else { |
|
20 | 19 | \class_alias('\PHPUnit\Framework\IncompleteTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\IncompleteTestError'); |
21 | 20 | } |
22 | 21 | |
23 | 22 | if ( class_exists('\PHPUnit_Framework_SkippedTestError') ) { |
24 | 23 | \class_alias('\PHPUnit_Framework_SkippedTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\SkippedTestError'); |
25 | -} |
|
26 | -else { |
|
24 | +} else { |
|
27 | 25 | \class_alias('\PHPUnit\Framework\SkippedTestError', '\ConsoleHelpers\PHPUnitCompat\Framework\SkippedTestError'); |
28 | 26 | } |
29 | 27 | |
30 | 28 | if ( class_exists('\PHPUnit_Framework_TestSuite_DataProvider') ) { |
31 | 29 | \class_alias('\PHPUnit_Framework_TestSuite_DataProvider', '\ConsoleHelpers\PHPUnitCompat\Framework\DataProviderTestSuite'); |
32 | -} |
|
33 | -else { |
|
30 | +} else { |
|
34 | 31 | \class_alias('\PHPUnit\Framework\DataProviderTestSuite', '\ConsoleHelpers\PHPUnitCompat\Framework\DataProviderTestSuite'); |
35 | 32 | } |
36 | 33 | |
37 | 34 | if ( class_exists('\PHPUnit_Framework_TestResult') ) { |
38 | 35 | \class_alias('\PHPUnit_Framework_TestResult', '\ConsoleHelpers\PHPUnitCompat\Framework\TestResult'); |
39 | -} |
|
40 | -else { |
|
36 | +} else { |
|
41 | 37 | \class_alias('\PHPUnit\Framework\TestResult', '\ConsoleHelpers\PHPUnitCompat\Framework\TestResult'); |
42 | 38 | } |
43 | 39 | |
44 | 40 | if ( class_exists('\PHPUnit_Framework_Test') ) { |
45 | 41 | \class_alias('\PHPUnit_Framework_Test', '\ConsoleHelpers\PHPUnitCompat\Framework\Test'); |
46 | -} |
|
47 | -else { |
|
42 | +} else { |
|
48 | 43 | \class_alias('\PHPUnit\Framework\Test', '\ConsoleHelpers\PHPUnitCompat\Framework\Test'); |
49 | 44 | } |
50 | 45 | |
51 | 46 | if ( class_exists('\PHP_CodeCoverage') ) { |
52 | 47 | \class_alias('\PHP_CodeCoverage', '\aik099\SebastianBergmann\CodeCoverage\CodeCoverage'); |
53 | -} |
|
54 | -else { |
|
48 | +} else { |
|
55 | 49 | \class_alias('\SebastianBergmann\CodeCoverage\CodeCoverage', '\aik099\SebastianBergmann\CodeCoverage\CodeCoverage'); |
56 | 50 | } |
57 | 51 | |
58 | 52 | if ( \interface_exists('\PHP_CodeCoverage_Driver') ) { |
59 | 53 | \class_alias('\PHP_CodeCoverage_Driver', '\aik099\SebastianBergmann\CodeCoverage\Driver\Driver'); |
60 | -} |
|
61 | -else { |
|
54 | +} else { |
|
62 | 55 | \class_alias('\SebastianBergmann\CodeCoverage\Driver\Driver', '\aik099\SebastianBergmann\CodeCoverage\Driver\Driver'); |
63 | 56 | } |
64 | 57 | |
65 | 58 | if ( class_exists('\PHP_CodeCoverage_Filter') ) { |
66 | 59 | \class_alias('\PHP_CodeCoverage_Filter', '\aik099\SebastianBergmann\CodeCoverage\Filter'); |
67 | -} |
|
68 | -else { |
|
60 | +} else { |
|
69 | 61 | \class_alias('\SebastianBergmann\CodeCoverage\Filter', '\aik099\SebastianBergmann\CodeCoverage\Filter'); |
70 | 62 | } |
71 | 63 | |
72 | 64 | if ( \class_exists('PHPUnit\Runner\Version') ) { |
73 | 65 | $runner_version = Version::id(); |
74 | -} |
|
75 | -else { |
|
66 | +} else { |
|
76 | 67 | $runner_version = \PHPUnit_Runner_Version::id(); |
77 | 68 | } |
78 | 69 | |
@@ -113,7 +104,6 @@ discard block |
||
113 | 104 | |
114 | 105 | if ( version_compare($runner_version, '6.0.0', '<') ) { |
115 | 106 | require_once __DIR__ . '/AbstractPHPUnitCompatibilityTestCase5.php'; |
116 | -} |
|
117 | -else { |
|
107 | +} else { |
|
118 | 108 | require_once __DIR__ . '/AbstractPHPUnitCompatibilityTestCase7.php'; |
119 | 109 | } |
@@ -23,10 +23,10 @@ |
||
23 | 23 | use TAbstractPHPUnitCompatibilityTestSuite; |
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->runCompatibilized($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 | */ |
@@ -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 | */ |
@@ -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 | */ |