Merge branch '3.0'

* 3.0: (105 commits)
  [Console] remove readline support
  bumped Symfony version to 3.0.3
  updated VERSION for 3.0.2
  updated CHANGELOG for 3.0.2
  [Routing] added a suggestion to add the HttpFoundation component.
  [FrameworkBundle] fix assets and templating tests
  [ClassLoader] fix ApcClassLoader tests on HHVM
  [travis] Add some comments
  changed operator from and to &&
  [DependencyInjection] Remove unused parameter
  [Process] Fix transient tests for incremental outputs
  [Console] Add missing `@require` annotation in test
  Fix merge
  [appveyor] Fix failure reporting
  [symfony#17634] move DebugBundle license file
  Limit Ldap component version for the 3.0 branch
  backport GlobTest from 2.7 branch
  Move licenses according to new best practices
  [FrameworkBundle] Remove unused code in test
  [2.3] Fixed an undefined variable in Glob::toRegex
  ...

Conflicts:
	.travis.yml
	composer.json
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/assets.yml
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
	src/Symfony/Component/Console/CHANGELOG.md
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/PropertyInfo/Tests/PropertyInfoExtractorTest.php
	src/Symfony/Component/Yaml/Tests/ParserTest.php

Author: nicolas-grekas

.travis.yml

@@ -29,7 +29,9 @@ cache:
 services: mongodb
 
 before_install:
+    # Matrix lines for intermediate PHP versions are skipped for pull requests
     - if [[ ! $deps && ! $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} && $TRAVIS_PHP_VERSION != hhvm && $TRAVIS_PULL_REQUEST != false ]]; then deps=skip; fi;
+    # A sigchild-enabled-PHP is used to test the Process component on the lowest PHP matrix line
     - if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} && ! -d php-$MIN_PHP/sapi ]]; then wget http://museum.php.net/php5/php-$MIN_PHP.tar.bz2 -O - | tar -xj; (cd php-$MIN_PHP; ./configure --enable-sigchild --enable-pcntl; make -j2); fi;
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then INI_FILE=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; else INI_FILE=/etc/hhvm/php.ini; fi;
     - echo memory_limit = -1 >> $INI_FILE
@@ -49,9 +51,12 @@ before_install:
 
 install:
     - if [[ $deps != skip ]]; then COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'); fi;
+    # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
     - if [[ $deps != skip && $deps ]]; then php .travis.php $TRAVIS_COMMIT_RANGE $TRAVIS_BRANCH $COMPONENTS; fi;
+    # For the master branch when deps=high, the version before master is checked out and tested with the locally patched components
     - if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//); else SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*'); fi;
     - if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then git fetch origin $SYMFONY_VERSION; git checkout -m FETCH_HEAD; COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'); fi;
+    # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number than the next one
     - if [[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]]; then LEGACY=,legacy; fi;
     - export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev;
     - if [[ ! $deps ]]; then composer update --prefer-dist; else export SYMFONY_DEPRECATIONS_HELPER=weak; fi;

CHANGELOG-3.0.md

@@ -7,6 +7,103 @@ in 3.0 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.0.0...v3.0.1
 
+* 3.0.2 (2016-02-03)
+
+ * bug #17658 [FrameworkBundle] fix assets and templating tests (xabbuh)
+ * bug #17596 [Translation] Add resources from fallback locale to parent catalogue (c960657)
+ * bug #17605 [FrameworkBundle] remove default null value for asset version (xabbuh)
+ * bug #17606 [DependencyInjection] pass triggerDeprecationError arg to parent class (xabbuh)
+ * bug #16956 [DependencyInjection] XmlFileLoader: enforce tags to have a name (xabbuh)
+ * bug #16265 [BrowserKit] Corrected HTTP_HOST logic (Naktibalda)
+ * bug #17559 [SecurityBundle] Fix HTTP Digest auth not being passed user checker (SamFleming)
+ * bug #17554 [DependencyInjection] resolve aliases in factories (xabbuh)
+ * bug #17555 [DependencyInjection] resolve aliases in factory services (xabbuh)
+ * bug #17511 [Form] ArrayChoiceList can now deal with a null in choices (issei-m)
+ * bug #17430 [Serializer] Ensure that groups are strings (dunglas)
+ * bug #16795 [FrameworkBundle][Validator] Fix apc cache service & config (ogizanagi)
+ * bug #15272 [FrameworkBundle] Fix template location for PHP templates (jakzal)
+ * bug #11232 [Routing] Fixes fatal errors with object resources in AnnotationDirectoryLoader::supports (Tischoi)
+ * bug #17526 Escape the delimiter in Glob::toRegex (javiereguiluz)
+ * bug #17527 fixed undefined variable (fabpot)
+ * bug #15706 [framework-bundle] Added support for the `0.0.0.0/0` trusted proxy (zerkms)
+ * bug #16274 [HttpKernel] Lookup the response even if the lock was released after two second wait (jakzal)
+ * bug #16954 [TranslationUpdateCommand] fixed undefined resultMessage var. (aitboudad)
+ * bug #17355 [DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument (xavismeh)
+ * bug #17330 Limit the max height/width of icons in the profiler menu (javiereguiluz)
+ * bug #17454 Allow absolute URLs to be displayed in the debug toolbar (javiereguiluz)
+ * bug #16736 [Request] Ignore invalid IP addresses sent by proxies (GromNaN)
+ * bug #17459 [EventDispatcher] TraceableEventDispatcher resets event listener priorities (c960657)
+ * bug #17486 [FrameworkBundle] Throw for missing container extensions (kix)
+ * bug #16961 Overriding profiler position in CSS breaks JS positioning (aschempp)
+ * bug #16873 Able to load big xml files with DomCrawler (zorn-v)
+ * bug #16897 [Form] Fix constraints could be null if not set (DZunke)
+ * bug #16912 [Translation][Writer] avoid calling setBackup if the dumper is not FileDumper (aitboudad)
+ * bug #17505 sort bundles in config:dump-reference command (xabbuh)
+ * bug #17506 [FrameworkBundle] enable assets when templates are enabled (xabbuh)
+ * bug #17514 [Asset] Add defaultNull to version configuration (ewgRa)
+ * bug #16511 [Asset] Ability to set empty version strategy in packages (ewgRa)
+ * bug #17457 Display Ajax requests from newest to oldest in the toolbar (javiereguiluz)
+ * bug #17503 [Asset] CLI: use request context to generate absolute URLs (xabbuh)
+ * bug #17478 [HttpFoundation] Do not overwrite the Authorization header if it is already set (jakzal)
+ * bug #17461 [Yaml] tag for dumped PHP objects must be a local one (xabbuh)
+ * bug #16822 [FrameworkBundle][Validator] Fix apc cache service deprecation (ogizanagi)
+ * bug #17463 [Form] make tests compatible with Symfony 2.8 and 3.0 (xabbuh)
+ * bug #17456 [DX] Remove default match from AbstractConfigCommand::findExtension (kix)
+ * bug #17455 Fixed form types in profiler (javiereguiluz)
+ * bug #17424 [Process] Update in 2.7 for stream-based output storage (romainneutron)
+ * bug #17417 Fixed the form profiler when using long form types (javiereguiluz)
+ * bug #17423 [Process] Use stream based storage to avoid memory issues (romainneutron)
+ * bug #17041 [FrameworkBundle] Added the assets helper again (dosten)
+ * bug #17406 [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced (paradajozsef)
+ * bug #17433 [FrameworkBundle] Don't log twice with the error handler (nicolas-grekas)
+ * bug #17418 Fixed Bootstrap form theme form "reset" buttons (javiereguiluz)
+ * bug #17416 [PropertyInfo] PhpDocExtractor: Fix a notice when the property doesn'… (dunglas)
+ * bug #17404 fix merge 2.3 into 2.7 for SecureRandom dependency (Tobion)
+ * bug #17373 [SecurityBundle] fix SecureRandom service constructor args (Tobion)
+ * bug #17397 Remove remaining calls to non-existing method (paradajozsef)
+ * bug #17382 [TwigBridge] Use label_format option for checkbox and radio labels (enumag)
+ * bug #17380 [TwigBridge] Use label_format option for checkbox and radio labels (enumag)
+ * bug #17377 Fix performance (PHP5) and memory (PHP7) issues when using token_get_all (nicolas-grekas, peteward)
+ * bug #17389 [Routing] Fixed correct class name in thrown exception (fixes #17388) (robinvdvleuten)
+ * bug #17358 [ClassLoader] Use symfony/polyfill-apcu (nicolas-grekas)
+ * bug #17370 [HttpFoundation][Cookie] Cookie DateTimeInterface fix (wildewouter)
+ * security #17359 do not ship with a custom rng implementation (xabbuh, fabpot)
+ * bug #17253 [Console] HHVM read input stream bug (mbutkereit)
+ * bug #17314 Fix max width for multibyte keys in choice question (mheki)
+ * bug #17326 [Console] Display console application name even when no version set (polc)
+ * bug #17328 [Serializer] Allow to use proxies in object_to_populate (dunglas)
+ * bug #17202 [FrameworkBundle] Don't log twice with the error handler (nicolas-grekas)
+ * bug #17347  Workaround https://bugs.php.net/63206 (nicolas-grekas)
+ * bug #17340 [HttpFoundation] Fixed Request HTTP_USER_AGENT on 3.X versions (davelima)
+ * bug #17199 [Serializer] Allow context to contain not serializable data (dunglas, nicolas-grekas)
+ * bug #17334 [WebProfiler] Fixed sf-minitoolbar height (yceruto)
+ * bug #17140 [Serializer] Remove normalizer cache in Serializer class (jvasseur)
+ * bug #17320 [Debug] Fixed erroneous deprecation notice for extended Interfaces (peterrehm)
+ * bug #17307 [FrameworkBundle] Fix paths with % in it (like urlencoded) (scaytrase)
+ * bug #17078 [Bridge] [Doctrine] [Validator] Added support \IteratorAggregate for UniqueEntityValidator (Disparity)
+ * bug #17298 [FrameworkBundle] Use proper class to fetch $versionStrategy property (dosten)
+ * bug #17287 [HttpKernel] Forcing string comparison on query parameters sort in UriSigner (Tim van Densen)
+ * bug #17279 [FrameworkBundle] Add case in Kernel directory guess for PHPUnit (tgalopin)
+ * bug #17278 [FrameworkBundle] Add case in Kernel directory guess for PHPUnit (tgalopin)
+ * bug #17063 bug #14246 [Filesystem] dumpFile() negates default file permissions (Hidde Boomsma)
+ * bug #17283 [WebProfilerBundle] Remove loading status from AJAX toolbar after error (kucharovic)
+ * bug #17275 [PhpUnitBridge] Re-enable the garbage collector (nicolas-grekas)
+ * bug #17276 [Process] Fix potential race condition (nicolas-grekas)
+ * bug #17261 [FrameworkBundle] Allow to autowire service_container (dunglas)
+ * bug #17183 [FrameworkBundle] Set the kernel.name properly after a cache warmup (jakzal)
+ * bug #17197 [Yaml] cast arrays to objects after parsing has finished (xabbuh)
+ * bug #17247 Fix toolbar display when nvd3 is loaded on page (Seldaek)
+ * bug #17159 [Yaml] recognize when a block scalar is left (xabbuh)
+ * bug #17195 bug #14246 [Filesystem] dumpFile() non atomic (Hidde Boomsma)
+ * feature #16747 [Form] Improved performance of ChoiceType and its subtypes (webmozart)
+ * bug #17179 [WebProfiler] Removed an object as route generator argument (iltar)
+ * bug #17177 [Process] Fix potential race condition leading to transient tests (nicolas-grekas)
+ * bug #17163 [Form] fix Catchable Fatal Error if choices is not an array (Gladhon, nicolas-grekas)
+ * bug #17152 [DoctrineBridge] [PropertyInfo] Catch Doctrine\ORM\Mapping\MappingException (dunglas)
+ * bug #17119 [Form] improve deprecation message for "empty_value" and "choice_list" options. (hhamon)
+ * bug #17156 [HttpFoundation] add missing symfony/polyfill-php55 dependency (xabbuh)
+ * bug #17162 [Form] Fix regression on Collection type (hason)
+
 * 3.0.1 (2015-12-26)
 
  * bug #16864 [Yaml] fix indented line handling in folded blocks (xabbuh)

UPGRADE-3.0.md

@@ -234,13 +234,13 @@ UPGRADE FROM 2.x to 3.0
 ### Form
 
  * The `getBlockPrefix()` method was added to the `FormTypeInterface` in replacement of
-   the `getName()` method which has been has been removed.
+   the `getName()` method which has been removed.
 
  * The `configureOptions()` method was added to the `FormTypeInterface` in replacement
    of the `setDefaultOptions()` method which has been removed.
 
  * The `getBlockPrefix()` method was added to the `ResolvedFormTypeInterface` in
-   replacement of the `getName()` method which has been has been removed.
+   replacement of the `getName()` method which has been removed.
 
  * The option `options` of the `CollectionType` has been removed in favor
    of the `entry_options` option.
@@ -940,9 +940,6 @@ UPGRADE FROM 2.x to 3.0
 
  * The `AbstractVoter` class was removed in favor of the new `Voter` class.
 
- * The `VoterInterface::supportsClass` and `supportsAttribute` methods were
-   removed from the interface.
-
  * The `Resources/` directory was moved to `Core/Resources/`
 
  * The `key` settings of `anonymous`, `remember_me` and `http_digest` are
@@ -1034,8 +1031,12 @@ UPGRADE FROM 2.x to 3.0
    ));
   ```
 
- * The `AbstractVoter::getSupportedAttributes()` and `AbstractVoter::getSupportedClasses()`
-   methods have been removed in favor of `AbstractVoter::supports()`.
+ * The `AbstractVoter` class was removed. Instead, extend the new `Voter` class,
+   introduced in 2.8, and move your voting logic to the to the `supports($attribute, $subject)`
+   and `voteOnAttribute($attribute, $object, TokenInterface $token)` methods.
+
+ * The `supportsClass` and `supportsAttribute` methods were
+   removed from the `VoterInterface` interface.
 
    Before:
 
@@ -1059,14 +1060,19 @@ UPGRADE FROM 2.x to 3.0
    After:
 
    ```php
-   class MyVoter extends AbstractVoter
+   use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+   
+   class MyVoter extends Voter
    {
        protected function supports($attribute, $object)
        {
            return $object instanceof Post && in_array($attribute, array('CREATE', 'EDIT'));
        }
 
-       // ...
+       protected function voteOnAttribute($attribute, $object, TokenInterface $token)
+       {
+           // Return true or false
+       }
    }
    ```
 
@@ -1103,6 +1109,16 @@ UPGRADE FROM 2.x to 3.0
  * The `supportsAttribute()` and `supportsClass()` methods of classes `AuthenticatedVoter`, `ExpressionVoter`
    and `RoleVoter` have been removed.
 
+ * The `intention` option was renamed to `csrf_token_id` for all the authentication listeners.
+
+ * The `csrf_provider` option was renamed to `csrf_token_generator` for all the authentication listeners.
+
+### SecurityBundle
+
+ * The `intention` firewall listener setting was renamed to `csrf_token_id`.
+
+ * The `csrf_provider` firewall listener setting was renamed to `csrf_token_generator`.
+
 ### Serializer
 
  * The `setCamelizedAttributes()` method of the

appveyor.yml

@@ -14,6 +14,7 @@ init:
     - SET PHP=1
     - SET ANSICON=121x90 (121x90)
     - SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
+    - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
 
 install:
     - IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
@@ -54,7 +55,6 @@ install:
 
 test_script:
     - cd c:\projects\symfony
-    - Setlocal EnableDelayedExpansion
     - SET X=0
     - copy /Y c:\php\php.ini-min c:\php\php.ini
     - php phpunit symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!

composer.json

@@ -21,7 +21,6 @@
         "twig/twig": "~1.23|~2.0",
         "psr/cache": "~1.0",
         "psr/log": "~1.0",
-        "symfony/polyfill-apcu": "~1.0,>=1.0.2",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php56": "~1.0",
@@ -85,6 +84,7 @@
         "monolog/monolog": "~1.11",
         "ocramius/proxy-manager": "~0.4|~1.0",
         "egulias/email-validator": "~1.2",
+        "symfony/polyfill-apcu": "~1.1",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection": "^1.0.7"
     },

phpunit

@@ -27,7 +27,7 @@ if ('phpdbg' === PHP_SAPI) {
     $PHP .= ' -qrr';
 }
 
-$COMPOSER = file_exists($COMPOSER = __DIR__.'/composer.phar') || ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? `where.exe composer.phar` : `which composer.phar`))
+$COMPOSER = file_exists($COMPOSER = __DIR__.'/composer.phar') || ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar`))
     ? $PHP.' '.ProcessUtils::escapeArgument($COMPOSER)
     : 'composer';
 

src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

@@ -153,7 +153,7 @@ protected function setMappingDriverConfig(array $mappingConfig, $mappingName)
      */
     protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container)
     {
-        $bundleDir = dirname($bundle->getFilename());
+        $bundleDir = dirname($bundle->getFileName());
 
         if (!$bundleConfig['type']) {
             $bundleConfig['type'] = $this->detectMetadataDriver($bundleDir, $container);

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php

@@ -60,7 +60,7 @@ private function updateValidatorMappingFiles(ContainerBuilder $container, $mappi
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {
             $reflection = new \ReflectionClass($bundle);
-            if (is_file($file = dirname($reflection->getFilename()).'/'.$validationPath)) {
+            if (is_file($file = dirname($reflection->getFileName()).'/'.$validationPath)) {
                 $files[] = realpath($file);
                 $container->addResource(new FileResource($file));
             }

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -26,7 +26,7 @@ class DoctrineExtractorTest extends \PHPUnit_Framework_TestCase
      */
     private $extractor;
 
-    public function setUp()
+    protected function setUp()
     {
         $config = Setup::createAnnotationMetadataConfiguration(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'), true);
         $entityManager = EntityManager::create(array('driver' => 'pdo_sqlite'), $config);

src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

@@ -16,7 +16,6 @@
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\Persistence\ObjectRepository;
 use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
-use Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleNameEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity;
@@ -402,8 +401,8 @@ public function testAssociatedEntity()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.single')
-            ->setParameter('{{ value }}', 1)
-            ->setInvalidValue(1)
+            ->setParameter('{{ value }}', $entity1)
+            ->setInvalidValue($entity1)
             ->assertRaised();
     }
 
@@ -427,29 +426,6 @@ public function testAssociatedEntityWithNull()
         $this->assertNoViolation();
     }
 
-    /**
-     * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
-     * @expectedExceptionMessage Associated entities are not allowed to have more than one identifier field
-     */
-    public function testAssociatedCompositeEntity()
-    {
-        $constraint = new UniqueEntity(array(
-            'message' => 'myMessage',
-            'fields' => array('composite'),
-            'em' => self::EM_NAME,
-        ));
-
-        $composite = new CompositeIntIdEntity(1, 1, 'test');
-        $associated = new AssociationEntity();
-        $associated->composite = $composite;
-
-        $this->em->persist($composite);
-        $this->em->persist($associated);
-        $this->em->flush();
-
-        $this->validator->validate($associated, $constraint);
-    }
-
     /**
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
      * @expectedExceptionMessage Object manager "foo" does not exist.