Merge branch '3.1'

* 3.1:
  [Routing] Reorder assert parameters
  [Cache] Use SCAN instead of KEYS with Redis >= 2.8
  Added missing czech validators translation of not expected charset
  Improved deprecation message
  Workaround another buggy PHP warning
  Add czech translation for Url and Length validator
  Add slovak translation for Url and Length validator

Author: nicolas-grekas

Tests/Generator/Dumper/PhpGeneratorDumperTest.php

@@ -77,10 +77,10 @@ public function testDumpWithRoutes()
         $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_PATH);
         $relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
 
-        $this->assertEquals($absoluteUrlWithParameter, 'http://localhost/app.php/testing/bar');
-        $this->assertEquals($absoluteUrlWithoutParameter, 'http://localhost/app.php/testing2');
-        $this->assertEquals($relativeUrlWithParameter, '/app.php/testing/bar');
-        $this->assertEquals($relativeUrlWithoutParameter, '/app.php/testing2');
+        $this->assertEquals('http://localhost/app.php/testing/bar', $absoluteUrlWithParameter);
+        $this->assertEquals('http://localhost/app.php/testing2', $absoluteUrlWithoutParameter);
+        $this->assertEquals('/app.php/testing/bar', $relativeUrlWithParameter);
+        $this->assertEquals('/app.php/testing2', $relativeUrlWithoutParameter);
     }
 
     public function testDumpWithTooManyRoutes()
@@ -108,10 +108,10 @@ public function testDumpWithTooManyRoutes()
         $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_PATH);
         $relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
 
-        $this->assertEquals($absoluteUrlWithParameter, 'http://localhost/app.php/testing/bar');
-        $this->assertEquals($absoluteUrlWithoutParameter, 'http://localhost/app.php/testing2');
-        $this->assertEquals($relativeUrlWithParameter, '/app.php/testing/bar');
-        $this->assertEquals($relativeUrlWithoutParameter, '/app.php/testing2');
+        $this->assertEquals('http://localhost/app.php/testing/bar', $absoluteUrlWithParameter);
+        $this->assertEquals('http://localhost/app.php/testing2', $absoluteUrlWithoutParameter);
+        $this->assertEquals('/app.php/testing/bar', $relativeUrlWithParameter);
+        $this->assertEquals('/app.php/testing2', $relativeUrlWithoutParameter);
     }
 
     /**
@@ -151,7 +151,7 @@ public function testDumpForRouteWithDefaults()
         $projectUrlGenerator = new \DefaultRoutesUrlGenerator(new RequestContext());
         $url = $projectUrlGenerator->generate('Test', array());
 
-        $this->assertEquals($url, '/testing');
+        $this->assertEquals('/testing', $url);
     }
 
     public function testDumpWithSchemeRequirement()
@@ -166,15 +166,15 @@ public function testDumpWithSchemeRequirement()
         $absoluteUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_URL);
         $relativeUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
 
-        $this->assertEquals($absoluteUrl, 'ftp://localhost/app.php/testing');
-        $this->assertEquals($relativeUrl, 'ftp://localhost/app.php/testing');
+        $this->assertEquals('ftp://localhost/app.php/testing', $absoluteUrl);
+        $this->assertEquals('ftp://localhost/app.php/testing', $relativeUrl);
 
         $projectUrlGenerator = new \SchemeUrlGenerator(new RequestContext('/app.php', 'GET', 'localhost', 'https'));
 
         $absoluteUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_URL);
         $relativeUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
 
-        $this->assertEquals($absoluteUrl, 'https://localhost/app.php/testing');
-        $this->assertEquals($relativeUrl, '/app.php/testing');
+        $this->assertEquals('https://localhost/app.php/testing', $absoluteUrl);
+        $this->assertEquals('/app.php/testing', $relativeUrl);
     }
 }