use meta charset in layouts without legacy http-equiv

[Doc] Use Markdown syntax highlighting
fixed CS
2026-03-25 01:32:09 +01:00 · 2014-10-09 18:42:17 +02:00 · 2014-10-01 07:38:33 +02:00 · 2014-09-22 10:32:35 +02:00 · 2014-07-07 12:13:42 +02:00 · 2014-07-07 11:57:21 +02:00
5 changed files with 34 additions and 33 deletions
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -125,6 +125,9 @@ class ErrorHandler
            if (!class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
                require __DIR__.'/Exception/ContextErrorException.php';
            }
+            if (!class_exists('Symfony\Component\Debug\Exception\FlattenException')) {
+                require __DIR__.'/Exception/FlattenException.php';
+            }

            if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && is_array($context)) {
                unset($context['GLOBALS']);
--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -257,7 +257,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.
--- a/Tests/Exception/FlattenExceptionTest.php
+++ b/Tests/Exception/FlattenExceptionTest.php
@@ -114,7 +114,6 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
        $this->assertEquals($exception->getMessage(), $flattened->getMessage(), 'The message is copied from the original exception.');
        $this->assertEquals($exception->getCode(), $flattened->getCode(), 'The code is copied from the original exception.');
        $this->assertInstanceOf($flattened->getClass(), $exception, 'The class is set to the class of the original exception');
-
    }

    /**
@@ -160,13 +159,13 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase

        $this->assertEquals(array(
            array(
-                'message'=> 'test',
-                'class'=>'Exception',
-                'trace'=>array(array(
+                'message' => 'test',
+                'class' => 'Exception',
+                'trace' => array(array(
                    'namespace'   => '', 'short_class' => '', 'class' => '','type' => '','function' => '', 'file' => 'foo.php', 'line' => 123,
-                    'args'        => array()
+                    'args'        => array(),
                )),
-            )
+            ),
        ), $flattened->toArray());
    }

@@ -202,7 +201,7 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
                    'line' => 123,
                    'function' => 'test',
                    'args' => array(
-                        unserialize('O:14:"BogusTestClass":0:{}')
+                        unserialize('O:14:"BogusTestClass":0:{}'),
                    ),
                ),
            ),
@@ -211,9 +210,9 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase

        $this->assertEquals(array(
            array(
-                'message'=> 'test',
-                'class'=>'Exception',
-                'trace'=>array(
+                'message' => 'test',
+                'class' => 'Exception',
+                'trace' => array(
                    array(
                        'namespace'   => '', 'short_class' => '', 'class' => '','type' => '','function' => '',
                        'file'        => 'foo.php', 'line' => 123,
@@ -224,12 +223,12 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
                        'file'        => __FILE__, 'line' => 123,
                        'args'        => array(
                            array(
-                                'incomplete-object', 'BogusTestClass'
+                                'incomplete-object', 'BogusTestClass',
                            ),
                        ),
-                    )
+                    ),
                ),
-            )
+            ),
        ), $flattened->toArray());
    }
 }
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
         bootstrap="vendor/autoload.php"
 >
    <testsuites>
Author	SHA1	Message	Date
Tobias Schultze	883f847ad1	use meta charset in layouts without legacy http-equiv	2014-10-09 18:42:17 +02:00
Laurent Ghirardotti	9760bae845	[Doc] Use Markdown syntax highlighting	2014-10-01 07:38:33 +02:00
Fabien Potencier	993f4c9cfc	fixed CS	2014-09-22 10:32:35 +02:00
Christian Raue	91e3a1480c	removed defaults from PHPUnit configuration	2014-07-07 12:13:42 +02:00
Christian Raue	732b41060b	added XSD to PHPUnit configuration	2014-07-07 11:57:21 +02:00
Nicolas Grekas	ca764f8af9	[Debug] fix #10313 : FlattenException not found because of https://bugs.php.net/42098	2014-04-29 21:42:43 +02:00