Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 24b1a3ffa5b6 · 2017-02-21T09:33:48.000+01:00
* 2.7:
  Further refactorings to PHPUnit namespaces
  resolve parameters in definition classes
diff --git a/Tests/CrawlerTest.php b/Tests/CrawlerTest.php
@@ -946,6 +946,8 @@ public function testChildren()
             $crawler = new Crawler('<p></p>');
             $crawler->filter('p')->children();
             $this->assertTrue(true, '->children() does not trigger a notice if the node has no children');
+        } catch (\PHPUnit\Framework\Error\Notice $e) {
+            $this->fail('->children() does not trigger a notice if the node has no children');
         } catch (\PHPUnit_Framework_Error_Notice $e) {
             $this->fail('->children() does not trigger a notice if the node has no children');
         }

Original file line number	Diff line number	Diff line change
`@@ -946,6 +946,8 @@ public function testChildren()`
`946`	`946`	`$crawler = new Crawler('<p></p>');`
`947`	`947`	`$crawler->filter('p')->children();`
`948`	`948`	`$this->assertTrue(true, '->children() does not trigger a notice if the node has no children');`
	`949`	`+ } catch (\PHPUnit\Framework\Error\Notice $e) {`
	`950`	`+ $this->fail('->children() does not trigger a notice if the node has no children');`
`949`	`951`	`} catch (\PHPUnit_Framework_Error_Notice $e) {`
`950`	`952`	`$this->fail('->children() does not trigger a notice if the node has no children');`
`951`	`953`	`}`