Skip to content

Commit

Permalink
Merge branch '4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastianbergmann
sebastianbergmann committed Apr 23, 2014
2 parents 7450a6d + 42443cc commit b9df073
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions src/Framework/Assert.php
View file
Expand Up @@ -466,7 +466,7 @@ public static function assertAttributeNotCount($expectedCount, $haystackAttribut
* @param boolean $canonicalize
* @param boolean $ignoreCase
*/
public static function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
public static function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
$constraint = new PHPUnit_Framework_Constraint_IsEqual(
$expected, $delta, $maxDepth, $canonicalize, $ignoreCase
Expand All @@ -487,7 +487,7 @@ public static function assertEquals($expected, $actual, $message = '', $delta =
* @param boolean $canonicalize
* @param boolean $ignoreCase
*/
public static function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
public static function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
self::assertEquals(
$expected,
Expand All @@ -512,7 +512,7 @@ public static function assertAttributeEquals($expected, $actualAttributeName, $a
* @param boolean $ignoreCase
* @since Method available since Release 2.3.0
*/
public static function assertNotEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
public static function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
$constraint = new PHPUnit_Framework_Constraint_Not(
new PHPUnit_Framework_Constraint_IsEqual(
Expand All @@ -535,7 +535,7 @@ public static function assertNotEquals($expected, $actual, $message = '', $delta
* @param boolean $canonicalize
* @param boolean $ignoreCase
*/
public static function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
public static function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
self::assertNotEquals(
$expected,
Expand Down Expand Up @@ -2526,7 +2526,7 @@ public static function arrayHasKey($key)
* @return PHPUnit_Framework_Constraint_IsEqual
* @since Method available since Release 3.0.0
*/
public static function equalTo($value, $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
public static function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
return new PHPUnit_Framework_Constraint_IsEqual(
$value, $delta, $maxDepth, $canonicalize, $ignoreCase
Expand All @@ -2547,7 +2547,7 @@ public static function equalTo($value, $delta = 0, $maxDepth = 10, $canonicalize
* @return PHPUnit_Framework_Constraint_Attribute
* @since Method available since Release 3.1.0
*/
public static function attributeEqualTo($attributeName, $value, $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
public static function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
return self::attribute(
self::equalTo(
Expand Down
12 changes: 6 additions & 6 deletions src/Framework/Assert/Functions.php
View file
Expand Up @@ -206,7 +206,7 @@ function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $m
* @param boolean $canonicalize
* @param boolean $ignoreCase
*/
function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
return call_user_func_array(
'PHPUnit_Framework_Assert::assertAttributeEquals',
Expand Down Expand Up @@ -404,7 +404,7 @@ function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject,
* @param boolean $canonicalize
* @param boolean $ignoreCase
*/
function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
return call_user_func_array(
'PHPUnit_Framework_Assert::assertAttributeNotEquals',
Expand Down Expand Up @@ -654,7 +654,7 @@ function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actual
* @param boolean $canonicalize
* @param boolean $ignoreCase
*/
function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
return call_user_func_array(
'PHPUnit_Framework_Assert::assertEquals',
Expand Down Expand Up @@ -1039,7 +1039,7 @@ function assertNotEmpty($actual, $message = '')
* @param boolean $ignoreCase
* @since Method available since Release 2.3.0
*/
function assertNotEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
return call_user_func_array(
'PHPUnit_Framework_Assert::assertNotEquals',
Expand Down Expand Up @@ -1848,7 +1848,7 @@ function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName)
* @return PHPUnit_Framework_Constraint_Attribute
* @since Method available since Release 3.1.0
*/
function attributeEqualTo($attributeName, $value, $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
return call_user_func_array(
'PHPUnit_Framework_Assert::attributeEqualTo',
Expand Down Expand Up @@ -1961,7 +1961,7 @@ function containsOnlyInstancesOf($classname)
* @return PHPUnit_Framework_Constraint_IsEqual
* @since Method available since Release 3.0.0
*/
function equalTo($value, $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
return call_user_func_array(
'PHPUnit_Framework_Assert::equalTo',
Expand Down
4 changes: 2 additions & 2 deletions src/Framework/Constraint/IsEqual.php
View file
Expand Up @@ -74,7 +74,7 @@ class PHPUnit_Framework_Constraint_IsEqual extends PHPUnit_Framework_Constraint
/**
* @var float
*/
protected $delta = 0;
protected $delta = 0.0;

/**
* @var integer
Expand Down Expand Up @@ -104,7 +104,7 @@ class PHPUnit_Framework_Constraint_IsEqual extends PHPUnit_Framework_Constraint
* @param boolean $ignoreCase
* @throws PHPUnit_Framework_Exception
*/
public function __construct($value, $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
public function __construct($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
{
parent::__construct();

Expand Down
8 changes: 4 additions & 4 deletions tests/Framework/AssertTest.php
View file
Expand Up @@ -946,7 +946,7 @@ public function notSameProvider()
* @covers PHPUnit_Framework_Assert::assertEquals
* @dataProvider equalProvider
*/
public function testAssertEqualsSucceeds($a, $b, $delta = 0, $canonicalize = false, $ignoreCase = false)
public function testAssertEqualsSucceeds($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
{
$this->assertEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
}
Expand All @@ -955,7 +955,7 @@ public function testAssertEqualsSucceeds($a, $b, $delta = 0, $canonicalize = fal
* @covers PHPUnit_Framework_Assert::assertEquals
* @dataProvider notEqualProvider
*/
public function testAssertEqualsFails($a, $b, $delta = 0, $canonicalize = false, $ignoreCase = false)
public function testAssertEqualsFails($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
{
try {
$this->assertEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
Expand All @@ -972,7 +972,7 @@ public function testAssertEqualsFails($a, $b, $delta = 0, $canonicalize = false,
* @covers PHPUnit_Framework_Assert::assertNotEquals
* @dataProvider notEqualProvider
*/
public function testAssertNotEqualsSucceeds($a, $b, $delta = 0, $canonicalize = false, $ignoreCase = false)
public function testAssertNotEqualsSucceeds($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
{
$this->assertNotEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
}
Expand All @@ -981,7 +981,7 @@ public function testAssertNotEqualsSucceeds($a, $b, $delta = 0, $canonicalize =
* @covers PHPUnit_Framework_Assert::assertNotEquals
* @dataProvider equalProvider
*/
public function testAssertNotEqualsFails($a, $b, $delta = 0, $canonicalize = false, $ignoreCase = false)
public function testAssertNotEqualsFails($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
{
try {
$this->assertNotEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
Expand Down

0 comments on commit b9df073

Please sign in to comment.