Fix E_STRICT error messages.

predis · Dec 11, 2011 · 4e0c09a · 4e0c09a
1 parent 71aad42
commit 4e0c09a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/lib/Predis/Commands/PrefixHelpers.php b/lib/Predis/Commands/PrefixHelpers.php
@@ -24,7 +24,7 @@ class PrefixHelpers
      * @param ICommand $command Command instance.
      * @param string $prefix Prefix string.
      */
-    public function first(ICommand $command, $prefix)
+    public static function first(ICommand $command, $prefix)
     {
         if ($arguments = $command->getArguments()) {
             $arguments[0] = "$prefix{$arguments[0]}";

diff --git a/tests/PHPUnit/ArrayHasSameValuesConstraint.php b/tests/PHPUnit/ArrayHasSameValuesConstraint.php
@@ -30,13 +30,15 @@ public function __construct($array)
     /**
      * {@inheritdoc}
      */
-    public function evaluate($other)
+    public function evaluate($other, $description = '', $returnResult = FALSE)
     {
+        $description = $description ?: 'Failed asserting that two arrays have the same elements.';
+
         if (count($this->array) !== count($other)) {
-            throw new PHPUnit_Framework_ExpectationFailedException('Failed asserting that two arrays have the same elements.');
+            throw new PHPUnit_Framework_ExpectationFailedException($description);
         }
         if (array_diff($this->array, $other)) {
-            throw new PHPUnit_Framework_ExpectationFailedException('Failed asserting that two arrays have the same elements.');
+            throw new PHPUnit_Framework_ExpectationFailedException($description);
         }
 
         return true;

diff --git a/tests/Predis/Commands/ServerSlowlogTest.php b/tests/Predis/Commands/ServerSlowlogTest.php
@@ -79,7 +79,8 @@ public function testReturnsAnArrayOfLoggedCommands()
     {
         $redis = $this->getClient();
 
-        $threshold = array_pop($redis->config('get', 'slowlog-log-slower-than'));
+        $config = $redis->config('get', 'slowlog-log-slower-than');
+        $threshold = array_pop($config);
 
         $redis->config('set', 'slowlog-log-slower-than', 0);
         $redis->set('foo', 'bar');