#5796 replacing Exception catching with Throwable catching, removing PHP5 compliance code

lib/Doctrine/ORM/EntityManager.php

@@ -240,11 +240,6 @@ use Doctrine\Common\Util\ClassUtils;
             $this->close();
             $this->conn->rollBack();
 
-            throw $e;
-        } catch (\Exception $e) { // PHP 5
-            $this->close();
-            $this->conn->rollBack();
-
             throw $e;
         }
     }

lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php

@@ -134,10 +134,6 @@ class MultiTableDeleteExecutor extends AbstractSqlExecutor
             $conn->executeUpdate($this->_dropTempTableSql);
 
             // Re-throw exception
-            throw $exception;
-        } catch (\Exception $exception) { // PHP 5
-            $conn->executeUpdate($this->_dropTempTableSql);
-
             throw $exception;
         }
 

lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php

@@ -193,10 +193,6 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor
             $conn->executeUpdate($this->_dropTempTableSql);
 
             // Re-throw exception
-            throw $exception;
-        } catch (\Exception $exception) { // PHP 5
-            $conn->executeUpdate($this->_dropTempTableSql);
-
             throw $exception;
         }
 

lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php

@@ -75,10 +75,6 @@ EOT
         } catch (\Throwable $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
 
-            return 1;
-        } catch (\Exception $e) { // PHP 5
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
-
             return 1;
         }
 

lib/Doctrine/ORM/Tools/SchemaTool.php

@@ -745,9 +745,7 @@ class SchemaTool
             try {
                 $conn->executeQuery($sql);
             } catch (\Throwable $e) {
-
+                // ignored
-            } catch (\Exception $e) { // PHP 5
-
             }
         }
     }

lib/Doctrine/ORM/UnitOfWork.php

@@ -43,8 +43,6 @@ use Doctrine\ORM\Persisters\Entity\JoinedSubclassPersister;
 use Doctrine\ORM\Persisters\Entity\SingleTablePersister;
 use Doctrine\ORM\Proxy\Proxy;
 use Doctrine\ORM\Utility\IdentifierFlattener;
-use Exception;
-use Throwable;
 use InvalidArgumentException;
 use UnexpectedValueException;
 
@@ -418,13 +416,6 @@ class UnitOfWork implements PropertyChangedListener
 
             $this->afterTransactionRolledBack();
 
-            throw $e;
-        } catch (\Exception $e) { // PHP 5
-            $this->em->close();
-            $conn->rollBack();
-
-            $this->afterTransactionRolledBack();
-
             throw $e;
         }