fix caching bean

Author: ArthurHlt

tests/ArthurH/SphringCache/AbstractSphringCache.php

@@ -18,6 +18,13 @@
  */
 class AbstractSphringCache extends \PHPUnit_Framework_TestCase
 {
+    public function __construct()
+    {
+        parent::__construct();
+        $this->contextFileTest = __DIR__ . '/Resources/mainSimpleTest.yml';
+    }
+
+    protected $contextFileTest;
     /**
      * @var Sphring
      */
@@ -42,7 +49,7 @@ class AbstractSphringCache extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $contextFile = new File(__DIR__ . '/Resources/mainSimpleTest.yml');
+        $contextFile = new File($this->contextFileTest);
         $this->contextCacheFile = new File(sys_get_temp_dir() . DIRECTORY_SEPARATOR .
             SphringCacheEnum::CACHE_FOLDER . DIRECTORY_SEPARATOR
             . sprintf(SphringCacheEnum::CACHE_FILE_CONTEXT, $contextFile->getHash('md5')));
@@ -55,7 +62,7 @@ public function setUp()
         $this->annotationFolder = new Folder(sys_get_temp_dir() . DIRECTORY_SEPARATOR .
             SphringCacheEnum::CACHE_FOLDER . DIRECTORY_SEPARATOR .
             SphringCacheEnum::CACHE_FOLDER_ANNOTATIONS);
-        $this->sphring = new Sphring(__DIR__ . '/Resources/mainSimpleTest.yml');
+        $this->sphring = new Sphring($this->contextFileTest);
         $this->sphring->setComposerLockFile(__DIR__ . '/Resources/composer.lock');
         $this->sphring->loadContext();
     }

tests/ArthurH/SphringCache/Annotation/CacheableTest.php

@@ -18,6 +18,11 @@
 
 class CacheableTest extends AbstractSphringCache
 {
+    public function __construct()
+    {
+        parent::__construct();
+        $this->contextFileTest = __DIR__ . '/../Resources/mainCacheTest.yml';
+    }
 
     public function testSimpleCacheable()
     {
@@ -35,7 +40,10 @@ public function testSimpleCacheable()
 
     public function tearDown()
     {
-        parent::tearDown();
+        $this->contextCacheFile->remove();
+        $this->annotationFolder->removeFiles('#.*#i', true);
+        $this->annotationFolder->removeFolders('#.*#i', true);
+        $this->annotationFolder->remove();
         $cacheFolder = new Folder(__DIR__ . '/../cache');
         $cacheFolder->removeFiles('#.*#i', true);
         $cacheFolder->removeFolders('#.*#i', true);

tests/ArthurH/SphringCache/Resources/mainCacheTest.yml

@@ -0,0 +1,18 @@
+cache:
+  type: cache
+  class:  ArthurH\SphringCache\CacheManager\DoctrineCacheManager
+  properties:
+    doctrineCache:
+      ref: filesystemCache
+foobean:
+  class: ArthurH\SphringCache\FakeBean\Foo
+  properties:
+    bar:
+      ref: barbean
+barbean:
+  class: ArthurH\SphringCache\FakeBean\Bar
+filesystemCache:
+  class: Doctrine\Common\Cache\FilesystemCache
+  constructor:
+    1:
+      value: %CONTEXTROOT%/../cache

tests/ArthurH/SphringCache/Resources/mainSimpleTest.yml

@@ -1,19 +1,11 @@
 cache:
   type: cache
-  class:  ArthurH\SphringCache\CacheManager\DoctrineCacheManager
+  class:  ArthurH\SphringCache\CacheManager\NullCacheManager
   cacheSphringBean: true
-  properties:
-    doctrineCache:
-      ref: filesystemCache
 foobean:
   class: ArthurH\SphringCache\FakeBean\Foo
   properties:
     bar:
       ref: barbean
 barbean:
   class: ArthurH\SphringCache\FakeBean\Bar
-filesystemCache:
-  class: Doctrine\Common\Cache\FilesystemCache
-  constructor:
-    1:
-      value: %CONTEXTROOT%/../cache

tests/ArthurH/SphringCache/SphringCacheTest.php

@@ -45,13 +45,13 @@ public function testCacheContextFile()
     public function testCacheProxies()
     {
         $files = $this->proxiesFolder->getFiles('#.*.php$#i');
-        $this->assertCount(4, $files);
+        $this->assertCount(5, $files);
     }
 
     public function testCacheAnnotations()
     {
         $files = $this->annotationFolder->getFiles('#.*$#i', true);
-        $this->assertCount(59, $files);
+        $this->assertCount(29, $files);
     }
 
     public function testCacheBean()