Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 877bb4b16ea5 · 2016-02-22T17:12:45.000+01:00
* 2.7:
  PhpUnitNoDedicateAssertFixer results
  Improve Norwegian translations
  Simplify markdown for PR template
diff --git a/Tests/Shell/CommandTest.php b/Tests/Shell/CommandTest.php
@@ -149,7 +149,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
`@@ -149,7 +149,7 @@ public function testExecute()`
`149`	`149`	`$cmd->add('--version');`
`150`	`150`	`$result = $cmd->execute();`
`151`	`151`
`152`		`- $this->assertTrue(is_array($result));`
	`152`	`+ $this->assertInternalType('array', $result);`
`153`	`153`	`$this->assertNotEmpty($result);`
`154`	`154`	`$this->assertRegexp('/PHP\|HipHop/', $result[0]);`
`155`	`155`	`}`