Skip to content

Commit

Permalink
- Merge [4328].
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastianbergmann
sebastianbergmann committed Dec 21, 2008
1 parent b6ad35a commit 8d1a6dd
Showing 1 changed file with 39 additions and 30 deletions.
69 changes: 39 additions & 30 deletions PHPUnit/Framework/Assert.php
View file
Expand Up @@ -1236,14 +1236,14 @@ public static function assertEqualXMLStructure(DOMNode $expectedNode, DOMNode $a
}

/**
* Assert the presence, absense, or count of elements in a document matching
* Assert the presence, absence, or count of elements in a document matching
* the CSS $selector, regardless of the contents of those elements.
*
* The first argument, $selector, is the CSS selector used to match
* the elements in the $actual document.
*
* The second argument, $count, can be either boolean or numeric. When boolean,
* it asserts for presence of elements matching the selector (TRUE) or absense
* it asserts for presence of elements matching the selector (TRUE) or absence
* of elements (FALSE). When numeric, it asserts the count of elements
*
* assertSelectCount("#binder", true, $xml); // any?
Expand Down Expand Up @@ -1494,7 +1494,7 @@ public static function assertNotTag($matcher, $actual, $message = '', $isHtml =
}

/**
*
* Evaluates a PHPUnit_Framework_Constraint matcher object.
*
* @param mixed $value
* @param PHPUnit_Framework_Constraint $constraint
Expand All @@ -1511,7 +1511,7 @@ public static function assertThat($value, PHPUnit_Framework_Constraint $constrai
}

/**
* Logical AND.
* Returns a PHPUnit_Framework_Constraint_And matcher object.
*
* @return PHPUnit_Framework_Constraint_And
* @since Method available since Release 3.0.0
Expand All @@ -1527,7 +1527,7 @@ public static function logicalAnd()
}

/**
* Logical OR.
* Returns a PHPUnit_Framework_Constraint_Or matcher object.
*
* @return PHPUnit_Framework_Constraint_Or
* @since Method available since Release 3.0.0
Expand All @@ -1543,7 +1543,7 @@ public static function logicalOr()
}

/**
* Logical NOT.
* Returns a PHPUnit_Framework_Constraint_Not matcher object.
*
* @param PHPUnit_Framework_Constraint $constraint
* @return PHPUnit_Framework_Constraint_Not
Expand All @@ -1555,7 +1555,7 @@ public static function logicalNot(PHPUnit_Framework_Constraint $constraint)
}

/**
* Logical XOR.
* Returns a PHPUnit_Framework_Constraint_Xor matcher object.
*
* @return PHPUnit_Framework_Constraint_Xor
* @since Method available since Release 3.0.0
Expand All @@ -1571,7 +1571,7 @@ public static function logicalXor()
}

/**
*
* Returns a PHPUnit_Framework_Constraint_IsAnything matcher object.
*
* @return PHPUnit_Framework_Constraint_IsAnything
* @since Method available since Release 3.0.0
Expand All @@ -1582,7 +1582,7 @@ public static function anything()
}

/**
*
* Returns a PHPUnit_Framework_Constraint_IsTrue matcher object.
*
* @return PHPUnit_Framework_Constraint_IsTrue
* @since Method available since Release 3.3.0
Expand All @@ -1593,7 +1593,7 @@ public static function isTrue()
}

/**
*
* Returns a PHPUnit_Framework_Constraint_IsFalse matcher object.
*
* @return PHPUnit_Framework_Constraint_IsFalse
* @since Method available since Release 3.3.0
Expand All @@ -1604,7 +1604,7 @@ public static function isFalse()
}

/**
*
* Returns a PHPUnit_Framework_Constraint_IsNull matcher object.
*
* @return PHPUnit_Framework_Constraint_IsNull
* @since Method available since Release 3.3.0
Expand All @@ -1615,7 +1615,7 @@ public static function isNull()
}

/**
*
* Returns a PHPUnit_Framework_Constraint_Attribute matcher object.
*
* @param PHPUnit_Framework_Constraint $constraint
* @param string $attributeName
Expand All @@ -1630,7 +1630,8 @@ public static function attribute(PHPUnit_Framework_Constraint $constraint, $attr
}

/**
*
* Returns a PHPUnit_Framework_Constraint_TraversableContains matcher
* object.
*
* @param mixed $value
* @return PHPUnit_Framework_Constraint_TraversableContains
Expand All @@ -1642,7 +1643,8 @@ public static function contains($value)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
* object.
*
* @param string $type
* @return PHPUnit_Framework_Constraint_TraversableContainsOnly
Expand All @@ -1654,7 +1656,7 @@ public static function containsOnly($type)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_ArrayHasKey matcher object.
*
* @param mixed $key
* @return PHPUnit_Framework_Constraint_ArrayHasKey
Expand All @@ -1666,7 +1668,7 @@ public static function arrayHasKey($key)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_IsEqual matcher object.
*
* @param mixed $value
* @param float $delta
Expand All @@ -1680,7 +1682,9 @@ public static function equalTo($value, $delta = 0, $maxDepth = 10)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_IsEqual matcher object
* that is wrapped in a PHPUnit_Framework_Constraint_Attribute matcher
* object.
*
* @param string $attributeName
* @param mixed $value
Expand All @@ -1698,7 +1702,7 @@ public static function attributeEqualTo($attributeName, $value, $delta = 0, $max
}

/**
*
* Returns a PHPUnit_Framework_Constraint_FileExists matcher object.
*
* @return PHPUnit_Framework_Constraint_FileExists
* @since Method available since Release 3.0.0
Expand All @@ -1709,7 +1713,7 @@ public static function fileExists()
}

/**
*
* Returns a PHPUnit_Framework_Constraint_GreaterThan matcher object.
*
* @param mixed $value
* @return PHPUnit_Framework_Constraint_GreaterThan
Expand All @@ -1721,7 +1725,9 @@ public static function greaterThan($value)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
* a PHPUnit_Framework_Constraint_IsEqual and a
* PHPUnit_Framework_Constraint_GreaterThan matcher object.
*
* @param mixed $value
* @return PHPUnit_Framework_Constraint_Or
Expand All @@ -1736,7 +1742,7 @@ public static function greaterThanOrEqual($value)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_ClassHasAttribute matcher object.
*
* @param string $attributeName
* @return PHPUnit_Framework_Constraint_ClassHasAttribute
Expand All @@ -1748,7 +1754,8 @@ public static function classHasAttribute($attributeName)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_ClassHasStaticAttribute matcher
* object.
*
* @param string $attributeName
* @return PHPUnit_Framework_Constraint_ClassHasStaticAttribute
Expand All @@ -1760,7 +1767,7 @@ public static function classHasStaticAttribute($attributeName)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_ObjectHasAttribute matcher object.
*
* @param string $attributeName
* @return PHPUnit_Framework_Constraint_ObjectHasAttribute
Expand All @@ -1772,7 +1779,7 @@ public static function objectHasAttribute($attributeName)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_IsIdentical matcher object.
*
* @param mixed $value
* @return PHPUnit_Framework_Constraint_IsIdentical
Expand All @@ -1784,7 +1791,7 @@ public static function identicalTo($value)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_IsInstanceOf matcher object.
*
* @param string $className
* @return PHPUnit_Framework_Constraint_IsInstanceOf
Expand All @@ -1796,7 +1803,7 @@ public static function isInstanceOf($className)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_IsType matcher object.
*
* @param string $type
* @return PHPUnit_Framework_Constraint_IsType
Expand All @@ -1808,7 +1815,7 @@ public static function isType($type)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_LessThan matcher object.
*
* @param mixed $value
* @return PHPUnit_Framework_Constraint_LessThan
Expand All @@ -1820,7 +1827,9 @@ public static function lessThan($value)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
* a PHPUnit_Framework_Constraint_IsEqual and a
* PHPUnit_Framework_Constraint_LessThan matcher object.
*
* @param mixed $value
* @return PHPUnit_Framework_Constraint_Or
Expand All @@ -1835,7 +1844,7 @@ public static function lessThanOrEqual($value)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_PCREMatch matcher object.
*
* @param string $pattern
* @return PHPUnit_Framework_Constraint_PCREMatch
Expand All @@ -1847,7 +1856,7 @@ public static function matchesRegularExpression($pattern)
}

/**
*
* Returns a PHPUnit_Framework_Constraint_StringContains matcher object.
*
* @param string $string
* @param boolean $case
Expand Down

0 comments on commit 8d1a6dd

Please sign in to comment.