Laravel version update

Laravel version update

vendor/sebastian/comparator/tests/ObjectComparatorTest.php

@@ -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,13 +10,17 @@
 
 namespace SebastianBergmann\Comparator;
 
+use PHPUnit\Framework\TestCase;
 use stdClass;
 
 /**
  * @coversDefaultClass SebastianBergmann\Comparator\ObjectComparator
  *
+ * @uses SebastianBergmann\Comparator\Comparator
+ * @uses SebastianBergmann\Comparator\Factory
+ * @uses SebastianBergmann\Comparator\ComparisonFailure
  */
-class ObjectComparatorTest extends \PHPUnit_Framework_TestCase
+class ObjectComparatorTest extends TestCase
 {
     private $comparator;
 
@@ -28,72 +32,72 @@ class ObjectComparatorTest extends \PHPUnit_Framework_TestCase
 
     public function acceptsSucceedsProvider()
     {
-        return array(
-          array(new TestClass, new TestClass),
-          array(new stdClass, new stdClass),
-          array(new stdClass, new TestClass)
-        );
+        return [
+          [new TestClass, new TestClass],
+          [new stdClass, new stdClass],
+          [new stdClass, new TestClass]
+        ];
     }
 
     public function acceptsFailsProvider()
     {
-        return array(
-          array(new stdClass, null),
-          array(null, new stdClass),
-          array(null, null)
-        );
+        return [
+          [new stdClass, null],
+          [null, new stdClass],
+          [null, null]
+        ];
     }
 
     public function assertEqualsSucceedsProvider()
     {
         // cyclic dependencies
-        $book1 = new Book;
-        $book1->author = new Author('Terry Pratchett');
+        $book1                  = new Book;
+        $book1->author          = new Author('Terry Pratchett');
         $book1->author->books[] = $book1;
-        $book2 = new Book;
-        $book2->author = new Author('Terry Pratchett');
+        $book2                  = new Book;
+        $book2->author          = new Author('Terry Pratchett');
         $book2->author->books[] = $book2;
 
         $object1 = new SampleClass(4, 8, 15);
         $object2 = new SampleClass(4, 8, 15);
 
-        return array(
-          array($object1, $object1),
-          array($object1, $object2),
-          array($book1, $book1),
-          array($book1, $book2),
-          array(new Struct(2.3), new Struct(2.5), 0.5)
-        );
+        return [
+          [$object1, $object1],
+          [$object1, $object2],
+          [$book1, $book1],
+          [$book1, $book2],
+          [new Struct(2.3), new Struct(2.5), 0.5]
+        ];
     }
 
     public function assertEqualsFailsProvider()
     {
-        $typeMessage = 'is not instance of expected class';
+        $typeMessage  = 'is not instance of expected class';
         $equalMessage = 'Failed asserting that two objects are equal.';
 
         // cyclic dependencies
-        $book1 = new Book;
-        $book1->author = new Author('Terry Pratchett');
+        $book1                  = new Book;
+        $book1->author          = new Author('Terry Pratchett');
         $book1->author->books[] = $book1;
-        $book2 = new Book;
-        $book2->author = new Author('Terry Pratch');
+        $book2                  = new Book;
+        $book2->author          = new Author('Terry Pratch');
         $book2->author->books[] = $book2;
 
-        $book3 = new Book;
+        $book3         = new Book;
         $book3->author = 'Terry Pratchett';
-        $book4 = new stdClass;
+        $book4         = new stdClass;
         $book4->author = 'Terry Pratchett';
 
-        $object1 = new SampleClass( 4,  8, 15);
+        $object1 = new SampleClass(4, 8, 15);
         $object2 = new SampleClass(16, 23, 42);
 
-        return array(
-          array(new SampleClass(4, 8, 15), new SampleClass(16, 23, 42), $equalMessage),
-          array($object1, $object2, $equalMessage),
-          array($book1, $book2, $equalMessage),
-          array($book3, $book4, $typeMessage),
-          array(new Struct(2.3), new Struct(4.2), $equalMessage, 0.5)
-        );
+        return [
+          [new SampleClass(4, 8, 15), new SampleClass(16, 23, 42), $equalMessage],
+          [$object1, $object2, $equalMessage],
+          [$book1, $book2, $equalMessage],
+          [$book3, $book4, $typeMessage],
+          [new Struct(2.3), new Struct(4.2), $equalMessage, 0.5]
+        ];
     }
 
     /**
@@ -128,9 +132,7 @@ class ObjectComparatorTest extends \PHPUnit_Framework_TestCase
 
         try {
             $this->comparator->assertEquals($expected, $actual, $delta);
-        }
-
-        catch (ComparisonFailure $exception) {
+        } catch (ComparisonFailure $exception) {
         }
 
         $this->assertNull($exception, 'Unexpected ComparisonFailure');
@@ -142,9 +144,9 @@ class ObjectComparatorTest extends \PHPUnit_Framework_TestCase
      */
     public function testAssertEqualsFails($expected, $actual, $message, $delta = 0.0)
     {
-        $this->setExpectedException(
-          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
-        );
+        $this->expectException(ComparisonFailure::class);
+        $this->expectExceptionMessage($message);
+
         $this->comparator->assertEquals($expected, $actual, $delta);
     }
 }