MAGETWO-33062: Update dictionary search tool to support \Magento\Framework\Phrase

Author: Yuri Kovsher

dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector;
 
 /**
  * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector
@@ -37,7 +38,7 @@ protected function setUp()
     public function testParse()
     {
         $file = __DIR__.'/_files/objectsCode.php.txt';
-        $this->phraseCollector->parse($file);
+        $this->phraseCollector->parse($file, true);
         $expectation = [
             [
                 'phrase' => '\'Testing\'',

dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate\MethodCollector;
 
 /**
  * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate\MethodCollector

dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php

@@ -92,7 +92,7 @@ public function testParse(
                 $isMatchingClassReturnValues
             ));
 
-        $this->phraseCollector->parse($file);
+        $this->phraseCollector->parse($file, true);
         $this->assertEquals($result, $this->phraseCollector->getPhrases());
     }
 

dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php

@@ -34,7 +34,7 @@ public function __construct(PhraseCollector $phraseCollector)
      */
     protected function _parse()
     {
-        $this->_phraseCollector->parse($this->_file);
+        $this->_phraseCollector->parse($this->_file, true);
 
         foreach ($this->_phraseCollector->getPhrases() as $phrase) {
             $this->_addPhrase($phrase['phrase'], $phrase['line']);

dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php

@@ -55,24 +55,26 @@ public function getPhrases()
      * Parse given files for phrase
      *
      * @param string $file
+     * @param bool $searchObjects
      * @return void
      */
-    public function parse($file)
+    public function parse($file, $searchObjects = false)
     {
         $this->_phrases = [];
         $this->_file = $file;
         $this->_tokenizer->parse($file);
         while (!$this->_tokenizer->isEndOfLoop()) {
-            $this->_extractPhrases();
+            $this->_extractPhrases($searchObjects);
         }
     }
 
     /**
      * Extract phrases from given tokens. e.g.: __('phrase', ...)
      *
+     * @param bool $searchObjects
      * @return void
      */
-    protected function _extractPhrases()
+    protected function _extractPhrases($searchObjects)
     {
         if ($firstToken = $this->_tokenizer->getNextRealToken()) {
             if ($firstToken->isEqualFunction('__')) {
@@ -84,7 +86,7 @@ protected function _extractPhrases()
                         $this->_addPhrase($phrase, count($arguments), $this->_file, $firstToken->getLine());
                     }
                 }
-            } elseif ($firstToken->isNew() && $this->_tokenizer->isMatchingClass('Phrase')) {
+            } elseif ($searchObjects && $firstToken->isNew() && $this->_tokenizer->isMatchingClass('Phrase')) {
                 $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
                 $phrase = $this->_collectPhrase(array_shift($arguments));
                 if (null !== $phrase) {