Merge pull request #108 from MyOnlineStore/update-bundle-sf-4

Made bundle compatible with symfony 3.4
tedious · Apr 4, 2019 · 337f0bc · 337f0bc
2 parents ec24fa1 + a540bd6
commit 337f0bc
Show file tree

Hide file tree

Showing 23 changed files with 165 additions and 110 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,10 @@
 language: php
 
 php:
-    - 5.4
-    - 5.5
-    - 5.6
     - 7.0
-    - hhvm
+    - 7.1
+    - 7.2
+    - 7.3
 
 before_install:
     - composer self-update

diff --git a/Adapters/DoctrineAdapter.php b/Adapters/DoctrineAdapter.php
@@ -11,10 +11,12 @@
  */
 
 namespace Tedivm\StashBundle\Adapters;
+
 use Doctrine\Common\Cache\Cache as DoctrineCacheInterface;
 
 /**
  * Class DoctrineAdapter
+ *
  * @package Tedivm\StashBundle\Adapters
  * @author Josh Hall-Bachner <[email protected]>
  * @author Robert Hafner <[email protected]>

diff --git 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;
@@ -152,4 +153,9 @@ public function getname()
     {
         return 'stash';
     }
+
+    public function reset()
+    {
+        $this->data = [];
+    }
 }
diff --git 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
@@ -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,57 +88,68 @@ 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'])));
         }
 
         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
@@ -147,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,16 +12,19 @@
 
 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
  * @package Tedivm\StashBundle\Tests\Collector
  * @author Josh Hall-Bachner <[email protected]>
  * @author Robert Hafner <[email protected]>
  */
-class CacheDataCollectorTest extends \PHPUnit_Framework_TestCase
+class CacheDataCollectorTest extends TestCase
 {
     protected $testClass = 'Tedivm\StashBundle\Collector\CacheDataCollector';
 
@@ -121,17 +124,28 @@ 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
+            );
         }
     }
 
+    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);