Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit addcb70b33af · 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/Tests/Shell/CommandTest.php b/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]);
     }

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`	`}`