[TASK] Make code PHP 5.3 compatible again for now 82/33682/2
authorHelmut Hummel <helmut.hummel@typo3.org>
Sat, 1 Nov 2014 10:25:50 +0000 (11:25 +0100)
committerHelmut Hummel <helmut.hummel@typo3.org>
Sat, 1 Nov 2014 10:37:44 +0000 (11:37 +0100)
The content exception handler change introduced PHP 5.5 only
code parts. Revert these parts until we have a final
decision when to introduce PHP 5.5 only code in master

Releases: master
Change-Id: I16c818a686e1a99a5084ce8f8dcddef0cc930929
Reviewed-on: http://review.typo3.org/33682
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
typo3/sysext/frontend/Classes/ContentObject/Exception/ProductionExceptionHandler.php

index 7b04949..1c4bf91 100644 (file)
@@ -814,7 +814,7 @@ class ContentObjectRenderer {
                }
 
                if ($exceptionHandlerClassName === '1') {
-                       $exceptionHandlerClassName = Exception\ProductionExceptionHandler::class;
+                       $exceptionHandlerClassName = 'TYPO3\\CMS\\Frontend\\ContentObject\\Exception\\ProductionExceptionHandler';
                }
 
                return $exceptionHandlerClassName;
index fa145d5..39cc136 100644 (file)
@@ -74,6 +74,6 @@ class ProductionExceptionHandler implements ExceptionHandlerInterface {
         * @return LoggerInterface
         */
        protected function getLogger() {
-               return GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
+               return GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
        }
 }
\ No newline at end of file