Merge branch '2.8' into 3.2

* 2.8: Using FQ name for PHP_VERSION_ID [Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 Harden the debugging of Twig filters and functions bumped Symfony version to 2.8.22 updated VERSION for 2.8.21 updated CHANGELOG for 2.8.21 bumped Symfony version to 2.7.29 updated VERSION for 2.7.28 update CONTRIBUTORS for 2.7.28 updated CHANGELOG for 2.7.28
Merge branch '2.7' into 2.8
2026-03-24 09:12:18 +01:00 · 2017-06-01 14:00:24 -07:00 · 2017-06-01 13:52:29 -07:00 · 2017-06-01 13:44:56 -07:00 · 2017-04-12 07:13:17 -07:00 · 2017-04-12 07:07:15 -07:00
9 changed files with 15 additions and 8 deletions
--- a/ClassCollectionLoader.php
+++ b/ClassCollectionLoader.php
@@ -256,7 +256,7 @@ REGEX;

        $output .= self::compressCode($rawChunk);

-        if (PHP_VERSION_ID >= 70000) {
+        if (\PHP_VERSION_ID >= 70000) {
            // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
            unset($tokens, $rawChunk);
            gc_mem_caches();
--- a/ClassMapGenerator.php
+++ b/ClassMapGenerator.php
@@ -64,7 +64,7 @@ class ClassMapGenerator

            $classes = self::findClasses($path);

-            if (PHP_VERSION_ID >= 70000) {
+            if (\PHP_VERSION_ID >= 70000) {
                // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
                gc_mem_caches();
            }
--- a/Tests/ApcClassLoaderTest.php
+++ b/Tests/ApcClassLoaderTest.php
@@ -11,10 +11,11 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ApcClassLoader;
 use Symfony\Component\ClassLoader\ClassLoader;

-class ApcClassLoaderTest extends \PHPUnit_Framework_TestCase
+class ApcClassLoaderTest extends TestCase
 {
    protected function setUp()
    {
--- a/Tests/ClassCollectionLoaderTest.php
+++ b/Tests/ClassCollectionLoaderTest.php
@@ -11,6 +11,7 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassCollectionLoader;
 use Symfony\Component\ClassLoader\Tests\Fixtures\DeclaredClass;
 use Symfony\Component\ClassLoader\Tests\Fixtures\WarmedClass;
@@ -20,7 +21,7 @@ require_once __DIR__.'/Fixtures/ClassesWithParents/CInterface.php';
 require_once __DIR__.'/Fixtures/ClassesWithParents/B.php';
 require_once __DIR__.'/Fixtures/ClassesWithParents/A.php';

-class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
+class ClassCollectionLoaderTest extends TestCase
 {
    public function testTraitDependencies()
    {
--- a/Tests/ClassLoaderTest.php
+++ b/Tests/ClassLoaderTest.php
@@ -11,9 +11,10 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassLoader;

-class ClassLoaderTest extends \PHPUnit_Framework_TestCase
+class ClassLoaderTest extends TestCase
 {
    public function testGetPrefixes()
    {
--- a/Tests/ClassMapGeneratorTest.php
+++ b/Tests/ClassMapGeneratorTest.php
@@ -11,9 +11,10 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassMapGenerator;

-class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
+class ClassMapGeneratorTest extends TestCase
 {
    /**
     * @var string|null
--- a/Tests/Fixtures/Namespaced/WithStrictTypes.php
+++ b/Tests/Fixtures/Namespaced/WithStrictTypes.php
@@ -4,7 +4,7 @@
 * foo
 */

-declare (strict_types = 1);
+declare(strict_types=1);

 namespace Namespaced;

--- a/Tests/Psr4ClassLoaderTest.php
+++ b/Tests/Psr4ClassLoaderTest.php
@@ -11,9 +11,10 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\Psr4ClassLoader;

-class Psr4ClassLoaderTest extends \PHPUnit_Framework_TestCase
+class Psr4ClassLoaderTest extends TestCase
 {
    /**
     * @param string $className
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
Author	SHA1	Message	Date
Fabien Potencier	e192d96b15	Merge branch '2.8' into 3.2 * 2.8: Using FQ name for PHP_VERSION_ID [Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 Harden the debugging of Twig filters and functions bumped Symfony version to 2.8.22 updated VERSION for 2.8.21 updated CHANGELOG for 2.8.21 bumped Symfony version to 2.7.29 updated VERSION for 2.7.28 update CONTRIBUTORS for 2.7.28 updated CHANGELOG for 2.7.28	2017-06-01 14:00:24 -07:00
Fabien Potencier	48b96f2fa9	Merge branch '2.7' into 2.8 * 2.7: Using FQ name for PHP_VERSION_ID [Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 Harden the debugging of Twig filters and functions bumped Symfony version to 2.7.29 updated VERSION for 2.7.28 update CONTRIBUTORS for 2.7.28 updated CHANGELOG for 2.7.28	2017-06-01 13:52:29 -07:00
Fabien Potencier	8bfdaa2e7a	Using FQ name for PHP_VERSION_ID	2017-06-01 13:44:56 -07:00
Fabien Potencier	fc4c04bfd1	Merge branch '2.8' into 3.2 * 2.8: fail when detecting risky tests fail when detecting risky tests	2017-04-12 07:13:17 -07:00
Fabien Potencier	6789dc86c9	Merge branch '2.7' into 2.8 * 2.7: fail when detecting risky tests	2017-04-12 07:07:15 -07:00
Christian Flothmann	fdb4806d2e	fail when detecting risky tests	2017-04-12 09:39:27 +02:00
Fabien Potencier	2c8de07a8a	fixed Composer constraints	2017-02-18 11:13:35 -08:00
Fabien Potencier	b6e2bb88a8	fixed Composer constraints	2017-02-18 10:28:08 -08:00
Nicolas Grekas	c29a5bc6ca	Merge branch '2.8' into 3.2 * 2.8: Update to PHPUnit namespaces Minor typo fix messsagesData -> messagesData remove translation data collector when not usable	2017-02-18 18:28:00 +01:00
Nicolas Grekas	a6f009ccd5	Merge branch '2.7' into 2.8 * 2.7: Update to PHPUnit namespaces remove translation data collector when not usable	2017-02-18 18:06:33 +01:00
Peter Rehm	64d2af707a	Update to PHPUnit namespaces	2017-02-18 08:02:39 -08:00
Fabien Potencier	2847d56f51	Merge branch '3.1' into 3.2 * 3.1: (31 commits) fixed CS fixed CS fixed CS fixer config fixed typo Revert "fixed typo" fixed typo fixed CS Avoid setting request attributes from signature arguments in AnnotationClassLoader [DependencyInjection] Add some missing typehints in YamlFileLoader [DependencyInjection] minor: Fix a DocBlock [HttpKernel] Give higher priority to adding request formats [PropertyInfo] Don't try to access a property thru a static method [PropertyInfo] Exclude static methods form properties guessing [FrameworkBundle] Fix third level headers for MarkdownDescriptor [Ldap] Using Ldap stored username instead of form submitted one [Ldap] load users with the good username case [DoctrineBridge] Fixed invalid unique value as composite key [Doctrine Bridge] fix UniqueEntityValidator for composite object primary keys [TwigBundle] do not lose already set method calls #20411 fix Yaml parsing for very long quoted strings ...	2017-01-21 09:06:35 -08:00
Fabien Potencier	06c783d45f	Merge branch '2.8' into 3.1 * 2.8: (26 commits) fixed CS fixed CS fixed CS fixer config fixed typo Revert "fixed typo" fixed typo fixed CS Avoid setting request attributes from signature arguments in AnnotationClassLoader [DependencyInjection] Add some missing typehints in YamlFileLoader [DependencyInjection] minor: Fix a DocBlock [HttpKernel] Give higher priority to adding request formats [PropertyInfo] Don't try to access a property thru a static method [PropertyInfo] Exclude static methods form properties guessing [FrameworkBundle] Fix third level headers for MarkdownDescriptor [TwigBundle] do not lose already set method calls #20411 fix Yaml parsing for very long quoted strings CS: apply is_null DX: remove invalid inheritdoc bumped Symfony version to 2.8.17 updated VERSION for 2.8.16 ...	2017-01-21 09:01:39 -08:00
Fabien Potencier	4f6bbee7b6	Merge branch '2.7' into 2.8 * 2.7: fixed typo Revert "fixed typo" fixed typo fixed CS Avoid setting request attributes from signature arguments in AnnotationClassLoader [DependencyInjection] Add some missing typehints in YamlFileLoader [DependencyInjection] minor: Fix a DocBlock [HttpKernel] Give higher priority to adding request formats [FrameworkBundle] Fix third level headers for MarkdownDescriptor [TwigBundle] do not lose already set method calls #20411 fix Yaml parsing for very long quoted strings CS: apply is_null DX: remove invalid inheritdoc bumped Symfony version to 2.7.24 updated VERSION for 2.7.23 update CONTRIBUTORS for 2.7.23 updated CHANGELOG for 2.7.23 [FrameworkBundle] Skip test if xdebug.file_link_format is defined.	2017-01-21 08:40:50 -08:00
Fabien Potencier	44816c55e9	fixed CS	2017-01-20 08:54:19 -08:00