MAGETWO-67587: Fixed coding standard violations in the Framework\Cach…

…e namespace #9320
magento · Apr 19, 2017 · 627164d · 627164d
2 parents 0cc45dd + 45f95ac
commit 627164d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 35 deletions.
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
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,6 @@ @@
      * See COPYING.txt for license details.
      */
-    // @codingStandardsIgnoreFile
     /**
      * \Magento\Framework\Cache\Core test case
      */
@@ Expand Down @@