Resolve merge conflicts

vladvildanov · vladvildanov · commit c15996e0c37d · 2023-06-07T17:11:22.000+03:00
diff --git a/src/Client.php b/src/Client.php
@@ -346,29 +346,29 @@ public function createCommand($commandID, $arguments = [])
     }
 
     /**
-     * @param                     $name
+     * @param  string             $name
      * @return ContainerInterface
      */
-    public function __get($name)
+    public function __get(string $name)
     {
         return ContainerFactory::create($this, $name);
     }
 
     /**
-     * @param        $name
-     * @param        $value
+     * @param  string $name
+     * @param  mixed  $value
      * @return mixed
      */
-    public function __set($name, $value)
+    public function __set(string $name, $value)
     {
         throw new RuntimeException('Not allowed');
     }
 
     /**
-     * @param        $name
+     * @param  string $name
      * @return mixed
      */
-    public function __isset($name)
+    public function __isset(string $name)
     {
         throw new RuntimeException('Not allowed');
     }
diff --git a/src/Command/Redis/Container/AbstractContainer.php b/src/Command/Redis/Container/AbstractContainer.php
@@ -29,7 +29,7 @@ public function __construct(ClientInterface $client)
     /**
      * {@inheritDoc}
      */
-    public function __call($subcommandID, $arguments)
+    public function __call(string $subcommandID, array $arguments)
     {
         array_unshift($arguments, strtoupper($subcommandID));
 
diff --git a/src/Command/Redis/Container/ContainerInterface.php b/src/Command/Redis/Container/ContainerInterface.php
@@ -18,11 +18,11 @@ interface ContainerInterface
      * Creates Redis container command with subcommand as virtual method name
      * and sends a request to the server.
      *
-     * @param        $subcommandID
-     * @param        $arguments
+     * @param  string $subcommandID
+     * @param  array  $arguments
      * @return mixed
      */
-    public function __call($subcommandID, $arguments);
+    public function __call(string $subcommandID, array $arguments);
 
     /**
      * Returns containerCommandId of specific container command.
diff --git a/tests/PHPUnit/OneOfConstraint.php b/tests/PHPUnit/OneOfConstraint.php
@@ -44,7 +44,7 @@ protected function matches($other): bool
     }
 
     /**
-     * @param         $other
+     * @param  mixed  $other
      * @return string
      */
     protected function failureDescription($other): string

Original file line number	Diff line number	Diff line change
`@@ -346,29 +346,29 @@ public function createCommand($commandID, $arguments = [])`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`/**`
`349`		`- * @param $name`
	`349`	`+ * @param string $name`
`350`	`350`	`* @return ContainerInterface`
`351`	`351`	`*/`
`352`		`- public function __get($name)`
	`352`	`+ public function __get(string $name)`
`353`	`353`	`{`
`354`	`354`	`return ContainerFactory::create($this, $name);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`/**`
`358`		`- * @param $name`
`359`		`- * @param $value`
	`358`	`+ * @param string $name`
	`359`	`+ * @param mixed $value`
`360`	`360`	`* @return mixed`
`361`	`361`	`*/`
`362`		`- public function __set($name, $value)`
	`362`	`+ public function __set(string $name, $value)`
`363`	`363`	`{`
`364`	`364`	`throw new RuntimeException('Not allowed');`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`/**`
`368`		`- * @param $name`
	`368`	`+ * @param string $name`
`369`	`369`	`* @return mixed`
`370`	`370`	`*/`
`371`		`- public function __isset($name)`
	`371`	`+ public function __isset(string $name)`
`372`	`372`	`{`
`373`	`373`	`throw new RuntimeException('Not allowed');`
`374`	`374`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(ClientInterface $client)`
`29`	`29`	`/**`
`30`	`30`	`* {@inheritDoc}`
`31`	`31`	`*/`
`32`		`- public function __call($subcommandID, $arguments)`
	`32`	`+ public function __call(string $subcommandID, array $arguments)`
`33`	`33`	`{`
`34`	`34`	`array_unshift($arguments, strtoupper($subcommandID));`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ protected function matches($other): bool`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
`47`		`- * @param $other`
	`47`	`+ * @param mixed $other`
`48`	`48`	`* @return string`
`49`	`49`	`*/`
`50`	`50`	`protected function failureDescription($other): string`