Removed the BaseCompilerPass

Author: Nyholm

src/DependencyInjection/Compiler/BaseCompilerPass.php

@@ -12,6 +12,8 @@
 namespace Cache\CacheBundle\DependencyInjection\Compiler;
 
 use Cache\CacheBundle\Cache\LoggingCachePool;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -20,20 +22,20 @@
  * @author Aaron Scherer <aequasi@gmail.com>
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class DataCollectorCompilerPass extends BaseCompilerPass
+class DataCollectorCompilerPass implements CompilerPassInterface
 {
     /**
      * {@inheritdoc}
      */
-    protected function prepare()
+    public function process(ContainerBuilder $container)
     {
-        $collectorDefinition = $this->container->getDefinition('cache.data_collector');
-        $serviceIds          = $this->container->findTaggedServiceIds('cache.provider');
+        $collectorDefinition = $container->getDefinition('cache.data_collector');
+        $serviceIds          = $container->findTaggedServiceIds('cache.provider');
 
         foreach (array_keys($serviceIds) as $id) {
 
             // Creating a LoggingCachePool instance, and passing it the new definition from above
-            $def = $this->container->register($id.'.logger', LoggingCachePool::class);
+            $def = $container->register($id.'.logger', LoggingCachePool::class);
             $def->addArgument(new Reference($id.'.logger.inner'))
                 ->setDecoratedService($id, null, 10);
 

src/DependencyInjection/Compiler/DataCollectorCompilerPass.php

@@ -14,6 +14,8 @@
 use Cache\Bridge\DoctrineCacheBridge;
 use Cache\CacheBundle\Cache\FixedTaggingCachePool;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -22,15 +24,16 @@
  * @author Aaron Scherer <aequasi@gmail.com>
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class DoctrineSupportCompilerPass extends BaseCompilerPass
+class DoctrineSupportCompilerPass implements CompilerPassInterface
 {
     /**
      * @throws \Exception
      *
      * @return void
      */
-    protected function prepare()
+    public function process(ContainerBuilder $container)
     {
+        $this->container = $container;
         // If disabled, continue
         if (!$this->container->hasParameter('cache.doctrine')) {
             return;

src/DependencyInjection/Compiler/DoctrineSupportCompilerPass.php

@@ -13,6 +13,8 @@
 
 use Cache\CacheBundle\Session\SessionHandler;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -21,24 +23,30 @@
  *
  * @author Aaron Scherer <aequasi@gmail.com>
  */
-class SessionSupportCompilerPass extends BaseCompilerPass
+class SessionSupportCompilerPass implements CompilerPassInterface
 {
     /**
-     *
+     * @type ContainerBuilder
+     */
+    protected $container;
+
+    /**
+     * @param ContainerBuilder $container
+     * @throws \Exception
      */
-    protected function prepare()
+    public function process(ContainerBuilder $container)
     {
         // Check if session support is enabled
-        if (!$this->container->hasParameter($this->getAlias().'.session')) {
+        if (!$container->hasParameter('cache.session')) {
             return;
         }
 
         // If there is no active session support, throw
-        if (!$this->container->hasAlias('session.storage')) {
+        if (!$container->hasAlias('session.storage')) {
             throw new \Exception('Session cache support cannot be enabled if there is no session.storage service');
         }
 
-        $this->enableSessionSupport($this->container->getParameter($this->getAlias().'.session'));
+        $this->enableSessionSupport($container, $container->getParameter('cache.session'));
     }
 
     /**
@@ -48,10 +56,10 @@ protected function prepare()
      *
      * @throws InvalidConfigurationException
      */
-    private function enableSessionSupport(array $config)
+    private function enableSessionSupport(ContainerBuilder $container, array $config)
     {
         // calculate options
-        $sessionOptions = $this->container->getParameter('session.storage.options');
+        $sessionOptions = $container->getParameter('session.storage.options');
         if (isset($sessionOptions['cookie_lifetime']) && !isset($config['cookie_lifetime'])) {
             $config['cookie_lifetime'] = $sessionOptions['cookie_lifetime'];
         }
@@ -60,8 +68,8 @@ private function enableSessionSupport(array $config)
         $definition->addArgument(new Reference($config['service_id']))
             ->addArgument($config);
 
-        $this->container->setDefinition('cache.session_handler', $definition);
+        $container->setDefinition('cache.session_handler', $definition);
 
-        $this->container->setAlias('session.handler', 'cache.session_handler');
+        $container->setAlias('session.handler', 'cache.session_handler');
     }
 }