Removed "aequasi*" and using composer autoload for tests

Author: Nyholm

phpunit.xml.dist

@@ -9,7 +9,7 @@
   processIsolation="false"
   stopOnFailure="false"
   syntaxCheck="false"
-  bootstrap="tests/bootstrap.php"
+  bootstrap="vendor/autoload.php"
   >
   <testsuites>
     <testsuite name="CacheBundle for the Symfony2 Framework">

src/DependencyInjection/CacheExtension.php

@@ -18,7 +18,7 @@
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * Class AequasiCacheExtension
+ * Class CacheExtension
  *
  * @author Aaron Scherer <[email protected]>
  */

src/DependencyInjection/Configuration.php

@@ -42,7 +42,7 @@ public function getConfigTreeBuilder()
     }
 
     /**
-     * Configure the "aequasi_cache.session" section
+     * Configure the "cache.session" section
      *
      * @return ArrayNodeDefinition
      */
@@ -69,7 +69,7 @@ private function addSessionSupportSection()
     }
 
     /**
-     * Configure the "aequasi_cache.doctrine" section
+     * Configure the "cache.doctrine" section
      *
      * @return ArrayNodeDefinition
      */
@@ -127,7 +127,7 @@ function ($v) {
     }
 
     /**
-     * Configure the "aequasi_cache.router" section
+     * Configure the "cache.router" section
      *
      * @return ArrayNodeDefinition
      */

tests/DependencyInjection/AequasiCacheExtensionTest.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of php-cache\cache-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Cache\CacheBundle\Tests\DependencyInjection;
+
+use Cache\CacheBundle\Tests\TestCase;
+use Aequasi\Cache\DoctrineCacheBridge;
+use Psr\Cache\CacheItemPoolInterface;
+
+/**
+ * Class CacheExtensionTest
+ *
+ * @author Aaron Scherer <[email protected]>
+ */
+class CacheExtensionTest extends TestCase
+{
+
+    /**
+     *
+     */
+    public function testRouterBuilder()
+    {
+        $container = $this->createContainerFromFile('router');
+
+        $config = $container->getParameter($this->getAlias().'.router');
+
+        $this->assertTrue(isset($config['enabled']));
+
+        $this->assertTrue($config['enabled']);
+        $this->assertEquals($config['service_id'], 'default');
+    }
+
+    /**
+     * @return string
+     */
+    private function getAlias()
+    {
+        return 'cache';
+    }
+}

tests/DependencyInjection/CacheExtensionTest.php

@@ -1,7 +1,4 @@
-aequasi_cache:
-    instances:
-        default:
-            type: array
+cache:
     router:
         enabled: true
-        instance: default
+        service_id: default

tests/Fixtures/router.yml

@@ -11,7 +11,7 @@
 
 namespace Cache\CacheBundle\Tests;
 
-use Cache\CacheBundle\DependencyInjection\AequasiCacheExtension;
+use Cache\CacheBundle\DependencyInjection\CacheExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
@@ -64,7 +64,7 @@ protected function createContainer(array $data = array())
     protected function createContainerFromFile($file, $data = array())
     {
         $container = $this->createContainer($data);
-        $container->registerExtension(new AequasiCacheExtension());
+        $container->registerExtension(new CacheExtension());
         $this->loadFromFile($container, $file);
 
         $container->getCompilerPassConfig()