Skip to content

Commit 9fa42b1

Browse files
committed
Improved code quality
1 parent 0920ea7 commit 9fa42b1

File tree

8 files changed

+42
-16
lines changed

8 files changed

+42
-16
lines changed

src/phpFastCache/Drivers/Devfalse/Driver.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,20 @@ protected function driverWrite(CacheItemInterface $item)
6868

6969
/**
7070
* @param \Psr\Cache\CacheItemInterface $item
71-
* @return mixed
71+
* @return array [
72+
* 'd' => 'THE ITEM DATA'
73+
* 't' => 'THE ITEM DATE EXPIRATION'
74+
* 'g' => 'THE ITEM TAGS'
75+
* ]
7276
*/
7377
protected function driverRead(CacheItemInterface $item)
7478
{
75-
return null;
79+
return [
80+
self::DRIVER_DATA_WRAPPER_INDEX => false,
81+
self::DRIVER_TAGS_WRAPPER_INDEX => [],
82+
self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(),
83+
];
7684
}
77-
7885
/**
7986
* @param \Psr\Cache\CacheItemInterface $item
8087
* @return bool

src/phpFastCache/Drivers/Devnull/Driver.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,19 @@ protected function driverWrite(CacheItemInterface $item)
6868

6969
/**
7070
* @param \Psr\Cache\CacheItemInterface $item
71-
* @return mixed
71+
* @return array [
72+
* 'd' => 'THE ITEM DATA'
73+
* 't' => 'THE ITEM DATE EXPIRATION'
74+
* 'g' => 'THE ITEM TAGS'
75+
* ]
7276
*/
7377
protected function driverRead(CacheItemInterface $item)
7478
{
75-
return null;
79+
return [
80+
self::DRIVER_DATA_WRAPPER_INDEX => null,
81+
self::DRIVER_TAGS_WRAPPER_INDEX => [],
82+
self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(),
83+
];
7684
}
7785

7886
/**

src/phpFastCache/Drivers/Devtrue/Driver.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,19 @@ protected function driverWrite(CacheItemInterface $item)
6868

6969
/**
7070
* @param \Psr\Cache\CacheItemInterface $item
71-
* @return mixed
71+
* @return array [
72+
* 'd' => 'THE ITEM DATA'
73+
* 't' => 'THE ITEM DATE EXPIRATION'
74+
* 'g' => 'THE ITEM TAGS'
75+
* ]
7276
*/
7377
protected function driverRead(CacheItemInterface $item)
7478
{
75-
return false;
79+
return [
80+
self::DRIVER_DATA_WRAPPER_INDEX => true,
81+
self::DRIVER_TAGS_WRAPPER_INDEX => [],
82+
self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(),
83+
];
7684
}
7785

7886
/**

src/phpFastCache/Drivers/Files/Driver.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,11 @@ protected function driverWrite(CacheItemInterface $item)
7373
$data = $this->encode($this->driverPreWrap($item));
7474

7575
$toWrite = true;
76-
/*
76+
77+
/**
7778
* Skip if Existing Caching in Options
7879
*/
79-
if (isset($option[ 'skipExisting' ]) && $option[ 'skipExisting' ] == true && file_exists($file_path)) {
80+
if (isset($this->config[ 'skipExisting' ]) && $this->config[ 'skipExisting' ] == true && file_exists($file_path)) {
8081
$content = $this->readfile($file_path);
8182
$old = $this->decode($content);
8283
$toWrite = false;
@@ -85,7 +86,9 @@ protected function driverWrite(CacheItemInterface $item)
8586
}
8687
}
8788

88-
// Force write
89+
/**
90+
* Force write
91+
*/
8992
try {
9093
if ($toWrite == true) {
9194
$f = fopen($file_path, 'w+');

src/phpFastCache/Drivers/Mongodb/Driver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ protected function driverDelete(CacheItemInterface $item)
145145
*/
146146
protected function driverClear()
147147
{
148-
return $this->getCollection()->drop();
148+
return (bool) $this->getCollection()->drop()['ok'];
149149
}
150150

151151
/**
@@ -159,8 +159,8 @@ protected function driverConnect()
159159
throw new LogicException('Already connected to Mongodb server');
160160
} else {
161161
$host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1';
162-
$port = isset($server[ 'port' ]) ? $server[ 'port' ] : '27017';
163-
$timeout = isset($server[ 'timeout' ]) ? $server[ 'timeout' ] : 3;
162+
$port = isset($this->config[ 'port' ]) ? $this->config[ 'port' ] : '27017';
163+
$timeout = isset($this->config[ 'timeout' ]) ? $this->config[ 'timeout' ] : 3;
164164
$password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : '';
165165
$username = isset($this->config[ 'username' ]) ? $this->config[ 'username' ] : '';
166166

src/phpFastCache/Drivers/Sqlite/Driver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class Driver extends DriverAbstract
5959
protected $SqliteDir = '';
6060

6161
/**
62-
* @var null
62+
* @var \PDO
6363
*/
6464
protected $indexing;
6565

tests/AttachingDetachingMethods.test.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
$driverInstance->detachItem($itemDetached);
3535
$itemAttached = $driverInstance->getItem($key);
3636

37-
if(!$driverInstance->isAttached($itemDetached))
37+
if($driverInstance->isAttached($itemDetached) !== true)
3838
{
3939
echo '[PASS] ExtendedCacheItemPoolInterface::isAttached() identified $itemDetached as being detached.' . "\n";
4040
}

tests/SyntaxChecker.test.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function read_dir($dir, $ext = null)
4646
continue;
4747
}
4848

49-
if ($status != 0) {
49+
if ($status !== 0) {
5050
$exit = $status;
5151
echo '[FAIL]';
5252
} else {

0 commit comments

Comments
 (0)