Merge remote-tracking branch 'remotes/api/MAGETWO-43752-Static-test-ArgumentsTest-does-not-check-all-cases' into API-Bug-PR

Cari Spruiell · Cari Spruiell · commit 6ad87fdc19a7 · 2015-11-02T09:51:22.000-06:00
diff --git a/app/code/Magento/Catalog/Model/CategoryLinkRepository.php b/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
@@ -80,6 +80,7 @@ public function deleteByIds($categoryId, $sku)
         if (!isset($productPositions[$productID])) {
             throw new InputException(__('Category does not contain specified product'));
         }
+        $backupPosition = $productPositions[$productID];
         unset($productPositions[$productID]);
 
         $category->setPostedProducts($productPositions);
@@ -88,9 +89,12 @@ public function deleteByIds($categoryId, $sku)
         } catch (\Exception $e) {
             throw new CouldNotSaveException(
                 __(
-                    'Could not save product "%1" with position %position to category %2',
-                    $product->getId(),
-                    $category->getId()
+                    'Could not save product "%product" with position %position to category %category',
+                    [
+                        "product" => $product->getId(),
+                        "position" => $backupPosition,
+                        "category" => $category->getId()
+                    ]
                 ),
                 $e
             );
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkRepositoryTest.php
@@ -145,7 +145,7 @@ public function testDeleteByIds()
 
     /**
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Could not save product "55" with position %position to category 42
+     * @expectedExceptionMessage Could not save product "55" with position 1 to category 42
      */
     public function testDeleteByIdsWithCouldNotSaveException()
     {
diff --git a/app/code/Magento/Reports/i18n/de_DE.csv b/app/code/Magento/Reports/i18n/de_DE.csv
@@ -170,7 +170,7 @@ Statistics,Statistik
 "Most Viewed Products Report","Most Viewed Products Report"
 "Show By","Show By"
 "Select Date","Select Date"
-"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Customers that have wish list: %1","Customers that have wish list: %1"
 "Number of wish lists: %1","Number of wish lists: %1"
 "Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
 "Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
diff --git a/app/code/Magento/Reports/i18n/en_US.csv b/app/code/Magento/Reports/i18n/en_US.csv
@@ -170,7 +170,7 @@ Statistics,Statistics
 "Most Viewed Products Report","Most Viewed Products Report"
 "Show By","Show By"
 "Select Date","Select Date"
-"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Customers that have wish list: %1","Customers that have wish list: %1"
 "Number of wish lists: %1","Number of wish lists: %1"
 "Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
 "Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
diff --git a/app/code/Magento/Reports/i18n/es_ES.csv b/app/code/Magento/Reports/i18n/es_ES.csv
@@ -170,7 +170,7 @@ Statistics,Estadísticas
 "Most Viewed Products Report","Most Viewed Products Report"
 "Show By","Show By"
 "Select Date","Select Date"
-"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Customers that have wish list: %1","Customers that have wish list: %1"
 "Number of wish lists: %1","Number of wish lists: %1"
 "Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
 "Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
diff --git a/app/code/Magento/Reports/i18n/fr_FR.csv b/app/code/Magento/Reports/i18n/fr_FR.csv
@@ -170,7 +170,7 @@ Statistics,Statistiques
 "Most Viewed Products Report","Most Viewed Products Report"
 "Show By","Show By"
 "Select Date","Select Date"
-"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Customers that have wish list: %1","Customers that have wish list: %1"
 "Number of wish lists: %1","Number of wish lists: %1"
 "Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
 "Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
diff --git a/app/code/Magento/Reports/i18n/nl_NL.csv b/app/code/Magento/Reports/i18n/nl_NL.csv
@@ -170,7 +170,7 @@ Statistics,Statistieken
 "Most Viewed Products Report","Most Viewed Products Report"
 "Show By","Show By"
 "Select Date","Select Date"
-"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Customers that have wish list: %1","Customers that have wish list: %1"
 "Number of wish lists: %1","Number of wish lists: %1"
 "Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
 "Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
diff --git a/app/code/Magento/Reports/i18n/pt_BR.csv b/app/code/Magento/Reports/i18n/pt_BR.csv
@@ -170,7 +170,7 @@ Statistics,Estatísticas
 "Most Viewed Products Report","Most Viewed Products Report"
 "Show By","Show By"
 "Select Date","Select Date"
-"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Customers that have wish list: %1","Customers that have wish list: %1"
 "Number of wish lists: %1","Number of wish lists: %1"
 "Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
 "Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
diff --git a/app/code/Magento/Reports/i18n/zh_Hans_CN.csv b/app/code/Magento/Reports/i18n/zh_Hans_CN.csv
@@ -170,7 +170,7 @@ Statistics,状态
 "Most Viewed Products Report","Most Viewed Products Report"
 "Show By","Show By"
 "Select Date","Select Date"
-"Customers that have wish list: %1%","Customers that have wish list: %1%"
+"Customers that have wish list: %1","Customers that have wish list: %1"
 "Number of wish lists: %1","Number of wish lists: %1"
 "Number of items bought from a wish list: %1","Number of items bought from a wish list: %1"
 "Number of times wish lists have been shared (emailed): %1","Number of times wish lists have been shared (emailed): %1"
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
@@ -10,7 +10,7 @@
 
 <div class="switcher f-left" style="margin: 10px 10px 10px 0px; padding:15px;">
 <?php
-    /* @escapeNotVerified */ echo __('Customers that have Wish List: %1%', $block->getCustomerWithWishlist())
+    /* @escapeNotVerified */ echo __('Customers that have Wish List: %1', $block->getCustomerWithWishlist())
 ?>
 </div>
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/ArgumentsTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/ArgumentsTest.php
@@ -4,15 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Scan source code for detects invocations of __() function, analyzes placeholders with arguments
- * and see if they not equal
- */
 namespace Magento\Test\Integrity\Phrase;
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer;
 
+/**
+ * Scan source code for detects invocations of __() function or Phrase object, analyzes placeholders with arguments
+ * and see if they not equal
+ */
 class ArgumentsTest extends \Magento\Test\Integrity\Phrase\AbstractTestCase
 {
     /**
@@ -31,7 +31,9 @@ class ArgumentsTest extends \Magento\Test\Integrity\Phrase\AbstractTestCase
     protected function setUp()
     {
         $this->_phraseCollector = new \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector(
-            new \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer()
+            new \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer(),
+            true,
+            'Magento\Framework\Phrase'
         );
 
         $componentRegistrar = new ComponentRegistrar();
@@ -51,16 +53,10 @@ public function testArguments()
                 continue;
             }
             $this->_phraseCollector->parse($file);
+
             foreach ($this->_phraseCollector->getPhrases() as $phrase) {
-                if (empty(trim($phrase['phrase'], "'\"\t\n\r\0\x0B"))) {
-                    $missedPhraseErrors[] = $this->_createMissedPhraseError($phrase);
-                }
-                if (preg_match_all('/%(\d+)/', $phrase['phrase'], $matches) || $phrase['arguments']) {
-                    $placeholdersInPhrase = array_unique($matches[1]);
-                    if (count($placeholdersInPhrase) != $phrase['arguments']) {
-                        $incorrectNumberOfArgumentsErrors[] = $this->_createPhraseError($phrase);
-                    }
-                }
+                $this->checkEmptyPhrases($phrase, $missedPhraseErrors);
+                $this->checkArgumentMismatch($phrase, $incorrectNumberOfArgumentsErrors);
             }
         }
         $this->assertEmpty(
@@ -80,4 +76,46 @@ public function testArguments()
             )
         );
     }
+
+    /**
+     * Will check if phrase is empty
+     *
+     * @param $phrase
+     * @param $missedPhraseErrors
+     */
+    private function checkEmptyPhrases($phrase, &$missedPhraseErrors)
+    {
+        if (empty(trim($phrase['phrase'], "'\"\t\n\r\0\x0B"))) {
+            $missedPhraseErrors[] = $this->_createMissedPhraseError($phrase);
+        }
+    }
+
+    /**
+     * Will check if the number of arguments does not match the number of placeholders
+     *
+     * @param $phrase
+     * @param $incorrectNumberOfArgumentsErrors
+     */
+    private function checkArgumentMismatch($phrase, &$incorrectNumberOfArgumentsErrors)
+    {
+        if (preg_match_all('/%(\w+)/', $phrase['phrase'], $matches) || $phrase['arguments']) {
+            $placeholderCount = count(array_unique($matches[1]));
+
+            // Check for zend placeholders %placeholder% and sprintf placeholder %s
+            if (preg_match_all('/%((s)|([A-Za-z]+)%)/', $phrase['phrase'], $placeHolders, PREG_OFFSET_CAPTURE)) {
+
+                foreach ($placeHolders[0] as $ph) {
+                    // Check if char after placeholder is not a digit or letter
+                    $charAfterPh = $phrase['phrase'][$ph[1] + strlen($ph[0])];
+                    if (!preg_match('/[A-Za-z0-9]/', $charAfterPh)) {
+                        $placeholderCount--;
+                    }
+                }
+            }
+
+            if ($placeholderCount != $phrase['arguments']) {
+                $incorrectNumberOfArgumentsErrors[] = $this->_createPhraseError($phrase);
+            }
+        }
+    }
 }
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php b/lib/internal/Magento/Framework/Archive/Helper/File/Bz.php
@@ -24,7 +24,7 @@ protected function _open($mode)
 
         if (false === $this->_fileHandler) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Failed to open file ', [$this->_filePath])
+                new \Magento\Framework\Phrase('Failed to open file %1', [$this->_filePath])
             );
         }
     }
@@ -38,7 +38,7 @@ protected function _write($data)
 
         if (false === $result) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Failed to write data to ', [$this->_filePath])
+                new \Magento\Framework\Phrase('Failed to write data to %1', [$this->_filePath])
             );
         }
     }
@@ -52,7 +52,7 @@ protected function _read($length)
 
         if (false === $data) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Failed to read data from ', [$this->_filePath])
+                new \Magento\Framework\Phrase('Failed to read data from %1', [$this->_filePath])
             );
         }
 
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php b/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
@@ -26,7 +26,7 @@ protected function _open($mode)
 
         if (false === $this->_fileHandler) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Failed to open file ', [$this->_filePath])
+                new \Magento\Framework\Phrase('Failed to open file %1', [$this->_filePath])
             );
         }
     }
@@ -40,7 +40,7 @@ protected function _write($data)
 
         if (empty($result) && !empty($data)) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase('Failed to write data to ', [$this->_filePath])
+                new \Magento\Framework\Phrase('Failed to write data to %1', [$this->_filePath])
             );
         }
     }
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/File.php b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
@@ -304,7 +304,7 @@ public function copy($source, $destination, DriverInterface $targetDriver = null
                     [
                         $source,
                         $destination,
-                        $this->getWarningMessage(),
+                        $this->getWarningMessage()
                     ]
                 )
             );
@@ -334,7 +334,7 @@ public function symlink($source, $destination, DriverInterface $targetDriver = n
                     [
                         $source,
                         $destination,
-                        $this->getWarningMessage(),
+                        $this->getWarningMessage()
                     ]
                 )
             );
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
@@ -38,16 +38,23 @@ class PhraseCollector
      */
     protected $includeObjects = false;
 
+    /**
+     * The class name of the phrase object
+     */
+    protected $className = 'Phrase';
+
     /**
      * Construct
      *
      * @param Tokenizer $tokenizer
      * @param bool $includeObjects
+     * @param String $className
      */
-    public function __construct(Tokenizer $tokenizer, $includeObjects = false)
+    public function __construct(Tokenizer $tokenizer, $includeObjects = false, $className = 'Phrase')
     {
         $this->_tokenizer = $tokenizer;
         $this->includeObjects = $includeObjects;
+        $this->className = $className;
     }
 
     /**
@@ -116,7 +123,7 @@ protected function extractMethodPhrase(Token $firstToken)
      */
     protected function extractObjectPhrase(Token $firstToken)
     {
-        if ($firstToken->isNew() && $this->_tokenizer->isMatchingClass('Phrase')) {
+        if ($firstToken->isNew() && $this->_tokenizer->isMatchingClass($this->className)) {
             $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
             $phrase = $this->_collectPhrase(array_shift($arguments));
             if (null !== $phrase) {

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function testDeleteByIds()`
`145`	`145`
`146`	`146`	`/**`
`147`	`147`	`* @expectedException \Magento\Framework\Exception\CouldNotSaveException`
`148`		`- * @expectedExceptionMessage Could not save product "55" with position %position to category 42`
	`148`	`+ * @expectedExceptionMessage Could not save product "55" with position 1 to category 42`
`149`	`149`	`*/`
`150`	`150`	`public function testDeleteByIdsWithCouldNotSaveException()`
`151`	`151`	`{`