Updated test config file to make use of Yaml imports

Author: Geolim4

tests/Command/CommandTestCase.php

@@ -16,12 +16,14 @@
 namespace Phpfastcache\Bundle\Tests\Command;
 
 use Phpfastcache\Bundle\Service\Phpfastcache;
+use Phpfastcache\CacheManager;
 use Phpfastcache\Core\Item\ExtendedCacheItemInterface;
 use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Yaml\Yaml;
 
 /**
  * Base Class for command tests
@@ -31,6 +33,8 @@
 abstract class CommandTestCase extends TestCase
 {
 
+    protected $ymlConfigFile = __DIR__ . '/../Resources/Config/phpfastcache.yaml';
+
     /**
      * @var \Symfony\Bundle\FrameworkBundle\Console\Application
      */
@@ -57,6 +61,8 @@ abstract class CommandTestCase extends TestCase
      */
     public function setUp()
     {
+        CacheManager::clearInstances();
+        putenv('COLUMNS=200');// Prevent broken console rendering  with unit tests
         $this->container = $this->getMockBuilder('\\Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
 
         /** @var Kernel|MockObject $kernel */
@@ -71,26 +77,9 @@ public function setUp()
           ->will($this->returnValue($this->container));
         $this->application = new Application($kernel);
 
-        $this->phpfastcacheParameters = [
-          'twig_driver' => 'filecache',
-          'twig_block_debug' => true,
-          'drivers' =>
-            [
-              'filecache' =>
-                [
-                  'type' => 'Files',
-                  'parameters' =>
-                    [
-                      'path' => \sys_get_temp_dir() . '/phpfastcache/',
-                    ],
-                ],
-              'staticcache' =>
-                [
-                  'type' => 'Memstatic',
-                  'parameters' => [],
-                ],
-            ],
-        ];
+        $parameters = Yaml::parse(\file_get_contents($this->ymlConfigFile));
+
+        $this->phpfastcacheParameters = $parameters['phpfastcache'];
 
         $this->phpfastcache = new Phpfastcache($this->phpfastcacheParameters);
 

tests/Command/PhpfastcacheClearCommandTest.php

@@ -24,14 +24,6 @@
  */
 class PhpfastcacheClearCommandTest extends CommandTestCase
 {
-
-    public function setUp()
-    {
-        CacheManager::clearInstances();
-        putenv('COLUMNS=200');// Prevent broken console rendering  with unit tests
-        parent::setUp();
-    }
-
     public function testCommandClearAllCacheInstances()
     {
         $command = $this->application->find('phpfastcache:clear');

tests/Command/PhpfastcacheDelCommandTest.php

@@ -24,14 +24,6 @@
  */
 class PhpfastcacheDelCommandTest extends CommandTestCase
 {
-
-    public function setUp()
-    {
-        CacheManager::clearInstances();
-        putenv('COLUMNS=200');// Prevent broken console rendering  with unit tests
-        parent::setUp();
-    }
-
     public function testCommandSetCacheItem()
     {
         $value = \md5(\random_bytes(255));

tests/Command/PhpfastcacheGetCommandTest.php

@@ -24,14 +24,6 @@
  */
 class PhpfastcacheGetCommandTest extends CommandTestCase
 {
-
-    public function setUp()
-    {
-        CacheManager::clearInstances();
-        putenv('COLUMNS=200');// Prevent broken console rendering  with unit tests
-        parent::setUp();
-    }
-
     public function testCommandSetCacheItem()
     {
         $value = \md5(\random_bytes(255));

tests/Command/PhpfastcacheSetCommandTest.php

@@ -24,14 +24,6 @@
  */
 class PhpfastcacheSetCommandTest extends CommandTestCase
 {
-
-    public function setUp()
-    {
-        CacheManager::clearInstances();
-        putenv('COLUMNS=200');// Prevent broken console rendering  with unit tests
-        parent::setUp();
-    }
-
     public function testCommandSetCacheItem()
     {
         $value = \md5(\random_bytes(255));

tests/Functional/AbstractWebTestCase.php

@@ -69,6 +69,7 @@ protected function profileRequest(string $method, string $uri, array $headers =
     public static function setUpBeforeClass()
     {
         static::deleteTmpDir();
+        PhpfastcacheManager::clearInstances();
         $kernel = static::createClient()->getKernel();
 
         /**

tests/Functional/App/config.yaml

@@ -1,5 +1,6 @@
 imports:
     - { resource: 'services.yaml' }
+    - { resource: './../../Resources/Config/phpfastcache.yaml' }
 
 framework:
     secret: test
@@ -11,14 +12,4 @@ framework:
 
 web_profiler:
     toolbar: false
-    intercept_redirects: false
-
-# PhpFastCache configuration
-phpfastcache:
-    twig_driver: "filecache" # This option must be a valid declared driver, in our example: "filecache"
-    twig_block_debug: true # This option will wrap CACHE/ENDCACHE blocks with block debug as HTML comment
-    drivers:
-        filecache:
-            type: Files
-            parameters:
-                path: "%kernel.cache_dir%/phpfastcache/"
+    intercept_redirects: false

tests/Resources/Config/phpfastcache.yaml

@@ -0,0 +1,20 @@
+# PhpFastCache unit tests configuration
+phpfastcache:
+    twig_driver: "filecache" # This option must be a valid declared driver, in our example: "filecache"
+    twig_block_debug: true # This option will wrap CACHE/ENDCACHE blocks with block debug as HTML comment
+    drivers:
+        filecache:
+            type: Files
+            parameters:
+                path: '' # Automatic
+        memorycache:
+            type: Files
+            parameters:
+                path: '' # Automatic
+                itemDetailedDate: true
+                preventCacheSlams: true
+                cacheFileExtension: db
+                securityKey: symfony-flex-test
+        staticcache:
+            type: Memstatic
+            parameters: []