From d0cd01eb25b726cb5b1973b06f3c0b106d0cf968 Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Thu, 20 Aug 2015 23:58:22 +0200 Subject: [PATCH] [TASK] Prettify Extbase Debugger Utility Releases: master Resolves: #69299 Change-Id: Ibee145703e1689ca804384b20b9af1b0b586b8d8 Reviewed-on: http://review.typo3.org/42790 Reviewed-by: Helmut Hummel Tested-by: Helmut Hummel Reviewed-by: Alexander Opitz Tested-by: Alexander Opitz --- .../Classes/Utility/DebuggerUtility.php | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php index 05cc91fba35b..e22585d31634 100644 --- a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php +++ b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php @@ -101,7 +101,7 @@ class DebuggerUtility { if ($plainText) { $dump = self::ansiEscapeWrap(('"' . implode((PHP_EOL . str_repeat(self::PLAINTEXT_INDENT, ($level + 1))), str_split($croppedValue, 76)) . '"'), '33', $ansiColors) . ' (' . strlen($value) . ' chars)'; } else { - $dump = sprintf('\'%s\' (%s chars)', implode('
' . str_repeat(self::HTML_INDENT, ($level + 1)), str_split(htmlspecialchars($croppedValue), 76)), strlen($value)); + $dump = sprintf('\'%s\' (%s chars)', implode('
' . str_repeat(self::HTML_INDENT, ($level + 1)), str_split(htmlspecialchars($croppedValue), 76)), strlen($value)); } } elseif (is_numeric($value)) { $dump = sprintf('%s (%s)', self::ansiEscapeWrap($value, '35', $ansiColors), gettype($value)); @@ -133,23 +133,23 @@ class DebuggerUtility { if ($plainText) { $header = self::ansiEscapeWrap('array', '36', $ansiColors); } else { - $header = 'array'; + $header = 'array'; } $header .= $count > 0 ? '(' . $count . ' item' . ($count > 1 ? 's' : '') . ')' : '(empty)'; if ($level >= self::$maxDepth) { if ($plainText) { $header .= ' ' . self::ansiEscapeWrap('max depth', '47;30', $ansiColors); } else { - $header .= 'max depth'; + $header .= 'max depth'; } } else { $content = self::renderCollection($array, $level, $plainText, $ansiColors); if (!$plainText) { - $header = ($level > 1 && $count > 0 ? '' : '') . $header . ''; + $header = ($level > 1 && $count > 0 ? '' : '') . $header . ''; } } if ($level > 1 && $count > 0 && !$plainText) { - $dump = '' . $header . '' . $content . ''; + $dump = '' . $header . '' . $content . ''; } else { $dump = $header . $content; } @@ -178,7 +178,7 @@ class DebuggerUtility { if ($plainText) { return $header . $content; } else { - return '' . $header . '' . $content . ''; + return '' . $header . '' . $content . ''; } } @@ -225,7 +225,7 @@ class DebuggerUtility { if ($plainText) { $dump .= self::ansiEscapeWrap($className, '36', $ansiColors); } else { - $dump .= '' . $className . ''; + $dump .= '' . $className . ''; } if ($object instanceof \TYPO3\CMS\Core\SingletonInterface) { $scope = 'singleton'; @@ -235,7 +235,7 @@ class DebuggerUtility { if ($plainText) { $dump .= ' ' . self::ansiEscapeWrap($scope, '44;37', $ansiColors); } else { - $dump .= $scope ? '' . $scope . '' : ''; + $dump .= $scope ? '' . $scope . '' : ''; } if ($object instanceof \TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject) { if ($object->_isDirty()) { @@ -259,27 +259,27 @@ class DebuggerUtility { if ($plainText) { $dump .= ' ' . self::ansiEscapeWrap(($persistenceType . ' ' . $domainObjectType), '42;30', $ansiColors); } else { - $dump .= '' . ($persistenceType ? $persistenceType . ' ' : '') . $domainObjectType . ''; + $dump .= '' . ($persistenceType ? $persistenceType . ' ' : '') . $domainObjectType . ''; } if (strpos(implode('|', self::$blacklistedClassNames), get_class($object)) > 0) { if ($plainText) { $dump .= ' ' . self::ansiEscapeWrap('filtered', '47;30', $ansiColors); } else { - $dump .= 'filtered'; + $dump .= 'filtered'; } } elseif (self::$renderedObjects->contains($object) && !$plainText) { - $dump = '' . $dump . 'see above'; + $dump = '' . $dump . 'see above'; } elseif ($level >= self::$maxDepth && !$object instanceof \DateTime) { if ($plainText) { $dump .= ' ' . self::ansiEscapeWrap('max depth', '47;30', $ansiColors); } else { - $dump .= 'max depth'; + $dump .= 'max depth'; } } elseif ($level > 1 && !$object instanceof \DateTime && !$plainText) { if (($object instanceof \Countable && empty($object)) || empty($classReflection->getProperties())) { $dump = '' . $dump . ''; } else { - $dump = '' . $dump . ''; + $dump = '' . $dump . ''; } } if ($object instanceof \Countable) { @@ -322,14 +322,14 @@ class DebuggerUtility { if (self::isBlacklisted($property)) { continue; } - $dump .= PHP_EOL . str_repeat(self::PLAINTEXT_INDENT, $level) . ($plainText ? '' : '') . self::ansiEscapeWrap($property->getName(), '37', $ansiColors) . ($plainText ? '' : '') . ' => '; + $dump .= PHP_EOL . str_repeat(self::PLAINTEXT_INDENT, $level) . ($plainText ? '' : '') . self::ansiEscapeWrap($property->getName(), '37', $ansiColors) . ($plainText ? '' : '') . ' => '; $property->setAccessible(TRUE); $dump .= self::renderDump($property->getValue($object), $level, $plainText, $ansiColors); if ($object instanceof \TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject && !$object->_isNew() && $object->_isDirty($property->getName())) { if ($plainText) { $dump .= ' ' . self::ansiEscapeWrap('modified', '43;30', $ansiColors); } else { - $dump .= 'modified'; + $dump .= 'modified'; } } } @@ -347,7 +347,7 @@ class DebuggerUtility { static protected function renderCollection($collection, $level, $plainText, $ansiColors) { $dump = ''; foreach ($collection as $key => $value) { - $dump .= PHP_EOL . str_repeat(self::PLAINTEXT_INDENT, $level) . ($plainText ? '' : '') . self::ansiEscapeWrap($key, '37', $ansiColors) . ($plainText ? '' : '') . ' => '; + $dump .= PHP_EOL . str_repeat(self::PLAINTEXT_INDENT, $level) . ($plainText ? '' : '') . self::ansiEscapeWrap($key, '37', $ansiColors) . ($plainText ? '' : '') . ' => '; $dump .= self::renderDump($value, $level, $plainText, $ansiColors); } if ($collection instanceof \Iterator) { @@ -405,28 +405,28 @@ class DebuggerUtility { if (!$plainText && self::$stylesheetEchoed === FALSE) { echo ' '; self::$stylesheetEchoed = TRUE; } @@ -434,9 +434,9 @@ class DebuggerUtility { $output = $title . PHP_EOL . self::renderDump($variable, 0, TRUE, $ansiColors) . PHP_EOL . PHP_EOL; } else { $output = ' -
-
' . htmlspecialchars($title) . '
-
+
+
' . htmlspecialchars($title) . '
+ 
' . self::renderDump($variable, 0, FALSE, FALSE) . '
-- 2.20.1