Added private method to capture errors and convert to exceptions

scoutapp · Dec 16, 2019 · 423c047 · 423c047
1 parent 64e31cf
commit 423c047
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/src/Connector/SocketConnector.php b/src/Connector/SocketConnector.php
@@ -54,6 +54,27 @@ public function __construct(string $socketPath)
         }
     }
 
+    /** @return mixed */
+    private function convertErrorsToExceptions(callable $functionToRun)
+    {
+        // phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.IncorrectReturnTypeHint
+        set_error_handler(
+            static function (int $severity, string $message, string $file = '', int $line = 0, array $context = []) : bool {
+                throw new ErrorException($message, 0, $severity, $file, $line);
+            },
+            E_STRICT | E_NOTICE | E_WARNING
+        );
+        // phpcs:enable
+
+        try {
+            $returnValue = $functionToRun();
+        } finally {
+            restore_error_handler();
+        }
+
+        return $returnValue;
+    }
+
     public function connect() : void
     {
         if ($this->connected()) {
@@ -63,22 +84,14 @@ public function connect() : void
         try {
             socket_clear_error($this->socket);
 
-            // phpcs:disable SlevomatCodingStandard.TypeHints.TypeHintDeclaration.IncorrectReturnTypeHint
-            set_error_handler(
-                static function (int $severity, string $message, string $file = '', int $line = 0, array $context = []) : bool {
-                    throw new ErrorException($message, 0, $severity, $file, $line);
-                },
-                E_STRICT | E_NOTICE | E_WARNING
-            );
-            // phpcs:enable
+            $this->connected = $this->convertErrorsToExceptions(function () {
+                return socket_connect($this->socket, $this->socketPath);
+            });
 
-            $this->connected = socket_connect($this->socket, $this->socketPath);
             register_shutdown_function([&$this, 'shutdown']);
         } catch (Throwable $e) {
             $this->connected = false;
             throw FailedToConnect::fromSocketPathAndPrevious($this->socketPath, $e);
-        } finally {
-            restore_error_handler();
         }
     }