Merge branch '4.3' into 4.4

* 4.3:
  Remove Google references when not needed
  Simplify usage of dirname()
  Remove Google references when not needed

Author: fabpot

Tests/Constraints/UrlValidatorTest.php

@@ -91,7 +91,7 @@ public function testValidRelativeUrl($url)
     public function getValidRelativeUrls()
     {
         return [
-            ['//google.com'],
+            ['//example.com'],
             ['//symfony.fake/blog/'],
             ['//symfony.com/search?type=&q=url+validator'],
         ];
@@ -101,11 +101,11 @@ public function getValidUrls()
     {
         return [
             ['http://a.pl'],
-            ['http://www.google.com'],
-            ['http://www.google.com.'],
-            ['http://www.google.museum'],
-            ['https://google.com/'],
-            ['https://google.com:80/'],
+            ['http://www.example.com'],
+            ['http://www.example.com.'],
+            ['http://www.example.museum'],
+            ['https://example.com/'],
+            ['https://example.com:80/'],
             ['http://www.example.coop/'],
             ['http://www.test-example.com/'],
             ['http://www.symfony.com/'],
@@ -166,11 +166,11 @@ public function getValidUrls()
     public function getValidUrlsWithWhitespaces()
     {
         return [
-            ["\x20http://www.google.com"],
-            ["\x09\x09http://www.google.com."],
+            ["\x20http://www.example.com"],
+            ["\x09\x09http://www.example.com."],
             ["http://symfony.fake/blog/\x0A"],
             ["http://symfony.com/search?type=&q=url+validator\x0D\x0D"],
-            ["\x00https://google.com:80\x00"],
+            ["\x00https://example.com:80\x00"],
             ["\x0B\x0Bhttp://username:[email protected]\x0B\x0B"],
         ];
     }
@@ -214,10 +214,10 @@ public function testInvalidRelativeUrl($url)
     public function getInvalidRelativeUrls()
     {
         return [
-            ['/google.com'],
-            ['//goog_le.com'],
-            ['//google.com::aa'],
-            ['//google.com:aa'],
+            ['/example.com'],
+            ['//examp_le.com'],
+            ['//example.com::aa'],
+            ['//example.com:aa'],
             ['//127.0.0.1:aa/'],
             ['//[::1'],
             ['//hello.☎/'],
@@ -235,15 +235,15 @@ public function getInvalidRelativeUrls()
     public function getInvalidUrls()
     {
         return [
-            ['google.com'],
-            ['://google.com'],
-            ['http ://google.com'],
-            ['http:/google.com'],
-            ['http://goog_le.com'],
-            ['http://google.com::aa'],
-            ['http://google.com:aa'],
-            ['ftp://google.fr'],
-            ['faked://google.fr'],
+            ['example.com'],
+            ['://example.com'],
+            ['http ://example.com'],
+            ['http:/example.com'],
+            ['http://examp_le.com'],
+            ['http://example.com::aa'],
+            ['http://example.com:aa'],
+            ['ftp://example.fr'],
+            ['faked://example.fr'],
             ['http://127.0.0.1:aa/'],
             ['ftp://[::1]/'],
             ['http://[::1'],
@@ -276,7 +276,7 @@ public function testCustomProtocolIsValid($url)
     public function getValidCustomUrls()
     {
         return [
-            ['ftp://google.com'],
+            ['ftp://example.com'],
             ['file://127.0.0.1'],
             ['git://[::1]/'],
         ];

Tests/Resources/TranslationFilesTest.php

@@ -29,15 +29,15 @@ public function provideTranslationFiles()
     {
         return array_map(
             function ($filePath) { return (array) $filePath; },
-            glob(\dirname(\dirname(__DIR__)).'/Resources/translations/*.xlf')
+            glob(\dirname(__DIR__, 2).'/Resources/translations/*.xlf')
         );
     }
 
     public function testNorwegianAlias()
     {
         $this->assertFileEquals(
-            \dirname(\dirname(__DIR__)).'/Resources/translations/validators.nb.xlf',
-            \dirname(\dirname(__DIR__)).'/Resources/translations/validators.no.xlf',
+            \dirname(__DIR__, 2).'/Resources/translations/validators.nb.xlf',
+            \dirname(__DIR__, 2).'/Resources/translations/validators.no.xlf',
             'The NO locale should be an alias for the NB variant of the Norwegian language.'
         );
     }