Merge branch '2.7' into 2.8

fabpot · fabpot · commit ba3204654efa · 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/Parser/Reader.php b/Parser/Reader.php
@@ -97,7 +97,7 @@ public function getOffset($string)
     /**
      * @param string $pattern
      *
-     * @return bool
+     * @return array|false
      */
     public function findPattern($pattern)
     {
diff --git a/XPath/Extension/NodeExtension.php b/XPath/Extension/NodeExtension.php
@@ -72,7 +72,7 @@ public function setFlag($flag, $on)
      */
     public function hasFlag($flag)
     {
-        return $this->flags & $flag;
+        return (bool) ($this->flags & $flag);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function getOffset($string)`
`97`	`97`	`/**`
`98`	`98`	`* @param string $pattern`
`99`	`99`	`*`
`100`		`- * @return bool`
	`100`	`+ * @return array\|false`
`101`	`101`	`*/`
`102`	`102`	`public function findPattern($pattern)`
`103`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function setFlag($flag, $on)`
`72`	`72`	`*/`
`73`	`73`	`public function hasFlag($flag)`
`74`	`74`	`{`
`75`		`- return $this->flags & $flag;`
	`75`	`+ return (bool) ($this->flags & $flag);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/**`