regenerate Matchers and Hamcrest to resolve conflicts

Author: pscheit

hamcrest/Hamcrest.php

@@ -6,8 +6,6 @@
 
 // This file is generated from the static method @factory doctags.
 
-use Hamcrest\Matcher;
-
 if (!function_exists('assertThat')) {
     /**
      * Make an assertion and throw {@link Hamcrest_AssertionError} if it fails.
@@ -146,6 +144,7 @@ function hasKey($key): \Hamcrest\Arrays\IsArrayContainingKey
 if (!function_exists('hasKeyValuePair')) {
     /**
      * Test if an array has both an key and value in parity with each other.
+     *
      * @param mixed $key
      * @param mixed $value
      */
@@ -158,6 +157,7 @@ function hasKeyValuePair($key, $value): \Hamcrest\Arrays\IsArrayContainingKeyVal
 if (!function_exists('hasEntry')) {
     /**
      * Test if an array has both an key and value in parity with each other.
+     *
      * @param mixed $key
      * @param mixed $value
      */
@@ -224,6 +224,7 @@ function nonEmptyTraversable(): \Hamcrest\Collection\IsEmptyTraversable
 if (!function_exists('traversableWithSize')) {
     /**
      * Does traversable size satisfy a given matcher?
+     *
      * @param mixed $size
      */
     function traversableWithSize($size): \Hamcrest\Collection\IsTraversableWithSize
@@ -306,7 +307,7 @@ function describedAs(/* args... */): \Hamcrest\Core\DescribedAs
 
 if (!function_exists('everyItem')) {
     /**
-     * @param Matcher $itemMatcher
+     * @param \Hamcrest\Matcher $itemMatcher
      *   A matcher to apply to every element in an array.
      *
      * @return \Hamcrest\Core\Every
@@ -322,6 +323,8 @@ function everyItem(\Hamcrest\Matcher $itemMatcher): \Hamcrest\Core\Every
     /**
      * Creates a matcher that matches any examined object whose <code>toString</code> or
      * <code>__toString()</code> method returns a value equalTo the specified string.
+     *
+     * @param mixed $matcher
      */
     function hasToString($matcher): \Hamcrest\Core\HasToString
     {
@@ -336,6 +339,7 @@ function hasToString($matcher): \Hamcrest\Core\HasToString
      *
      * For example:  assertThat($cheese, equalTo($smelly))
      *          vs.  assertThat($cheese, is(equalTo($smelly)))
+     *
      * @param mixed $value
      */
     function is($value): \Hamcrest\Core\Is
@@ -349,8 +353,6 @@ function is($value): \Hamcrest\Core\Is
      * This matcher always evaluates to true.
      *
      * @param string $description A meaningful string used when describing itself.
-     *
-     * @return \Hamcrest\Core\IsAnything
      */
     function anything(string $description = 'ANYTHING'): \Hamcrest\Core\IsAnything
     {
@@ -397,6 +399,7 @@ function hasItems(/* args... */): \Hamcrest\Core\AllOf
     /**
      * Is the value equal to another value, as tested by the use of the "=="
      * comparison operator?
+     *
      * @param mixed $item
      */
     function equalTo($item): \Hamcrest\Core\IsEqual
@@ -408,6 +411,7 @@ function equalTo($item): \Hamcrest\Core\IsEqual
 if (!function_exists('identicalTo')) {
     /**
      * Tests of the value is identical to $value as tested by the "===" operator.
+     *
      * @param mixed $value
      */
     function identicalTo($value): \Hamcrest\Core\IsIdentical
@@ -445,6 +449,7 @@ function any(string $theClass): \Hamcrest\Core\IsInstanceOf
 if (!function_exists('not')) {
     /**
      * Matches if value does not match $value.
+     *
      * @param mixed $value
      */
     function not($value): \Hamcrest\Core\IsNot
@@ -492,6 +497,8 @@ function sameInstance($object): \Hamcrest\Core\IsSame
 if (!function_exists('typeOf')) {
     /**
      * Is the value a particular built-in type?
+     *
+     * @param string $theType
      */
     function typeOf(string $theType): \Hamcrest\Core\IsTypeOf
     {
@@ -502,6 +509,7 @@ function typeOf(string $theType): \Hamcrest\Core\IsTypeOf
 if (!function_exists('set')) {
     /**
      * Matches if value (class, object, or array) has named $property.
+     *
      * @param mixed $property
      */
     function set($property): \Hamcrest\Core\Set
@@ -513,6 +521,7 @@ function set($property): \Hamcrest\Core\Set
 if (!function_exists('notSet')) {
     /**
      * Matches if value (class, object, or array) does not have named $property.
+     *
      * @param mixed $property
      */
     function notSet($property): \Hamcrest\Core\Set
@@ -525,6 +534,7 @@ function notSet($property): \Hamcrest\Core\Set
     /**
      * Matches if value is a number equal to $value within some range of
      * acceptable error $delta.
+     *
      * @param mixed $value
      * @param mixed $delta
      */
@@ -537,6 +547,7 @@ function closeTo($value, $delta): \Hamcrest\Number\IsCloseTo
 if (!function_exists('comparesEqualTo')) {
     /**
      * The value is not > $value, nor < $value.
+     *
      * @param mixed $value
      */
     function comparesEqualTo($value): \Hamcrest\Number\OrderingComparison
@@ -548,6 +559,7 @@ function comparesEqualTo($value): \Hamcrest\Number\OrderingComparison
 if (!function_exists('greaterThan')) {
     /**
      * The value is > $value.
+     *
      * @param mixed $value
      */
     function greaterThan($value): \Hamcrest\Number\OrderingComparison
@@ -559,6 +571,7 @@ function greaterThan($value): \Hamcrest\Number\OrderingComparison
 if (!function_exists('greaterThanOrEqualTo')) {
     /**
      * The value is >= $value.
+     *
      * @param mixed $value
      */
     function greaterThanOrEqualTo($value): \Hamcrest\Number\OrderingComparison
@@ -570,6 +583,7 @@ function greaterThanOrEqualTo($value): \Hamcrest\Number\OrderingComparison
 if (!function_exists('atLeast')) {
     /**
      * The value is >= $value.
+     *
      * @param mixed $value
      */
     function atLeast($value): \Hamcrest\Number\OrderingComparison
@@ -581,6 +595,7 @@ function atLeast($value): \Hamcrest\Number\OrderingComparison
 if (!function_exists('lessThan')) {
     /**
      * The value is < $value.
+     *
      * @param mixed $value
      */
     function lessThan($value): \Hamcrest\Number\OrderingComparison
@@ -592,6 +607,7 @@ function lessThan($value): \Hamcrest\Number\OrderingComparison
 if (!function_exists('lessThanOrEqualTo')) {
     /**
      * The value is <= $value.
+     *
      * @param mixed $value
      */
     function lessThanOrEqualTo($value): \Hamcrest\Number\OrderingComparison
@@ -603,6 +619,7 @@ function lessThanOrEqualTo($value): \Hamcrest\Number\OrderingComparison
 if (!function_exists('atMost')) {
     /**
      * The value is <= $value.
+     *
      * @param mixed $value
      */
     function atMost($value): \Hamcrest\Number\OrderingComparison
@@ -674,6 +691,7 @@ function nonEmptyString(): \Hamcrest\Text\IsEmptyString
 if (!function_exists('equalToIgnoringCase')) {
     /**
      * Matches if value is a string equal to $string, regardless of the case.
+     *
      * @param mixed $string
      */
     function equalToIgnoringCase($string): \Hamcrest\Text\IsEqualIgnoringCase
@@ -685,6 +703,7 @@ function equalToIgnoringCase($string): \Hamcrest\Text\IsEqualIgnoringCase
 if (!function_exists('equalToIgnoringWhiteSpace')) {
     /**
      * Matches if value is a string equal to $string, regardless of whitespace.
+     *
      * @param mixed $string
      */
     function equalToIgnoringWhiteSpace($string): \Hamcrest\Text\IsEqualIgnoringWhiteSpace
@@ -696,6 +715,7 @@ function equalToIgnoringWhiteSpace($string): \Hamcrest\Text\IsEqualIgnoringWhite
 if (!function_exists('matchesPattern')) {
     /**
      * Matches if value is a string that matches regular expression $pattern.
+     *
      * @param mixed $pattern
      */
     function matchesPattern($pattern): \Hamcrest\Text\MatchesPattern
@@ -707,6 +727,7 @@ function matchesPattern($pattern): \Hamcrest\Text\MatchesPattern
 if (!function_exists('containsString')) {
     /**
      * Matches if value is a string that contains $substring.
+     *
      * @param mixed $substring
      */
     function containsString($substring): \Hamcrest\Text\StringContains
@@ -718,6 +739,7 @@ function containsString($substring): \Hamcrest\Text\StringContains
 if (!function_exists('containsStringIgnoringCase')) {
     /**
      * Matches if value is a string that contains $substring regardless of the case.
+     *
      * @param mixed $substring
      */
     function containsStringIgnoringCase($substring): \Hamcrest\Text\StringContainsIgnoringCase
@@ -740,6 +762,7 @@ function stringContainsInOrder(/* args... */): \Hamcrest\Text\StringContainsInOr
 if (!function_exists('endsWith')) {
     /**
      * Matches if value is a string that ends with $substring.
+     *
      * @param mixed $substring
      */
     function endsWith($substring): \Hamcrest\Text\StringEndsWith
@@ -751,6 +774,7 @@ function endsWith($substring): \Hamcrest\Text\StringEndsWith
 if (!function_exists('startsWith')) {
     /**
      * Matches if value is a string that starts with $substring.
+     *
      * @param mixed $substring
      */
     function startsWith($substring): \Hamcrest\Text\StringStartsWith
@@ -904,10 +928,11 @@ function stringValue(): \Hamcrest\Type\IsString
      * Wraps <code>$matcher</code> with {@link Hamcrest\Core\IsEqual)
      * if it's not a matcher and the XPath in <code>count()</code>
      * if it's an integer.
+     *
      * @param string $xpath
      * @param null|Matcher|int|mixed $matcher
      */
-    function hasXPath($xpath, $matcher = null): \Hamcrest\Xml\HasXPath
+    function hasXPath(string $xpath, $matcher = null): \Hamcrest\Xml\HasXPath
     {
         return \Hamcrest\Xml\HasXPath::hasXPath($xpath, $matcher);
     }