Revert container command changes

vladvildanov · vladvildanov · commit ad4fa6771038 · 2023-04-05T10:13:12.000+03:00
diff --git a/src/Client.php b/src/Client.php
@@ -16,9 +16,9 @@
 use InvalidArgumentException;
 use IteratorAggregate;
 use Predis\Command\CommandInterface;
-use Predis\Command\Container\ContainerFactory;
-use Predis\Command\Container\ContainerInterface;
 use Predis\Command\RawCommand;
+use Predis\Command\Redis\Container\ContainerFactory;
+use Predis\Command\Redis\Container\ContainerInterface;
 use Predis\Command\ScriptCommand;
 use Predis\Configuration\Options;
 use Predis\Configuration\OptionsInterface;
diff --git a/src/ClientContextInterface.php b/src/ClientContextInterface.php
@@ -38,11 +38,11 @@
 use Predis\Command\Argument\TimeSeries\MRangeArguments;
 use Predis\Command\Argument\TimeSeries\RangeArguments;
 use Predis\Command\CommandInterface;
-use Predis\Command\Container\ACL;
-use Predis\Command\Container\FUNCTIONS;
-use Predis\Command\Container\Json\JSONDEBUG;
-use Predis\Command\Container\Search\FTCONFIG;
-use Predis\Command\Container\Search\FTCURSOR;
+use Predis\Command\Redis\Container\ACL;
+use Predis\Command\Redis\Container\FunctionContainer;
+use Predis\Command\Redis\Container\Json\JSONDEBUG;
+use Predis\Command\Redis\Container\Search\FTCONFIG;
+use Predis\Command\Redis\Container\Search\FTCURSOR;
 
 /**
  * Interface defining a client-side context such as a pipeline or transaction.
@@ -336,11 +336,11 @@
  * @method $this geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
  *
  * Container commands
- * @property FUNCTIONS $function
- * @property FTCONFIG  $ftconfig
- * @property FTCURSOR  $ftcursor
- * @property JSONDEBUG $jsondebug
- * @property ACL       $acl
+ * @property FunctionContainer $function
+ * @property FTCONFIG          $ftconfig
+ * @property FTCURSOR          $ftcursor
+ * @property JSONDEBUG         $jsondebug
+ * @property ACL               $acl
  */
 interface ClientContextInterface
 {
diff --git a/src/ClientInterface.php b/src/ClientInterface.php
@@ -38,12 +38,12 @@
 use Predis\Command\Argument\TimeSeries\MRangeArguments;
 use Predis\Command\Argument\TimeSeries\RangeArguments;
 use Predis\Command\CommandInterface;
-use Predis\Command\Container\ACL;
-use Predis\Command\Container\FUNCTIONS;
-use Predis\Command\Container\Json\JSONDEBUG;
-use Predis\Command\Container\Search\FTCONFIG;
-use Predis\Command\Container\Search\FTCURSOR;
 use Predis\Command\FactoryInterface;
+use Predis\Command\Redis\Container\ACL;
+use Predis\Command\Redis\Container\FunctionContainer;
+use Predis\Command\Redis\Container\Json\JSONDEBUG;
+use Predis\Command\Redis\Container\Search\FTCONFIG;
+use Predis\Command\Redis\Container\Search\FTCURSOR;
 use Predis\Configuration\OptionsInterface;
 use Predis\Connection\ConnectionInterface;
 use Predis\Response\Status;
@@ -354,11 +354,11 @@
  * @method int               geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
  *
  * Container commands
- * @property FUNCTIONS $function
- * @property FTCONFIG  $ftconfig
- * @property FTCURSOR  $ftcursor
- * @property JSONDEBUG $jsondebug
- * @property ACL       $acl
+ * @property FunctionContainer $function
+ * @property FTCONFIG          $ftconfig
+ * @property FTCURSOR          $ftcursor
+ * @property JSONDEBUG         $jsondebug
+ * @property ACL               $acl
  */
 interface ClientInterface
 {
diff --git a/src/Command/Redis/Container/ACL.php b/src/Command/Redis/Container/ACL.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container;
+namespace Predis\Command\Redis\Container;
 
 use Predis\Response\Status;
 
diff --git a/src/Command/Redis/Container/AbstractContainer.php b/src/Command/Redis/Container/AbstractContainer.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container;
+namespace Predis\Command\Redis\Container;
 
 use Predis\ClientInterface;
 
diff --git a/src/Command/Redis/Container/ContainerFactory.php b/src/Command/Redis/Container/ContainerFactory.php
@@ -10,23 +10,23 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container;
+namespace Predis\Command\Redis\Container;
 
 use Predis\ClientConfiguration;
 use Predis\ClientInterface;
 use UnexpectedValueException;
 
 class ContainerFactory
 {
-    private const CONTAINER_NAMESPACE = "Predis\Command\Container";
+    private const CONTAINER_NAMESPACE = "Predis\Command\Redis\Container";
 
     /**
      * Mappings for class names that corresponds to PHP reserved words.
      *
      * @var array
      */
     private static $specialMappings = [
-        'FUNCTION' => FUNCTIONS::class,
+        'FUNCTION' => FunctionContainer::class,
     ];
 
     /**
diff --git a/src/Command/Redis/Container/ContainerInterface.php b/src/Command/Redis/Container/ContainerInterface.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container;
+namespace Predis\Command\Redis\Container;
 
 interface ContainerInterface
 {
diff --git a/src/Command/Redis/Container/FunctionContainer.php b/src/Command/Redis/Container/FunctionContainer.php
@@ -10,15 +10,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container;
+namespace Predis\Command\Redis\Container;
 
 use Predis\Response\Status;
 
 /**
  * @method string load(string $functionCode, bool $replace = 'false')
  * @method Status delete(string $libraryName)
  */
-class FUNCTIONS extends AbstractContainer
+class FunctionContainer extends AbstractContainer
 {
     public function getContainerCommandId(): string
     {
diff --git a/src/Command/Redis/Container/Json/JSONDEBUG.php b/src/Command/Redis/Container/Json/JSONDEBUG.php
@@ -10,9 +10,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container\Json;
+namespace Predis\Command\Redis\Container\Json;
 
-use Predis\Command\Container\AbstractContainer;
+use Predis\Command\Redis\Container\AbstractContainer;
 
 /**
  * @method array memory(string $key, string $path)
diff --git a/src/Command/Redis/Container/Search/FTCONFIG.php b/src/Command/Redis/Container/Search/FTCONFIG.php
@@ -10,9 +10,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container\Search;
+namespace Predis\Command\Redis\Container\Search;
 
-use Predis\Command\Container\AbstractContainer;
+use Predis\Command\Redis\Container\AbstractContainer;
 use Predis\Response\Status;
 
 /**
diff --git a/src/Command/Redis/Container/Search/FTCURSOR.php b/src/Command/Redis/Container/Search/FTCURSOR.php
@@ -10,10 +10,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container\Search;
+namespace Predis\Command\Redis\Container\Search;
 
 use Predis\Command\Argument\Search\CursorArguments;
-use Predis\Command\Container\AbstractContainer;
+use Predis\Command\Redis\Container\AbstractContainer;
 use Predis\Response\Status;
 
 /**
diff --git a/tests/Predis/Command/Redis/Container/AbstractContainerTest.php b/tests/Predis/Command/Redis/Container/AbstractContainerTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container;
+namespace Predis\Command\Redis\Container;
 
 use PHPUnit\Framework\TestCase;
 use Predis\ClientInterface;
diff --git a/tests/Predis/Command/Redis/Container/ContainerFactoryTest.php b/tests/Predis/Command/Redis/Container/ContainerFactoryTest.php
@@ -10,12 +10,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command\Container;
+namespace Predis\Command\Redis\Container;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Predis\ClientInterface;
-use Predis\Command\Container\Search\FTCONFIG;
+use Predis\Command\Redis\Container\Search\FTCONFIG;
 use UnexpectedValueException;
 
 class ContainerFactoryTest extends TestCase
@@ -73,7 +73,7 @@ public function testThrowsExceptionOnNonExistingCommand(
     public function containerProvider(): array
     {
         return [
-            'core command' => ['function', FUNCTIONS::class],
+            'core command' => ['function', FunctionContainer::class],
             'module command' => ['ftconfig', FTCONFIG::class],
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* file that was distributed with this source code.`
`11`	`11`	`*/`
`12`	`12`
`13`		`-namespace Predis\Command\Container;`
	`13`	`+namespace Predis\Command\Redis\Container;`
`14`	`14`
`15`	`15`	`interface ContainerInterface`
`16`	`16`	`{`