[Filesystem] Fix usages of error_get_last()

nicolas-grekas · nicolas-grekas · commit ff4bb8f24a02 · 2018-05-11T10:06:09.000-07:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -126,7 +126,10 @@ public static function createConnection($dsn, array $options = array())
                     throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn));
                 }
 
-                if (@!$redis->isConnected()) {
+                set_error_handler('var_dump', 0);
+                $isConnected = @$redis->isConnected();
+                restore_error_handler();
+                if (!$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));
                 }
diff --git a/src/Symfony/Component/Lock/Store/FlockStore.php b/src/Symfony/Component/Lock/Store/FlockStore.php
@@ -78,14 +78,13 @@ private function lock(Key $key, $blocking)
         );
 
         // Silence error reporting
-        set_error_handler(function () {
-        });
-        if (!$handle = fopen($fileName, 'r')) {
-            if ($handle = fopen($fileName, 'x')) {
-                chmod($fileName, 0444);
-            } elseif (!$handle = fopen($fileName, 'r')) {
+        set_error_handler('var_dump', 0);
+        if (!$handle = @fopen($fileName, 'r')) {
+            if ($handle = @fopen($fileName, 'x')) {
+                @chmod($fileName, 0444);
+            } elseif (!$handle = @fopen($fileName, 'r')) {
                 usleep(100); // Give some time for chmod() to complete
-                $handle = fopen($fileName, 'r');
+                $handle = @fopen($fileName, 'r');
             }
         }
         restore_error_handler();

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,10 @@ 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()) {`
	`129`	`+ set_error_handler('var_dump', 0);`
	`130`	`+ $isConnected = @$redis->isConnected();`
	`131`	`+ restore_error_handler();`
	`132`	`+ if (!$isConnected) {`
`130`	`133`	`$e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';`
`131`	`134`	`throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $e, $dsn));`
`132`	`135`	`}`