MAGETWO-33063: Replace usage of __() to Phrase object in library

Author: Yuri Kovsher

dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Test\Integrity\Library;
 
 use Magento\Framework\Test\Utility\Files;
+use Magento\Framework\Test\Utility\AggregateInvoker;
 use Magento\TestFramework\Integrity\Library\Injectable;
 use Magento\TestFramework\Integrity\Library\PhpParser\ParserFactory;
 use Magento\TestFramework\Integrity\Library\PhpParser\Tokens;
@@ -67,6 +68,27 @@ function ($file) {
         );
     }
 
+    public function testAppCodeUsage()
+    {
+        $files = Files::init();
+        $path = $files->getPathToSource();
+        $invoker = new AggregateInvoker($this);
+        $invoker(
+            function ($file) use ($path) {
+                $content = file_get_contents($file);
+                if (strpos($file, $path . '/lib/') === 0) {
+                    $this->assertSame(
+                        0,
+                        preg_match('~(?<![a-z\\d_:]|->|function\\s)__\\s*\\(~iS', $content),
+                        'Function __() is defined outside of the library and must not be used there. ' .
+                        'Replacement suggestion: new \\Magento\\Framework\\Phrase()'
+                    );
+                }
+            },
+            $files->getPhpFiles(false, true, false)
+        );
+    }
+
     /**
      * @inheritdoc
      */

dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php

@@ -10,8 +10,6 @@
  */
 namespace Magento\Test\Legacy;
 
-use Magento\Framework\Test\Utility\Files;
-
 class ObsoleteCodeTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -131,7 +129,6 @@ function ($file) {
                 $this->_testObsoleteActions($content);
                 $this->_testObsoleteConstants($content);
                 $this->_testObsoletePropertySkipCalculate($content);
-                $this->checkLibraryDependence($content, $file);
             },
             \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files*')
         );
@@ -494,25 +491,6 @@ protected function _testObsoletePropertySkipCalculate($content)
         );
     }
 
-    /**
-     * Checks that library is not using app defined code
-     *
-     * @param string $content
-     * @param string $file
-     */
-    protected function checkLibraryDependence($content, $file)
-    {
-        $path = Files::init()->getPathToSource();
-        if (strpos($file, $path . '/lib/') === 0) {
-            $this->_assertNotRegexp(
-                '~(?<![a-z\\d_:]|->|function\\s)__\\s*\\(~iS',
-                $content,
-                'Function __() is defined outside of the library and must not be used there. ' .
-                'Replacement suggestion: new \\Magento\\Framework\\Phrase()'
-            );
-        }
-    }
-
     /**
      * Analyze contents to determine whether this is declaration of specified class/interface
      *