Merge branch '3.4' into 4.0

* 3.4:
  Fix lock strategy tests
  [travis] cache compiled php extensions
  fix merge
  Allow remember-me factory creation when multiple user providers are configured.
  Add tests for glob loaders
  Improve assertions
  [DI][Routing] Fix tracking of globbed resources
  [Config] Handle Service/EventSubscriberInterface in ReflectionClassResource
  always call the parent class' constructor

Author: nicolas-grekas

.travis.yml

@@ -32,6 +32,7 @@ cache:
     directories:
         - .phpunit
         - php-$MIN_PHP
+        - php-ext
 
 services:
     - memcached
@@ -97,6 +98,23 @@ before_install:
       echo extension = redis.so >> $INI
       echo extension = memcached.so >> $INI
 
+      # tpecl is a helper to compile and cache php extensions
+      tpecl () {
+          local ext_name=$1
+          local ext_so=$2
+          local ext_dir=$(php -r "echo ini_get('extension_dir');")
+          local ext_cache=~/php-ext/$(basename $ext_dir)/$ext_name
+
+          if [[ -e $ext_cache/$ext_so ]]; then
+              echo extension = $ext_cache/$ext_so >> $INI
+          else
+              mkdir -p $ext_cache
+              echo yes | pecl install -f $ext_name &&
+              cp $ext_dir/$ext_so $ext_cache
+          fi
+      }
+      export -f tpecl
+
       # Matrix lines for intermediate PHP versions are skipped for pull requests
       if [[ ! $deps && ! $PHP = $MIN_PHP && $TRAVIS_PULL_REQUEST != false ]]; then
           deps=skip
@@ -115,8 +133,8 @@ before_install:
     - |
       # Install extra PHP extensions
       if [[ ! $skip ]]; then
-          tfold ext.apcu5 'echo yes | pecl install -f apcu-5.1.6'
-          tfold ext.mongodb pecl install -f mongodb-1.4.0RC1
+          tfold ext.apcu tpecl apcu-5.1.6 apcu.so
+          tfold ext.mongodb tpecl mongodb-1.4.0RC1 mongodb.so
       fi
 
     - |

src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php

@@ -40,7 +40,7 @@ public function testResetService()
         $registry->resetManager();
 
         $this->assertSame($foo, $container->get('foo'));
-        $this->assertFalse(isset($foo->bar));
+        $this->assertObjectNotHasAttribute('bar', $foo);
     }
 }
 

src/Symfony/Bridge/Monolog/Tests/LoggerTest.php

@@ -43,7 +43,7 @@ public function testGetLogsWithDebugProcessor()
         $logger = new Logger(__METHOD__, array($handler), array($processor));
 
         $this->assertTrue($logger->error('error message'));
-        $this->assertSame(1, count($logger->getLogs()));
+        $this->assertCount(1, $logger->getLogs());
     }
 
     public function testCountErrorsWithDebugProcessor()

src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml

@@ -30,7 +30,7 @@
             <argument type="service" id="file_locator" />
         </service>
 
-        <service id="routing.loader.glob" class="Symfony\Component\Config\Loader\GlobFileLoader">
+        <service id="routing.loader.glob" class="Symfony\Component\Routing\Loader\GlobFileLoader">
             <tag name="routing.loader" />
             <argument type="service" id="file_locator" />
         </service>

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -1101,7 +1101,7 @@ private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $con
         $this->assertFalse($poolDefinition->isAbstract(), sprintf('Service definition "%s" is not abstract.', $id));
 
         $tag = $poolDefinition->getTag('cache.pool');
-        $this->assertTrue(isset($tag[0]['default_lifetime']), 'The default lifetime is stored as an attribute of the "cache.pool" tag.');
+        $this->assertArrayHasKey('default_lifetime', $tag[0], 'The default lifetime is stored as an attribute of the "cache.pool" tag.');
         $this->assertSame($defaultLifetime, $tag[0]['default_lifetime'], 'The default lifetime is stored as an attribute of the "cache.pool" tag.');
 
         $parentDefinition = $poolDefinition;

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -27,7 +27,7 @@
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "~3.4|~4.0",
         "symfony/finder": "~3.4|~4.0",
-        "symfony/routing": "~3.4|~4.0"
+        "symfony/routing": "^3.4.5|^4.0.5"
     },
     "require-dev": {
         "doctrine/cache": "~1.0",

src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

@@ -409,6 +409,9 @@ private function createAuthenticationListeners($container, $id, $firewall, &$aut
                             throw new InvalidConfigurationException(sprintf('Invalid firewall "%s": user provider "%s" not found.', $id, $firewall[$key]['provider']));
                         }
                         $userProvider = $providerIds[$normalizedName];
+                    } elseif ('remember_me' === $key) {
+                        // RememberMeFactory will use the firewall secret when created
+                        $userProvider = null;
                     } elseif($defaultProvider) {
                         $userProvider = $defaultProvider;
                     } else {

src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php

@@ -193,6 +193,28 @@ public function testMissingProviderForListener()
         $container->compile();
     }
 
+    public function testPerListenerProviderWithRememberMe()
+    {
+        $container = $this->getRawContainer();
+        $container->loadFromExtension('security', array(
+            'providers' => array(
+                'first' => array('id' => 'foo'),
+                'second' => array('id' => 'bar'),
+            ),
+
+            'firewalls' => array(
+                'default' => array(
+                    'form_login' => array('provider' => 'second'),
+                    'logout_on_user_change' => true,
+                    'remember_me' => array('secret' => 'baz'),
+                ),
+            ),
+        ));
+
+        $container->compile();
+        $this->addToAssertionCount(1);
+    }
+
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();

src/Symfony/Component/Cache/Tests/Adapter/NullAdapterTest.php

@@ -53,7 +53,7 @@ public function testGetItems()
             $itemKey = $item->getKey();
 
             $this->assertEquals($itemKey, $key, 'Keys must be preserved when fetching multiple items');
-            $this->assertTrue(in_array($key, $keys), 'Cache key can not change.');
+            $this->assertContains($key, $keys, 'Cache key can not change.');
             $this->assertFalse($item->isHit());
 
             // Remove $key for $keys

src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterTest.php

@@ -43,7 +43,7 @@ public function testProxyfiedItem()
 
         $proxyItem = $pool->getItem('foo');
 
-        $this->assertFalse($proxyItem === $item);
+        $this->assertNotSame($item, $proxyItem);
         $pool->save($proxyItem->set('bar'));
     }
 }