Fix CS.

cakephp · Nov 25, 2017 · bea2b90 · bea2b90
1 parent 5a76d37
commit bea2b90
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -223,7 +223,7 @@ public function connect()
     {
         try {
             return $this->_driver->connect();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             throw new MissingConnectionException(['reason' => $e->getMessage()]);
         }
     }
@@ -679,7 +679,7 @@ public function transactional(callable $callback)
 
         try {
             $result = $callback($this);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->rollback(false);
             throw $e;
         }
@@ -727,7 +727,7 @@ public function disableConstraints(callable $callback)
 
         try {
             $result = $callback($this);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->enableForeignKeys();
             throw $e;
         }

diff --git a/src/Database/Driver/PDODriverTrait.php b/src/Database/Driver/PDODriverTrait.php
@@ -17,6 +17,7 @@
 use Cake\Database\Query;
 use Cake\Database\Statement\PDOStatement;
 use PDO;
+use PDOException;
 
 /**
  * PDO driver trait
@@ -90,7 +91,7 @@ public function isConnected()
         } else {
             try {
                 $connected = $this->_connection->query('SELECT 1');
-            } catch (\PDOException $e) {
+            } catch (PDOException $e) {
                 $connected = false;
             }
         }

diff --git a/src/Shell/CacheShell.php b/src/Shell/CacheShell.php
@@ -18,6 +18,7 @@
 use Cake\Cache\Engine\ApcEngine;
 use Cake\Cache\Engine\WincacheEngine;
 use Cake\Console\Shell;
+use InvalidArgumentException;
 
 /**
  * Cache Shell.
@@ -84,7 +85,7 @@ public function clear($prefix = null)
             } else {
                 $this->out("<success>Cleared $prefix cache</success>");
             }
-        } catch (\InvalidArgumentException $e) {
+        } catch (InvalidArgumentException $e) {
             $this->abort($e->getMessage());
         }
     }

diff --git a/src/TestSuite/IntegrationTestCase.php b/src/TestSuite/IntegrationTestCase.php
@@ -32,6 +32,7 @@ class_alias('PHPUnit_Exception', 'PHPUnit\Exception');
 use Cake\View\Helper\SecureFieldTokenTrait;
 use Exception;
 use LogicException;
+use PHPUnit\Exception as PhpunitException;
 
 /**
  * A test case class intended to make integration tests of
@@ -487,7 +488,7 @@ protected function _sendRequest($url, $method, $data = [])
                 $this->_requestSession->write('Flash', $this->_flashMessages);
             }
             $this->_response = $response;
-        } catch (\PHPUnit\Exception $e) {
+        } catch (PhpUnitException $e) {
             throw $e;
         } catch (DatabaseException $e) {
             throw $e;