Moved error detection into trait

Author: stevebauman

src/Connection.php

@@ -12,6 +12,8 @@
 
 class Connection
 {
+    use DetectsErrors;
+
     /**
      * The underlying LDAP connection.
      *
@@ -277,24 +279,12 @@ public function isConnected()
      */
     protected function tryAgainIfCausedByLostConnection(LdapRecordException $e, Closure $callback)
     {
-        if ($this->causedByLostConnection($e)) {
+        if ($this->causedByLostConnection($e->getMessage())) {
             $this->reconnect();
 
             return $this->runOperationCallback($callback);
         }
 
         throw $e;
     }
-
-    /**
-     * Determine if the given exception was caused by a lost connection.
-     *
-     * @param LdapRecordException $e
-     *
-     * @return bool
-     */
-    protected function causedByLostConnection(LdapRecordException $e)
-    {
-        return strpos($e->getMessage(), 'contact LDAP server') !== false;
-    }
 }

src/DetectsErrors.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace LdapRecord;
+
+trait DetectsErrors
+{
+    /**
+     * Determine if the error was caused by a lost connection.
+     *
+     * @param string $error
+     *
+     * @return bool
+     */
+    protected function causedByLostConnection($error)
+    {
+        return $this->errorContainsMessage($error, ["Can't contact LDAP server", 'Operations error']);
+    }
+
+    /**
+     * Determine if the error was caused by lack of pagination support.
+     *
+     * @param string $error
+     *
+     * @return bool
+     */
+    protected function causedByPaginationSupport($error)
+    {
+        return $this->errorContainsMessage($error, 'No server controls in result');
+    }
+
+    /**
+     * Determine if the error was caused by a size limit warning.
+     *
+     * @param $error
+     *
+     * @return bool
+     */
+    protected function causedBySizeLimit($error)
+    {
+        return $this->errorContainsMessage($error, ['Partial search results returned', 'Size limit exceeded']);
+    }
+
+    /**
+     * Determine if the error contains the any of the messages.
+     *
+     * @param string       $error
+     * @param string|array $messages
+     *
+     * @return bool
+     */
+    protected function errorContainsMessage($error, $messages = [])
+    {
+        foreach ((array) $messages as $message) {
+            if (strpos($error, $message) !== false) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

src/Ldap.php

@@ -6,6 +6,8 @@
 
 class Ldap
 {
+    use DetectsErrors;
+
     /**
      * The SSL LDAP protocol string.
      *
@@ -857,49 +859,6 @@ protected function shouldBypassError($error)
         return $this->causedByPaginationSupport($error) || $this->causedBySizeLimit($error);
     }
 
-    /**
-     * Determine if the error was caused by lack of pagination support.
-     *
-     * @param string $error
-     *
-     * @return bool
-     */
-    protected function causedByPaginationSupport($error)
-    {
-        return $this->errorContainsMessage($error, 'No server controls in result');
-    }
-
-    /**
-     * Determine if the error was caused by a size limit warning.
-     *
-     * @param $error
-     *
-     * @return bool
-     */
-    protected function causedBySizeLimit($error)
-    {
-        return $this->errorContainsMessage($error, ['Partial search results returned', 'Size limit exceeded']);
-    }
-
-    /**
-     * Determine if the given error contains the any of the messages.
-     *
-     * @param string       $error
-     * @param string|array $messages
-     *
-     * @return bool
-     */
-    protected function errorContainsMessage($error, $messages = [])
-    {
-        foreach ((array) $messages as $message) {
-            if (strpos($error, $message) !== false) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     /**
      * Generates an LDAP connection string for each host given.
      *

tests/ConnectionTest.php

@@ -215,7 +215,7 @@ public function test_ran_ldap_operations_are_retried_when_connection_is_lost()
             $called++;
 
             if ($called === 1) {
-                throw new \Exception('Cannot contact LDAP server');
+                throw new \Exception("Can't contact LDAP server");
             }
 
             return $called === 2;