Merge branch '2.3' into 2.5

* 2.3: enforce memcached version to be 2.1.0 [FrameworkBundle] improve server:run feedback [Form] no need to add the url listener when it does not do anything [Form] Fix #11694 - Enforce options value type check in some form types Lithuanian security translations [Router] Cleanup [FrameworkBundle] Fixed ide links Add missing argument [TwigBundle] do not pass a template reference to twig [TwigBundle] show correct fallback exception template in debug mode [TwigBundle] remove unused email placeholder from error page use meta charset in layouts without legacy http-equiv Conflicts: src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig
use meta charset in layouts without legacy http-equiv
2026-03-25 09:42:20 +01:00 · 2014-10-24 07:49:22 +02:00 · 2014-10-09 18:42:17 +02:00 · 2014-10-01 07:50:18 +02:00 · 2014-10-01 07:38:33 +02:00
2 changed files with 16 additions and 12 deletions
--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -321,7 +321,7 @@ EOF;
 <!DOCTYPE html>
 <html>
    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta charset="UTF-8" />
        <meta name="robots" content="noindex,nofollow" />
        <style>
            /* Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html */
--- a/README.md
+++ b/README.md
@@ -6,23 +6,27 @@ Debug provides tools to make debugging easier.
 Enabling all debug tools is as easy as calling the `enable()` method on the
 main `Debug` class:

-    use Symfony\Component\Debug\Debug;
+```php
+use Symfony\Component\Debug\Debug;

-    Debug::enable();
+Debug::enable();
+```

 You can also use the tools individually:

-    use Symfony\Component\Debug\ErrorHandler;
-    use Symfony\Component\Debug\ExceptionHandler;
+```php
+use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\Debug\ExceptionHandler;

-    error_reporting(-1);
+error_reporting(-1);

-    ErrorHandler::register($errorReportingLevel);
-    if ('cli' !== php_sapi_name()) {
-        ExceptionHandler::register();
-    } elseif (!ini_get('log_errors') || ini_get('error_log')) {
-        ini_set('display_errors', 1);
-    }
+ErrorHandler::register($errorReportingLevel);
+if ('cli' !== php_sapi_name()) {
+    ExceptionHandler::register();
+} elseif (!ini_get('log_errors') || ini_get('error_log')) {
+    ini_set('display_errors', 1);
+}
+```

 Note that the `Debug::enable()` call also registers the debug class loader
 from the Symfony ClassLoader component when available.
Author	SHA1	Message	Date
Fabien Potencier	2538d5099b	Merge branch '2.3' into 2.5 * 2.3: enforce memcached version to be 2.1.0 [FrameworkBundle] improve server:run feedback [Form] no need to add the url listener when it does not do anything [Form] Fix #11694 - Enforce options value type check in some form types Lithuanian security translations [Router] Cleanup [FrameworkBundle] Fixed ide links Add missing argument [TwigBundle] do not pass a template reference to twig [TwigBundle] show correct fallback exception template in debug mode [TwigBundle] remove unused email placeholder from error page use meta charset in layouts without legacy http-equiv Conflicts: src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig	2014-10-24 07:49:22 +02:00
Tobias Schultze	883f847ad1	use meta charset in layouts without legacy http-equiv	2014-10-09 18:42:17 +02:00
Fabien Potencier	4350e0b15b	Merge branch '2.3' into 2.5 * 2.3: [Doc] Use Markdown syntax highlighting [Finder] tweaked docs [Finder] Add info about possibilities offered by SplFileInfo fix components tests [Intl] FIxed failing test [Intl] Generated the data for ICU version 54-rc [EventDispatcher] fix doc bloc on EventDispatcherInterface [Validator] Update validators.zh_CN.xlf, fix translation error bumped Symfony version to 2.3.21 updated VERSION for 2.3.20 update CONTRIBUTORS for 2.3.20 updated CHANGELOG for 2.3.20 [Intl] Integrated ICU data into Intl component Conflicts: src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php	2014-10-01 07:50:18 +02:00
Laurent Ghirardotti	9760bae845	[Doc] Use Markdown syntax highlighting	2014-10-01 07:38:33 +02:00