Merge pull request #6 from Kharhamel/fix/cache

implemented a cache and a cache clearer in tdbm bundle
thecodingmachine · Feb 5, 2020 · 383f5f2 · 383f5f2
2 parents e4f6c91 + c526dcc
commit 383f5f2
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 6 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+/Tests export-ignore
+/phpstan.neon export-ignore
+/phpcs.xml.dist export-ignore
+/phpcs.xml export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
diff --git a/Resources/config/container/tdbm.xml b/Resources/config/container/tdbm.xml
@@ -15,8 +15,19 @@
             <argument key="$codeGeneratorListeners" type="collection">
                 <argument type="service" id="TheCodingMachine\TDBM\Bundle\Utils\SymfonyCodeGeneratorListener"/>
             </argument>
+            <argument key="$cache" type="service" id="tdbm.cache"></argument>
         </service>
 
+        <service id="tdbm.cache" class="Doctrine\Common\Cache\FilesystemCache">
+            <argument>%kernel.project_dir%/var/cache/tdbm</argument>
+        </service>
+
+
+        <service id="tdbm.cacheclearer" class="TheCodingMachine\TDBM\Bundle\Utils\DoctrineCacheClearer">
+            <argument type="service" id="tdbm.cache" />
+            <tag name="kernel.cache_clearer"/>
+        </service>
+
         <service id="TheCodingMachine\TDBM\ConfigurationInterface" alias="TheCodingMachine\TDBM\Configuration">
         </service>
 

diff --git a/Tests/Fixtures/config/services.yaml b/Tests/Fixtures/config/services.yaml
@@ -13,7 +13,7 @@ services:
 
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
-    TheCodingMachine\Graphqlite\Bundle\Tests\Fixtures\:
+    TheCodingMachine\TDBM\Bundle\Tests\Fixtures\:
         resource: '../*'
         exclude: '../{Entities}'
 

diff --git a/Tests/FunctionalTest.php b/Tests/FunctionalTest.php
@@ -4,7 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
-use TheCodingMachine\GraphQLite\Schema;
 use TheCodingMachine\TDBM\TDBMService;
 
 class FunctionalTest extends TestCase

diff --git a/Tests/TdbmTestingKernel.php b/Tests/TdbmTestingKernel.php
@@ -10,9 +10,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\RouteCollectionBuilder;
-use TheCodingMachine\Graphqlite\Bundle\GraphqliteBundle;
 use TheCodingMachine\TDBM\Bundle\TdbmBundle;
-use TheCodingMachine\TDBM\Bundle\TdbmGraphqlBundle;
 
 class TdbmTestingKernel extends Kernel
 {

diff --git a/Utils/DoctrineCacheClearer.php b/Utils/DoctrineCacheClearer.php
@@ -0,0 +1,28 @@
+<?php
+
+
+namespace TheCodingMachine\TDBM\Bundle\Utils;
+
+use Doctrine\Common\Cache\FlushableCache;
+use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
+
+class DoctrineCacheClearer implements CacheClearerInterface
+{
+    /**
+     * @var FlushableCache
+     */
+    private $cache;
+
+    public function __construct(FlushableCache $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Clears any caches necessary.
+     */
+    public function clear($cacheDir)
+    {
+        $this->cache->flushAll();
+    }
+}
diff --git a/composer.json b/composer.json
@@ -24,7 +24,8 @@
     "php" : ">=7.1",
     "thecodingmachine/tdbm" : "~5.1.0",
     "doctrine/doctrine-bundle": "^1.9 || ^2",
-    "doctrine/orm": "^1 || ^2"
+    "doctrine/orm": "^1 || ^2",
+    "symfony/http-kernel": "^4.1.9 || ^5"
   },
   "require-dev": {
     "roave/security-advisories": "dev-master",
@@ -34,7 +35,7 @@
     "phpstan/phpstan-shim": "^0.11.4"
   },
   "scripts": {
-    "phpstan": "phpstan analyse TdbmBundle.php DependencyInjection/ Resources/ -c phpstan.neon --level=7 --no-progress"
+    "phpstan": "phpstan analyse TdbmBundle.php DependencyInjection/ Resources/ Utils/ -c phpstan.neon --level=7 --no-progress"
   },
   "autoload" : {
     "psr-4" : {