Laravel version update

Laravel version update
This commit is contained in:
Manish Verma
2018-08-06 18:48:58 +05:30
parent d143048413
commit 126fbb0255
13678 changed files with 1031482 additions and 778530 deletions

View File

@@ -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\ResourceComparator
*
* @uses SebastianBergmann\Comparator\Comparator
* @uses SebastianBergmann\Comparator\Factory
* @uses SebastianBergmann\Comparator\ComparisonFailure
*/
class ResourceComparatorTest extends \PHPUnit_Framework_TestCase
class ResourceComparatorTest extends TestCase
{
private $comparator;
@@ -25,47 +30,47 @@ class ResourceComparatorTest extends \PHPUnit_Framework_TestCase
public function acceptsSucceedsProvider()
{
$tmpfile1 = tmpfile();
$tmpfile2 = tmpfile();
$tmpfile1 = \tmpfile();
$tmpfile2 = \tmpfile();
return array(
array($tmpfile1, $tmpfile1),
array($tmpfile2, $tmpfile2),
array($tmpfile1, $tmpfile2)
);
return [
[$tmpfile1, $tmpfile1],
[$tmpfile2, $tmpfile2],
[$tmpfile1, $tmpfile2]
];
}
public function acceptsFailsProvider()
{
$tmpfile1 = tmpfile();
$tmpfile1 = \tmpfile();
return array(
array($tmpfile1, null),
array(null, $tmpfile1),
array(null, null)
);
return [
[$tmpfile1, null],
[null, $tmpfile1],
[null, null]
];
}
public function assertEqualsSucceedsProvider()
{
$tmpfile1 = tmpfile();
$tmpfile2 = tmpfile();
$tmpfile1 = \tmpfile();
$tmpfile2 = \tmpfile();
return array(
array($tmpfile1, $tmpfile1),
array($tmpfile2, $tmpfile2)
);
return [
[$tmpfile1, $tmpfile1],
[$tmpfile2, $tmpfile2]
];
}
public function assertEqualsFailsProvider()
{
$tmpfile1 = tmpfile();
$tmpfile2 = tmpfile();
$tmpfile1 = \tmpfile();
$tmpfile2 = \tmpfile();
return array(
array($tmpfile1, $tmpfile2),
array($tmpfile2, $tmpfile1)
);
return [
[$tmpfile1, $tmpfile2],
[$tmpfile2, $tmpfile1]
];
}
/**
@@ -100,9 +105,7 @@ class ResourceComparatorTest extends \PHPUnit_Framework_TestCase
try {
$this->comparator->assertEquals($expected, $actual);
}
catch (ComparisonFailure $exception) {
} catch (ComparisonFailure $exception) {
}
$this->assertNull($exception, 'Unexpected ComparisonFailure');
@@ -114,7 +117,8 @@ class ResourceComparatorTest extends \PHPUnit_Framework_TestCase
*/
public function testAssertEqualsFails($expected, $actual)
{
$this->setExpectedException('SebastianBergmann\\Comparator\\ComparisonFailure');
$this->expectException(ComparisonFailure::class);
$this->comparator->assertEquals($expected, $actual);
}
}