[TASK] Remove obsolete require statements from ErrorHandler 59/40759/2
authorBenjamin Mack <benni@typo3.org>
Tue, 30 Jun 2015 09:26:38 +0000 (11:26 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 30 Jun 2015 21:55:49 +0000 (23:55 +0200)
As the autoloader is now always present through the bootstrap
and Composer class loader, the fallback of manually
requiring classes can be removed.

Resolves: #36061
Releases: master
Change-Id: I299232630a0390688bd683b64e5d31c422baa444
Reviewed-on: http://review.typo3.org/40759
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Frederic Gaus <frederic.gaus@flagbit.de>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/core/Classes/Error/ErrorHandler.php

index 3827ca3..d98b1e4 100644 (file)
@@ -92,13 +92,6 @@ class ErrorHandler implements ErrorHandlerInterface {
                                        'line ' . $errorLine;
                                die($message);
                        }
-                       // We need to manually require the exception classes in case
-                       // the autoloader is not available at this point yet.
-                       // @see http://forge.typo3.org/issues/23444
-                       if (!class_exists(\TYPO3\CMS\Core\Error\Exception::class, FALSE)) {
-                               require_once PATH_site . 'typo3/sysext/core/Classes/Exception.php';
-                               require_once PATH_site . 'typo3/sysext/core/Classes/Error/Exception.php';
-                       }
                        throw new Exception($message, 1);
                } else {
                        switch ($errorLevel) {