From fc0fab5c050ea6f1afdde8856133f8e910c39130 Mon Sep 17 00:00:00 2001 From: Martin Beukman Date: Fri, 8 Mar 2019 09:35:24 +0100 Subject: [PATCH 1/7] update dependencies, drop php 5.4 support --- composer.json | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index a3260b2..965a2a9 100644 --- a/composer.json +++ b/composer.json @@ -25,17 +25,25 @@ } ], "require": { - "php": "^5.4|^7.0", - "tedivm/stash": "0.14.*", - "symfony/config": "~2.1|~3.0", - "symfony/http-kernel": "~2.1|~3.0", - "symfony/dependency-injection": "~2.1|~3.0" + "php": "^7.0", + "tedivm/stash": "^0.15", + "symfony/config": "^3.4", + "symfony/http-kernel": "^3.4", + "symfony/dependency-injection": "^3.4" + }, + "config": { + "vendor-dir": "vendor", + "sort-packages": true, + "platform": { + "php": "7.0.8" + } }, "require-dev": { - "phpunit/phpunit": "4.1.*", - "fabpot/php-cs-fixer": "0.4.0", - "satooshi/php-coveralls": "1.0.*", - "doctrine/cache": "~1.0" + "doctrine/cache": "^1.6", + "friendsofphp/php-cs-fixer": "^2", + "php-coveralls/php-coveralls": "^2", + "phpunit/phpunit": "^6.5", + "symfony/phpunit-bridge": "*" }, "autoload": { "psr-4": {"Tedivm\\StashBundle\\": ""} From 7f197dc7194f1f46fc9e9fb9b925276cb3569630 Mon Sep 17 00:00:00 2001 From: Martin Beukman Date: Fri, 8 Mar 2019 09:36:09 +0100 Subject: [PATCH 2/7] update tests, fix symfony deprecations --- .travis.yml | 5 +- Adapters/DoctrineAdapter.php | 1 + Collector/CacheDataCollector.php | 5 ++ DependencyInjection/TedivmStashExtension.php | 85 +++++++++++-------- Tests/Collector/CacheDataCollectorTest.php | 22 +++-- .../DependencyInjection/ConfigurationTest.php | 3 +- .../TedivmStashExtensionTest.php | 3 +- Tests/Factory/DriverFactoryTest.php | 3 +- Tests/Service/CacheItemTest.php | 3 +- Tests/Service/CacheServiceTest.php | 3 +- Tests/Service/CacheTrackerTest.php | 5 +- Tests/TedivmStashBundleTest.php | 5 +- Tests/ThirdParty/Doctrine/CacheTest.php | 3 +- Tests/travis/php_extensions.ini | 3 +- 14 files changed, 93 insertions(+), 56 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76b75f6..9722bdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,9 @@ language: php php: - - 5.4 - - 5.5 - - 5.6 - 7.0 + - 7.1 + - 7.2 - hhvm before_install: diff --git a/Adapters/DoctrineAdapter.php b/Adapters/DoctrineAdapter.php index 5da96d6..ec05ed7 100644 --- a/Adapters/DoctrineAdapter.php +++ b/Adapters/DoctrineAdapter.php @@ -15,6 +15,7 @@ /** * Class DoctrineAdapter + * * @package Tedivm\StashBundle\Adapters * @author Josh Hall-Bachner * @author Robert Hafner diff --git a/Collector/CacheDataCollector.php b/Collector/CacheDataCollector.php index 1d2bed6..37332f0 100644 --- a/Collector/CacheDataCollector.php +++ b/Collector/CacheDataCollector.php @@ -152,4 +152,9 @@ public function getname() { return 'stash'; } + + public function reset() + { + $this->data = []; + } } diff --git a/DependencyInjection/TedivmStashExtension.php b/DependencyInjection/TedivmStashExtension.php index 14af73c..983ecad 100644 --- a/DependencyInjection/TedivmStashExtension.php +++ b/DependencyInjection/TedivmStashExtension.php @@ -14,7 +14,7 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\DefinitionDecorator; +use Symfony\Component\DependencyInjection\ChildDefinition; use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\Config\FileLocator; @@ -88,34 +88,37 @@ protected function addCacheService($name, $cache, $container) unset($cache['registerSessionHandler']); $container - ->setDefinition(sprintf('stash.driver.%s_cache', $name), new DefinitionDecorator('stash.driver')) - ->setArguments(array( - $drivers, - $cache - )) - ->setAbstract(false) - ; + ->setDefinition(sprintf('stash.driver.%s_cache', $name), new ChildDefinition('stash.driver')) + ->setArguments( + [ + $drivers, + $cache, + ] + ) + ->setAbstract(false); $container - ->setDefinition(sprintf('stash.tracker.%s_cache', $name), new DefinitionDecorator('stash.tracker')) - ->setArguments(array( - $name - )) - ->addMethodCall('enableQueryLogging', array($logqueries)) - ->addMethodCall('enableQueryValueLogging', array($logQueryValues)) - ->setAbstract(false) - ; - - $cacheDefinition = new DefinitionDecorator('stash.cache'); + ->setDefinition(sprintf('stash.tracker.%s_cache', $name), new ChildDefinition('stash.tracker')) + ->setArguments( + [ + $name, + ] + ) + ->addMethodCall('enableQueryLogging', [$logqueries]) + ->addMethodCall('enableQueryValueLogging', [$logQueryValues]) + ->setAbstract(false); + + $cacheDefinition = new ChildDefinition('stash.cache'); $container ->setDefinition(sprintf('stash.%s_cache', $name), $cacheDefinition) - ->setArguments(array( - $name, - new Reference(sprintf('stash.driver.%s_cache', $name)), - new Reference(sprintf('stash.tracker.%s_cache', $name)) - )) - ->setAbstract(false) - ; + ->setArguments( + [ + $name, + new Reference(sprintf('stash.driver.%s_cache', $name)), + new Reference(sprintf('stash.tracker.%s_cache', $name)), + ] + ) + ->setAbstract(false); if (isset($cache['logger']) && $cache['logger']) { $cacheDefinition->addMethodCall('setLogger', array(new Reference($cache['logger']))); @@ -123,22 +126,30 @@ protected function addCacheService($name, $cache, $container) if (interface_exists("\\Doctrine\\Common\\Cache\\Cache") && $doctrine) { $container - ->setDefinition(sprintf('stash.adapter.doctrine.%s_cache', $name), new DefinitionDecorator('stash.adapter.doctrine')) - ->setArguments(array( - new Reference(sprintf('stash.%s_cache', $name)) - )) - ->setAbstract(false) - ; + ->setDefinition( + sprintf('stash.adapter.doctrine.%s_cache', $name), + new ChildDefinition('stash.adapter.doctrine') + ) + ->setArguments( + [ + new Reference(sprintf('stash.%s_cache', $name)), + ] + ) + ->setAbstract(false); } if ($session) { $container - ->setDefinition(sprintf('stash.adapter.session.%s_cache', $name), new DefinitionDecorator('stash.adapter.session')) - ->setArguments(array( - new Reference(sprintf('stash.%s_cache', $name)) - )) - ->setAbstract(false) - ; + ->setDefinition( + sprintf('stash.adapter.session.%s_cache', $name), + new ChildDefinition('stash.adapter.session') + ) + ->setArguments( + [ + new Reference(sprintf('stash.%s_cache', $name)), + ] + ) + ->setAbstract(false); } $container diff --git a/Tests/Collector/CacheDataCollectorTest.php b/Tests/Collector/CacheDataCollectorTest.php index 86d4412..1afd4a7 100644 --- a/Tests/Collector/CacheDataCollectorTest.php +++ b/Tests/Collector/CacheDataCollectorTest.php @@ -12,8 +12,11 @@ namespace Tedivm\StashBundle\Tests\Collector; -use \Stash\DriverList; -use \Tedivm\StashBundle\Service\CacheTracker as Tracker; +use PHPUnit\Framework\TestCase; +use Stash\DriverList; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; +use Tedivm\StashBundle\Service\CacheTracker as Tracker; /** * Class CacheDataCollectorTest @@ -21,7 +24,7 @@ * @author Josh Hall-Bachner * @author Robert Hafner */ -class CacheDataCollectorTest extends \PHPUnit_Framework_TestCase +class CacheDataCollectorTest extends TestCase { protected $testClass = 'Tedivm\StashBundle\Collector\CacheDataCollector'; @@ -126,12 +129,21 @@ public function testGetAvailableDrivers() } } + public function testResetWillSetDataToEmptyArray() + { + $collector = $this->getPrimedCollector(); + + self::assertNotSame('a:0:{}', $collector->serialize()); + $collector->reset(); + self::assertSame('a:0:{}', $collector->serialize()); + } + protected function getPrimedCollector() { $collector = $this->getPopulatedCollector(); - $requestMock = $this->getMock('Symfony\Component\HttpFoundation\Request'); - $responseMock = $this->getMock('Symfony\Component\HttpFoundation\Response'); + $requestMock = $this->createMock(Request::class); + $responseMock = $this->createMock(Response::class); $collector->collect($requestMock, $responseMock); diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php index c3c795d..a510f57 100644 --- a/Tests/DependencyInjection/ConfigurationTest.php +++ b/Tests/DependencyInjection/ConfigurationTest.php @@ -12,6 +12,7 @@ namespace Tedivm\StashBundle\Tests\DependencyInjection; +use PHPUnit\Framework\TestCase; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Tedivm\StashBundle\DependencyInjection\Configuration; @@ -21,7 +22,7 @@ * @author Josh Hall-Bachner * @author Robert Hafner */ -class ConfigurationTest extends \PHPUnit_Framework_TestCase +class ConfigurationTest extends TestCase { public function testGetConfigTreeBuilder() { diff --git a/Tests/DependencyInjection/TedivmStashExtensionTest.php b/Tests/DependencyInjection/TedivmStashExtensionTest.php index a3662ad..a6af648 100644 --- a/Tests/DependencyInjection/TedivmStashExtensionTest.php +++ b/Tests/DependencyInjection/TedivmStashExtensionTest.php @@ -12,6 +12,7 @@ namespace Tedivm\StashBundle\Tests\DependencyInjection; +use PHPUnit\Framework\TestCase; use Tedivm\StashBundle\DependencyInjection\TedivmStashExtension; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -21,7 +22,7 @@ * @author Josh Hall-Bachner * @author Robert Hafner */ -class TedivmStashExtensionTest extends \PHPUnit_Framework_TestCase +class TedivmStashExtensionTest extends TestCase { /** * @dataProvider configProvider diff --git a/Tests/Factory/DriverFactoryTest.php b/Tests/Factory/DriverFactoryTest.php index 0498dd2..92bda7f 100644 --- a/Tests/Factory/DriverFactoryTest.php +++ b/Tests/Factory/DriverFactoryTest.php @@ -12,6 +12,7 @@ namespace Tedivm\StashBundle\Tests\Factory; +use PHPUnit\Framework\TestCase; use Tedivm\StashBundle\Factory\DriverFactory; use Stash\DriverList; @@ -21,7 +22,7 @@ * @author Josh Hall-Bachner * @author Robert Hafner */ -class DriverFactoryTest extends \PHPUnit_Framework_TestCase +class DriverFactoryTest extends TestCase { protected $drivers = array(); diff --git a/Tests/Service/CacheItemTest.php b/Tests/Service/CacheItemTest.php index 08584d8..88b6713 100644 --- a/Tests/Service/CacheItemTest.php +++ b/Tests/Service/CacheItemTest.php @@ -12,6 +12,7 @@ namespace Tedivm\StashBundle\Tests\Service; +use Stash\Test\AbstractItemTest; use Tedivm\StashBundle\Service\CacheTracker; /** @@ -20,7 +21,7 @@ * @author Josh Hall-Bachner * @author Robert Hafner */ -class CacheItemTest extends \Stash\Test\AbstractItemTest +class CacheItemTest extends AbstractItemTest { protected $itemClass = '\Tedivm\StashBundle\Service\CacheItem'; diff --git a/Tests/Service/CacheServiceTest.php b/Tests/Service/CacheServiceTest.php index db0c819..0ea602e 100644 --- a/Tests/Service/CacheServiceTest.php +++ b/Tests/Service/CacheServiceTest.php @@ -12,10 +12,9 @@ namespace Tedivm\StashBundle\Tests\Service; -use Tedivm\StashBundle\Service\CacheService; -use Tedivm\StashBundle\Service\CacheTracker; use Stash\Driver\Ephemeral; use Stash\DriverList; +use Tedivm\StashBundle\Service\CacheTracker; /** * Class CacheServiceTest diff --git a/Tests/Service/CacheTrackerTest.php b/Tests/Service/CacheTrackerTest.php index 8885f75..f4da05f 100644 --- a/Tests/Service/CacheTrackerTest.php +++ b/Tests/Service/CacheTrackerTest.php @@ -12,11 +12,14 @@ namespace Tedivm\StashBundle\Tests\Service; +use PHPUnit\Framework\TestCase; + /** * Class CacheTrackerTest + * * @package Tedivm\StashBundle\Tests\Service */ -class CacheTrackerTest extends \PHPUnit_Framework_TestCase +class CacheTrackerTest extends TestCase { protected $testClass = '\Tedivm\StashBundle\Service\CacheTracker'; diff --git a/Tests/TedivmStashBundleTest.php b/Tests/TedivmStashBundleTest.php index 7a29177..8498876 100644 --- a/Tests/TedivmStashBundleTest.php +++ b/Tests/TedivmStashBundleTest.php @@ -12,13 +12,16 @@ namespace Tedivm\StashBundle\Tests; +use PHPUnit\Framework\TestCase; + /** * Class TedivmStashBundleTest + * * @package Tedivm\StashBundle\Tests * @author Josh Hall-Bachner * @author Robert Hafner */ -class TedivmStashBundleTest extends \PHPUnit_Framework_TestCase +class TedivmStashBundleTest extends TestCase { public function testGetContainerExtension() { diff --git a/Tests/ThirdParty/Doctrine/CacheTest.php b/Tests/ThirdParty/Doctrine/CacheTest.php index 4bb1115..417ff12 100644 --- a/Tests/ThirdParty/Doctrine/CacheTest.php +++ b/Tests/ThirdParty/Doctrine/CacheTest.php @@ -28,6 +28,7 @@ use Doctrine\Common\Cache\Cache; use ArrayObject; +use PHPUnit\Framework\TestCase; /** * Class CacheTest @@ -35,7 +36,7 @@ * @author Josh Hall-Bachner * @author Robert Hafner */ -abstract class CacheTest extends \PHPUnit_Framework_TestCase +abstract class CacheTest extends TestCase { /** * @dataProvider provideCrudValues diff --git a/Tests/travis/php_extensions.ini b/Tests/travis/php_extensions.ini index d253368..6b9b24f 100644 --- a/Tests/travis/php_extensions.ini +++ b/Tests/travis/php_extensions.ini @@ -1,2 +1 @@ -extension="memcache.so" -extension="memcached.so" \ No newline at end of file +extension="memcached.so" From fb4aebbcda5058cb68c8991c3337d81cde90cd5a Mon Sep 17 00:00:00 2001 From: Martin Beukman Date: Wed, 13 Mar 2019 08:58:25 +0100 Subject: [PATCH 3/7] fixup! update dependencies, drop php 5.4 support --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 965a2a9..bd92b64 100644 --- a/composer.json +++ b/composer.json @@ -27,9 +27,9 @@ "require": { "php": "^7.0", "tedivm/stash": "^0.15", - "symfony/config": "^3.4", - "symfony/http-kernel": "^3.4", - "symfony/dependency-injection": "^3.4" + "symfony/config": "^3.4 || ^4.0", + "symfony/http-kernel": "^3.4 || ^4.0", + "symfony/dependency-injection": "^3.4 || ^4.0" }, "config": { "vendor-dir": "vendor", From b9515521623b63e340164b226e93ea494c769a9b Mon Sep 17 00:00:00 2001 From: Martin Beukman Date: Thu, 14 Mar 2019 08:21:59 +0100 Subject: [PATCH 4/7] fixup! update dependencies, drop php 5.4 support --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9722bdf..2f73c6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ php: - 7.0 - 7.1 - 7.2 - - hhvm + - 7.3 before_install: - composer self-update From ff80cdfce650534c8686c221d7960d765d4340cd Mon Sep 17 00:00:00 2001 From: Martin Beukman Date: Fri, 29 Mar 2019 11:42:42 +0100 Subject: [PATCH 5/7] fixup! update tests, fix symfony deprecations --- Tests/Service/CacheServiceTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/Service/CacheServiceTest.php b/Tests/Service/CacheServiceTest.php index 0ea602e..867d0b9 100644 --- a/Tests/Service/CacheServiceTest.php +++ b/Tests/Service/CacheServiceTest.php @@ -14,6 +14,7 @@ use Stash\Driver\Ephemeral; use Stash\DriverList; +use Stash\Interfaces\ItemInterface; use Tedivm\StashBundle\Service\CacheTracker; /** @@ -120,8 +121,8 @@ public function testServiceGetItemIterator() $iterator = $service->getItems($keys); $setvalues = $values; + /** @var ItemInterface $item */ foreach ($iterator as $item) { - $this->assertTrue($item->isMiss()); $val = array_shift($setvalues); $item->set($val); $service->save($item); From 175f893610e39c1d79ca798291094ec6a3913618 Mon Sep 17 00:00:00 2001 From: Martin Beukman Date: Mon, 1 Apr 2019 09:04:17 +0200 Subject: [PATCH 6/7] fix test tool --- Tests/runTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/runTests.sh b/Tests/runTests.sh index b0eaabc..db77f6d 100755 --- a/Tests/runTests.sh +++ b/Tests/runTests.sh @@ -13,4 +13,4 @@ echo '' echo '' echo 'Testing for Coding Styling Compliance.' echo 'All code should follow PSR standards.' -./vendor/fabpot/php-cs-fixer/php-cs-fixer fix ./ --level="all" -vv --dry-run \ No newline at end of file +./vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix ./ -vv --dry-run From a540bd66969b21e7134af2c1ebf17a3662cbedfd Mon Sep 17 00:00:00 2001 From: Martin Beukman Date: Mon, 1 Apr 2019 09:09:55 +0200 Subject: [PATCH 7/7] style fixes --- Adapters/DoctrineAdapter.php | 1 + Collector/CacheDataCollector.php | 1 + DependencyInjection/Configuration.php | 38 +++++++++++-------- DependencyInjection/TedivmStashExtension.php | 1 - Factory/DriverFactory.php | 2 +- Service/CacheItem.php | 2 +- Service/CacheService.php | 5 ++- TedivmStashBundle.php | 1 - Tests/Adapters/DoctrineAdapterTest.php | 3 -- Tests/Adapters/SessionHandlerAdapterTest.php | 1 - Tests/Collector/CacheDataCollectorTest.php | 6 ++- .../DependencyInjection/ConfigurationTest.php | 16 +++++--- Tests/Factory/DriverFactoryTest.php | 1 - Tests/Service/CacheServiceTest.php | 1 - Tests/Service/CacheTrackerTest.php | 3 -- Tests/TedivmStashBundleTest.php | 7 +++- Tests/ThirdParty/Doctrine/CacheTest.php | 4 +- 17 files changed, 51 insertions(+), 42 deletions(-) diff --git a/Adapters/DoctrineAdapter.php b/Adapters/DoctrineAdapter.php index ec05ed7..a49a5e4 100644 --- a/Adapters/DoctrineAdapter.php +++ b/Adapters/DoctrineAdapter.php @@ -11,6 +11,7 @@ */ namespace Tedivm\StashBundle\Adapters; + use Doctrine\Common\Cache\Cache as DoctrineCacheInterface; /** diff --git a/Collector/CacheDataCollector.php b/Collector/CacheDataCollector.php index 37332f0..3ea45e8 100644 --- a/Collector/CacheDataCollector.php +++ b/Collector/CacheDataCollector.php @@ -11,6 +11,7 @@ */ namespace Tedivm\StashBundle\Collector; + use Symfony\Component\HttpKernel\DataCollector\DataCollector; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 2f9eacc..e8a6224 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -66,13 +66,17 @@ public function getConfigTreeBuilder() $rootNode ->beforeNormalization() - ->ifTrue(function ($v) { return is_array($v) && !array_key_exists('default_cache', $v) && array_key_exists('caches', $v); }) + ->ifTrue(function ($v) { + return is_array($v) && !array_key_exists('default_cache', $v) && array_key_exists('caches', $v); + }) ->then(function ($v) { return Configuration::normalizeDefaultCacheConfig($v); }) ->end() ->beforeNormalization() - ->ifTrue(function ($v) { return is_array($v) && !array_key_exists('caches', $v) && !array_key_exists('cache', $v); }) + ->ifTrue(function ($v) { + return is_array($v) && !array_key_exists('caches', $v) && !array_key_exists('cache', $v); + }) ->then(function ($v) { return Configuration::normalizeCacheConfig($v); }) @@ -105,7 +109,9 @@ public function getCachesNode() ->fixXmlConfig('handler') ->fixXmlConfig('driver') ->beforeNormalization() - ->ifTrue(function ($v) { return is_array($v) && array_key_exists('handlers', $v); }) + ->ifTrue(function ($v) { + return is_array($v) && array_key_exists('handlers', $v); + }) ->then(function ($v) { return Configuration::normalizeHandlerToDriverConfig($v); }) @@ -152,8 +158,8 @@ public function addDriverSettings($driver, NodeBuilder $rootNode) ->arrayNode($driver) ->fixXmlConfig('server'); - if ($driver == 'Memcache') { - $finalNode = $driverNode + if ($driver == 'Memcache') { + $finalNode = $driverNode ->info('All options except "servers" are Memcached options. See http://www.php.net/manual/en/memcached.constants.php') ->addDefaultsIfNotSet() ->children() @@ -193,8 +199,8 @@ public function addDriverSettings($driver, NodeBuilder $rootNode) ->end() ->end() ; - } elseif ($driver == 'Redis') { - $finalNode = $driverNode + } elseif ($driver == 'Redis') { + $finalNode = $driverNode ->info("Accepts server info, password, and database.") ->addDefaultsIfNotSet() ->children() @@ -216,26 +222,26 @@ public function addDriverSettings($driver, NodeBuilder $rootNode) ->end() ->end() ; - } else { - $defaults = isset($this->driverSettings[$driver]) ? $this->driverSettings[$driver] : array(); + } else { + $defaults = isset($this->driverSettings[$driver]) ? $this->driverSettings[$driver] : array(); - $node = $driverNode + $node = $driverNode ->addDefaultsIfNotSet() ->children(); - foreach ($defaults as $setting => $default) { - $node + foreach ($defaults as $setting => $default) { + $node ->scalarNode($setting) ->defaultValue($default) ->end() ; - } + } - $finalNode = $node->end() + $finalNode = $node->end() ; - } + } - $finalNode->end() + $finalNode->end() ; } diff --git a/DependencyInjection/TedivmStashExtension.php b/DependencyInjection/TedivmStashExtension.php index 983ecad..c1b7ace 100644 --- a/DependencyInjection/TedivmStashExtension.php +++ b/DependencyInjection/TedivmStashExtension.php @@ -158,7 +158,6 @@ protected function addCacheService($name, $cache, $container) new Reference(sprintf('stash.tracker.%s_cache', $name)) )) ; - } /** diff --git a/Factory/DriverFactory.php b/Factory/DriverFactory.php index c47260f..a484ae6 100644 --- a/Factory/DriverFactory.php +++ b/Factory/DriverFactory.php @@ -11,6 +11,7 @@ */ namespace Tedivm\StashBundle\Factory; + use Stash\DriverList; use Stash\Interfaces\DriverInterface; @@ -37,7 +38,6 @@ public static function createDriver($types, $options) $h = array(); foreach ($types as $type) { - if (!isset($drivers[$type])) { $allDrivers = DriverList::getAllDrivers(); diff --git a/Service/CacheItem.php b/Service/CacheItem.php index 6cdb5f9..ac117be 100644 --- a/Service/CacheItem.php +++ b/Service/CacheItem.php @@ -11,6 +11,7 @@ */ namespace Tedivm\StashBundle\Service; + use Stash\Item; /** @@ -52,5 +53,4 @@ public function get($invalidation = 0, $arg = null, $arg2 = null) return $result; } - } diff --git a/Service/CacheService.php b/Service/CacheService.php index 825e3dc..c64cac6 100644 --- a/Service/CacheService.php +++ b/Service/CacheService.php @@ -11,6 +11,7 @@ */ namespace Tedivm\StashBundle\Service; + use Stash\DriverList; use Stash\Interfaces\DriverInterface; use Stash\Pool; @@ -47,7 +48,7 @@ public function __construct($name, DriverInterface $driver = null, CacheTracker $this->setNamespace($name); if (isset($driver)) { - $this->setDriver($driver); + $this->setDriver($driver); } parent::__construct($driver); @@ -62,7 +63,7 @@ public function getItem($key) $item = parent::getItem($key); if (isset($this->tracker)) { - $item->setCacheTracker($this->tracker); + $item->setCacheTracker($this->tracker); } return $item; diff --git a/TedivmStashBundle.php b/TedivmStashBundle.php index 0a56350..9bdfab2 100644 --- a/TedivmStashBundle.php +++ b/TedivmStashBundle.php @@ -12,7 +12,6 @@ */ class TedivmStashBundle extends Bundle { - public function getContainerExtension() { return new TedivmStashExtension(); diff --git a/Tests/Adapters/DoctrineAdapterTest.php b/Tests/Adapters/DoctrineAdapterTest.php index 08d841f..23b4c5e 100644 --- a/Tests/Adapters/DoctrineAdapterTest.php +++ b/Tests/Adapters/DoctrineAdapterTest.php @@ -88,12 +88,9 @@ protected function _getCacheDriver() public function testDeleteAllAndNamespaceVersioningBetweenCaches() { - } public function testFlushAllAndNamespaceVersioningBetweenCaches() { - } - } diff --git a/Tests/Adapters/SessionHandlerAdapterTest.php b/Tests/Adapters/SessionHandlerAdapterTest.php index 9dbb789..a484900 100644 --- a/Tests/Adapters/SessionHandlerAdapterTest.php +++ b/Tests/Adapters/SessionHandlerAdapterTest.php @@ -54,5 +54,4 @@ public function testClearAll() $this->assertEquals('', $sessionB->read('session_id'), 'SessionB cleared after ClearAll'); $this->assertEquals('', $sessionC->read('session_id'), 'SessionC cleared after ClearAll'); } - } diff --git a/Tests/Collector/CacheDataCollectorTest.php b/Tests/Collector/CacheDataCollectorTest.php index 1afd4a7..ad33d56 100644 --- a/Tests/Collector/CacheDataCollectorTest.php +++ b/Tests/Collector/CacheDataCollectorTest.php @@ -124,8 +124,10 @@ public function testGetAvailableDrivers() //var_dump($drivers, $systemDrivers);exit(); foreach ($drivers as $driver) { - $this->assertTrue(in_array($driver, $systemDrivers), - 'getDrivers returns only registered drivers- Unregistered: ' . $driver); + self::assertTrue( + in_array($driver, $systemDrivers), + 'getDrivers returns only registered drivers- Unregistered: ' . $driver + ); } } diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php index a510f57..4d51ffe 100644 --- a/Tests/DependencyInjection/ConfigurationTest.php +++ b/Tests/DependencyInjection/ConfigurationTest.php @@ -13,6 +13,7 @@ namespace Tedivm\StashBundle\Tests\DependencyInjection; use PHPUnit\Framework\TestCase; +use Symfony\Component\Config\Definition\ArrayNode; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Tedivm\StashBundle\DependencyInjection\Configuration; @@ -41,8 +42,11 @@ public function testAddDriverSettings() $configuration->addDriverSettings('Memcache', $rootNode->children()); $memcacheNode = $rootNode->getNode('Memcache'); - $this->assertInstanceOf('Symfony\Component\Config\Definition\ArrayNode', $memcacheNode, - 'Config generator makes Memcache nodes when requested'); + $this->assertInstanceOf( + ArrayNode::class, + $memcacheNode, + 'Config generator makes Memcache nodes when requested' + ); $treeBuilder = new TreeBuilder(); $rootNode = $treeBuilder->root('stash'); @@ -50,8 +54,11 @@ public function testAddDriverSettings() $configuration->addDriverSettings('Redis', $rootNode->children()); $memcacheNode = $rootNode->getNode('Redis'); - $this->assertInstanceOf('Symfony\Component\Config\Definition\ArrayNode', $memcacheNode, - 'Config generator makes Redis nodes when requested'); + $this->assertInstanceOf( + ArrayNode::class, + $memcacheNode, + 'Config generator makes Redis nodes when requested' + ); } public function testNormalizeCacheConfig() @@ -104,5 +111,4 @@ public function testNormalizeHandlerToDriverConfig() $this->assertArrayHasKey('drivers', $returnedData, 'Normalization converts "handlers" to "drivers"'); $this->assertEquals($testData['handlers'], $returnedData['drivers'], 'Normalization converts "handlers" to "drivers"'); } - } diff --git a/Tests/Factory/DriverFactoryTest.php b/Tests/Factory/DriverFactoryTest.php index 92bda7f..e116d54 100644 --- a/Tests/Factory/DriverFactoryTest.php +++ b/Tests/Factory/DriverFactoryTest.php @@ -93,7 +93,6 @@ public function testManufactureDrivers($types, $options) $subDriverClass = $this->drivers[$subtype]; $this->assertInstanceOf($subDriverClass, $subDriver); } - } public function testMemcacheSetup() diff --git a/Tests/Service/CacheServiceTest.php b/Tests/Service/CacheServiceTest.php index 867d0b9..387213b 100644 --- a/Tests/Service/CacheServiceTest.php +++ b/Tests/Service/CacheServiceTest.php @@ -158,5 +158,4 @@ protected function runCacheCycle($service, $num, $ismiss) $this->assertFalse($item->isMiss()); $this->assertEquals($testData, $data); } - } diff --git a/Tests/Service/CacheTrackerTest.php b/Tests/Service/CacheTrackerTest.php index f4da05f..719a5c4 100644 --- a/Tests/Service/CacheTrackerTest.php +++ b/Tests/Service/CacheTrackerTest.php @@ -37,7 +37,6 @@ public function testConstruct($name = 'test') public function testTrackRequest() { - } public function testGetName() @@ -62,7 +61,6 @@ public function testGetCalls() $tracker->trackRequest('Key7', false, 'Value7'); $this->assertEquals(8, $tracker->getCalls(), 'Tracker counts calls sent to it with duplicate keys.'); - } public function testGetHits() @@ -78,7 +76,6 @@ public function testGetHits() $tracker->trackRequest('Key7', true, 'Value7'); $this->assertEquals(4, $tracker->getHits(), 'Tracker increments hits when sent them.'); - } public function testGetQueries() diff --git a/Tests/TedivmStashBundleTest.php b/Tests/TedivmStashBundleTest.php index 8498876..e60adb4 100644 --- a/Tests/TedivmStashBundleTest.php +++ b/Tests/TedivmStashBundleTest.php @@ -13,6 +13,7 @@ namespace Tedivm\StashBundle\Tests; use PHPUnit\Framework\TestCase; +use Tedivm\StashBundle\DependencyInjection\TedivmStashExtension; /** * Class TedivmStashBundleTest @@ -27,7 +28,9 @@ public function testGetContainerExtension() { $bundle = new \Tedivm\StashBundle\TedivmStashBundle(); - $this->assertInstanceOf('Tedivm\StashBundle\DependencyInjection\TedivmStashExtension', - $bundle->getContainerExtension()); + $this->assertInstanceOf( + TedivmStashExtension::class, + $bundle->getContainerExtension() + ); } } diff --git a/Tests/ThirdParty/Doctrine/CacheTest.php b/Tests/ThirdParty/Doctrine/CacheTest.php index 417ff12..922e085 100644 --- a/Tests/ThirdParty/Doctrine/CacheTest.php +++ b/Tests/ThirdParty/Doctrine/CacheTest.php @@ -84,7 +84,7 @@ public function testDeleteAll() public function testDeleteAllAndNamespaceVersioningBetweenCaches() { - if ( ! $this->isSharedStorage()) { + if (! $this->isSharedStorage()) { $this->markTestSkipped('The ' . __CLASS__ .' does not use shared storage'); } @@ -134,7 +134,7 @@ public function testFlushAll() public function testFlushAllAndNamespaceVersioningBetweenCaches() { - if ( ! $this->isSharedStorage()) { + if (! $this->isSharedStorage()) { $this->markTestSkipped('The ' . __CLASS__ .' does not use shared storage'); }