Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 833beea4b0bc · 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/Definition/Builder/TreeBuilderTest.php b/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());
     }
 }

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