Merge pull request #108 from jingu/fix-command-error

Fix refresh command issue on ResourceObject has an error code
bearsunday · Mar 25, 2022 · 44be4ea · 44be4ea
2 parents dbfb481 + 354f6dd
commit 44be4ea
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 4 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -41,6 +41,12 @@ jobs:
           coverage: pcov
           ini-values: zend.assertions=1
 
+      - name: Install pecl memcached
+        continue-on-error: true
+        run: |
+          sudo apt-get install -y libmemcached-dev
+          sudo pecl install memcached
+
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "bamarni/composer-bin-plugin": "^1.4",
         "koriym/attributes": "^1.0.1",
         "madapaja/twig-module": "^2.3",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.5.19",
         "psr/log": "^1.1",
         "ray/object-visual-grapher": "^1.0",
         "symfony/process": "^4.3",

diff --git a/src/CommandInterceptor.php b/src/CommandInterceptor.php
@@ -43,7 +43,7 @@ public function invoke(MethodInvocation $invocation)
         }
 
         if ($ro->code >= Code::BAD_REQUEST) {
-            return $this;
+            return $ro;
         }
 
         foreach ($this->commands as $command) {

diff --git a/src/CommandsProvider.php b/src/CommandsProvider.php
@@ -7,6 +7,9 @@
 use BEAR\Resource\ResourceInterface;
 use Ray\Di\ProviderInterface;
 
+/**
+ * @implements ProviderInterface<array<CommandInterface>>
+ */
 final class CommandsProvider implements ProviderInterface
 {
     /** @var QueryRepositoryInterface */

diff --git a/src/DonutCommandInterceptor.php b/src/DonutCommandInterceptor.php
@@ -6,6 +6,7 @@
 
 use BEAR\QueryRepository\Exception\UnmatchedQuery;
 use BEAR\Resource\AbstractUri;
+use BEAR\Resource\Code;
 use BEAR\Resource\ResourceObject;
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\MethodInvocation;
@@ -36,6 +37,10 @@ public function invoke(MethodInvocation $invocation): ResourceObject
     {
         $ro = $invocation->proceed();
         assert($ro instanceof ResourceObject);
+        if ($ro->code >= Code::BAD_REQUEST) {
+            return $ro;
+        }
+
         $this->refreshDonutAndState($ro);
 
         return $ro;

diff --git a/tests/DonutCommandInterceptorTest.php b/tests/DonutCommandInterceptorTest.php
@@ -4,6 +4,7 @@
 
 namespace BEAR\QueryRepository;
 
+use BEAR\Resource\Code;
 use BEAR\Resource\ResourceInterface;
 use BEAR\Sunday\Extension\Transfer\HttpCacheInterface as HttpCacheInterfaceAlias;
 use Madapaja\TwigModule\TwigModule;
@@ -69,6 +70,21 @@ public function testCommandInterceptorRefresh(): void
         $this->assertArrayHasKey('Age', $ro->headers);
     }
 
+    public function testCommandInterceptorRefreshOnErrorCode(): void
+    {
+        $this->resource->get('page://self/html/comment');
+        $ro = $this->resource->delete('page://self/html/comment');
+        $this->assertSame(Code::BAD_REQUEST, $ro->code);
+        $ro = $this->resource->get('page://self/html/comment');
+        $this->assertArrayHasKey('Age', $ro->headers);
+
+        $this->resource->get('page://self/html/blog-posting?id=0');
+        $ro = $this->resource->delete('page://self/html/blog-posting', ['id' => 9999]);
+        $this->assertSame(Code::BAD_REQUEST, $ro->code);
+        $ro = $this->resource->get('page://self/html/blog-posting?id=0');
+        $this->assertArrayHasKey('Age', $ro->headers);
+    }
+
     public function testCacheableResponse(): void
     {
         $ro = $this->resource->get('page://self/html/blog-posting-cache?id=0');

diff --git a/tests/Fake/fake-app/src/Resource/Page/Html/BlogPosting.php b/tests/Fake/fake-app/src/Resource/Page/Html/BlogPosting.php
@@ -5,6 +5,7 @@
 use BEAR\QueryRepository\Header;
 use BEAR\RepositoryModule\Annotation\CacheableResponse;
 use BEAR\Resource\Annotation\Embed;
+use BEAR\Resource\Code;
 use BEAR\Resource\ResourceObject;
 use Koriym\HttpConstants\CacheControl;
 use Koriym\HttpConstants\ResponseHeader;
@@ -30,6 +31,12 @@ public function onGet(int $id = 0)
 
     public function onDelete(int $id = 0)
     {
+        if ($id !== 0) {
+            $this->code = Code::BAD_REQUEST;
+
+            return $this;
+        }
+
         return $this;
     }
-}
+}
diff --git a/tests/Fake/fake-app/src/Resource/Page/Html/Comment.php b/tests/Fake/fake-app/src/Resource/Page/Html/Comment.php
@@ -4,6 +4,7 @@
 
 use BEAR\RepositoryModule\Annotation\Cacheable;
 use BEAR\Resource\Annotation\Embed;
+use BEAR\Resource\Code;
 use BEAR\Resource\ResourceObject;
 
 /**
@@ -24,4 +25,11 @@ public function onGet()
 
         return $this;
     }
-}
+
+    public function onDelete()
+    {
+        $this->code = Code::BAD_REQUEST;
+
+        return $this;
+    }
+}