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

Tests/LegacyOptionsResolverTest.php

@@ -89,9 +89,9 @@ public function testTypeAliasesForAllowedTypes()
             'force' => 'boolean',
         ));
 
-        $this->resolver->resolve(array(
+        $this->assertSame(array('force' => true), $this->resolver->resolve(array(
             'force' => true,
-        ));
+        )));
     }
 
     public function testResolveLazyDependencyOnOptional()

Tests/OptionsResolver2Dot6Test.php

@@ -1102,7 +1102,7 @@ public function testFailIfCyclicDependencyBetweenNormalizerAndLazyOption()
         $this->resolver->resolve();
     }
 
-    public function testCatchedExceptionFromNormalizerDoesNotCrashOptionResolver()
+    public function testCaughtExceptionFromNormalizerDoesNotCrashOptionResolver()
     {
         $throw = true;
 
@@ -1116,7 +1116,7 @@ public function testCatchedExceptionFromNormalizerDoesNotCrashOptionResolver()
             }
         });
 
-        $this->resolver->setNormalizer('thrower', function (Options $options) use (&$throw) {
+        $this->resolver->setNormalizer('thrower', function () use (&$throw) {
             if ($throw) {
                 $throw = false;
                 throw new \UnexpectedValueException('throwing');
@@ -1125,10 +1125,10 @@ public function testCatchedExceptionFromNormalizerDoesNotCrashOptionResolver()
             return true;
         });
 
-        $this->resolver->resolve();
+        $this->assertSame(array('catcher' => false, 'thrower' => true), $this->resolver->resolve());
     }
 
-    public function testCatchedExceptionFromLazyDoesNotCrashOptionResolver()
+    public function testCaughtExceptionFromLazyDoesNotCrashOptionResolver()
     {
         $throw = true;
 
@@ -1149,7 +1149,7 @@ public function testCatchedExceptionFromLazyDoesNotCrashOptionResolver()
             return true;
         });
 
-        $this->resolver->resolve();
+        $this->assertSame(array('catcher' => false, 'thrower' => true), $this->resolver->resolve());
     }
 
     public function testInvokeEachNormalizerOnlyOnce()