Merge branch '2.7' into 2.8

* 2.7:
  [HttpKernel] Fixed bug with purging of HTTPS URLs
  fix some risky tests
  [DI] [YamlFileLoader] change error message of a non existing file
  [Security] Added option to return true in the method isRememberMeRequested

Author: fabpot

Loader/YamlFileLoader.php

@@ -353,7 +353,7 @@ protected function loadFile($file)
         }
 
         if (!file_exists($file)) {
-            throw new InvalidArgumentException(sprintf('The service file "%s" is not valid.', $file));
+            throw new InvalidArgumentException(sprintf('The file "%s" does not exist.', $file));
         }
 
         if (null === $this->yamlParser) {

Tests/Compiler/CheckCircularReferencesPassTest.php

@@ -114,6 +114,8 @@ public function testProcessIgnoresMethodCalls()
         $container->register('b')->addMethodCall('setA', array(new Reference('a')));
 
         $this->process($container);
+
+        $this->addToAssertionCount(1);
     }
 
     protected function process(ContainerBuilder $container)

Tests/Compiler/CheckDefinitionValidityPassTest.php

@@ -85,6 +85,8 @@ public function testProcess()
         $container->register('d', 'class')->setSynthetic(true);
 
         $this->process($container);
+
+        $this->addToAssertionCount(1);
     }
 
     public function testValidTags()
@@ -96,6 +98,8 @@ public function testValidTags()
         $container->register('d', 'class')->addTag('foo', array('bar' => 1.1));
 
         $this->process($container);
+
+        $this->addToAssertionCount(1);
     }
 
     /**

Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php

@@ -28,6 +28,10 @@ public function testProcess()
             ->addArgument(new Reference('b'))
         ;
         $container->register('b', '\stdClass');
+
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
     }
 
     /**

Tests/Compiler/CheckReferenceValidityPassTest.php

@@ -30,6 +30,8 @@ public function testProcessIgnoresScopeWideningIfNonStrictReference()
         $container->register('b')->setScope('prototype');
 
         $this->process($container);
+
+        $this->addToAssertionCount(1);
     }
 
     /**
@@ -43,6 +45,8 @@ public function testProcessDetectsScopeWidening()
         $container->register('b')->setScope('prototype');
 
         $this->process($container);
+
+        $this->addToAssertionCount(1);
     }
 
     /**
@@ -58,6 +62,8 @@ public function testProcessIgnoresCrossScopeHierarchyReferenceIfNotStrict()
         $container->register('b')->setScope('b');
 
         $this->process($container);
+
+        $this->addToAssertionCount(1);
     }
 
     /**
@@ -96,6 +102,8 @@ public function testProcess()
         $container->register('b');
 
         $this->process($container);
+
+        $this->addToAssertionCount(1);
     }
 
     protected function process(ContainerBuilder $container)

Tests/Dumper/PhpDumperTest.php

@@ -305,6 +305,8 @@ public function testCircularReferenceAllowanceForLazyServices()
 
         $dumper = new PhpDumper($container);
         $dumper->dump();
+
+        $this->addToAssertionCount(1);
     }
 
     public function testCircularReferenceAllowanceForInlinedDefinitionsForLazyServices()
@@ -342,5 +344,7 @@ public function testCircularReferenceAllowanceForInlinedDefinitionsForLazyServic
 
         $dumper->setProxyDumper(new DummyProxyDumper());
         $dumper->dump();
+
+        $this->addToAssertionCount(1);
     }
 }

Tests/Dumper/XmlDumperTest.php

@@ -162,6 +162,8 @@ public function testCompiledContainerCanBeDumped($containerFile)
         $container->compile();
         $dumper = new XmlDumper($container);
         $dumper->dump();
+
+        $this->addToAssertionCount(1);
     }
 
     public function provideCompiledContainerData()

Tests/Loader/YamlFileLoaderTest.php

@@ -33,40 +33,33 @@ public static function setUpBeforeClass()
         require_once self::$fixturesPath.'/includes/ProjectExtension.php';
     }
 
-    public function testLoadFile()
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessageRegExp /The file ".+" does not exist./
+     */
+    public function testLoadUnExistFile()
     {
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/ini'));
         $r = new \ReflectionObject($loader);
         $m = $r->getMethod('loadFile');
         $m->setAccessible(true);
 
-        try {
-            $m->invoke($loader, 'foo.yml');
-            $this->fail('->load() throws an InvalidArgumentException if the loaded file does not exist');
-        } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the loaded file does not exist');
-            $this->assertEquals('The service file "foo.yml" is not valid.', $e->getMessage(), '->load() throws an InvalidArgumentException if the loaded file does not exist');
-        }
-
-        try {
-            $m->invoke($loader, 'parameters.ini');
-            $this->fail('->load() throws an InvalidArgumentException if the loaded file is not a valid YAML file');
-        } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the loaded file is not a valid YAML file');
-            $this->assertEquals('The service file "parameters.ini" is not valid.', $e->getMessage(), '->load() throws an InvalidArgumentException if the loaded file is not a valid YAML file');
-        }
+        $m->invoke($loader, 'foo.yml');
+    }
 
-        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessageRegExp /The file ".+" does not contain valid YAML./
+     */
+    public function testLoadInvalidYamlFile()
+    {
+        $path = self::$fixturesPath.'/ini';
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator($path));
+        $r = new \ReflectionObject($loader);
+        $m = $r->getMethod('loadFile');
+        $m->setAccessible(true);
 
-        foreach (array('nonvalid1', 'nonvalid2') as $fixture) {
-            try {
-                $m->invoke($loader, $fixture.'.yml');
-                $this->fail('->load() throws an InvalidArgumentException if the loaded file does not validate');
-            } catch (\Exception $e) {
-                $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the loaded file does not validate');
-                $this->assertStringMatchesFormat('The service file "nonvalid%d.yml" is not valid.', $e->getMessage(), '->load() throws an InvalidArgumentException if the loaded file does not validate');
-            }
-        }
+        $m->invoke($loader, $path.'/parameters.ini');
     }
 
     /**
@@ -90,6 +83,8 @@ public function provideInvalidFiles()
             array('bad_service'),
             array('bad_calls'),
             array('bad_format'),
+            array('nonvalid1'),
+            array('nonvalid2'),
         );
     }