Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-20 13:28:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement cache tests and stringify tests

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-12-23 10:58:53 +01:00
parent 10f0d1f692
commit 42d5d274b2
10 changed files with 204 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
DataStorage/Cache/Connection/FileCache.php
View File

@ -240,7 +240,7 @@ class FileCache extends ConnectionAbstract
} elseif ($type === CacheValueType::_SERIALIZABLE) {
return \get_class($value) . self::DELIM . $value->serialize();
} elseif ($type === CacheValueType::_JSONSERIALIZABLE) {
return \get_class($value) . self::DELIM . $value->jsonSerialize();
return \get_class($value) . self::DELIM . ((string) \json_encode($value->jsonSerialize()));
} elseif ($type === CacheValueType::_NULL) {
return '';
}
@ -279,7 +279,7 @@ class FileCache extends ConnectionAbstract
return null;
}
$created = Directory::created($path)->getTimestamp();
$created = File::created($path)->getTimestamp();
$now = \time();
if ($expire >= 0 && $created + $expire < $now) {
@ -300,7 +300,7 @@ class FileCache extends ConnectionAbstract
}
$cacheExpire = \substr($raw, $expireStart + 1, $expireEnd - ($expireStart + 1));
$cacheExpire = ($cacheExpire === false) ? $created : (int) $cacheExpire;
$cacheExpire = ($cacheExpire === -1) ? $created : (int) $cacheExpire;
if ($cacheExpire >= 0 && $created + $cacheExpire < $now) {
$this->delete($key);
@ -324,43 +324,37 @@ class FileCache extends ConnectionAbstract
*/
private function reverseValue(int $type, string $raw, int $expireEnd)
{
$value = null;
switch ($type) {
case CacheValueType::_INT:
$value = (int) \substr($raw, $expireEnd + 1);
break;
return (int) \substr($raw, $expireEnd + 1);
case CacheValueType::_FLOAT:
$value = (float) \substr($raw, $expireEnd + 1);
break;
return (float) \substr($raw, $expireEnd + 1);
case CacheValueType::_BOOL:
$value = (bool) \substr($raw, $expireEnd + 1);
break;
return (bool) \substr($raw, $expireEnd + 1);
case CacheValueType::_STRING:
$value = \substr($raw, $expireEnd + 1);
break;
return \substr($raw, $expireEnd + 1);
case CacheValueType::_ARRAY:
$array = \substr($raw, $expireEnd + 1);
$value = \json_decode($array === false ? '[]' : $array, true);
break;
return \json_decode($array === false ? '[]' : $array, true);
case CacheValueType::_NULL:
$value = null;
break;
case CacheValueType::_SERIALIZABLE:
return null;
case CacheValueType::_JSONSERIALIZABLE:
case CacheValueType::_SERIALIZABLE:
$namespaceStart = (int) \strpos($raw, self::DELIM, $expireEnd);
$namespaceEnd = (int) \strpos($raw, self::DELIM, $namespaceStart + 1);
$namespace = \substr($raw, $namespaceStart, $namespaceEnd);
$namespace = \substr($raw, $namespaceStart + 1, $namespaceEnd - $namespaceStart - 1);
if ($namespace === false) {
return null;
}
$value = $namespace::unserialize(\substr($raw, $namespaceEnd + 1));
break;
}
$obj = new $namespace();
$obj->unserialize(\substr($raw, $namespaceEnd + 1));
return $value;
return $obj;
default:
return null;
}
}
/**
@ -373,14 +367,18 @@ class FileCache extends ConnectionAbstract
}
$path = $this->getPath($key);
if ($expire < 0 && File::exists($path)) {
if (!File::exists($path)) {
return true;
}
if ($expire < 0) {
File::delete($path);
return true;
}
if ($expire >= 0) {
$created = Directory::created(Directory::sanitize($key, self::SANITIZE))->getTimestamp();
$created = File::created($path)->getTimestamp();
$now = \time();
$raw = \file_get_contents($path);
@ -388,26 +386,15 @@ class FileCache extends ConnectionAbstract
return false;
}
$expireStart = (int) \strpos($raw, self::DELIM);
$expireEnd = (int) \strpos($raw, self::DELIM, $expireStart + 1);
if ($expireStart < 0 || $expireEnd < 0) {
return false;
}
$cacheExpire = \substr($raw, $expireStart + 1, $expireEnd - ($expireStart + 1));
$cacheExpire = ($cacheExpire === false) ? $created : (int) $cacheExpire;
$cacheExpire = $this->getExpire($raw);
$cacheExpire = ($cacheExpire === -1) ? $created : (int) $cacheExpire;
if ($cacheExpire >= 0 && $created + $cacheExpire < $now) {
$this->delete($key);
return false;
return $this->delete($key);
}
if ($cacheExpire >= 0 && $created + $cacheExpire > $now) {
File::delete($path);
return true;
if ($cacheExpire >= 0 && \abs($now - $created) > $expire) {
return $this->delete($key);
}
}

4
DataStorage/Session/HttpSession.php
View File

@ -76,10 +76,6 @@ class HttpSession implements SessionInterface
*/
public function __construct(int $liftetime = 3600, $sid = false, int $inactivityInterval = 0)
{
if ($this->isLocked) {
throw new LockException('HttpSession');
}
if (\session_id()) {
\session_write_close();
}

8
Stdlib/Queue/PriorityQueue.php
View File

@ -14,6 +14,8 @@ declare(strict_types=1);
namespace phpOMS\Stdlib\Queue;
use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
/**
* Priority queue class.
*
@ -47,6 +49,10 @@ class PriorityQueue implements \Countable, \Serializable
*/
public function __construct(int $type = PriorityMode::FIFO)
{
if (!PriorityMode::isValidValue($type)) {
throw new InvalidEnumValue($type);
}
$this->type = $type;
}
@ -112,7 +118,7 @@ class PriorityQueue implements \Countable, \Serializable
case PriorityMode::LOWEST:
return $this->getInsertLowest($priority);
default:
throw new \InvalidArgumentException();
throw new InvalidEnumValue($this->type);
}
}

2
Utils/StringUtils.php
View File

@ -413,7 +413,7 @@ final class StringUtils
} elseif (\is_int($element) || \is_float($element)) {
return (string) $element;
} elseif (\is_bool($element)) {
return (string) $element;
return $element ? '1' : '0';
} elseif ($element === null) {
return null;
} elseif ($element instanceof \DateTime) {

29
tests/DataStorage/Cache/Connection/FileCacheJsonSerializable.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/**
* Orange Management
*
* PHP Version 7.2
*
* @package tests
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link http://website.orange-management.de
*/
namespace phpOMS\tests\DataStorage\Cache\Connection;
class FileCacheJsonSerializable implements \JsonSerializable
{
public $val = 'asdf';
public function jsonSerialize()
{
return 'abc';
}
public function unserialize($val)
{
$this->val = \json_decode($val, true);
}
}

29
tests/DataStorage/Cache/Connection/FileCacheSerializable.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/**
* Orange Management
*
* PHP Version 7.2
*
* @package tests
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link http://website.orange-management.de
*/
namespace phpOMS\tests\DataStorage\Cache\Connection;
class FileCacheSerializable implements \Serializable
{
public $val = 'asdf';
public function serialize()
{
return 'abc';
}
public function unserialize($val)
{
$this->val = $val;
}
}

60
tests/DataStorage/Cache/Connection/FileCacheTest.php
View File

@ -87,19 +87,25 @@ class FileCacheTest extends \PHPUnit\Framework\TestCase
$cache->set('key6', ['asdf', 1, true, 2.3]); // 7
self::assertEquals(['asdf', 1, true, 2.3], $cache->get('key6'));
$cache->set('key7', new FileCacheSerializable()); // 8
self::assertEquals('abc', $cache->get('key7')->val);
$cache->set('key8', new FileCacheJsonSerializable()); // 9
self::assertEquals('abc', $cache->get('key8')->val);
self::assertTrue($cache->replace('key4', 5));
self::assertFalse($cache->replace('keyInvalid', 5));
self::assertEquals(5, $cache->get('key4'));
self::assertTrue($cache->delete('key4')); // 6
self::assertFalse($cache->delete('keyInvalid'));
self::assertTrue($cache->delete('key4')); // 8
self::assertTrue($cache->delete('keyInvalid'));
self::assertEquals(null, $cache->get('key4'));
self::assertEquals(
[
'status' => CacheStatus::OK,
'count' => 6,
'size' => 70,
'count' => 8,
'size' => 220,
],
$cache->stats()
);
@ -107,8 +113,6 @@ class FileCacheTest extends \PHPUnit\Framework\TestCase
self::assertTrue($cache->flushAll());
self::assertEquals(null, $cache->get('key5'));
$cache->flushAll();
self::assertEquals(
[
'status' => CacheStatus::OK,
@ -123,6 +127,49 @@ class FileCacheTest extends \PHPUnit\Framework\TestCase
}
}
public function testExpire()
{
if (\file_exists(__DIR__ . '/Cache')) {
\rmdir(__DIR__ . '/Cache');
}
$cache = new FileCache(__DIR__ . '/Cache');
$cache->flushAll();
$cache->set('key1', 'testVal', 1);
self::assertEquals('testVal', $cache->get('key1'));
$cache->set('key2', 'testVal2', 1);
self::assertEquals('testVal2', $cache->get('key2', 1));
sleep(3);
self::assertEquals(null, $cache->get('key2', 1));
$cache->set('key3', 'testVal3', 1);
self::assertEquals('testVal3', $cache->get('key3', 1));
sleep(3);
self::assertEquals(null, $cache->get('key3', 1));
$cache->set('key4', 'testVal4', 1);
self::assertFalse($cache->delete('key4', 0));
sleep(3);
self::assertTrue($cache->delete('key4', 1));
$cache->set('key5', 'testVal5', 10000);
sleep(3);
self::assertFalse($cache->delete('key5', 1000000));
self::assertTrue($cache->delete('key5', 1));
$cache->set('key6', 'testVal6', 1);
sleep(2);
$cache->flush(0);
if (\file_exists(__DIR__ . '/Cache')) {
\rmdir(__DIR__ . '/Cache');
}
}
public function testBadCacheStatus()
{
if (\file_exists(__DIR__ . '/Cache')) {
@ -140,6 +187,7 @@ class FileCacheTest extends \PHPUnit\Framework\TestCase
self::assertFalse($cache->replace('key1', 5));
self::assertFalse($cache->delete('key1'));
self::assertFalse($cache->flushAll());
self::assertFalse($cache->flush());
self::assertEquals([], $cache->stats());
if (\file_exists(__DIR__ . '/Cache')) {

3
tests/DataStorage/Session/HttpSessionTest.php
View File

@ -41,5 +41,8 @@ class HttpSessionTest extends \PHPUnit\Framework\TestCase
$session->setSID('abc');
self::assertEquals('abc', $session->getSID());
$session->lock();
self::assertTrue($session->isLocked());
}
}

13
tests/Stdlib/Queue/PriorityQueueTest.php
View File

@ -51,6 +51,11 @@ class PriorityQueueTest extends \PHPUnit\Framework\TestCase
$queue->setPriority($id1, 3);
self::assertEquals(3, $queue->get($id1)['priority']);
$queue2 = new PriorityQueue();
$queue2->unserialize($queue->serialize());
self::assertEquals($queue->serialize(), $queue2->serialize());
}
public function testFIFO()
@ -205,4 +210,12 @@ class PriorityQueueTest extends \PHPUnit\Framework\TestCase
self::assertFalse($queue->delete($id2));
self::assertEquals(1, $queue->count());
}
/**
* @expectedException \phpOMS\Stdlib\Base\Exception\InvalidEnumValue
*/
public function testInvalidPriority()
{
$queue = new PriorityQueue(99999);
}
}

40
tests/Utils/StringUtilsTest.php
View File

@ -79,4 +79,44 @@ class StringUtilsTest extends \PHPUnit\Framework\TestCase
self::assertEquals(4, StringUtils::countCharacterFromStart(' Test string', ' '));
self::assertEquals(0, StringUtils::countCharacterFromStart(' Test string', 's'));
}
public function testStringify()
{
self::assertEquals('"abc"', StringUtils::stringify(new class implements \JsonSerializable {
public function jsonSerialize()
{
return 'abc';
}
}));
self::assertEquals('["abc"]', StringUtils::stringify(['abc']));
self::assertEquals('abc', StringUtils::stringify(new class implements \Serializable {
public function serialize()
{
return 'abc';
}
public function unserialize($val)
{
}
}));
self::assertEquals('abc', StringUtils::stringify('abc'));
self::assertEquals('1', StringUtils::stringify(1));
self::assertEquals('1.1', StringUtils::stringify(1.1));
self::assertEquals('1', StringUtils::stringify(true));
self::assertEquals('0', StringUtils::stringify(false));
self::assertEquals(null, StringUtils::stringify(null));
$date = new \DateTime('now');
self::assertEquals($date->format('Y-m-d H:i:s'), StringUtils::stringify($date));
self::assertEquals('abc', StringUtils::stringify(new class {
public function __toString()
{
return 'abc';
}
}));
}
}