[Cache][Lock] Fix usages of error_get_last()

nicolas-grekas · nicolas-grekas · commit 7904784a94b2 · 2018-05-11T10:42:54.000-07:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -126,9 +126,12 @@ public static function createConnection($dsn, array $options = array())
                     throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn));
                 }
 
-                if (@!$redis->isConnected()) {
-                    $e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';
-                    throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $e, $dsn));
+                set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
+                $isConnected = $redis->isConnected();
+                restore_error_handler();
+                if (!$isConnected) {
+                    $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : '';
+                    throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $error, $dsn));
                 }
 
                 if ((null !== $auth && !$redis->auth($auth))
diff --git a/src/Symfony/Component/Lock/Store/FlockStore.php b/src/Symfony/Component/Lock/Store/FlockStore.php
@@ -78,8 +78,7 @@ private function lock(Key $key, $blocking)
         );
 
         // Silence error reporting
-        set_error_handler(function () {
-        });
+        set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
         if (!$handle = fopen($fileName, 'r')) {
             if ($handle = fopen($fileName, 'x')) {
                 chmod($fileName, 0444);
@@ -91,8 +90,7 @@ private function lock(Key $key, $blocking)
         restore_error_handler();
 
         if (!$handle) {
-            $error = error_get_last();
-            throw new LockStorageException($error['message'], 0, null);
+            throw new LockStorageException($error, 0, null);
         }
 
         // On Windows, even if PHP doc says the contrary, LOCK_NB works, see

Original file line number	Diff line number	Diff line change
`@@ -126,9 +126,12 @@ public static function createConnection($dsn, array $options = array())`
`126`	`126`	`throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn));`
`127`	`127`	`}`
`128`	`128`
`129`		`- if (@!$redis->isConnected()) {`
`130`		`- $e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';`
`131`		`- throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $e, $dsn));`
	`129`	`+ set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });`
	`130`	`+ $isConnected = $redis->isConnected();`
	`131`	`+ restore_error_handler();`
	`132`	`+ if (!$isConnected) {`
	`133`	`+ $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : '';`
	`134`	`+ throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $error, $dsn));`
`132`	`135`	`}`
`133`	`136`
`134`	`137`	`if ((null !== $auth && !$redis->auth($auth))`