codestyle and php 5.3 compatibility

FriendsOfSymfony1 · Mar 29, 2016 · f50e3a3 · f50e3a3
1 parent e474423
commit f50e3a3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/lib/Doctrine/Adapter/Statement/Oracle.php b/lib/Doctrine/Adapter/Statement/Oracle.php
@@ -187,7 +187,7 @@ public function bindParam($column, &$variable, $type = null, $length = null, $dr
     public function closeCursor()
     {
         $this->bindParams = array();
-        if(is_resource($this->statement)) {
+        if (is_resource($this->statement)) {
             return oci_free_statement($this->statement);
         }
         return true;

diff --git a/lib/Doctrine/Connection/Statement.php b/lib/Doctrine/Connection/Statement.php
@@ -64,8 +64,9 @@ public function __construct(Doctrine_Connection $conn, $stmt)
      *
      * make sure that the cursor is closed
      *
-     * */
-    public function __destruct() {
+     */
+    public function __destruct()
+    {
         $this->closeCursor();
     }
     /**
@@ -269,19 +270,17 @@ public function execute($params = null)
 
             $this->_conn->getListener()->postStmtExecute($event);
 
-        } catch (PDOException $e) {
-            $result = false;
-            $this->_conn->rethrowException($e, $this);
-        } catch (Doctrine_Adapter_Exception $e) {
-            $result = false;
-            $this->_conn->rethrowException($e, $this);
-        } finally {
-            //fix a possible "ORA-01000: maximum open cursors exceeded" when many non-SELECTs are executed
+            //fix a possible "ORA-01000: maximum open cursors exceeded" when many non-SELECTs are executed and the profiling is enabled
             if (strtoupper(substr($this->_stmt->queryString,0,6)) != 'SELECT' && strtoupper(substr($this->_stmt->queryString,0,4)) != 'WITH' ){
                 $this->closeCursor();
             }
             return $result;
+        } catch (PDOException $e) {
+        } catch (Doctrine_Adapter_Exception $e) {
         }
+
+        $this->_conn->rethrowException($e, $this);
+
         return false;
     }