Laravel version update
Laravel version update
This commit is contained in:
Manish Verma
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/*
|
||||
* This file is part of the Comparator package.
|
||||
* This file is part of sebastian/comparator.
|
||||
*
|
||||
* (c) Sebastian Bergmann <sebastian@phpunit.de>
|
||||
*
|
||||
@@ -10,11 +10,16 @@
|
||||
|
||||
namespace SebastianBergmann\Comparator;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
/**
|
||||
* @coversDefaultClass SebastianBergmann\Comparator\ScalarComparator
|
||||
*
|
||||
* @uses SebastianBergmann\Comparator\Comparator
|
||||
* @uses SebastianBergmann\Comparator\Factory
|
||||
* @uses SebastianBergmann\Comparator\ComparisonFailure
|
||||
*/
|
||||
class ScalarComparatorTest extends \PHPUnit_Framework_TestCase
|
||||
class ScalarComparatorTest extends TestCase
|
||||
{
|
||||
private $comparator;
|
||||
|
||||
@@ -25,83 +30,83 @@ class ScalarComparatorTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
public function acceptsSucceedsProvider()
|
||||
{
|
||||
return array(
|
||||
array("string", "string"),
|
||||
array(new ClassWithToString, "string"),
|
||||
array("string", new ClassWithToString),
|
||||
array("string", null),
|
||||
array(false, "string"),
|
||||
array(false, true),
|
||||
array(null, false),
|
||||
array(null, null),
|
||||
array("10", 10),
|
||||
array("", false),
|
||||
array("1", true),
|
||||
array(1, true),
|
||||
array(0, false),
|
||||
array(0.1, "0.1")
|
||||
);
|
||||
return [
|
||||
['string', 'string'],
|
||||
[new ClassWithToString, 'string'],
|
||||
['string', new ClassWithToString],
|
||||
['string', null],
|
||||
[false, 'string'],
|
||||
[false, true],
|
||||
[null, false],
|
||||
[null, null],
|
||||
['10', 10],
|
||||
['', false],
|
||||
['1', true],
|
||||
[1, true],
|
||||
[0, false],
|
||||
[0.1, '0.1']
|
||||
];
|
||||
}
|
||||
|
||||
public function acceptsFailsProvider()
|
||||
{
|
||||
return array(
|
||||
array(array(), array()),
|
||||
array("string", array()),
|
||||
array(new ClassWithToString, new ClassWithToString),
|
||||
array(false, new ClassWithToString),
|
||||
array(tmpfile(), tmpfile())
|
||||
);
|
||||
return [
|
||||
[[], []],
|
||||
['string', []],
|
||||
[new ClassWithToString, new ClassWithToString],
|
||||
[false, new ClassWithToString],
|
||||
[\tmpfile(), \tmpfile()]
|
||||
];
|
||||
}
|
||||
|
||||
public function assertEqualsSucceedsProvider()
|
||||
{
|
||||
return array(
|
||||
array("string", "string"),
|
||||
array(new ClassWithToString, new ClassWithToString),
|
||||
array("string representation", new ClassWithToString),
|
||||
array(new ClassWithToString, "string representation"),
|
||||
array("string", "STRING", true),
|
||||
array("STRING", "string", true),
|
||||
array("String Representation", new ClassWithToString, true),
|
||||
array(new ClassWithToString, "String Representation", true),
|
||||
array("10", 10),
|
||||
array("", false),
|
||||
array("1", true),
|
||||
array(1, true),
|
||||
array(0, false),
|
||||
array(0.1, "0.1"),
|
||||
array(false, null),
|
||||
array(false, false),
|
||||
array(true, true),
|
||||
array(null, null)
|
||||
);
|
||||
return [
|
||||
['string', 'string'],
|
||||
[new ClassWithToString, new ClassWithToString],
|
||||
['string representation', new ClassWithToString],
|
||||
[new ClassWithToString, 'string representation'],
|
||||
['string', 'STRING', true],
|
||||
['STRING', 'string', true],
|
||||
['String Representation', new ClassWithToString, true],
|
||||
[new ClassWithToString, 'String Representation', true],
|
||||
['10', 10],
|
||||
['', false],
|
||||
['1', true],
|
||||
[1, true],
|
||||
[0, false],
|
||||
[0.1, '0.1'],
|
||||
[false, null],
|
||||
[false, false],
|
||||
[true, true],
|
||||
[null, null]
|
||||
];
|
||||
}
|
||||
|
||||
public function assertEqualsFailsProvider()
|
||||
{
|
||||
$stringException = 'Failed asserting that two strings are equal.';
|
||||
$otherException = 'matches expected';
|
||||
$otherException = 'matches expected';
|
||||
|
||||
return array(
|
||||
array("string", "other string", $stringException),
|
||||
array("string", "STRING", $stringException),
|
||||
array("STRING", "string", $stringException),
|
||||
array("string", "other string", $stringException),
|
||||
return [
|
||||
['string', 'other string', $stringException],
|
||||
['string', 'STRING', $stringException],
|
||||
['STRING', 'string', $stringException],
|
||||
['string', 'other string', $stringException],
|
||||
// https://github.com/sebastianbergmann/phpunit/issues/1023
|
||||
array('9E6666666','9E7777777', $stringException),
|
||||
array(new ClassWithToString, "does not match", $otherException),
|
||||
array("does not match", new ClassWithToString, $otherException),
|
||||
array(0, 'Foobar', $otherException),
|
||||
array('Foobar', 0, $otherException),
|
||||
array("10", 25, $otherException),
|
||||
array("1", false, $otherException),
|
||||
array("", true, $otherException),
|
||||
array(false, true, $otherException),
|
||||
array(true, false, $otherException),
|
||||
array(null, true, $otherException),
|
||||
array(0, true, $otherException)
|
||||
);
|
||||
['9E6666666','9E7777777', $stringException],
|
||||
[new ClassWithToString, 'does not match', $otherException],
|
||||
['does not match', new ClassWithToString, $otherException],
|
||||
[0, 'Foobar', $otherException],
|
||||
['Foobar', 0, $otherException],
|
||||
['10', 25, $otherException],
|
||||
['1', false, $otherException],
|
||||
['', true, $otherException],
|
||||
[false, true, $otherException],
|
||||
[true, false, $otherException],
|
||||
[null, true, $otherException],
|
||||
[0, true, $otherException]
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -136,9 +141,7 @@ class ScalarComparatorTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
try {
|
||||
$this->comparator->assertEquals($expected, $actual, 0.0, false, $ignoreCase);
|
||||
}
|
||||
|
||||
catch (ComparisonFailure $exception) {
|
||||
} catch (ComparisonFailure $exception) {
|
||||
}
|
||||
|
||||
$this->assertNull($exception, 'Unexpected ComparisonFailure');
|
||||
@@ -150,9 +153,9 @@ class ScalarComparatorTest extends \PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testAssertEqualsFails($expected, $actual, $message)
|
||||
{
|
||||
$this->setExpectedException(
|
||||
'SebastianBergmann\\Comparator\\ComparisonFailure', $message
|
||||
);
|
||||
$this->expectException(ComparisonFailure::class);
|
||||
$this->expectExceptionMessage($message);
|
||||
|
||||
$this->comparator->assertEquals($expected, $actual);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user