Merge branch '2.12' into 2.14

Author: keradus

.composer-require-checker.json

@@ -1,5 +1,6 @@
 {
     "symbol-whitelist" : [
+        "Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface",
         "PhpCsFixer\\Tests\\Test\\Constraint\\SameStringsConstraint",
         "PHPUnit\\Framework\\Constraint\\IsIdentical",
         "PHPUnit\\Framework\\TestCase",

.travis.yml

@@ -83,7 +83,7 @@ jobs:
             <<: *STANDARD_TEST_JOB
             stage: Test
             php: 7.1
-            env: SYMFONY_DEPRECATIONS_HELPER=weak PHP_CS_FIXER_TEST_USE_LEGACY_TOKENIZER=1 SYMFONY_VERSION="~4.1.0"
+            env: SYMFONY_DEPRECATIONS_HELPER=disabled PHP_CS_FIXER_TEST_USE_LEGACY_TOKENIZER=1 SYMFONY_VERSION="~4.1.0"
 
         -
             <<: *STANDARD_TEST_JOB

composer.json

@@ -42,7 +42,7 @@
         "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
         "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
         "phpunitgoodpractices/traits": "^1.8",
-        "symfony/phpunit-bridge": "^4.0"
+        "symfony/phpunit-bridge": "^4.3"
     },
     "suggest": {
         "ext-mbstring": "For handling non-UTF8 characters in cache signature.",

src/Fixer/Casing/LowercaseStaticReferenceFixer.php

@@ -62,7 +62,7 @@ public function baz(?self $x) : SELF
     }
 }
 ',
-                    new VersionSpecification(71000)
+                    new VersionSpecification(70100)
                 ),
             ]
         );

src/Fixer/PhpUnit/PhpUnitNamespacedFixer.php

@@ -32,6 +32,18 @@ final class PhpUnitNamespacedFixer extends AbstractFixer implements Configuratio
      */
     private $originalClassRegEx;
 
+    /**
+     * Class Mappings.
+     *
+     *  * [original classname => new classname] Some classes which match the
+     *    original class regular expression do not have a same-compound name-
+     *    space class and need a dedicated translation table. This trans-
+     *    lation table is defined in @see configure.
+     *
+     * @var array|string[] Class Mappings
+     */
+    private $classMap;
+
     /**
      * {@inheritdoc}
      */
@@ -81,10 +93,42 @@ public function configure(array $configuration = null)
 
         if (PhpUnitTargetVersion::fulfills($this->configuration['target'], PhpUnitTargetVersion::VERSION_6_0)) {
             $this->originalClassRegEx = '/^PHPUnit_\w+$/i';
+            // @noinspection ClassConstantCanBeUsedInspection
+            $this->classMap = [
+                'PHPUnit_Extensions_PhptTestCase' => 'PHPUnit\Runner\PhptTestCase',
+                'PHPUnit_Framework_Constraint' => 'PHPUnit\Framework\Constraint\Constraint',
+                'PHPUnit_Framework_Constraint_StringMatches' => 'PHPUnit\Framework\Constraint\StringMatchesFormatDescription',
+                'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider' => 'PHPUnit\Framework\Constraint\JsonMatchesErrorMessageProvider',
+                'PHPUnit_Framework_Constraint_PCREMatch' => 'PHPUnit\Framework\Constraint\RegularExpression',
+                'PHPUnit_Framework_Constraint_ExceptionMessageRegExp' => 'PHPUnit\Framework\Constraint\ExceptionMessageRegularExpression',
+                'PHPUnit_Framework_Constraint_And' => 'PHPUnit\Framework\Constraint\LogicalAnd',
+                'PHPUnit_Framework_Constraint_Or' => 'PHPUnit\Framework\Constraint\LogicalOr',
+                'PHPUnit_Framework_Constraint_Not' => 'PHPUnit\Framework\Constraint\LogicalNot',
+                'PHPUnit_Framework_Constraint_Xor' => 'PHPUnit\Framework\Constraint\LogicalXor',
+                'PHPUnit_Framework_Error' => 'PHPUnit\Framework\Error\Error',
+                'PHPUnit_Framework_TestSuite_DataProvider' => 'PHPUnit\Framework\DataProviderTestSuite',
+                'PHPUnit_Framework_MockObject_Invocation_Static' => 'PHPUnit\Framework\MockObject\Invocation\StaticInvocation',
+                'PHPUnit_Framework_MockObject_Invocation_Object' => 'PHPUnit\Framework\MockObject\Invocation\ObjectInvocation',
+                'PHPUnit_Framework_MockObject_Stub_Return' => 'PHPUnit\Framework\MockObject\Stub\ReturnStub',
+                'PHPUnit_Runner_Filter_Group_Exclude' => 'PHPUnit\Runner\Filter\ExcludeGroupFilterIterator',
+                'PHPUnit_Runner_Filter_Group_Include' => 'PHPUnit\Runner\Filter\IncludeGroupFilterIterator',
+                'PHPUnit_Runner_Filter_Test' => 'PHPUnit\Runner\Filter\NameFilterIterator',
+                'PHPUnit_Util_PHP' => 'PHPUnit\Util\PHP\AbstractPhpProcess',
+                'PHPUnit_Util_PHP_Default' => 'PHPUnit\Util\PHP\DefaultPhpProcess',
+                'PHPUnit_Util_PHP_Windows' => 'PHPUnit\Util\PHP\WindowsPhpProcess',
+                'PHPUnit_Util_Regex' => 'PHPUnit\Util\RegularExpression',
+                'PHPUnit_Util_TestDox_ResultPrinter_XML' => 'PHPUnit\Util\TestDox\XmlResultPrinter',
+                'PHPUnit_Util_TestDox_ResultPrinter_HTML' => 'PHPUnit\Util\TestDox\HtmlResultPrinter',
+                'PHPUnit_Util_TestDox_ResultPrinter_Text' => 'PHPUnit\Util\TestDox\TextResultPrinter',
+                'PHPUnit_Util_TestSuiteIterator' => 'PHPUnit\Framework\TestSuiteIterator',
+                'PHPUnit_Util_XML' => 'PHPUnit\Util\Xml',
+            ];
         } elseif (PhpUnitTargetVersion::fulfills($this->configuration['target'], PhpUnitTargetVersion::VERSION_5_7)) {
             $this->originalClassRegEx = '/^PHPUnit_Framework_TestCase|PHPUnit_Framework_Assert|PHPUnit_Framework_BaseTestListener|PHPUnit_Framework_TestListener$/i';
+            $this->classMap = [];
         } else {
             $this->originalClassRegEx = '/^PHPUnit_Framework_TestCase$/i';
+            $this->classMap = [];
         }
     }
 
@@ -153,7 +197,15 @@ protected function createConfigurationDefinition()
      */
     private function generateReplacement($originalClassName)
     {
-        $parts = explode('_', $originalClassName);
+        $delimiter = '_';
+        $string = $originalClassName;
+
+        if (isset($this->classMap[$originalClassName])) {
+            $delimiter = '\\';
+            $string = $this->classMap[$originalClassName];
+        }
+
+        $parts = explode($delimiter, $string);
 
         $tokensArray = [];
         while (!empty($parts)) {

src/Runner/FileFilterIterator.php

@@ -105,6 +105,15 @@ private function dispatchEvent($name, Event $event)
             return;
         }
 
-        $this->eventDispatcher->dispatch($name, $event);
+        // BC compatibility < Sf 4.3
+        if (
+            !$this->eventDispatcher instanceof \Symfony\Contracts\EventDispatcher\EventDispatcherInterface
+        ) {
+            $this->eventDispatcher->dispatch($name, $event);
+
+            return;
+        }
+
+        $this->eventDispatcher->dispatch($event, $name);
     }
 }

src/Runner/Runner.php

@@ -294,6 +294,15 @@ private function dispatchEvent($name, Event $event)
             return;
         }
 
-        $this->eventDispatcher->dispatch($name, $event);
+        // BC compatibility < Sf 4.3
+        if (
+            !$this->eventDispatcher instanceof \Symfony\Contracts\EventDispatcher\EventDispatcherInterface
+        ) {
+            $this->eventDispatcher->dispatch($name, $event);
+
+            return;
+        }
+
+        $this->eventDispatcher->dispatch($event, $name);
     }
 }

tests/Fixer/PhpUnit/PhpUnitNamespacedFixerTest.php

@@ -40,6 +40,14 @@ public function testFix($expected, $input = null, array $config = [])
     public function provideTestFixCases()
     {
         return [
+            'class_mapping' => [
+                '<?php new PHPUnit\Framework\Error\Error();',
+                '<?php new PHPUnit_Framework_Error();',
+            ],
+            'class_mapping_bogus_fqcn' => [
+                '<?php new \PHPUnit\Framework\MockObject\Stub\ReturnStub();',
+                '<?php new \PHPUnit_Framework_MockObject_Stub_Return();',
+            ],
             [
                 '<?php
     final class MyTest extends \PHPUnit\Framework\TestCase