ITT: Laravel 5.3 support.

dmitry-ivanov · Sep 7, 2017 · dbd1cde · dbd1cde
1 parent 8f1a73d
commit dbd1cde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/src/Asserts/DatabaseAsserts.php b/src/Asserts/DatabaseAsserts.php
@@ -18,23 +18,17 @@ protected function dontSeeDatabaseTable($table)
 
     protected function seeInDatabaseMany($table, array $rows)
     {
-        /* @laravel-versions */
-        $assert = method_exists($this, 'assertDatabaseHas') ? 'assertDatabaseHas' : 'seeInDatabase';
-
         foreach ($rows as $row) {
-            $this->$assert($table, $row);
+            $this->seeInDatabase($table, $row);
         }
 
         return $this;
     }
 
     protected function dontSeeInDatabaseMany($table, array $rows)
     {
-        /* @laravel-versions */
-        $assert = method_exists($this, 'assertDatabaseMissing') ? 'assertDatabaseMissing' : 'dontSeeInDatabase';
-
         foreach ($rows as $row) {
-            $this->$assert($table, $row);
+            $this->dontSeeInDatabase($table, $row);
         }
 
         return $this;

diff --git a/src/Asserts/EloquentAsserts.php b/src/Asserts/EloquentAsserts.php
@@ -77,10 +77,7 @@ protected function assertEloquentHasMany($class, $relation)
         $parentKey = $hasManyRelation->getParent()->getKeyName();
         $childModel = $hasManyRelation->getRelated();
         $childKey = $childModel->getKeyName();
-
-        /* @laravel-versions */
-        $childForeignKey = method_exists($hasManyRelation, 'getForeignKeyName')
-            ? $hasManyRelation->getForeignKeyName() : last(explode('.', $hasManyRelation->getForeignKey()));
+        $childForeignKey = last(explode('.', $hasManyRelation->getForeignKey()));
 
         $parent = factory($class)->create();
         $children = factory(get_class($childModel), 3)->create([$childForeignKey => $parent->{$parentKey}]);
@@ -127,9 +124,7 @@ protected function assertEloquentHasCreateManyFor($class, $relation, $createMany
                 ->make()
                 ->toArray()
         );
-
-        /* @laravel-versions */
-        $children = is_array($children) ? collect($children) : $children;
+        $children = collect($children);
 
         $this->assertCollectionsEqual($children, $parent->{$relation}, $childKey);
     }