Merge branch '2.3' into 2.7

fabpot · fabpot · commit f8b573af1348 · 2016-01-25T10:55:53.000+01:00
* 2.3:
  [Request] Ignore invalid IP addresses sent by proxies
  Able to load big xml files with DomCrawler
  fixed typo
  [Form] Fix constraints could be null if not set
  [Finder] Check PHP version before applying a workaround for a PHP bug
  fixed CS
  sort bundles in config:dump-reference command
  Fixer findings.
diff --git a/Tests/Node/AbstractNodeTest.php b/Tests/Node/AbstractNodeTest.php
@@ -28,5 +28,6 @@ public function testSpecificityValue(NodeInterface $node, $value)
     }
 
     abstract public function getToStringConversionTestData();
+
     abstract public function getSpecificityValueTestData();
 }
diff --git a/Tests/Parser/Handler/AbstractHandlerTest.php b/Tests/Parser/Handler/AbstractHandlerTest.php
@@ -43,7 +43,9 @@ public function testDontHandleValue($value)
     }
 
     abstract public function getHandleValueTestData();
+
     abstract public function getDontHandleValueTestData();
+
     abstract protected function generateHandler();
 
     protected function assertStreamEmpty(TokenStream $stream)

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@ public function testSpecificityValue(NodeInterface $node, $value)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`abstract public function getToStringConversionTestData();`
	`31`	`+`
`31`	`32`	`abstract public function getSpecificityValueTestData();`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@ public function testDontHandleValue($value)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`abstract public function getHandleValueTestData();`
	`46`	`+`
`46`	`47`	`abstract public function getDontHandleValueTestData();`
	`48`	`+`
`47`	`49`	`abstract protected function generateHandler();`
`48`	`50`
`49`	`51`	`protected function assertStreamEmpty(TokenStream $stream)`