Merge branch '3.4' into 4.4

fabpot · fabpot · commit b5cbc43cadb5 · 2020-10-06T10:07:23.000+02:00
* 3.4:
  Move to the new default 5.x branch
  Use PHPUnit 9.4 to run the test suite.
  Fix type annotation
diff --git a/Token.php b/Token.php
@@ -54,7 +54,7 @@ public function __toString()
     /**
      * Tests the current token for a type and/or a value.
      *
-     * @param array|int   $type  The type to test
+     * @param string      $type  The type to test
      * @param string|null $value The token value
      *
      * @return bool

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __toString()`
`54`	`54`	`/**`
`55`	`55`	`* Tests the current token for a type and/or a value.`
`56`	`56`	`*`
`57`		`- * @param array\|int $type The type to test`
	`57`	`+ * @param string $type The type to test`
`58`	`58`	`* @param string\|null $value The token value`
`59`	`59`	`*`
`60`	`60`	`* @return bool`