Merge pull request #157 from koriym/remove-cache

Remove cache
bearsunday · Jul 15, 2021 · 8b0fee0 · 8b0fee0
2 parents 1a6cd21 + 58e9b31
commit 8b0fee0
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 407 deletions.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -136,4 +136,5 @@ jobs:
           composer require --dev maglnet/composer-require-checker ^3.0
 
       - name: Run composer-require-checker
-        run: ./vendor/bin/composer-require-checker
+        run: ./vendor/bin/composer-require-checker --config-file=./composer-require-checker.json
+
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@
 /coverage.xml
 /vendor-bin/**/vendor
 /demo/vendor
+/.phpunit-cache
diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -0,0 +1,18 @@
+{
+  "symbol-whitelist" : [
+    "null", "true", "false",
+    "static", "self", "parent",
+    "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object", "mixed",
+    "Doctrine\\Common\\Cache\\ArrayCache", "Doctrine\\Common\\Cache\\Cache"
+  ],
+  "php-core-extensions" : [
+    "Core",
+    "date",
+    "pcre",
+    "Phar",
+    "Reflection",
+    "SPL",
+    "standard"
+  ],
+  "scan-files" : []
+}
diff --git a/composer.json b/composer.json
@@ -25,7 +25,6 @@
     "ext-json": "*",
     "bear/resource": "^1.15.4",
     "doctrine/annotations": "^1.12",
-    "doctrine/cache": "^1.10",
     "psr/log": "^1.1",
     "ray/aop": "^2.10.1",
     "ray/di": "^2.11"

diff --git a/coverage.xml b/coverage.xml
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php">
-  <coverage processUncoveredFiles="true">
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+        bootstrap="vendor/autoload.php">
+  <coverage processUncoveredFiles="true" cacheDirectory="./.phpunit-cache">
     <include>
       <directory suffix=".php">src</directory>
     </include>
   </coverage>
   <testsuites>
-    <testsuite name="all">
+    <testsuite name="BEAR.Sunday test suite">
       <directory>tests</directory>
     </testsuite>
   </testsuites>

diff --git a/src/Module/Cache/DoctrineCacheModule.php → ...ated/Module/Cache/DoctrineCacheModule.php b/src/Module/Cache/DoctrineCacheModule.php → ...ated/Module/Cache/DoctrineCacheModule.php
@@ -9,6 +9,9 @@
 use Ray\Di\AbstractModule;
 use Ray\Di\Scope;
 
+/**
+ * @deprecated
+ */
 class DoctrineCacheModule extends AbstractModule
 {
     protected function configure(): void

diff --git a/src/Module/SundayModule.php b/src/Module/SundayModule.php
@@ -5,7 +5,6 @@
 namespace BEAR\Sunday\Module;
 
 use BEAR\Resource\Module\ResourceModule;
-use BEAR\Sunday\Module\Cache\DoctrineCacheModule;
 use BEAR\Sunday\Provide\Error\ErrorModule;
 use BEAR\Sunday\Provide\Router\RouterModule;
 use BEAR\Sunday\Provide\Transfer\HttpCacheModule;
@@ -17,7 +16,6 @@ class SundayModule extends AbstractModule
     protected function configure(): void
     {
         $this->install(new HttpCacheModule());
-        $this->install(new DoctrineCacheModule());
         $this->install(new ResourceModule());
         $this->install(new RouterModule());
         $this->install(new HttpResponderModule());

diff --git a/src/Provide/Transfer/ConditionalResponse.php b/src/Provide/Transfer/ConditionalResponse.php
@@ -33,17 +33,17 @@ public function isModified(ResourceObject $ro, array $server): bool
     /**
      * {@inheritdoc}
      */
-    public function getOutput(array $originalHeaders): Output
+    public function getOutput(array $headers): Output
     {
-        $headers = [];
-        foreach ($originalHeaders as $label => $value) {
+        $newHeaders = [];
+        foreach ($headers as $label => $value) {
             if (! in_array($label, self::HEADER_IN_304, true)) {
                 continue;
             }
 
-            $headers[$label] = $value;
+            $newHeaders[$label] = $value;
         }
 
-        return new Output(304, $headers, '');
+        return new Output(304, $newHeaders, '');
     }
 }
diff --git a/tests/Module/Cache/DoctrineCacheModuleTest.php b/tests/Module/Cache/DoctrineCacheModuleTest.php
diff --git a/tests/Module/SundayModuleTest.php b/tests/Module/SundayModuleTest.php
@@ -13,8 +13,6 @@
 use BEAR\Sunday\Provide\Router\WebRouter;
 use BEAR\Sunday\Provide\Transfer\HttpResponder;
 use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Cache\Cache;
 use PHPUnit\Framework\TestCase;
 use Ray\Di\AbstractModule;
 use Ray\Di\Injector;
@@ -43,9 +41,6 @@ public function testMinApp(): void
 
     public function testDependModules(): void
     {
-        $cache = $this->injector->getInstance(Cache::class);
-        $this->assertInstanceOf(ArrayCache::class, $cache);
-
         $reader = $this->injector->getInstance(Reader::class);
         $this->assertInstanceOf(Reader::class, $reader);