Update hamcrest-php to latest (fixes PHP 5.4 compatibility)

Author: Hamish Friedlander

hamcrest-php/.piston.yml

@@ -1,8 +1,8 @@
 --- 
 format: 1
 handler: 
-  piston:remote-revision: 718
+  piston:remote-revision: 739
   piston:uuid: 2aa0e9f1-8e24-0410-adc4-1b6a3a6e65e2
-lock: false
 repository_class: Piston::Svn::Repository
 repository_url: http://hamcrest.googlecode.com/svn/trunk/hamcrest-php
+lock: false

hamcrest-php/CHANGES.txt

@@ -1,10 +1,36 @@
-== Version 1.0.0: Not Released ==
+== Version 1.1.0: Released Feb 2 2012 ==
 
-Issues Fixed: 119, 136, 139, 141
+Issues Fixed: 121, 138, 147
 
-* Moved hamcrest.php into hamcrest folder and renamed to Hamcrest.php.
+* Added non-empty matchers to complement the emptiness-matching forms.
+
+  - nonEmptyString()
+  - nonEmptyArray()
+  - nonEmptyTraversable()
+
+* Added ability to pass variable arguments to several array-based matcher
+  factory methods so they work like allOf() et al.
+
+  - anArray()
+  - arrayContainingInAnyOrder(), containsInAnyOrder()
+  - arrayContaining(), contains()
+  - stringContainsInOrder()
+
+* Matchers that accept an array of matchers now also accept variable arguments.
+  Any non-matcher arguments are wrapped by IsEqual.
+
+* Added noneOf() as a shortcut for not(anyOf()).
+
+
+== Version 1.0.0: Released Jan 20 2012 ==
+
+Issues Fixed: 119, 136, 139, 141, 148, 149, 172
+
+* Moved hamcrest.php into Hamcrest folder and renamed to Hamcrest.php.
   This is more in line with PEAR packaging standards.
 
+* Renamed callable() to callableValue() for compatibility with PHP 5.4.
+
 * Added Hamcrest_Text_StringContainsIgnoringCase to assert using stripos().
 
     assertThat('fOObAr', containsStringIgnoringCase('oba'));
@@ -118,6 +144,7 @@ Issues Fixed: 109, 111, 114, 115
     assertThat(array('SomeClass', 'SomeMethod'), callable());
     assertThat(array($object, 'SomeMethod'), callable());
     assertThat($object, callable());
+    assertThat(function ($x, $y) { return $x + $y; }, callable());
 
 * Added Hamcrest_Text_MatchesPattern for regex matching with preg_match().
 

hamcrest-php/hamcrest/Hamcrest.php

@@ -34,10 +34,11 @@ function assertThat()
 /**
  * Evaluates to true only if each $matcher[$i] is satisfied by $array[$i].
  */
-function anArray($array)
+function anArray(/* args... */)
 {
   require_once 'Hamcrest/Array/IsArray.php';
-  return Hamcrest_Array_IsArray::anArray($array);
+  $args = func_get_args();
+  return call_user_func_array(array('Hamcrest_Array_IsArray', 'anArray'), $args);
 }
 
 /**
@@ -65,37 +66,41 @@ function hasValue($item)
 /**
  * An array with elements that match the given matchers.
  */
-function arrayContainingInAnyOrder(array $items)
+function arrayContainingInAnyOrder(/* args... */)
 {
   require_once 'Hamcrest/Array/IsArrayContainingInAnyOrder.php';
-  return Hamcrest_Array_IsArrayContainingInAnyOrder::arrayContainingInAnyOrder($items);
+  $args = func_get_args();
+  return call_user_func_array(array('Hamcrest_Array_IsArrayContainingInAnyOrder', 'arrayContainingInAnyOrder'), $args);
 }
 
 /**
  * An array with elements that match the given matchers.
  */
-function containsInAnyOrder(array $items)
+function containsInAnyOrder(/* args... */)
 {
   require_once 'Hamcrest/Array/IsArrayContainingInAnyOrder.php';
-  return Hamcrest_Array_IsArrayContainingInAnyOrder::arrayContainingInAnyOrder($items);
+  $args = func_get_args();
+  return call_user_func_array(array('Hamcrest_Array_IsArrayContainingInAnyOrder', 'arrayContainingInAnyOrder'), $args);
 }
 
 /**
  * An array with elements that match the given matchers in the same order.
  */
-function arrayContaining(array $items)
+function arrayContaining(/* args... */)
 {
   require_once 'Hamcrest/Array/IsArrayContainingInOrder.php';
-  return Hamcrest_Array_IsArrayContainingInOrder::arrayContaining($items);
+  $args = func_get_args();
+  return call_user_func_array(array('Hamcrest_Array_IsArrayContainingInOrder', 'arrayContaining'), $args);
 }
 
 /**
  * An array with elements that match the given matchers in the same order.
  */
-function contains(array $items)
+function contains(/* args... */)
 {
   require_once 'Hamcrest/Array/IsArrayContainingInOrder.php';
-  return Hamcrest_Array_IsArrayContainingInOrder::arrayContaining($items);
+  $args = func_get_args();
+  return call_user_func_array(array('Hamcrest_Array_IsArrayContainingInOrder', 'arrayContaining'), $args);
 }
 
 /**
@@ -140,6 +145,8 @@ function hasEntry($key, $value)
 
 /**
  * Does array size satisfy a given matcher?
+ * 
+ * @param int $size as a {@link Hamcrest_Matcher} or a value.
  */
 function arrayWithSize($size)
 {
@@ -157,14 +164,32 @@ function emptyArray()
 }
 
 /**
- * Is traversable empty?
+ * Matches an empty array.
+ */
+function nonEmptyArray()
+{
+  require_once 'Hamcrest/Array/IsArrayWithSize.php';
+  return Hamcrest_Array_IsArrayWithSize::nonEmptyArray();
+}
+
+/**
+ * Returns true if traversable is empty.
  */
 function emptyTraversable()
 {
   require_once 'Hamcrest/Collection/IsEmptyTraversable.php';
   return Hamcrest_Collection_IsEmptyTraversable::emptyTraversable();
 }
 
+/**
+ * Returns true if traversable is not empty.
+ */
+function nonEmptyTraversable()
+{
+  require_once 'Hamcrest/Collection/IsEmptyTraversable.php';
+  return Hamcrest_Collection_IsEmptyTraversable::nonEmptyTraversable();
+}
+
 /**
  * Does traversable size satisfy a given matcher?
  */
@@ -194,6 +219,16 @@ function anyOf(/* args... */)
   return call_user_func_array(array('Hamcrest_Core_AnyOf', 'anyOf'), $args);
 }
 
+/**
+ * Evaluates to false if ANY of the passed in matchers evaluate to true.
+ */
+function noneOf(/* args... */)
+{
+  require_once 'Hamcrest/Core/AnyOf.php';
+  $args = func_get_args();
+  return call_user_func_array(array('Hamcrest_Core_AnyOf', 'noneOf'), $args);
+}
+
 /**
  * This is useful for fluently combining matchers that must both pass.
  * For example:
@@ -493,7 +528,7 @@ function atMost($value)
 }
 
 /**
- * Matches if value is zero-length string.
+ * Matches if value is a zero-length string.
  */
 function isEmptyString()
 {
@@ -502,7 +537,7 @@ function isEmptyString()
 }
 
 /**
- * Matches if value is zero-length string.
+ * Matches if value is a zero-length string.
  */
 function emptyString()
 {
@@ -511,7 +546,7 @@ function emptyString()
 }
 
 /**
- * Matches if value is null or zero-length string.
+ * Matches if value is null or a zero-length string.
  */
 function isEmptyOrNullString()
 {
@@ -520,14 +555,32 @@ function isEmptyOrNullString()
 }
 
 /**
- * Matches if value is null or zero-length string.
+ * Matches if value is null or a zero-length string.
  */
 function nullOrEmptyString()
 {
   require_once 'Hamcrest/Text/IsEmptyString.php';
   return Hamcrest_Text_IsEmptyString::isEmptyOrNullString();
 }
 
+/**
+ * Matches if value is a non-zero-length string.
+ */
+function isNonEmptyString()
+{
+  require_once 'Hamcrest/Text/IsEmptyString.php';
+  return Hamcrest_Text_IsEmptyString::isNonEmptyString();
+}
+
+/**
+ * Matches if value is a non-zero-length string.
+ */
+function nonEmptyString()
+{
+  require_once 'Hamcrest/Text/IsEmptyString.php';
+  return Hamcrest_Text_IsEmptyString::isNonEmptyString();
+}
+
 /**
  * Matches if value is a string equal to $string, regardless of the case.
  */
@@ -576,10 +629,11 @@ function containsStringIgnoringCase($substring)
 /**
  * Matches if value contains $substrings in a constrained order.
  */
-function stringContainsInOrder(array $substrings)
+function stringContainsInOrder(/* args... */)
 {
   require_once 'Hamcrest/Text/StringContainsInOrder.php';
-  return Hamcrest_Text_StringContainsInOrder::stringContainsInOrder($substrings);
+  $args = func_get_args();
+  return call_user_func_array(array('Hamcrest_Text_StringContainsInOrder', 'stringContainsInOrder'), $args);
 }
 
 /**
@@ -630,10 +684,10 @@ function boolValue()
 /**
  * Is the value callable?
  */
-function callable()
+function callableValue()
 {
   require_once 'Hamcrest/Type/IsCallable.php';
-  return Hamcrest_Type_IsCallable::callable();
+  return Hamcrest_Type_IsCallable::callableValue();
 }
 
 /**

hamcrest-php/hamcrest/Hamcrest/Array/IsArray.php

@@ -18,34 +18,36 @@
  */
 class Hamcrest_Array_IsArray extends Hamcrest_TypeSafeMatcher
 {
-  
+
   private $_elementMatchers;
-  
+
   public function __construct(array $elementMatchers)
   {
     parent::__construct(self::TYPE_ARRAY);
-    
+
+    Hamcrest_Util::checkAllAreMatchers($elementMatchers);
+
     $this->_elementMatchers = $elementMatchers;
   }
-  
+
   protected function matchesSafely($array)
   {
     if (array_keys($array) != array_keys($this->_elementMatchers))
     {
       return false;
     }
-    
+
     foreach ($this->_elementMatchers as $k => $matcher)
     {
       if (!$matcher->matches($array[$k]))
       {
         return false;
       }
     }
-    
+
     return true;
   }
-  
+
   protected function describeMismatchSafely($actual,
     Hamcrest_Description $mismatchDescription)
   {
@@ -66,7 +68,7 @@ protected function describeMismatchSafely($actual,
                           ;
       return;
     }
-    
+
     foreach ($this->_elementMatchers as $k => $matcher)
     {
       if (!$matcher->matches($actual[$k]))
@@ -78,7 +80,7 @@ protected function describeMismatchSafely($actual,
       }
     }
   }
-  
+
   public function describeTo(Hamcrest_Description $description)
   {
     $description->appendList(
@@ -88,32 +90,33 @@ public function describeTo(Hamcrest_Description $description)
       $this->_elementMatchers
     );
   }
-  
+
   /**
    * Evaluates to true only if each $matcher[$i] is satisfied by $array[$i].
    *
-   * @factory
+   * @factory ...
    */
-  public static function anArray($array)
+  public static function anArray(/* args... */)
   {
-    return new self($array);
+    $args = func_get_args();
+    return new self(Hamcrest_Util::createMatcherArray($args));
   }
-  
+
   // -- Protected Methods
-  
+
   protected function descriptionStart()
   {
     return '[';
   }
-  
+
   protected function descriptionSeparator()
   {
     return ', ';
   }
-  
+
   protected function descriptionEnd()
   {
     return ']';
   }
-  
+
 }