Skip to content

Fixed coding standard violations in the Framework\Cache namespace #9320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 20, 2017
Merged

Fixed coding standard violations in the Framework\Cache namespace #9320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 32 additions & 29 deletions lib/internal/Magento/Framework/Cache/Backend/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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)
Expand All @@ -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();
}
Expand Down Expand Up @@ -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());
Expand All @@ -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(
Expand Down
7 changes: 3 additions & 4 deletions lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/Magento/Framework/Cache/Test/Unit/CoreTest.php
View file
Open in desktop
Original file line number Diff 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