From a29211a9ee79a687aa1ecc691e9d91b76271c11c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 1 Sep 2010 09:08:23 +0200 Subject: [PATCH] [FrameworkBundle] removed usage of array access for helpers in templates --- .../FrameworkBundle/Resources/views/Exception/exception.php | 4 ++-- .../FrameworkBundle/Resources/views/Exception/layout.php | 2 +- .../FrameworkBundle/Resources/views/Exception/trace.php | 6 +++--- .../FrameworkBundle/Resources/views/Exception/trace.txt.php | 2 +- .../FrameworkBundle/Resources/views/Exception/traces.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.php index ed98239920..f114c10995 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.php @@ -8,7 +8,7 @@
-

formatFileFromText(str_replace("\n", '
', htmlspecialchars($exception->getMessage(), ENT_QUOTES, $view->getCharset()))) ?>

+

get('code')->formatFileFromText(str_replace("\n", '
', htmlspecialchars($exception->getMessage(), ENT_QUOTES, $view->getCharset()))) ?>

getStatusCode() ?> getStatusText() ?> - getClass() ?>

getPreviouses())): ?> @@ -16,7 +16,7 @@ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.php index 5de199732f..1af24063e8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.php @@ -29,7 +29,7 @@
- get('_content') ?> + get('slots')->get('_content') ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.php index 8eba45f84e..365646eb42 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.php @@ -1,10 +1,10 @@ - at (formatArgs($trace['args']) ?>)
+ at (get('code')->formatArgs($trace['args']) ?>)
- in formatFile($trace['file'], $trace['line']) ?> + in get('code')->formatFile($trace['file'], $trace['line']) ?> »
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.txt.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.txt.php index 6a047d0920..fd96e428d6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.txt.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/trace.txt.php @@ -1,5 +1,5 @@ - at (formatArgsAsText($trace['args']) ?>) + at (get('code')->formatArgsAsText($trace['args']) ?>) at n/a diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.php index 8abcbfde82..0d9156819a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.php @@ -2,7 +2,7 @@ 0): ?>

/ - abbrClass($exception->getClass()) ?>: ', htmlspecialchars($exception->getMessage(), ENT_QUOTES, $view->getCharset())) ?> + get('code')->abbrClass($exception->getClass()) ?>: ', htmlspecialchars($exception->getMessage(), ENT_QUOTES, $view->getCharset())) ?> »