Merge pull request #1047 from magento-engcom/develop-prs

Oleksii Korshenko · web-flow · commit a9f1814e76e0 · 2017-04-19T20:24:42.000-05:00
Public Pull Requests: #9321 #9320 #9319 #9318
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageContentValidatorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageContentValidatorTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Api\Test\Unit\Api;
 
 /**
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Api\Test\Unit\Api;
 
 /**
@@ -67,7 +65,8 @@ protected function setUp()
             ->method('getDirectoryWrite')
             ->willReturn($this->directoryWriteMock);
         $this->contentValidatorMock = $this->getMockBuilder(
-            \Magento\Framework\Api\ImageContentValidatorInterface::class)
+            \Magento\Framework\Api\ImageContentValidatorInterface::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
         $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/ExtensionAttributesGeneratorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/ExtensionAttributesGeneratorTest.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+
 namespace Magento\Framework\Api\Test\Unit\Code\Generator;
 
 use Magento\Framework\Api\ExtensionAttribute\Config\Converter;
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/ExtensionAttributesInterfaceGeneratorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/ExtensionAttributesInterfaceGeneratorTest.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+
 namespace Magento\Framework\Api\Test\Unit\Code\Generator;
 
 use Magento\Framework\Api\ExtensionAttribute\Config\Converter;
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Api\Test\Unit;
 
 use Magento\Framework\Api\CustomAttributesDataInterface;
@@ -144,7 +142,8 @@ public function testPopulateWithArrayWithSimpleAttributes()
 
         $this->dataObjectHelper->populateWithArray(
             $addressDataObject,
-            $data, \Magento\Customer\Api\Data\AddressInterface::class
+            $data,
+            \Magento\Customer\Api\Data\AddressInterface::class
         );
 
         $this->assertEquals($id, $addressDataObject->getId());
@@ -198,7 +197,8 @@ public function testPopulateWithArrayWithCustomAttribute()
             ->willReturn($customAttribute);
         $this->dataObjectHelper->populateWithArray(
             $addressDataObject,
-            $data, \Magento\Customer\Api\Data\AddressInterface::class
+            $data,
+            \Magento\Customer\Api\Data\AddressInterface::class
         );
 
         $this->assertEquals($id, $addressDataObject->getId());
@@ -260,7 +260,8 @@ public function testPopulateWithArrayWithCustomAttributes()
             ->willReturn($customAttribute);
         $this->dataObjectHelper->populateWithArray(
             $addressDataObject,
-            $data, \Magento\Customer\Api\Data\AddressInterface::class
+            $data,
+            \Magento\Customer\Api\Data\AddressInterface::class
         );
 
         $this->assertEquals($id, $addressDataObject->getId());
diff --git a/lib/internal/Magento/Framework/Autoload/Test/Unit/ClassLoaderWrapperTest.php b/lib/internal/Magento/Framework/Autoload/Test/Unit/ClassLoaderWrapperTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Autoload\Test\Unit;
 
 use Composer\Autoload\ClassLoader;
@@ -32,7 +30,8 @@ class ClassLoaderWrapperTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->autoloaderMock = $this->getMock(\Composer\Autoload\ClassLoader::class);
-        $this->model = (new ObjectManager($this))->getObject(\Magento\Framework\Autoload\ClassLoaderWrapper::class,
+        $this->model = (new ObjectManager($this))->getObject(
+            \Magento\Framework\Autoload\ClassLoaderWrapper::class,
             [
                 'autoloader' => $this->autoloaderMock
             ]
diff --git a/lib/internal/Magento/Framework/Backup/Archive/Tar.php b/lib/internal/Magento/Framework/Backup/Archive/Tar.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Extended version of \Magento\Framework\Archive\Tar that supports filtering
  *
@@ -23,14 +21,15 @@ class Tar extends \Magento\Framework\Archive\Tar
     protected $_skipFiles = [];
 
     /**
-     * Overridden \Magento\Framework\Archive\Tar::_createTar method that does the same actions as it's parent but filters
-     * files using \Magento\Framework\Backup\Filesystem\Iterator\Filter
+     * Overridden \Magento\Framework\Archive\Tar::_createTar method that does the same actions as it's parent but
+     * filters files using \Magento\Framework\Backup\Filesystem\Iterator\Filter
      *
      * @param bool $skipRoot
      * @param bool $finalize
      * @return void
      *
      * @see \Magento\Framework\Archive\Tar::_createTar()
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _createTar($skipRoot = false, $finalize = false)
     {
@@ -41,7 +40,10 @@ protected function _createTar($skipRoot = false, $finalize = false)
             \RecursiveIteratorIterator::SELF_FIRST
         );
 
-        $iterator = new \Magento\Framework\Backup\Filesystem\Iterator\Filter($filesystemIterator, $this->_skipFiles);
+        $iterator = new \Magento\Framework\Backup\Filesystem\Iterator\Filter(
+            $filesystemIterator,
+            $this->_skipFiles
+        );
 
         foreach ($iterator as $item) {
             $this->_setCurrentFile($item->getPathname());
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php b/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Backup\Db;
 
 class BackupFactory
@@ -32,8 +30,11 @@ class BackupFactory
      * @param string $backupInstanceName
      * @param string $backupDbInstanceName
      */
-    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $backupInstanceName, $backupDbInstanceName)
-    {
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $backupInstanceName,
+        $backupDbInstanceName
+    ) {
         $this->_objectManager = $objectManager;
         $this->_backupInstanceName = $backupInstanceName;
         $this->_backupDbInstanceName = $backupDbInstanceName;
diff --git a/lib/internal/Magento/Framework/Backup/Factory.php b/lib/internal/Magento/Framework/Backup/Factory.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * Backup object factory.
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/**
+ * Backup object factory.
+ */
 namespace Magento\Framework\Backup;
 
 class Factory
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem.php b/lib/internal/Magento/Framework/Backup/Filesystem.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Backup;
 
 use Magento\Framework\App\ObjectManager;
@@ -108,7 +106,8 @@ public function create()
 
         $filesInfo = $fsHelper->getInfo(
             $this->getRootDir(),
-            \Magento\Framework\Backup\Filesystem\Helper::INFO_READABLE | \Magento\Framework\Backup\Filesystem\Helper::INFO_SIZE,
+            \Magento\Framework\Backup\Filesystem\Helper::INFO_READABLE |
+            \Magento\Framework\Backup\Filesystem\Helper::INFO_SIZE,
             $this->getIgnorePaths()
         );
 
@@ -162,8 +161,8 @@ public function validateAvailableDiscSpace($backupDir, $size)
         if ($requiredSpace > $freeSpace) {
             throw new \Magento\Framework\Backup\Exception\NotEnoughFreeSpace(
                 new \Magento\Framework\Phrase(
-                'Warning: necessary space for backup is ' . (ceil($requiredSpace) / 1024)
-                . 'MB, but your free disc space is ' . (ceil($freeSpace) / 1024) . 'MB.'
+                    'Warning: necessary space for backup is ' . (ceil($requiredSpace) / 1024)
+                    . 'MB, but your free disc space is ' . (ceil($freeSpace) / 1024) . 'MB.'
                 )
             );
         }
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Database.php b/lib/internal/Magento/Framework/Cache/Backend/Database.php
@@ -4,29 +4,28 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
-Tables declaration:
-
-CREATE TABLE IF NOT EXISTS `cache` (
-        `id` VARCHAR(255) NOT NULL,
-        `data` mediumblob,
-        `create_time` int(11),
-        `update_time` int(11),
-        `expire_time` int(11),
-        PRIMARY KEY  (`id`),
-        KEY `IDX_EXPIRE_TIME` (`expire_time`)
-)ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `cache_tag` (
-    `tag` VARCHAR(255) NOT NULL,
-    `cache_id` VARCHAR(255) NOT NULL,
-    KEY `IDX_TAG` (`tag`),
-    KEY `IDX_CACHE_ID` (`cache_id`),
-    CONSTRAINT `FK_CORE_CACHE_TAG` FOREIGN KEY (`cache_id`) REFERENCES `cache` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-*/
+ * Tables declaration:
+ *
+ * CREATE TABLE IF NOT EXISTS `cache` (
+ *      `id` VARCHAR(255) NOT NULL,
+ *      `data` mediumblob,
+ *      `create_time` int(11),
+ *      `update_time` int(11),
+ *      `expire_time` int(11),
+ *      PRIMARY KEY  (`id`),
+ *      KEY `IDX_EXPIRE_TIME` (`expire_time`)
+ * )ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ *
+ * CREATE TABLE IF NOT EXISTS `cache_tag` (
+ *      `tag` VARCHAR(255) NOT NULL,
+ *      `cache_id` VARCHAR(255) NOT NULL,
+ *      KEY `IDX_TAG` (`tag`),
+ *      KEY `IDX_CACHE_ID` (`cache_id`),
+ *      CONSTRAINT `FK_CORE_CACHE_TAG` FOREIGN KEY (`cache_id`)
+ *      REFERENCES `cache` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+ * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ */
 
 /**
  * Database cache backend
@@ -148,7 +147,10 @@ public function load($id, $doNotTestCacheValidity = false)
     {
         if ($this->_options['store_data'] && !$this->_options['infinite_loop_flag']) {
             $this->_options['infinite_loop_flag'] = true;
-            $select = $this->_getConnection()->select()->from($this->_getDataTable(), 'data')->where('id=:cache_id');
+            $select = $this->_getConnection()->select()->from(
+                $this->_getDataTable(),
+                'data'
+            )->where('id=:cache_id');
 
             if (!$doNotTestCacheValidity) {
                 $select->where('expire_time=0 OR expire_time>?', time());
@@ -197,7 +199,7 @@ public function test($id)
      * @param string $data            Datas to cache
      * @param string $id              Cache id
      * @param string[] $tags          Array of strings, the cache record will be tagged by each string entry
-     * @param int|bool $specificLifetime  If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @param int|bool $specificLifetime  Integer to set a specific lifetime or null for infinite lifetime
      * @return bool true if no problem
      */
     public function save($data, $id, $tags = [], $specificLifetime = false)
@@ -222,7 +224,8 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
                 'create_time'
             )},\n                    {$connection->quoteIdentifier(
                 'update_time'
-            )},\n                    {$expireCol})\n                VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE\n                    {$dataCol}=VALUES({$dataCol}),\n                    {$expireCol}=VALUES({$expireCol})";
+            )},\n                    {$expireCol})\n                VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE\n
+            {$dataCol}=VALUES({$dataCol}),\n                    {$expireCol}=VALUES({$expireCol})";
 
                 $result = $connection->query($query, [$id, $data, $time, $time, $expire])->rowCount();
             }
@@ -554,10 +557,10 @@ protected function _cleanByTags($mode, $tags)
     /**
      * Clean all cache entries
      *
-     * @param $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return bool
      */
-    private function cleanAll($connection)
+    private function cleanAll(\Magento\Framework\DB\Adapter\AdapterInterface $connection)
     {
         if ($this->_options['store_data']) {
             $result = $connection->query('TRUNCATE TABLE ' . $this->_getDataTable());
@@ -571,10 +574,10 @@ private function cleanAll($connection)
     /**
      * Clean old cache entries
      *
-     * @param $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @return bool
      */
-    private function cleanOld($connection)
+    private function cleanOld(\Magento\Framework\DB\Adapter\AdapterInterface $connection)
     {
         if ($this->_options['store_data']) {
             $result = $connection->delete(
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php b/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Cache\Backend;
 
 class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
@@ -76,7 +74,7 @@ public function test($id)
      * @param string $data datas to cache
      * @param string $id cache id
      * @param string[] $tags array of strings, the cache record will be tagged by each string entry
-     * @param int|bool $specificLifetime if != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @param int|bool $specificLifetime Integer to set a specific lifetime or null for infinite lifetime
      * @return bool true if no problem
      */
     public function save($data, $id, $tags = [], $specificLifetime = false)
@@ -124,7 +122,8 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
                 break;
             case \Zend_Cache::CLEANING_MODE_OLD:
                 $this->_log(
-                    "Magento\Framework\Cache\Backend\Eaccelerator::clean() : CLEANING_MODE_OLD is unsupported by the Eaccelerator backend"
+                    "Magento\Framework\Cache\Backend\Eaccelerator::clean() : ".
+                    "CLEANING_MODE_OLD is unsupported by the Eaccelerator backend"
                 );
                 break;
             case \Zend_Cache::CLEANING_MODE_MATCHING_TAG:
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * \Magento\Framework\Cache\Core test case
  */
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Test class for \Magento\Framework\Session\Config
  */
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Webapi\Test\Unit;
 
 use Magento\Framework\Serialize\SerializerInterface;
@@ -68,7 +66,8 @@ function ($className) use ($objectManager) {
         $cache->expects($this->any())->method('load')->willReturn(false);
 
         $this->customAttributeTypeLocator = $this->getMockBuilder(
-            \Magento\Eav\Model\EavCustomAttributeTypeLocator::class)
+            \Magento\Eav\Model\EavCustomAttributeTypeLocator::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -472,7 +471,7 @@ protected function getObjectWithCustomAttributes($type, $value = [])
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $customAttributeValue = null;
-        switch($type) {
+        switch ($type) {
             case 'integer':
                 $customAttributeValue = $value;
                 break;

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
`6`	`6`
`7`		`-// @codingStandardsIgnoreFile`
`8`		`-`
`9`	`7`	`namespace Magento\Framework\Autoload\Test\Unit;`
`10`	`8`
`11`	`9`	`use Composer\Autoload\ClassLoader;`
`@@ -32,7 +30,8 @@ class ClassLoaderWrapperTest extends \PHPUnit_Framework_TestCase`
`32`	`30`	`protected function setUp()`
`33`	`31`	`{`
`34`	`32`	`$this->autoloaderMock = $this->getMock(\Composer\Autoload\ClassLoader::class);`
`35`		`- $this->model = (new ObjectManager($this))->getObject(\Magento\Framework\Autoload\ClassLoaderWrapper::class,`
	`33`	`+ $this->model = (new ObjectManager($this))->getObject(`
	`34`	`+ \Magento\Framework\Autoload\ClassLoaderWrapper::class,`
`36`	`35`	`[`
`37`	`36`	`'autoloader' => $this->autoloaderMock`
`38`	`37`	`]`