MAGETWO-69964: PHPCS cannot parse correctly syntax of PHP 7.x return types

Author: oshmyheliuk

dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Phrase;
 use Magento\Setup\Module\I18n\Locale;
+use Magento\Theme\Block\Html\Footer;
 
 /**
  * @magentoAppIsolation enabled
@@ -56,12 +57,12 @@ public function testViewDirective()
      */
     public function testBlockDirective()
     {
-        $class = 'Magento\\\\Theme\\\\Block\\\\Html\\\\Footer';
-        $data = ["{{block class='$class' name='test.block' template='Magento_Theme::html/footer.phtml'}}",
-                'block',
-                " class='$class' name='test.block' template='Magento_Theme::html/footer.phtml'",
-
-            ];
+        $class = Footer::class;
+        $data = [
+            "{{block class='$class' name='test.block' template='Magento_Theme::html/footer.phtml'}}",
+            'block',
+            " class='$class' name='test.block' template='Magento_Theme::html/footer.phtml'",
+        ];
         $html = $this->model->blockDirective($data);
         $this->assertContains('<div class="footer-container">', $html);
     }

dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php

@@ -47,6 +47,11 @@ public function process(File $sourceFile, $stackPtr)
         }
 
         $content = trim($tokens[$stackPtr]['content'], "\"'");
+        // replace double slashes from class name for avoiding problems with class autoload
+        if (strpos($content, '\\') !== false) {
+            $content = preg_replace('|\\\{2,}|', '\\', $content);
+        }
+
         if (preg_match($this->literalNamespacePattern, $content) === 1 && $this->classExists($content)) {
             $sourceFile->addError(
                 "Use ::class notation instead.",

lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php

@@ -8,6 +8,9 @@
 
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\InputException;
 use Zend\Code\Reflection\MethodReflection;
 use Zend\Code\Reflection\ParameterReflection;
 
@@ -21,13 +24,6 @@ class Repository extends \Magento\Framework\Code\Generator\EntityAbstract
      */
     const ENTITY_TYPE = 'repository';
 
-    /**
-     * No Such Entity Exception
-     */
-    const NO_SUCH_ENTITY_EXCEPTION = '\\Magento\Framework\Exception\NoSuchEntityException';
-    const INPUT_EXCEPTION = '\\Magento\Framework\Exception\InputException';
-    const SEARCH_CRITERIA = '\\Magento\Framework\Api\SearchCriteriaInterface';
-
     /**
      * The namespace of repository interface
      * @var string
@@ -227,13 +223,13 @@ protected function _getGetMethod()
         /** @var ParameterReflection $parameterReflection */
         $parameterReflection = $methodReflection->getParameters()[0];
         $body = "if (!\$id) {\n"
-            . "    throw new " . self::INPUT_EXCEPTION . "('ID required');\n"
+            . "    throw new " . InputException::class . "('ID required');\n"
             . "}\n"
             . "if (!isset(\$this->registry[\$id])) {\n"
             . "    \$entity = \$this->" . $this->_getSourcePersistorPropertyName()
             . "->loadEntity(\$id);\n"
             . "    if (!\$entity->getId()) {\n"
-            . "        throw new " . self::NO_SUCH_ENTITY_EXCEPTION . "('Requested entity doesn\\'t exist');\n"
+            . "        throw new " . NoSuchEntityException::class . "('Requested entity doesn\\'t exist');\n"
             . "    }\n"
             . "    \$this->registry[\$id] = \$entity;\n"
             . "}\n"
@@ -261,11 +257,11 @@ protected function _getGetMethod()
                     ],
                     [
                         'name' => 'throws',
-                        'description' => self::INPUT_EXCEPTION,
+                        'description' => InputException::class,
                     ],
                     [
                         'name' => 'throws',
-                        'description' => self::NO_SUCH_ENTITY_EXCEPTION,
+                        'description' => NoSuchEntityException::class,
                     ],
                 ],
             ]
@@ -514,7 +510,7 @@ protected function _getGetListMethod()
             'parameters' => [
                 [
                     'name' => 'searchCriteria',
-                    'type' => self::SEARCH_CRITERIA,
+                    'type' => SearchCriteriaInterface::class,
                 ],
             ],
             'body' => $body,
@@ -523,7 +519,7 @@ protected function _getGetListMethod()
                 'tags' => [
                     [
                         'name' => 'param',
-                        'description' => self::SEARCH_CRITERIA . ' $searchCriteria',
+                        'description' => SearchCriteriaInterface::class . ' $searchCriteria',
                     ],
                     [
                         'name' => 'return',