Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit ba35f3d7bb78 · 2016-02-22T17:12:29.000+01:00
* 2.3:
  PhpUnitNoDedicateAssertFixer results
  Improve Norwegian translations
  Simplify markdown for PR template

Conflicts:
	src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
	src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,10 @@
 | Q             | A
 | ------------- | ---
-| Bug fix?      | [yes|no]
-| New feature?  | [yes|no]
-| BC breaks?    | [yes|no]
-| Deprecations? | [yes|no]
-| Tests pass?   | [yes|no]
-| Fixed tickets | [comma-separated list of tickets fixed by the PR, if any]
+| Bug fix?      | yes/no
+| New feature?  | yes/no
+| BC breaks?    | yes/no
+| Deprecations? | yes/no
+| Tests pass?   | yes/no
+| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
 | License       | MIT
-| Doc PR        | [reference to the documentation PR, if any]
+| Doc PR        | reference to the documentation PR, if any
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
@@ -120,7 +120,7 @@ public function testDefinitionExampleGetsTransferredToNode()
         $tree = $builder->buildTree();
         $children = $tree->getChildren();
 
-        $this->assertTrue(is_array($tree->getExample()));
+        $this->assertInternalType('array', $tree->getExample());
         $this->assertEquals('example', $children['child']->getExample());
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/Shell/CommandTest.php b/src/Symfony/Component/Finder/Tests/Shell/CommandTest.php
@@ -146,7 +146,7 @@ public function testExecute()
         $cmd->add('--version');
         $result = $cmd->execute();
 
-        $this->assertTrue(is_array($result));
+        $this->assertInternalType('array', $result);
         $this->assertNotEmpty($result);
         $this->assertRegexp('/PHP|HipHop/', $result[0]);
     }
diff --git a/src/Symfony/Component/Form/Resources/translations/validators.no.xlf b/src/Symfony/Component/Form/Resources/translations/validators.no.xlf
@@ -8,7 +8,7 @@
             </trans-unit>
             <trans-unit id="29">
                 <source>The uploaded file was too large. Please try to upload a smaller file.</source>
-                <target>Den opplastede file var for stor. Vennligst last opp en mindre fil.</target>
+                <target>Den opplastede filen var for stor. Vennligst last opp en mindre fil.</target>
             </trans-unit>
             <trans-unit id="30">
                 <source>The CSRF token is invalid.</source>
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
@@ -81,8 +81,8 @@ public function testMove()
         $movedFile = $file->move($targetDir);
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
 
-        $this->assertTrue(file_exists($targetPath));
-        $this->assertFalse(file_exists($path));
+        $this->assertFileExists($targetPath);
+        $this->assertFileNotExists($path);
         $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
 
         @unlink($targetPath);
@@ -100,8 +100,8 @@ public function testMoveWithNewName()
         $file = new File($path);
         $movedFile = $file->move($targetDir, 'test.newname.gif');
 
-        $this->assertTrue(file_exists($targetPath));
-        $this->assertFalse(file_exists($path));
+        $this->assertFileExists($targetPath);
+        $this->assertFileNotExists($path);
         $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
 
         @unlink($targetPath);
@@ -135,8 +135,8 @@ public function testMoveWithNonLatinName($filename, $sanitizedFilename)
         $movedFile = $file->move($targetDir, $filename);
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
 
-        $this->assertTrue(file_exists($targetPath));
-        $this->assertFalse(file_exists($path));
+        $this->assertFileExists($targetPath);
+        $this->assertFileNotExists($path);
         $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
 
         @unlink($targetPath);
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
@@ -164,8 +164,8 @@ public function testMoveLocalFileIsAllowedInTestMode()
 
         $movedFile = $file->move(__DIR__.'/Fixtures/directory');
 
-        $this->assertTrue(file_exists($targetPath));
-        $this->assertFalse(file_exists($path));
+        $this->assertFileExists($targetPath);
+        $this->assertFileNotExists($path);
         $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
 
         @unlink($targetPath);
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php
@@ -32,7 +32,7 @@ public function testWriteCacheFileCreatesTheFile()
         $warmer = new TestCacheWarmer(self::$cacheFile);
         $warmer->warmUp(dirname(self::$cacheFile));
 
-        $this->assertTrue(file_exists(self::$cacheFile));
+        $this->assertFileExists(self::$cacheFile);
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php
@@ -32,7 +32,7 @@ public function testReadReturnsArray()
     {
         $data = $this->reader->read(__DIR__.'/Fixtures/json', 'en');
 
-        $this->assertTrue(is_array($data));
+        $this->assertInternalType('array', $data);
         $this->assertSame('Bar', $data['Foo']);
         $this->assertFalse(isset($data['ExistsNot']));
     }
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php
@@ -32,7 +32,7 @@ public function testReadReturnsArray()
     {
         $data = $this->reader->read(__DIR__.'/Fixtures/php', 'en');
 
-        $this->assertTrue(is_array($data));
+        $this->assertInternalType('array', $data);
         $this->assertSame('Bar', $data['Foo']);
         $this->assertFalse(isset($data['ExistsNot']));
     }
diff --git a/src/Symfony/Component/Security/Resources/translations/security.no.xlf b/src/Symfony/Component/Security/Resources/translations/security.no.xlf
@@ -4,7 +4,7 @@
         <body>
             <trans-unit id="1">
                 <source>An authentication exception occurred.</source>
-                <target>En autentiserings feil har skjedd.</target>
+                <target>En autentiseringsfeil har skjedd.</target>
             </trans-unit>
             <trans-unit id="2">
                 <source>Authentication credentials could not be found.</source>
@@ -24,7 +24,7 @@
             </trans-unit>
             <trans-unit id="6">
                 <source>Not privileged to request the resource.</source>
-                <target>Ingen tilgang til å be om gitt kilde.</target>
+                <target>Ingen tilgang til å be om gitt ressurs.</target>
             </trans-unit>
             <trans-unit id="7">
                 <source>Invalid CSRF token.</source>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function testDefinitionExampleGetsTransferredToNode()`
`120`	`120`	`$tree = $builder->buildTree();`
`121`	`121`	`$children = $tree->getChildren();`
`122`	`122`
`123`		`- $this->assertTrue(is_array($tree->getExample()));`
	`123`	`+ $this->assertInternalType('array', $tree->getExample());`
`124`	`124`	`$this->assertEquals('example', $children['child']->getExample());`
`125`	`125`	`}`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public function testExecute()`
`146`	`146`	`$cmd->add('--version');`
`147`	`147`	`$result = $cmd->execute();`
`148`	`148`
`149`		`- $this->assertTrue(is_array($result));`
	`149`	`+ $this->assertInternalType('array', $result);`
`150`	`150`	`$this->assertNotEmpty($result);`
`151`	`151`	`$this->assertRegexp('/PHP\|HipHop/', $result[0]);`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testWriteCacheFileCreatesTheFile()`
`32`	`32`	`$warmer = new TestCacheWarmer(self::$cacheFile);`
`33`	`33`	`$warmer->warmUp(dirname(self::$cacheFile));`
`34`	`34`
`35`		`- $this->assertTrue(file_exists(self::$cacheFile));`
	`35`	`+ $this->assertFileExists(self::$cacheFile);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testReadReturnsArray()`
`32`	`32`	`{`
`33`	`33`	`$data = $this->reader->read(__DIR__.'/Fixtures/json', 'en');`
`34`	`34`
`35`		`- $this->assertTrue(is_array($data));`
	`35`	`+ $this->assertInternalType('array', $data);`
`36`	`36`	`$this->assertSame('Bar', $data['Foo']);`
`37`	`37`	`$this->assertFalse(isset($data['ExistsNot']));`
`38`	`38`	`}`