Merge branch '2.7' into 2.8

fabpot · fabpot · commit dee868baf516 · 2017-05-01T07:31:55.000-07:00
* 2.7:
  Fix minor phpdoc mismatches with the code(detected by phan)
  [Asset] Starting slash should indicate no basePath wanted
  [Security] Fix phpdoc logout listener
  Fix minor typo in the main README.md
diff --git a/Encoder/XmlEncoder.php b/Encoder/XmlEncoder.php
@@ -468,7 +468,7 @@ private function appendNode(\DOMNode $parentNode, $data, $nodeName, $key = null)
      */
     private function needsCdataWrapping($val)
     {
-        return preg_match('/[<>&]/', $val);
+        return 0 < preg_match('/[<>&]/', $val);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ private function appendNode(\DOMNode $parentNode, $data, $nodeName, $key = null)`
`468`	`468`	`*/`
`469`	`469`	`private function needsCdataWrapping($val)`
`470`	`470`	`{`
`471`		`- return preg_match('/[<>&]/', $val);`
	`471`	`+ return 0 < preg_match('/[<>&]/', $val);`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`/**`