Merge branch '2.3' into 2.4

* 2.3: bumped Symfony version to 2.3.18 updated VERSION for 2.3.17 update CONTRIBUTORS for 2.3.17 updated CHANGELOG for 2.3.17 added XSD to PHPUnit configuration bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest [Translation] Added unescaping of ids in PoFileLoader updated italian translation for validation messages [DomCrawler] Fix docblocks and formatting. [DomCrawler] Remove the query string and the anchor of the uri of a link Simplified the Travis test command [Console] Make sure formatter is the same Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
added XSD to PHPUnit configuration
2026-03-24 17:22:11 +01:00 · 2014-07-08 13:46:35 +02:00 · 2014-07-07 11:57:21 +02:00 · 2014-07-01 08:40:32 +02:00 · 2014-06-26 10:33:01 +02:00
2 changed files with 8 additions and 4 deletions
--- a/ClassMapGenerator.php
+++ b/ClassMapGenerator.php
@@ -11,6 +11,10 @@

 namespace Symfony\Component\ClassLoader;

+if (!defined('T_TRAIT')) {
+    define('T_TRAIT', 0);
+}
+
 /**
 * ClassMapGenerator
 *
@@ -84,7 +88,6 @@ class ClassMapGenerator
    {
        $contents = file_get_contents($path);
        $tokens   = token_get_all($contents);
-        $T_TRAIT  = version_compare(PHP_VERSION, '5.4', '<') ? -1 : T_TRAIT;

        $classes = array();

@@ -111,7 +114,7 @@ class ClassMapGenerator
                    break;
                case T_CLASS:
                case T_INTERFACE:
-                case $T_TRAIT:
+                case T_TRAIT:
                    // Find the classname
                    while (($t = $tokens[++$i]) && is_array($t)) {
                        if (T_STRING === $t[0]) {
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
         backupStaticAttributes="false"
         colors="true"
         convertErrorsToExceptions="true"
@@ -8,7 +10,6 @@
         convertWarningsToExceptions="true"
         processIsolation="false"
         stopOnFailure="false"
-         syntaxCheck="false"
         bootstrap="vendor/autoload.php"
 >
    <testsuites>
Author	SHA1	Message	Date
Fabien Potencier	fea82e505d	Merge branch '2.3' into 2.4 * 2.3: bumped Symfony version to 2.3.18 updated VERSION for 2.3.17 update CONTRIBUTORS for 2.3.17 updated CHANGELOG for 2.3.17 added XSD to PHPUnit configuration bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest [Translation] Added unescaping of ids in PoFileLoader updated italian translation for validation messages [DomCrawler] Fix docblocks and formatting. [DomCrawler] Remove the query string and the anchor of the uri of a link Simplified the Travis test command [Console] Make sure formatter is the same Conflicts: src/Symfony/Component/HttpKernel/Kernel.php	2014-07-08 13:46:35 +02:00
Christian Raue	afb83252cb	added XSD to PHPUnit configuration	2014-07-07 11:57:21 +02:00
Fabien Potencier	083ae606f0	Merge branch '2.3' into 2.4 * 2.3: Fixed failed config schema loads due to libxml_disable_entity_loader usage. enabled PHP 5.6 for tests [Process] Fix ExecutableFinder with open basedir Refactored the CssSelector to remove the circular object graph Fix mocks to support >=5.5.14 and >=5.4.30 [ClassLoader] fixed PHP warning on PHP 5.3 [Components][Serializer] optional constructor arguments can be omitted during the denormalization process [DomCrawler] properly handle buttons with single and double quotes inside the name attribute Conflicts: src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php	2014-07-01 08:40:32 +02:00
Fabien Potencier	b321e4830b	[ClassLoader] fixed PHP warning on PHP 5.3	2014-06-26 10:33:01 +02:00