Unwrap exceptions

closes #28
daryl-software · Nov 21, 2015 · aac7c06 · aac7c06
1 parent bf647c1
commit aac7c06
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -13,9 +13,15 @@
         }
     },
     "require": {
-        "doctrine/dbal": "~2.5"
+        "doctrine/dbal": "dev-avoid-over-nesting-exceptions"
     },
     "require-dev": {
         "behat/behat": "~3.0"
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/mathroc/dbal"
+        }
+    ]
 }
diff --git a/features/bootstrap/MySQLContext.php b/features/bootstrap/MySQLContext.php
@@ -73,12 +73,7 @@ private function retryStrategy($n)
 
     private function errorCode($exception)
     {
-        while ($exception !== null) {
-            if ($exception instanceof \Doctrine\DBAL\Exception\DriverException) {
-                return $exception->getErrorCode();
-            }
-            $exception = $exception->getPrevious();
-        }
+        return $exception->getErrorCode();
     }
 
     private function retryDriverClass()

diff --git a/features/bootstrap/PostgreSQLContext.php b/features/bootstrap/PostgreSQLContext.php
@@ -65,14 +65,8 @@ private function retryStrategy($n)
 
     private function errorCode($exception)
     {
-        while ($exception !== null) {
-            if ($exception instanceof DriverException) {
-                preg_match("/SQLSTATE\[(?<errorCode>[A-Z0-9]*)\]/", $exception->getMessage(), $matches);
-                if (array_key_exists("errorCode", $matches)) {
-                    return $matches["errorCode"];
-                }
-            }
-            $exception = $exception->getPrevious();
+        if(preg_match("/SQLSTATE\[(?<errorCode>[A-Z0-9]*)\]/", $exception->getMessage(), $matches)) {
+            return $matches["errorCode"];
         }
     }
 

diff --git a/src/RetryStrategy/MysqlRetryStrategy.php b/src/RetryStrategy/MysqlRetryStrategy.php
@@ -33,11 +33,6 @@ private function errorCodeStrategies() {
 
     private function errorCode(DBALException $exception)
     {
-        while ($exception !== null) {
-            if ($exception instanceof DriverException) {
-                return $exception->getErrorCode();
-            }
-            $exception = $exception->getPrevious();
-        }
+        return $exception->getErrorCode();
     }
 }
diff --git a/src/RetryStrategy/PostgreSQLRetryStrategy.php b/src/RetryStrategy/PostgreSQLRetryStrategy.php
@@ -21,14 +21,8 @@ private function errorCodeStrategies() {
 
     private function errorCode(DBALException $exception)
     {
-        while ($exception !== null) {
-            if ($exception instanceof DriverException) {
-                preg_match("/SQLSTATE\[(?<errorCode>[A-Z0-9]*)\]/", $exception->getMessage(), $matches);
-                if (array_key_exists("errorCode", $matches)) {
-                    return $matches["errorCode"];
-                }
-            }
-            $exception = $exception->getPrevious();
+        if (preg_match("/SQLSTATE\[(?<errorCode>[A-Z0-9]*)\]/", $exception->getMessage(), $matches)) {
+            return $matches["errorCode"];
         }
     }
 }