Changed ContainerInterface and AbstractContainer

Vladyslav Vildanov · Vladyslav Vildanov · commit 46dfbbe06e63 · 2023-01-30T17:29:45.000+02:00
diff --git a/src/Command/Redis/Container/AbstractContainer.php b/src/Command/Redis/Container/AbstractContainer.php
@@ -26,24 +26,23 @@ public function __construct(ClientInterface $client)
         $this->client = $client;
     }
 
-
     /**
      * {@inheritDoc}
      */
-    public function __call($commandID, $arguments)
+    public function __call($subcommandID, $arguments)
     {
-        array_unshift($arguments, strtoupper($commandID));
+        array_unshift($arguments, strtoupper($subcommandID));
 
         return $this->client->executeCommand(
-            $this->client->createCommand($this->getContainerId(), $arguments)
+            $this->client->createCommand($this->getContainerCommandId(), $arguments)
         );
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getContainerId(): string
+    public function getContainerCommandId(): string
     {
-        return static::$containerId;
+        return static::$containerCommandId;
     }
 }
diff --git a/src/Command/Redis/Container/ContainerInterface.php b/src/Command/Redis/Container/ContainerInterface.php
@@ -18,16 +18,16 @@ interface ContainerInterface
      * Creates Redis container command with subcommand as virtual method name
      * and sends a request to the server.
      *
-     * @param $commandID
+     * @param $subcommandID
      * @param $arguments
      * @return mixed
      */
-    public function __call($commandID, $arguments);
+    public function __call($subcommandID, $arguments);
 
     /**
-     * Returns containerId of specific container.
+     * Returns containerCommandId of specific container command.
      *
      * @return string
      */
-    public function getContainerId(): string;
+    public function getContainerCommandId(): string;
 }
diff --git a/src/Command/Redis/Container/FunctionContainer.php b/src/Command/Redis/Container/FunctionContainer.php
@@ -20,5 +20,5 @@
  */
 class FunctionContainer extends AbstractContainer
 {
-    protected static $containerId = 'function';
+    protected static $containerCommandId = 'function';
 }
diff --git a/tests/Predis/Command/Redis/Container/AbstractContainerTest.php b/tests/Predis/Command/Redis/Container/AbstractContainerTest.php
@@ -1,5 +1,15 @@
 <?php
 
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Predis\Command\Redis\Container;
 
 use PHPUnit\Framework\TestCase;
@@ -41,7 +51,7 @@ protected function setUp(): void
         $this->mockClient = $this->getMockBuilder(ClientInterface::class)->getMock();
 
         $this->testClass = new class($this->mockClient) extends AbstractContainer {
-            protected static $containerId = 'test';
+            protected static $containerCommandId = 'test';
         };
     }
 
@@ -50,7 +60,7 @@ protected function setUp(): void
      */
     public function testGetContainerId(): void
     {
-        $this->assertSame('test', $this->testClass->getContainerId());
+        $this->assertSame('test', $this->testClass->getContainerCommandId());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -26,24 +26,23 @@ public function __construct(ClientInterface $client)`
`26`	`26`	`$this->client = $client;`
`27`	`27`	`}`
`28`	`28`
`29`		`-`
`30`	`29`	`/**`
`31`	`30`	`* {@inheritDoc}`
`32`	`31`	`*/`
`33`		`- public function __call($commandID, $arguments)`
	`32`	`+ public function __call($subcommandID, $arguments)`
`34`	`33`	`{`
`35`		`- array_unshift($arguments, strtoupper($commandID));`
	`34`	`+ array_unshift($arguments, strtoupper($subcommandID));`
`36`	`35`
`37`	`36`	`return $this->client->executeCommand(`
`38`		`- $this->client->createCommand($this->getContainerId(), $arguments)`
	`37`	`+ $this->client->createCommand($this->getContainerCommandId(), $arguments)`
`39`	`38`	`);`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`/**`
`43`	`42`	`* {@inheritDoc}`
`44`	`43`	`*/`
`45`		`- public function getContainerId(): string`
	`44`	`+ public function getContainerCommandId(): string`
`46`	`45`	`{`
`47`		`- return static::$containerId;`
	`46`	`+ return static::$containerCommandId;`
`48`	`47`	`}`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`*/`
`21`	`21`	`class FunctionContainer extends AbstractContainer`
`22`	`22`	`{`
`23`		`- protected static $containerId = 'function';`
	`23`	`+ protected static $containerCommandId = 'function';`
`24`	`24`	`}`