From 7bdb694dc4614cddacae38ed3d17011d9b2d26a5 Mon Sep 17 00:00:00 2001
From: Yurii K <yurii-github@users.noreply.github.com>
Date: Thu, 29 Oct 2020 00:39:45 +0200
Subject: [PATCH 1/9] CI/CD integrations - added Travis CI support - added
 Codeclimate support - better PHPUnit config

---
 .codeclimate.yml |  5 +++++
 .gitignore       |  2 ++
 .travis.yml      | 45 +++++++++++++++++++++++++++++++++++++++++++++
 phpunit.xml      | 17 -----------------
 phpunit.xml.dist | 29 +++++++++++++++++++++++++++++
 5 files changed, 81 insertions(+), 17 deletions(-)
 create mode 100644 .codeclimate.yml
 create mode 100644 .travis.yml
 delete mode 100644 phpunit.xml
 create mode 100644 phpunit.xml.dist

diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 0000000..ce3670c
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,5 @@
+languages:
+  PHP: true
+exclude_paths:
+  - tests
+  - vendor
diff --git a/.gitignore b/.gitignore
index fe8a4b4..ca25074 100755
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /vendor/
 /.idea/
 /composer.lock
+/.phpunit.result.cache
+/.php_cs.cache
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..6a56d89
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,45 @@
+language: php
+php:
+  - 7.2
+  - 7.3
+  - 7.4
+env:
+  - ILLUMINATE_DATABASE=5.6
+  - ILLUMINATE_DATABASE=~5.0
+  - ILLUMINATE_DATABASE=~6.0
+  - ILLUMINATE_DATABASE=~7.0
+  - ILLUMINATE_DATABASE=~8.0
+jobs:
+  include:
+    - php: 7.1
+      env: ILLUMINATE_DATABASE=5.6
+    - php: 7.1
+      env: ILLUMINATE_DATABASE=~5.0
+  exclude:
+    - php: 7.2
+      env: ILLUMINATE_DATABASE=~8.0
+  allow_failures:
+    - php: 7.3
+      env: ILLUMINATE_DATABASE=5.6
+    - php: 7.4
+      env: ILLUMINATE_DATABASE=5.6
+git:
+  depth: 3
+  submodules: false
+dist: xenial
+os: linux
+install:
+  - composer require "illuminate/database:$ILLUMINATE_DATABASE"
+  - composer update
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]] || [[ ${TRAVIS_PHP_VERSION:0:3} == "7.1" ]]; then wget -O vendor/bin/phpunit https://phar.phpunit.de/phpunit-6.phar; fi
+  - if [ ! -f "vendor/bin/phpunit" ]; then wget -O vendor/bin/phpunit https://phar.phpunit.de/phpunit-8.phar; fi
+  - chmod +x vendor/bin/phpunit
+before_script:
+  - wget -O cc-test-reporter https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
+  - chmod +x cc-test-reporter
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter before-build; fi 
+script:
+  - ./vendor/bin/phpunit --version
+  - ./vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
+after_script:
+  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index f994f39..0000000
--- a/phpunit.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-</phpunit>
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..405369a
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="true"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="true"
+         verbose="true">
+    <testsuites>
+        <testsuite name="Package Test Suite">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
\ No newline at end of file

From 01967f998b45c2279f6e3b49a9aba5a905eba3a0 Mon Sep 17 00:00:00 2001
From: Yurii K <yurii-github@users.noreply.github.com>
Date: Thu, 29 Oct 2020 00:44:42 +0200
Subject: [PATCH 2/9] fix unit tests - made tests as namespaced - fix
 composer.json with proper dependencies - drop support for service provider
 hook as it is bloatware - added support for several PHPUnit versions

---
 composer.json                           |  23 ++---
 src/ComposhipsServiceProvider.php       |  26 -----
 tests/ComposhipsTest.php                | 125 ++++++++----------------
 tests/Factories/AllocationFactory.php   |  24 -----
 tests/Factories/TrackingTaskFactory.php |  23 -----
 tests/{migrations.php => Migration.php} |  29 ++----
 tests/Models/Allocation.php             |   5 +-
 tests/Models/PickupPoint.php            |   5 +-
 tests/Models/PickupTime.php             |   5 +-
 tests/Models/Space.php                  |   5 +-
 tests/Models/TrackingTask.php           |   5 +-
 tests/Models/User.php                   |   5 +-
 tests/TestCase.php                      |  53 ----------
 tests/TestCase/AbstractTestCase.php     |  25 +++++
 tests/TestCase/TestCase6.php            |  30 ++++++
 tests/TestCase/TestCase8.php            |  21 ++++
 tests/bootstrap.php                     |  13 +++
 17 files changed, 170 insertions(+), 252 deletions(-)
 delete mode 100755 src/ComposhipsServiceProvider.php
 delete mode 100644 tests/Factories/AllocationFactory.php
 delete mode 100644 tests/Factories/TrackingTaskFactory.php
 rename tests/{migrations.php => Migration.php} (78%)
 delete mode 100644 tests/TestCase.php
 create mode 100644 tests/TestCase/AbstractTestCase.php
 create mode 100644 tests/TestCase/TestCase6.php
 create mode 100644 tests/TestCase/TestCase8.php
 create mode 100644 tests/bootstrap.php

diff --git a/composer.json b/composer.json
index e6d9e4e..12e5a4c 100755
--- a/composer.json
+++ b/composer.json
@@ -14,29 +14,20 @@
     }
   ],
   "require": {
-    "php": ">=5.6.4",
-    "illuminate/database": "^7.27|~8.0",
-    "illuminate/console": "~5.4|~6.0|~7.0|~8.0",
-    "illuminate/support": "~5.4|~6.0|~7.0|~8.0",
-    "illuminate/cache": "~5.4|~6.0|~7.0|~8.0"
+    "php": ">=7.1",
+    "illuminate/database": ">=5.6 <9.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.*",
-    "laravel/laravel": "~5.4|~6.0|~7.0|~8.0",
-    "fzaninotto/faker": "^1.8"
+    "ext-sqlite3": "*"
   },
   "autoload": {
     "psr-4": {
       "Awobaz\\Compoships\\": "src"
-    },
-    "files": [
-    ]
+    }
   },
-  "extra": {
-    "laravel": {
-      "providers": [
-        "Awobaz\\Compoships\\ComposhipsServiceProvider"
-      ]
+  "autoload-dev": {
+    "psr-4": {
+      "Awobaz\\Compoships\\Tests\\": "tests"
     }
   },
   "suggest": {
diff --git a/src/ComposhipsServiceProvider.php b/src/ComposhipsServiceProvider.php
deleted file mode 100755
index 3a0eae8..0000000
--- a/src/ComposhipsServiceProvider.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php namespace Awobaz\Compoships;
-
-use Illuminate\Support\ServiceProvider;
-
-class ComposhipsServiceProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap the application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-
-    }
-
-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-
-    }
-}
diff --git a/tests/ComposhipsTest.php b/tests/ComposhipsTest.php
index ddb474c..e05948b 100644
--- a/tests/ComposhipsTest.php
+++ b/tests/ComposhipsTest.php
@@ -1,24 +1,26 @@
 <?php
 
-use Awobaz\Compoships\Database\Eloquent\Model;
-use Awobaz\Compoships\Tests\Factories\AllocationFactory;
-use Awobaz\Compoships\Tests\Factories\TrackingTaskFactory;
-use Awobaz\Compoships\Tests\Model\Allocation;
-use Awobaz\Compoships\Tests\Model\PickupPoint;
-use Awobaz\Compoships\Tests\Model\PickupTime;
-use Awobaz\Compoships\Tests\Model\Space;
-use Awobaz\Compoships\Tests\Model\TrackingTask;
-use Awobaz\Compoships\Tests\Model\User;
-use Faker\Generator as Faker;
-
-require_once __DIR__.'/TestCase.php';
+namespace Awobaz\Compoships\Tests;
 
+use Awobaz\Compoships\Database\Eloquent\Model;
+use Awobaz\Compoships\Tests\Models\Allocation;
+use Awobaz\Compoships\Tests\Models\PickupPoint;
+use Awobaz\Compoships\Tests\Models\PickupTime;
+use Awobaz\Compoships\Tests\Models\Space;
+use Awobaz\Compoships\Tests\Models\TrackingTask;
+use Awobaz\Compoships\Tests\Models\User;
+use Awobaz\Compoships\Tests\TestCase\TestCase;
+
+/**
+ * @covers \Awobaz\Compoships\Compoships
+ * @covers \Awobaz\Compoships\Database\Query\Builder
+ * @covers \Awobaz\Compoships\Database\Eloquent\Relations\BelongsTo
+ * @covers \Awobaz\Compoships\Database\Eloquent\Relations\HasMany
+ */
 class ComposhipsTest extends TestCase
 {
     /**
      * Test the save method on a relationship.
-     *
-     * @return void
      */
     public function testSave()
     {
@@ -39,11 +41,9 @@ public function testSave()
     }
 
     /**
-     * Test the save method on a relationship.
-     *
-     * @return void
+     * @covers \Awobaz\Compoships\Database\Eloquent\Relations\HasOne
      */
-    public function testSaveModelNotUsingCompoships()
+    public function testSaveModelNotUsingCompoships_onHasOne()
     {
         Model::unguard();
 
@@ -62,8 +62,6 @@ public function testSaveModelNotUsingCompoships()
 
     /**
      * Test the save method on a relationship.
-     *
-     * @return void
      */
     public function testSaveMany()
     {
@@ -90,8 +88,6 @@ public function testSaveMany()
 
     /**
      * Test the save method on a relationship with a null value.
-     *
-     * @return void
      */
     public function testSaveWithANullValue()
     {
@@ -114,8 +110,6 @@ public function testSaveWithANullValue()
 
     /**
      * Test a relationship with only null values is not supported.
-     *
-     * @return void
      */
     public function testARelationshipWithOnlyNullValuesIsNotSupported()
     {
@@ -138,8 +132,6 @@ public function testARelationshipWithOnlyNullValuesIsNotSupported()
 
     /**
      * Test a relationship with a foreign key is empty on a new instance.
-     *
-     * @return void
      */
     public function testARelationshipWithAForeignKeyIsEmptyOnANewInstance()
     {
@@ -159,8 +151,6 @@ public function testARelationshipWithAForeignKeyIsEmptyOnANewInstance()
 
     /**
      * Test the create method on a relationship.
-     *
-     * @return void
      */
     public function testCreate()
     {
@@ -182,19 +172,12 @@ public function testCreate()
 
     /**
      * Test the make method on a relationship.
-     *
-     * @return void
      */
     public function testMake()
     {
         Model::unguard();
 
         $allocation = new Allocation();
-
-        if (!method_exists($allocation->trackingTasks(), 'make')) {
-            return;
-        }
-
         $allocation->booking_id = 1;
         $allocation->vehicle_id = 1;
         $allocation->save();
@@ -214,13 +197,11 @@ public function testHas()
             ->get()
             ->toArray();
 
-        $this->assertInternalType('array', $allocations);
+        $this->assertIsArray($allocations);
     }
 
     /**
      * A basic test example.
-     *
-     * @return void
      */
     public function testWhereHas()
     {
@@ -228,14 +209,14 @@ public function testWhereHas()
             ->get()
             ->toArray();
 
-        $this->assertInternalType('array', $allocations);
+        $this->assertIsArray($allocations);
 
         $allocations = Allocation::query()
             ->has('trackingTasks')
             ->get()
             ->toArray();
 
-        $this->assertInternalType('array', $allocations);
+        $this->assertIsArray($allocations);
     }
 
     public function testWhereHasCallback()
@@ -246,7 +227,7 @@ public function testWhereHasCallback()
             ->get()
             ->toArray();
 
-        $this->assertInternalType('array', $allocations);
+        $this->assertIsArray($allocations);
     }
 
     public function testMixedTypeCompositeKey()
@@ -260,7 +241,7 @@ public function testMixedTypeCompositeKey()
 
         $pickupPoint->pickupTimes()
             ->create([
-                'days'        => 'mon tue',
+                'days' => 'mon tue',
                 'pickup_time' => '08:00:00',
             ]);
 
@@ -269,43 +250,22 @@ public function testMixedTypeCompositeKey()
         Model::reguard();
     }
 
-    public function testFactories()
+    protected function makeTrackingTask()
     {
-        if (class_exists('\Illuminate\Database\Eloquent\Factory')) {
-            //Laravel 7 and below
-            $factory = app(\Illuminate\Database\Eloquent\Factory::class);
-
-            $factory->define(Allocation::class, function (Faker $faker) {
-                return [
-                    'booking_id' => rand(1, 100),
-                    'vehicle_id' => rand(1, 100),
-                ];
-            });
-
-            $factory->define(TrackingTask::class, function (Faker $faker) {
-                return [
-
-                ];
-            });
-
-            factory(Allocation::class)
-                ->create()
-                ->each(function ($a) {
-                    $a->trackingTasks()
-                      ->save(factory(TrackingTask::class)->make());
-                });
-        } else {
-            //Laravel 8 and above
-
-            AllocationFactory::new()->create()->each(function ($a) {
-                $a->trackingTasks()
-                  ->save(TrackingTaskFactory::new()->make());
-            });
-        }
-
-        $allocation = Allocation::firstOrFail();
+        $task = new TrackingTask();
+        $task->booking_id = rand(1, 100);
+        $task->vehicle_id = rand(1, 100);
+        $task->save();
+        return $task;
+    }
 
-        $this->assertNotNull($allocation->trackingTasks);
+    protected function makeAllocation()
+    {
+        $allocation = new Allocation();
+        $allocation->booking_id = rand(1, 100);
+        $allocation->vehicle_id = rand(1, 100);
+        $allocation->save();
+        return $allocation;
     }
 
     public function testHasForSelfRelation()
@@ -314,7 +274,7 @@ public function testHasForSelfRelation()
             ->get()
             ->toArray();
 
-        $this->assertInternalType('array', $trackingTask);
+        $this->assertIsArray($trackingTask);
     }
 
     public function testHasWithBelongsToRelation()
@@ -323,15 +283,10 @@ public function testHasWithBelongsToRelation()
             ->get()
             ->toArray();
 
-        $this->assertInternalType('array', $pickup_times);
+        $this->assertIsArray($pickup_times);
     }
 
-    /**
-     * Test the associate method on a belongsTo relationship
-     *
-     * @return void
-     */
-    public function testAssociate()
+    public function testAssociateOnbelongsTo()
     {
         Model::unguard();
 
diff --git a/tests/Factories/AllocationFactory.php b/tests/Factories/AllocationFactory.php
deleted file mode 100644
index 65de32f..0000000
--- a/tests/Factories/AllocationFactory.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Awobaz\Compoships\Tests\Factories;
-
-use Awobaz\Compoships\Tests\Model\Allocation;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-class AllocationFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Allocation::class;
-
-    public function definition()
-    {
-        return [
-            'booking_id' => rand(1, 100),
-            'vehicle_id' => rand(1, 100),
-        ];
-    }
-}
diff --git a/tests/Factories/TrackingTaskFactory.php b/tests/Factories/TrackingTaskFactory.php
deleted file mode 100644
index ff00cb5..0000000
--- a/tests/Factories/TrackingTaskFactory.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Awobaz\Compoships\Tests\Factories;
-
-use Awobaz\Compoships\Tests\Model\TrackingTask;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-class TrackingTaskFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = TrackingTask::class;
-
-    public function definition()
-    {
-        return [
-
-        ];
-    }
-}
diff --git a/tests/migrations.php b/tests/Migration.php
similarity index 78%
rename from tests/migrations.php
rename to tests/Migration.php
index d2081c4..b836f22 100644
--- a/tests/migrations.php
+++ b/tests/Migration.php
@@ -1,19 +1,21 @@
 <?php
 
+namespace Awobaz\Compoships\Tests;
+
+use Illuminate\Database\Capsule\Manager as Capsule;
 use Illuminate\Database\Migrations\Migration as BaseMigration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
 
 class Migration extends BaseMigration
 {
     /**
      * Run the migrations.
      *
-     * @return  void
+     * @return void
      */
     public function up()
     {
-        Schema::create('allocations', function (Blueprint $table) {
+        Capsule::schema()->create('allocations', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('user_id')
                 ->unsigned()
@@ -27,14 +29,14 @@ public function up()
             $table->timestamps();
         });
 
-        Schema::create('spaces', function (Blueprint $table) {
+        Capsule::schema()->create('spaces', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('booking_id')
                 ->unsigned();
             $table->timestamps();
         });
 
-        Schema::create('tracking_tasks', function (Blueprint $table) {
+        Capsule::schema()->create('tracking_tasks', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('booking_id')
                 ->unsigned()
@@ -58,14 +60,14 @@ public function up()
             $table->softDeletes();
         });
 
-        Schema::create('pickup_points', function (Blueprint $table) {
+        Capsule::schema()->create('pickup_points', function (Blueprint $table) {
             $table->string('contract_number');
             $table->integer('pickup_index')
                 ->unsigned();
             $table->timestamps();
         });
 
-        Schema::create('pickup_times', function (Blueprint $table) {
+        Capsule::schema()->create('pickup_times', function (Blueprint $table) {
             $table->string('contract_number');
             $table->integer('pickup_index')
                 ->unsigned();
@@ -83,7 +85,7 @@ public function up()
             $table->timestamps();
         });
 
-        Schema::create('users', function (Blueprint $table) {
+        Capsule::schema()->create('users', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('booking_id')
                 ->unsigned()
@@ -91,15 +93,4 @@ public function up()
             $table->timestamps();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return  void
-     */
-    public function down()
-    {
-        Schema::drop('tracking_tasks');
-        Schema::drop('allocations');
-    }
 }
diff --git a/tests/Models/Allocation.php b/tests/Models/Allocation.php
index 284447a..beee099 100644
--- a/tests/Models/Allocation.php
+++ b/tests/Models/Allocation.php
@@ -1,9 +1,12 @@
 <?php
 
-namespace Awobaz\Compoships\Tests\Model;
+namespace Awobaz\Compoships\Tests\Models;
 
 use Awobaz\Compoships\Database\Eloquent\Model;
 
+/**
+ * @mixin \Illuminate\Database\Eloquent\Builder
+ */
 class Allocation extends Model
 {
     public function trackingTasks()
diff --git a/tests/Models/PickupPoint.php b/tests/Models/PickupPoint.php
index 8a3bb77..52a48d6 100644
--- a/tests/Models/PickupPoint.php
+++ b/tests/Models/PickupPoint.php
@@ -1,9 +1,12 @@
 <?php
 
-namespace Awobaz\Compoships\Tests\Model;
+namespace Awobaz\Compoships\Tests\Models;
 
 use Awobaz\Compoships\Database\Eloquent\Model;
 
+/**
+ * @mixin \Illuminate\Database\Eloquent\Builder
+ */
 class PickupPoint extends Model
 {
     public function pickupTimes()
diff --git a/tests/Models/PickupTime.php b/tests/Models/PickupTime.php
index c8b7778..a6a8b25 100644
--- a/tests/Models/PickupTime.php
+++ b/tests/Models/PickupTime.php
@@ -1,9 +1,12 @@
 <?php
 
-namespace Awobaz\Compoships\Tests\Model;
+namespace Awobaz\Compoships\Tests\Models;
 
 use Awobaz\Compoships\Database\Eloquent\Model;
 
+/**
+ * @mixin \Illuminate\Database\Eloquent\Builder
+ */
 class PickupTime extends Model
 {
     public function pickupPoint()
diff --git a/tests/Models/Space.php b/tests/Models/Space.php
index 0707827..a18ff7b 100644
--- a/tests/Models/Space.php
+++ b/tests/Models/Space.php
@@ -1,9 +1,12 @@
 <?php
 
-namespace Awobaz\Compoships\Tests\Model;
+namespace Awobaz\Compoships\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @mixin \Illuminate\Database\Eloquent\Builder
+ */
 class Space extends Model
 {
 }
\ No newline at end of file
diff --git a/tests/Models/TrackingTask.php b/tests/Models/TrackingTask.php
index 96713a7..468973a 100644
--- a/tests/Models/TrackingTask.php
+++ b/tests/Models/TrackingTask.php
@@ -1,10 +1,13 @@
 <?php
 
-namespace Awobaz\Compoships\Tests\Model;
+namespace Awobaz\Compoships\Tests\Models;
 
 use Awobaz\Compoships\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
+/**
+ * @mixin \Illuminate\Database\Eloquent\Builder
+ */
 class TrackingTask extends Model
 {
     use SoftDeletes;
diff --git a/tests/Models/User.php b/tests/Models/User.php
index 108591c..a80450d 100644
--- a/tests/Models/User.php
+++ b/tests/Models/User.php
@@ -1,9 +1,12 @@
 <?php
 
-namespace Awobaz\Compoships\Tests\Model;
+namespace Awobaz\Compoships\Tests\Models;
 
 use Awobaz\Compoships\Database\Eloquent\Model;
 
+/**
+ * @mixin \Illuminate\Database\Eloquent\Builder
+ */
 class User extends Model
 {
     public function allocations()
diff --git a/tests/TestCase.php b/tests/TestCase.php
deleted file mode 100644
index 3f43796..0000000
--- a/tests/TestCase.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-use Illuminate\Filesystem\Filesystem;
-use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
-use Illuminate\Support\Facades\DB;
-
-abstract class TestCase extends BaseTestCase
-{
-    /**
-     * Boots the application.
-     *
-     * @return \Illuminate\Foundation\Application
-     */
-    public function createApplication()
-    {
-        $app = require __DIR__.'/../vendor/laravel/laravel/bootstrap/app.php';
-
-        $app->make('Illuminate\Contracts\Console\Kernel')
-            ->bootstrap();
-
-        return $app;
-    }
-
-    /**
-     * Setup DB before each test.
-     *
-     * @return void
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->app['config']->set('database.default', 'sqlite');
-        $this->app['config']->set('database.connections.sqlite.database', ':memory:');
-
-        DB::statement("PRAGMA foreign_keys = OFF"); //Prevent weird "1 foreign key mismatch" error
-
-        $this->migrate();
-    }
-
-    /**
-     * run package database migrations
-     *
-     * @return void
-     */
-    public function migrate()
-    {
-        $fileSystem = new Filesystem;
-        $fileSystem->requireOnce(__DIR__."/migrations.php");
-
-        (new Migration())->up();
-    }
-}
\ No newline at end of file
diff --git a/tests/TestCase/AbstractTestCase.php b/tests/TestCase/AbstractTestCase.php
new file mode 100644
index 0000000..ae23d73
--- /dev/null
+++ b/tests/TestCase/AbstractTestCase.php
@@ -0,0 +1,25 @@
+<?php
+namespace Awobaz\Compoships\Tests\TestCase;
+
+use Awobaz\Compoships\Tests\Migration;
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+abstract class AbstractTestCase extends \PHPUnit\Framework\TestCase
+{
+    protected function setupDatabase()
+    {
+        $capsuleManager = new Capsule();
+        $capsuleManager->addConnection([
+            'driver'    => 'sqlite',
+            'database'  => ':memory:',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ]);
+        $capsuleManager->setAsGlobal();
+        $capsuleManager->bootEloquent();
+
+        (new Migration())->up();
+    }
+
+}
diff --git a/tests/TestCase/TestCase6.php b/tests/TestCase/TestCase6.php
new file mode 100644
index 0000000..79b7d60
--- /dev/null
+++ b/tests/TestCase/TestCase6.php
@@ -0,0 +1,30 @@
+<?php
+namespace Awobaz\Compoships\Tests\TestCase;
+
+use PHPUnit\Framework\Assert;
+
+/**
+ * PHP 7.0 | 7.1
+ * PHPUnit 6.x
+ * 
+ * @see https://github.com/sebastianbergmann/phpunit/issues/3368
+ * @see https://phpunit.de/supported-versions.html
+ */
+abstract class TestCase extends AbstractTestCase
+{
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->setupDatabase();
+    }
+
+    /**
+     * Asserts that a variable is of type array.
+     */
+    public static function assertIsArray($actual, string $message = '')
+    {
+        Assert::assertInternalType('array', $actual, $message);
+    }
+}
diff --git a/tests/TestCase/TestCase8.php b/tests/TestCase/TestCase8.php
new file mode 100644
index 0000000..430bb2c
--- /dev/null
+++ b/tests/TestCase/TestCase8.php
@@ -0,0 +1,21 @@
+<?php
+namespace Awobaz\Compoships\Tests\TestCase;
+
+/**
+ * Supports latest versions
+ * 
+ * PHP 7.2, 7.3, 7.4
+ * PHPUnit 7.x, 8.x
+ * 
+ * @see https://phpunit.de/supported-versions.html
+ */
+abstract class TestCase extends AbstractTestCase
+{
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->setupDatabase();
+    }
+}
\ No newline at end of file
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..6c44c71
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,13 @@
+<?php
+/** @var \Composer\Autoload\ClassLoader $autoloader */
+$autoloader = require_once dirname(__DIR__) . '/vendor/autoload.php';
+
+if (PHP_MAJOR_VERSION === 7 && in_array(PHP_MINOR_VERSION, [0, 1])) {
+    $mappedTestCaseFilename = __DIR__ . '/TestCase/TestCase6.php';
+} else {
+    $mappedTestCaseFilename = __DIR__ . '/TestCase/TestCase8.php';
+}
+
+$autoloader->addClassMap([
+    \Awobaz\Compoships\Tests\TestCase\TestCase::class => $mappedTestCaseFilename
+]);

From 698ea8ec96756251e3db6a2239a1c8f3eab3e87b Mon Sep 17 00:00:00 2001
From: Yurii K <yurii-github@users.noreply.github.com>
Date: Thu, 29 Oct 2020 00:44:55 +0200
Subject: [PATCH 3/9] clean code

---
 src/Database/Eloquent/Concerns/HasRelationships.php | 9 ++++-----
 tests/.gitkeep                                      | 0
 2 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 tests/.gitkeep

diff --git a/src/Database/Eloquent/Concerns/HasRelationships.php b/src/Database/Eloquent/Concerns/HasRelationships.php
index 6277864..ce2a48b 100644
--- a/src/Database/Eloquent/Concerns/HasRelationships.php
+++ b/src/Database/Eloquent/Concerns/HasRelationships.php
@@ -2,6 +2,7 @@
 
 namespace Awobaz\Compoships\Database\Eloquent\Concerns;
 
+use Awobaz\Compoships\Compoships;
 use Awobaz\Compoships\Database\Eloquent\Relations\BelongsTo;
 use Awobaz\Compoships\Database\Eloquent\Relations\HasMany;
 use Awobaz\Compoships\Database\Eloquent\Relations\HasOne;
@@ -96,11 +97,9 @@ protected function newHasOne(Builder $query, Model $parent, $foreignKey, $localK
      */
     private function validateRelatedModel($related)
     {
-        $uses = class_uses_recursive($related);
-
-        if (!array_key_exists('Awobaz\Compoships\Compoships', $uses) && !is_subclass_of($related,
-                'Awobaz\Compoships\Database\Eloquent\Model')) {
-            throw new InvalidUsageException("The related model '${related}' must either extend 'Awobaz\Compoships\Database\Eloquent\Model' or use the 'Awobaz\Compoships\Compoships' trait");
+        $traitClass = Compoships::class;
+        if (!array_key_exists($traitClass, class_uses_recursive($related))) {
+            throw new InvalidUsageException("The related model '{$related}' must use the '{$traitClass}' trait");
         }
     }
 
diff --git a/tests/.gitkeep b/tests/.gitkeep
deleted file mode 100644
index e69de29..0000000

From 2cd54b66b18790d229a336a21c56d70dd3cb037b Mon Sep 17 00:00:00 2001
From: Yurii K <yurii-github@users.noreply.github.com>
Date: Thu, 29 Oct 2020 00:45:58 +0200
Subject: [PATCH 4/9] added BC fix for 5.6~5.8

---
 src/Database/Eloquent/Relations/BelongsTo.php | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Database/Eloquent/Relations/BelongsTo.php b/src/Database/Eloquent/Relations/BelongsTo.php
index b2e33c8..d6d525d 100755
--- a/src/Database/Eloquent/Relations/BelongsTo.php
+++ b/src/Database/Eloquent/Relations/BelongsTo.php
@@ -33,26 +33,26 @@ public function getResults()
      */
     public function associate($model)
     {
-        if (is_array($this->ownerKey)) {
-
-            $ownerKey = $model instanceof Model ? $model->getAttribute($this->ownerKey) : $model;
-            for ($i = 0; $i < count($this->foreignKey); $i++) {
-                $foreignKey = $this->foreignKey[$i];
-                $value = $ownerKey[$i];
-                $this->child->setAttribute($foreignKey, $value);
-            }
-
-            if ($model instanceof Model) {
-                $this->child->setRelation($this->relationName, $model);
-            } else {
-                $this->child->unsetRelation($this->relationName);
-            }
-
-            return $this->child;
-
-        } else {
+        if (!is_array($this->ownerKey)) {
             return parent::associate($model);
         }
+
+        $ownerKey = $model instanceof Model ? $model->getAttribute($this->ownerKey) : $model;
+        for ($i = 0; $i < count($this->foreignKey); $i++) {
+            $foreignKey = $this->foreignKey[$i];
+            $value = $ownerKey[$i];
+            $this->child->setAttribute($foreignKey, $value);
+        }
+        // BC break in 5.8 : https://github.com/illuminate/database/commit/87b9833019f48b88d98a6afc46f38ce37f08237d
+        $relationName = property_exists($this, 'relationName') ? $this->relationName : $this->relation;
+        if ($model instanceof Model) {
+            $this->child->setRelation($relationName, $model);
+            // proper unset // https://github.com/illuminate/database/commit/44411c7288fc7b7d4e5680cfcdaa46d348b5c981
+        } elseif ($this->child->isDirty($this->foreignKey)) {
+            $this->child->unsetRelation($relationName);
+        }
+
+        return $this->child;
     }
 
     /**

From fe99addf6e393c23a81e5bddc1c1c6def4ed22f2 Mon Sep 17 00:00:00 2001
From: Yurii K <yurii-github@users.noreply.github.com>
Date: Thu, 29 Oct 2020 10:35:35 +0200
Subject: [PATCH 5/9] drop Model support as it is not needed

---
 src/Database/Eloquent/Model.php | 11 -----------
 tests/ComposhipsTest.php        |  2 +-
 tests/Models/Allocation.php     |  5 ++++-
 tests/Models/PickupPoint.php    |  5 ++++-
 tests/Models/PickupTime.php     |  5 ++++-
 tests/Models/TrackingTask.php   |  4 +++-
 tests/Models/User.php           |  5 ++++-
 7 files changed, 20 insertions(+), 17 deletions(-)
 delete mode 100644 src/Database/Eloquent/Model.php

diff --git a/src/Database/Eloquent/Model.php b/src/Database/Eloquent/Model.php
deleted file mode 100644
index 04d7794..0000000
--- a/src/Database/Eloquent/Model.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Awobaz\Compoships\Database\Eloquent;
-
-use Awobaz\Compoships\Compoships;
-use Illuminate\Database\Eloquent\Model as Eloquent;
-
-class Model extends Eloquent
-{
-    use Compoships;
-}
\ No newline at end of file
diff --git a/tests/ComposhipsTest.php b/tests/ComposhipsTest.php
index e05948b..534754c 100644
--- a/tests/ComposhipsTest.php
+++ b/tests/ComposhipsTest.php
@@ -2,7 +2,7 @@
 
 namespace Awobaz\Compoships\Tests;
 
-use Awobaz\Compoships\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Model as Model;
 use Awobaz\Compoships\Tests\Models\Allocation;
 use Awobaz\Compoships\Tests\Models\PickupPoint;
 use Awobaz\Compoships\Tests\Models\PickupTime;
diff --git a/tests/Models/Allocation.php b/tests/Models/Allocation.php
index beee099..a97f1d9 100644
--- a/tests/Models/Allocation.php
+++ b/tests/Models/Allocation.php
@@ -2,13 +2,16 @@
 
 namespace Awobaz\Compoships\Tests\Models;
 
-use Awobaz\Compoships\Database\Eloquent\Model;
+use Awobaz\Compoships\Compoships;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class Allocation extends Model
 {
+    use Compoships;
+
     public function trackingTasks()
     {
         return $this->hasMany(TrackingTask::class, ['booking_id', 'vehicle_id'], ['booking_id', 'vehicle_id']);
diff --git a/tests/Models/PickupPoint.php b/tests/Models/PickupPoint.php
index 52a48d6..53e65e0 100644
--- a/tests/Models/PickupPoint.php
+++ b/tests/Models/PickupPoint.php
@@ -2,13 +2,16 @@
 
 namespace Awobaz\Compoships\Tests\Models;
 
-use Awobaz\Compoships\Database\Eloquent\Model;
+use Awobaz\Compoships\Compoships;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class PickupPoint extends Model
 {
+    use Compoships;
+
     public function pickupTimes()
     {
         return $this->hasMany(PickupTime::class, ['contract_number', 'pickup_index'], [
diff --git a/tests/Models/PickupTime.php b/tests/Models/PickupTime.php
index a6a8b25..b62cd3b 100644
--- a/tests/Models/PickupTime.php
+++ b/tests/Models/PickupTime.php
@@ -2,13 +2,16 @@
 
 namespace Awobaz\Compoships\Tests\Models;
 
-use Awobaz\Compoships\Database\Eloquent\Model;
+use Awobaz\Compoships\Compoships;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class PickupTime extends Model
 {
+    use Compoships;
+
     public function pickupPoint()
     {
         return $this->belongsTo(PickupPoint::class, ['contract_number', 'pickup_index'], [
diff --git a/tests/Models/TrackingTask.php b/tests/Models/TrackingTask.php
index 468973a..53b72bc 100644
--- a/tests/Models/TrackingTask.php
+++ b/tests/Models/TrackingTask.php
@@ -2,7 +2,8 @@
 
 namespace Awobaz\Compoships\Tests\Models;
 
-use Awobaz\Compoships\Database\Eloquent\Model;
+use Awobaz\Compoships\Compoships;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -11,6 +12,7 @@
 class TrackingTask extends Model
 {
     use SoftDeletes;
+    use Compoships;
 
     public function allocation()
     {
diff --git a/tests/Models/User.php b/tests/Models/User.php
index a80450d..a16f825 100644
--- a/tests/Models/User.php
+++ b/tests/Models/User.php
@@ -2,13 +2,16 @@
 
 namespace Awobaz\Compoships\Tests\Models;
 
-use Awobaz\Compoships\Database\Eloquent\Model;
+use Awobaz\Compoships\Compoships;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class User extends Model
 {
+    use Compoships;
+
     public function allocations()
     {
         return $this->hasMany(Allocation::class, ['user_id', 'booking_id'], ['id', 'booking_id']);

From 4ebd604e81f3860372fe3f7361281815fa840abf Mon Sep 17 00:00:00 2001
From: Yurii K <yurii-github@users.noreply.github.com>
Date: Thu, 29 Oct 2020 11:07:57 +0200
Subject: [PATCH 6/9] better test coverage

---
 .codeclimate.yml                              |   4 +
 phpunit.xml.dist                              |   2 +-
 .../Eloquent/Concerns/HasRelationships.php    |   3 -
 src/Database/Eloquent/Relations/BelongsTo.php |   8 +-
 .../Eloquent/Relations/HasOneOrMany.php       |   5 +-
 tests/ComposhipsTest.php                      |  43 ---
 tests/Migration.php                           |  12 +
 tests/Models/Allocation.php                   |  36 ++
 tests/Models/OriginalPackage.php              |  30 ++
 tests/Models/PickupPoint.php                  |  13 +
 tests/Models/PickupTime.php                   |   6 +
 tests/Models/Space.php                        |  11 +
 tests/Models/TrackingTask.php                 |  16 +
 tests/Models/User.php                         |  13 +
 tests/TestCase/AbstractTestCase.php           |  12 +-
 tests/Unit/BuilderTest.php                    |  58 +++
 tests/Unit/HasManyTest.php                    | 360 ++++++++++++++++++
 17 files changed, 579 insertions(+), 53 deletions(-)
 create mode 100644 tests/Models/OriginalPackage.php
 create mode 100644 tests/Unit/BuilderTest.php
 create mode 100644 tests/Unit/HasManyTest.php

diff --git a/.codeclimate.yml b/.codeclimate.yml
index ce3670c..cb10bab 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,5 +1,9 @@
+versoin: 2
 languages:
   PHP: true
+ratings:
+  paths:
+    - "**.php"
 exclude_paths:
   - tests
   - vendor
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 405369a..1955fe8 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,7 +14,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="true"
+         stopOnFailure="false"
          verbose="true">
     <testsuites>
         <testsuite name="Package Test Suite">
diff --git a/src/Database/Eloquent/Concerns/HasRelationships.php b/src/Database/Eloquent/Concerns/HasRelationships.php
index ce2a48b..8e3dcb8 100644
--- a/src/Database/Eloquent/Concerns/HasRelationships.php
+++ b/src/Database/Eloquent/Concerns/HasRelationships.php
@@ -90,10 +90,7 @@ protected function newHasOne(Builder $query, Model $parent, $foreignKey, $localK
      * Validate the related model for Compoships compatibility.
      *
      * @param  $related
-     *
      * @throws InvalidUsageException
-     *
-     * @return void
      */
     private function validateRelatedModel($related)
     {
diff --git a/src/Database/Eloquent/Relations/BelongsTo.php b/src/Database/Eloquent/Relations/BelongsTo.php
index d6d525d..88f5dea 100755
--- a/src/Database/Eloquent/Relations/BelongsTo.php
+++ b/src/Database/Eloquent/Relations/BelongsTo.php
@@ -107,7 +107,13 @@ public function addEagerConstraints(array $models)
                 $keys[] = $this->related->getTable().'.'.$key;
             }
 
-            $this->query->whereIn($keys, $this->getEagerModelKeys($models));
+            /*
+             * 5.6 - no method \Awobaz\Compoships\Database\Eloquent\Relations\HasOneOrMany::whereInMethod
+             * added in this commit (5.7.17) https://github.com/illuminate/database/commit/9af300d1c50c9ec526823c1e6548daa3949bf9a9
+             */
+             //  $this->query->whereIn($keys, $this->getEagerModelKeys($models));
+            $whereIn = $this->whereInMethod($this->related, $this->ownerKey);
+            $this->query->{$whereIn}($keys, $this->getEagerModelKeys($models));
         } else {
             parent::addEagerConstraints($models);
         }
diff --git a/src/Database/Eloquent/Relations/HasOneOrMany.php b/src/Database/Eloquent/Relations/HasOneOrMany.php
index 239504f..ebccc76 100755
--- a/src/Database/Eloquent/Relations/HasOneOrMany.php
+++ b/src/Database/Eloquent/Relations/HasOneOrMany.php
@@ -44,9 +44,12 @@ public function addConstraints()
      * Get the name of the "where in" method for eager loading.
      *
      * @param \Illuminate\Database\Eloquent\Model $model
-     * @param string|array                        $key
+     * @param string|array $key
      *
      * @return string
+     * 
+     * 5.6 - no method \Awobaz\Compoships\Database\Eloquent\Relations\HasOneOrMany::whereInMethod
+     * added in this commit (5.7.17) https://github.com/illuminate/database/commit/9af300d1c50c9ec526823c1e6548daa3949bf9a9
      */
     protected function whereInMethod(Model $model, $key)
     {
diff --git a/tests/ComposhipsTest.php b/tests/ComposhipsTest.php
index 534754c..af8dfa5 100644
--- a/tests/ComposhipsTest.php
+++ b/tests/ComposhipsTest.php
@@ -60,31 +60,6 @@ public function testSaveModelNotUsingCompoships_onHasOne()
         Model::reguard();
     }
 
-    /**
-     * Test the save method on a relationship.
-     */
-    public function testSaveMany()
-    {
-        Model::unguard();
-
-        $allocation = new Allocation();
-        $allocation->booking_id = 1;
-        $allocation->vehicle_id = 1;
-        $allocation->save();
-
-        $allocation->trackingTasks()
-            ->saveMany([
-                new TrackingTask(),
-                new TrackingTask(),
-                new TrackingTask(),
-            ]);
-
-        $this->assertNotNull($allocation->trackingTasks);
-        $this->assertEquals($allocation->trackingTasks->count(), 3);
-        $this->assertInstanceOf(Allocation::class, $allocation->trackingTasks->first()->allocation);
-
-        Model::reguard();
-    }
 
     /**
      * Test the save method on a relationship with a null value.
@@ -250,24 +225,6 @@ public function testMixedTypeCompositeKey()
         Model::reguard();
     }
 
-    protected function makeTrackingTask()
-    {
-        $task = new TrackingTask();
-        $task->booking_id = rand(1, 100);
-        $task->vehicle_id = rand(1, 100);
-        $task->save();
-        return $task;
-    }
-
-    protected function makeAllocation()
-    {
-        $allocation = new Allocation();
-        $allocation->booking_id = rand(1, 100);
-        $allocation->vehicle_id = rand(1, 100);
-        $allocation->save();
-        return $allocation;
-    }
-
     public function testHasForSelfRelation()
     {
         $trackingTask = TrackingTask::has('subTasks')
diff --git a/tests/Migration.php b/tests/Migration.php
index b836f22..61c649d 100644
--- a/tests/Migration.php
+++ b/tests/Migration.php
@@ -29,6 +29,18 @@ public function up()
             $table->timestamps();
         });
 
+        // contains original single PK relations
+        Capsule::schema()->create('original_packages', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name')->nullable();
+            $table->integer('allocation_id');
+            $table->foreign('allocation_id')
+                ->references('id')
+                ->on('allocations')
+                ->onUpdate('cascade')
+                ->onDelete('cascade');
+        });
+
         Capsule::schema()->create('spaces', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('booking_id')
diff --git a/tests/Models/Allocation.php b/tests/Models/Allocation.php
index a97f1d9..566698e 100644
--- a/tests/Models/Allocation.php
+++ b/tests/Models/Allocation.php
@@ -4,24 +4,60 @@
 
 use Awobaz\Compoships\Compoships;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 
 /**
+ * @property int $id
+ * @property int $user_id
+ * @property int $booking_id
+ * @property int $vehicle_id
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property-read TrackingTask[]|Collection $trackingTasks
+ * @property-read OriginalPackage[]|Collection $originalPackages
+ * @property-read Space $space
+ * @property-read User $user
+ * 
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class Allocation extends Model
 {
     use Compoships;
 
+    // NOTE: we need this because Laravel 7 uses Carbon's method toJSON() instead of toDateTimeString()
+    protected $casts = [
+        'created_at' => 'datetime:Y-m-d H:i:s',
+        'updated_at' => 'datetime:Y-m-d H:i:s',
+    ];
+
+    /**
+     * @return \Awobaz\Compoships\Database\Eloquent\Relations\HasMany
+     */
     public function trackingTasks()
     {
         return $this->hasMany(TrackingTask::class, ['booking_id', 'vehicle_id'], ['booking_id', 'vehicle_id']);
     }
 
+    /**
+     * @return \Awobaz\Compoships\Database\Eloquent\Relations\HasMany
+     */
+    public function originalPackages()
+    {
+        return $this->hasMany(OriginalPackage::class);
+    }
+
+    /**
+     * @return \Awobaz\Compoships\Database\Eloquent\Relations\HasOne
+     */
     public function space()
     {
         return $this->hasOne(Space::class, 'booking_id', 'booking_id');
     }
 
+    /**
+     * @return \Awobaz\Compoships\Database\Eloquent\Relations\BelongsTo
+     */
     public function user()
     {
         return $this->belongsTo(User::class, ['user_id', 'booking_id'], ['id', 'booking_id']);
diff --git a/tests/Models/OriginalPackage.php b/tests/Models/OriginalPackage.php
new file mode 100644
index 0000000..4eb5ccc
--- /dev/null
+++ b/tests/Models/OriginalPackage.php
@@ -0,0 +1,30 @@
+<?php
+
+
+namespace Awobaz\Compoships\Tests\Models;
+
+use Awobaz\Compoships\Compoships;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property int $id
+ * @property string $name
+ * @property int $allocation_id
+ * @property-read Allocation $allocation
+ *
+ * @mixin \Illuminate\Database\Eloquent\Builder
+ */
+class OriginalPackage extends Model
+{
+    use Compoships;
+
+    public $timestamps = false;
+
+    /**
+     * @return \Awobaz\Compoships\Database\Eloquent\Relations\BelongsTo
+     */
+    public function allocation()
+    {
+        return $this->belongsTo(Allocation::class);
+    }
+}
\ No newline at end of file
diff --git a/tests/Models/PickupPoint.php b/tests/Models/PickupPoint.php
index 53e65e0..ccdd80f 100644
--- a/tests/Models/PickupPoint.php
+++ b/tests/Models/PickupPoint.php
@@ -4,14 +4,27 @@
 
 use Awobaz\Compoships\Compoships;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
 
 /**
+ * @property string $contract_number
+ * @property int $pickup_index
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property-read PickupTime[] $pickupTimes
+ * 
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class PickupPoint extends Model
 {
     use Compoships;
 
+    // NOTE: we need this because Laravel 7 uses Carbon's method toJSON() instead of toDateTimeString()
+    protected $casts = [
+        'created_at' => 'datetime:Y-m-d H:i:s',
+        'updated_at' => 'datetime:Y-m-d H:i:s',
+    ];
+
     public function pickupTimes()
     {
         return $this->hasMany(PickupTime::class, ['contract_number', 'pickup_index'], [
diff --git a/tests/Models/PickupTime.php b/tests/Models/PickupTime.php
index b62cd3b..0c89a47 100644
--- a/tests/Models/PickupTime.php
+++ b/tests/Models/PickupTime.php
@@ -6,6 +6,12 @@
 use Illuminate\Database\Eloquent\Model;
 
 /**
+ * @property string $contract_number
+ * @property int $pickup_index
+ * @property string $days
+ * @property string $pickup_time
+ * @property-read PickupPoint $pickupPoint
+ * 
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class PickupTime extends Model
diff --git a/tests/Models/Space.php b/tests/Models/Space.php
index a18ff7b..e474f53 100644
--- a/tests/Models/Space.php
+++ b/tests/Models/Space.php
@@ -3,10 +3,21 @@
 namespace Awobaz\Compoships\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
 
 /**
+ * @property int $id
+ * @property int $booking_id
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * 
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class Space extends Model
 {
+    // NOTE: we need this because Laravel 7 uses Carbon's method toJSON() instead of toDateTimeString()
+    protected $casts = [
+        'created_at' => 'datetime:Y-m-d H:i:s',
+        'updated_at' => 'datetime:Y-m-d H:i:s',
+    ];
 }
\ No newline at end of file
diff --git a/tests/Models/TrackingTask.php b/tests/Models/TrackingTask.php
index 53b72bc..25fec45 100644
--- a/tests/Models/TrackingTask.php
+++ b/tests/Models/TrackingTask.php
@@ -5,8 +5,18 @@
 use Awobaz\Compoships\Compoships;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Carbon;
 
 /**
+ * @property int $id
+ * @property int $booking_id
+ * @property int $vehicle_id
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property Carbon $deleted_at
+ * @property-read Allocation $allocation
+ * @property-read TrackingTask[] $subTasks
+ * 
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class TrackingTask extends Model
@@ -14,6 +24,12 @@ class TrackingTask extends Model
     use SoftDeletes;
     use Compoships;
 
+    // NOTE: we need this because Laravel 7 uses Carbon's method toJSON() instead of toDateTimeString()
+    protected $casts = [
+        'created_at' => 'datetime:Y-m-d H:i:s',
+        'updated_at' => 'datetime:Y-m-d H:i:s',
+    ];
+
     public function allocation()
     {
         return $this->belongsTo(Allocation::class, ['booking_id', 'vehicle_id'], ['booking_id', 'vehicle_id']);
diff --git a/tests/Models/User.php b/tests/Models/User.php
index a16f825..c6ba022 100644
--- a/tests/Models/User.php
+++ b/tests/Models/User.php
@@ -4,14 +4,27 @@
 
 use Awobaz\Compoships\Compoships;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
 
 /**
+ * @property int $id
+ * @property int $booking_id
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property-read Allocation[] $allocations
+ * 
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 class User extends Model
 {
     use Compoships;
 
+    // NOTE: we need this because Laravel 7 uses Carbon's method toJSON() instead of toDateTimeString()
+    protected $casts = [
+        'created_at' => 'datetime:Y-m-d H:i:s',
+        'updated_at' => 'datetime:Y-m-d H:i:s',
+    ];
+
     public function allocations()
     {
         return $this->hasMany(Allocation::class, ['user_id', 'booking_id'], ['id', 'booking_id']);
diff --git a/tests/TestCase/AbstractTestCase.php b/tests/TestCase/AbstractTestCase.php
index ae23d73..19dff34 100644
--- a/tests/TestCase/AbstractTestCase.php
+++ b/tests/TestCase/AbstractTestCase.php
@@ -1,20 +1,24 @@
 <?php
+
 namespace Awobaz\Compoships\Tests\TestCase;
 
 use Awobaz\Compoships\Tests\Migration;
 use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Support\Carbon;
 
 abstract class AbstractTestCase extends \PHPUnit\Framework\TestCase
 {
     protected function setupDatabase()
     {
+        Carbon::setTestNow('2020-10-29 23:59:59');
+
         $capsuleManager = new Capsule();
         $capsuleManager->addConnection([
-            'driver'    => 'sqlite',
-            'database'  => ':memory:',
-            'charset'   => 'utf8',
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'charset' => 'utf8',
             'collation' => 'utf8_unicode_ci',
-            'prefix'    => '',
+            'prefix' => '',
         ]);
         $capsuleManager->setAsGlobal();
         $capsuleManager->bootEloquent();
diff --git a/tests/Unit/BuilderTest.php b/tests/Unit/BuilderTest.php
new file mode 100644
index 0000000..3e04e57
--- /dev/null
+++ b/tests/Unit/BuilderTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Awobaz\Compoships\Tests\Unit;
+
+use Awobaz\Compoships\Tests\Models\Allocation;
+use Awobaz\Compoships\Tests\TestCase\TestCase;
+use Illuminate\Database\Capsule\Manager as Capsule;
+
+/**
+ * @covers \Awobaz\Compoships\Compoships::getAttribute
+ * @covers \Awobaz\Compoships\Database\Eloquent\Relations\HasMany::getResults
+ * @covers \Awobaz\Compoships\Database\Eloquent\Relations\HasOneOrMany::getForeignKeyName
+ */
+class BuilderTest extends TestCase
+{
+    /**
+     * @covers \Awobaz\Compoships\Compoships::newBaseQueryBuilder
+     * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::hasMany
+     * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::newHasMany
+     * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::sanitizeKey
+     * @covers \Awobaz\Compoships\Database\Eloquent\Relations\HasOneOrMany::addConstraints
+     * @covers \Awobaz\Compoships\Database\Eloquent\Relations\HasOneOrMany::getQualifiedParentKeyName
+     * @covers \Awobaz\Compoships\Database\Query\Builder::whereColumn
+     */
+    public function test_Illuminate_hasOneOrMany__Builder_whereColumn_on_relation_column()
+    {
+        $allocationId1 = Capsule::table('allocations')->insertGetId([
+            'booking_id' => 1,
+            'vehicle_id' => 1,
+        ]);
+        $allocationId2 = Capsule::table('allocations')->insertGetId([
+            'booking_id' => 2,
+            'vehicle_id' => 2,
+        ]);
+        $package1 = Capsule::table('original_packages')->insertGetId([
+            'name' => 'name 1',
+            'allocation_id' => 1,
+        ]);
+        $package2 = Capsule::table('original_packages')->insertGetId([
+            'name' => 'name 2',
+            'allocation_id' => 1,
+        ]);
+
+        /** @var Allocation[] $allocations */
+        $allocations = Allocation::query()->whereHas('originalPackages', function ($query) {
+            $query->where('id', 123);
+        })->get();
+        $this->assertCount(0, $allocations);
+
+        /** @var Allocation[] $allocations */
+        $allocations = Allocation::query()->whereHas('originalPackages', function ($query) {
+            $query->where('id', 2);
+        })->get();
+        $this->assertCount(1, $allocations);
+        $this->assertCount(2, $allocations[0]->originalPackages);
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Unit/HasManyTest.php b/tests/Unit/HasManyTest.php
new file mode 100644
index 0000000..52e8f4f
--- /dev/null
+++ b/tests/Unit/HasManyTest.php
@@ -0,0 +1,360 @@
+<?php
+
+namespace Awobaz\Compoships\Tests\Unit;
+
+use Awobaz\Compoships\Database\Eloquent\Relations\HasMany;
+use Awobaz\Compoships\Tests\Models\Allocation;
+use Awobaz\Compoships\Tests\Models\OriginalPackage;
+use Awobaz\Compoships\Tests\Models\TrackingTask;
+use Awobaz\Compoships\Tests\TestCase\TestCase;
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Support\Carbon;
+
+/**
+ * @covers \Awobaz\Compoships\Database\Eloquent\Relations\HasOneOrMany
+ * @covers \Awobaz\Compoships\Database\Eloquent\Relations\HasMany
+ * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::hasMany
+ * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::newHasMany
+ * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::validateRelatedModel
+ * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::sanitizeKey
+ * Generic:
+ * @covers \Awobaz\Compoships\Compoships::getAttribute
+ * @covers \Awobaz\Compoships\Compoships::newBaseQueryBuilder
+ * @covers \Awobaz\Compoships\Compoships::qualifyColumn
+ * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::getQualifiedKeyName
+ */
+class HasManyTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function broken_Compoships_hasOneOrMany_whereInMethod__missingRelationColumn()
+    {
+        $this->markAsRisky();
+        $this->markTestIncomplete('This test is broken, because relation columns are required on selections!');
+        $allocation = $this->createAllocation();
+        $allocation->trackingTasks()
+            ->saveMany([
+                new TrackingTask(),
+                new TrackingTask(),
+                new TrackingTask(),
+            ]);
+
+        $trackingTasks = Allocation::where('id', $allocation->id)->with(['trackingTasks' => function (HasMany $query) {
+                // missing 'vehicle column'
+                $query->select('booking_id');
+            }]
+        )->first()->trackingTasks;
+        $this->assertCount(1, $trackingTasks); // TODO: must be error or 3 items?
+    }
+
+    /**
+     * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::belongsTo
+     * @covers \Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships::newBelongsTo
+     * @covers \Awobaz\Compoships\Database\Eloquent\Relations\BelongsTo::addConstraints
+     * @covers \Awobaz\Compoships\Database\Eloquent\Relations\BelongsTo::getResults
+     */
+    public function test_Compoships_hasOneOrMany_saveMany()
+    {
+        $expectedData = [
+            [
+                'id' => (string)1,
+                'booking_id' => (string)1,
+                'vehicle_id' => (string)1,
+                'updated_at' => Carbon::now()->toDateTimeString(),
+                'created_at' => Carbon::now()->toDateTimeString(),
+                'deleted_at' => null
+            ],
+            [
+                'id' => (string)2,
+                'booking_id' => (string)1,
+                'vehicle_id' => (string)1,
+                'updated_at' => Carbon::now()->toDateTimeString(),
+                'created_at' => Carbon::now()->toDateTimeString(),
+                'deleted_at' => null
+            ],
+            [
+                'id' => (string)3,
+                'booking_id' => (string)1,
+                'vehicle_id' => (string)1,
+                'updated_at' => Carbon::now()->toDateTimeString(),
+                'created_at' => Carbon::now()->toDateTimeString(),
+                'deleted_at' => null
+            ],
+        ];
+
+        $allocation = $this->createAllocation();
+        $allocation->trackingTasks()->saveMany([
+            new TrackingTask(),
+            new TrackingTask(),
+            new TrackingTask(),
+        ]);
+        $this->assertNotNull($allocation->trackingTasks);
+        $this->assertEquals(count($expectedData), $allocation->trackingTasks->count());
+        $this->assertEquals($expectedData, $allocation->trackingTasks->toArray());
+        $this->assertEquals($expectedData, array_map(function ($item) {
+            return (array)$item;
+        }, Capsule::table('tracking_tasks')->get()->all()));
+    }
+
+    public function test_Compoships_hasOneOrMany_create__empty()
+    {
+        $allocation = $this->createAllocation();
+        $trackingTask = $allocation->trackingTasks()->create();
+        $this->assertEquals([
+            'id' => 1,
+            'booking_id' => 1,
+            'vehicle_id' => 1,
+            'updated_at' => Carbon::now()->toDateTimeString(),
+            'created_at' => Carbon::now()->toDateTimeString(),
+        ], $trackingTask->toArray());
+
+        $this->assertEquals(1, Capsule::table('tracking_tasks')->count());
+        $this->AssertEquals([
+            'id' => (string)1,
+            'booking_id' => (string)1,
+            'vehicle_id' => (string)1,
+            'updated_at' => Carbon::now()->toDateTimeString(),
+            'created_at' => Carbon::now()->toDateTimeString(),
+            'deleted_at' => null
+        ], (array)Capsule::table('tracking_tasks')->select()->first());
+
+        $trackingTask->refresh();
+        $this->assertEquals([
+            'id' => (string)1,
+            'booking_id' => (string)1,
+            'vehicle_id' => (string)1,
+            'updated_at' => Carbon::now()->toDateTimeString(),
+            'created_at' => Carbon::now()->toDateTimeString(),
+            'deleted_at' => null
+        ], $trackingTask->toArray());
+    }
+
+    public function test_Compoships_hasOneOrMany_create__fail_set_unguarded()
+    {
+        $this->expectException(\Illuminate\Database\Eloquent\MassAssignmentException::class);
+        $this->expectExceptionMessage('Add [created_at] to fillable property to allow mass assignment');
+        $allocation = $this->createAllocation();
+        $trackingTask = $allocation->trackingTasks()->create(['created_at' => Carbon::now()]);
+    }
+
+    public function test_Compoships_hasOneOrMany_create__change_relation_columns()
+    {
+        $allocation = $this->createAllocation();
+        $allocation::unguard(true);
+        $package = $allocation->trackingTasks()->create(['booking_id' => 123]);
+        $allocation::unguard(false);
+        $package->refresh();
+        $this->assertEquals([
+            'id' => (string)1,
+            'booking_id' => (string)1,  // correct, as it was not changed
+            'vehicle_id' => (string)1,
+            'updated_at' => Carbon::now()->toDateTimeString(),
+            'created_at' => Carbon::now()->toDateTimeString(),
+            'deleted_at' => null
+        ], $package->toArray());
+    }
+
+    public function test_Compoships_hasOneOrMany_create__normal()
+    {
+        $allocation = $this->createAllocation();
+        $allocation::unguard(true);
+        $trackingTask = $allocation->trackingTasks()->create(['created_at' => Carbon::now()->addDay()]);
+        $allocation::unguard(false);
+        $trackingTask->refresh();
+        $this->assertEquals([
+            'id' => (string)1,
+            'booking_id' => (string)1,
+            'vehicle_id' => (string)1,
+            'updated_at' => Carbon::now()->toDateTimeString(),
+            'created_at' => Carbon::now()->addDay()->toDateTimeString(),
+            'deleted_at' => null
+        ], $trackingTask->toArray());
+    }
+
+    /**
+     * @covers \Awobaz\Compoships\Database\Query\Builder::whereIn
+     */
+    public function test_Compoships_eagerLoading()
+    {
+        $allocationId1 = Capsule::table('allocations')->insertGetId([
+            'booking_id' => 1,
+            'vehicle_id' => 1,
+        ]);
+        $allocationId2 = Capsule::table('allocations')->insertGetId([
+            'booking_id' => 2,
+            'vehicle_id' => 2,
+        ]);
+        $trackingTaskId1 = Capsule::table('tracking_tasks')->insertGetId([
+            'booking_id' => 1,
+            'vehicle_id' => 1,
+            'created_at' => Carbon::now()->toDateTimeString(),
+            'updated_at' => Carbon::now()->toDateTimeString(),
+            'deleted_at' => null
+        ]);
+        $trackingTaskId2 = Capsule::table('tracking_tasks')->insertGetId([
+            'booking_id' => 1,
+            'vehicle_id' => 1,
+            'created_at' => Carbon::now()->toDateTimeString(),
+            'updated_at' => Carbon::now()->toDateTimeString(),
+            'deleted_at' => null
+        ]);
+
+        $allocations1 = Allocation::where('id', $allocationId1)->with('trackingTasks')->get()->all();
+        $allocations2 = Allocation::where('id', $allocationId2)->with('trackingTasks')->get()->all();
+
+        $this->assertCount(1, $allocations1);
+        $this->assertCount(2, $allocations1[0]->trackingTasks);
+        $this->assertEquals(1, $allocations1[0]->trackingTasks[0]->id);
+        $this->assertEquals(2, $allocations1[0]->trackingTasks[1]->id);
+
+        $this->assertCount(1, $allocations2);
+        $this->assertCount(0, $allocations2[0]->trackingTasks);
+    }
+
+
+    /**
+     * @covers \Awobaz\Compoships\Database\Query\Builder::whereIn
+     */
+    public function test_Illuminate_eagerLoading()
+    {
+        $allocationId1 = Capsule::table('allocations')->insertGetId([
+            'booking_id' => 1,
+            'vehicle_id' => 1,
+        ]);
+
+        $allocationId2 = Capsule::table('allocations')->insertGetId([
+            'booking_id' => 2,
+            'vehicle_id' => 2,
+        ]);
+        $package1 = Capsule::table('original_packages')->insertGetId([
+            'name' => 'name 1',
+            'allocation_id' => 1,
+        ]);
+        $package2 = Capsule::table('original_packages')->insertGetId([
+            'name' => 'name 2',
+            'allocation_id' => 1,
+        ]);
+
+        $allocations1 = Allocation::where('id', $allocationId1)->with('originalPackages')->get()->all();
+        $this->assertCount(1, $allocations1);
+        $this->assertCount(2, $allocations1[0]->originalPackages);
+        $this->assertEquals(1, $allocations1[0]->originalPackages[0]->id);
+        $this->assertEquals(2, $allocations1[0]->originalPackages[1]->id);
+
+        $allocations2 = Allocation::where('id', $allocationId2)->with('originalPackages')->get()->all();
+        $this->assertCount(1, $allocations2);
+        $this->assertCount(0, $allocations2[0]->originalPackages);
+    }
+
+    public function test_Illuminate_hasOneOrMany_create__normal()
+    {
+        $allocation = $this->createAllocation();
+        $allocation::unguard(true);
+        $package = $allocation->originalPackages()->create(['name' => 'some name']);
+        $allocation::unguard(false);
+        $package->refresh();
+        $this->assertEquals([
+            'id' => (string)1,
+            'allocation_id' => (string)1,
+            'name' => 'some name'
+        ], $package->toArray());
+    }
+
+    public function test_Illuminate_hasOneOrMany_create__change_relation_columns()
+    {
+        $allocation = $this->createAllocation();
+        $allocation::unguard(true);
+        $package = $allocation->originalPackages()->create(['allocation_id' => 123]);
+        $allocation::unguard(false);
+        $package->refresh();
+        $this->assertEquals([
+            'id' => (string)1,
+            'allocation_id' => (string)1, // correct, as it was not changed
+            'name' => null,
+        ], $package->toArray());
+    }
+
+    public function test_Illuminate_hasOneOrMany_create__empty()
+    {
+        $allocation = $this->createAllocation();
+        $package = $allocation->originalPackages()->create();
+        $package->refresh();
+        $this->assertEquals([
+            'id' => (string)1,
+            'allocation_id' => (string)1,
+            'name' => null
+        ], $package->toArray());
+    }
+
+    public function test_Illuminate_hasOneOrMany_create__fail_set_unguarded()
+    {
+        $this->expectException(\Illuminate\Database\Eloquent\MassAssignmentException::class);
+        $this->expectExceptionMessage('Add [name] to fillable property to allow mass assignment');
+        $allocation = $this->createAllocation();
+        $package = $allocation->originalPackages()->create(['name' => 'some name']);
+    }
+
+    public function test_Illuminate_hasOneOrMany_saveMany()
+    {
+        $expectedData = [
+            [
+                'id' => (string)1,
+                'allocation_id' => (string)1,
+                'name' => 'name 1'
+            ],
+            [
+                'id' => (string)2,
+                'allocation_id' => (string)1,
+                'name' => 'name 2'
+            ],
+            [
+                'id' => (string)3,
+                'allocation_id' => (string)1,
+                'name' => 'name 3'
+            ],
+        ];
+
+        $allocation = $this->createAllocation(1, 1);
+        $allocation::unguard(true);
+        $allocation->originalPackages()->saveMany([
+            new OriginalPackage(['name' => 'name 1']),
+            new OriginalPackage(['name' => 'name 2']),
+            new OriginalPackage(['name' => 'name 3']),
+        ]);
+        $allocation::unguard(false);
+        $allocation->refresh();
+        $this->assertNotNull($allocation->originalPackages);
+        $this->assertEquals(count($expectedData), $allocation->originalPackages->count());
+        $this->assertEquals($expectedData, $allocation->originalPackages->toArray());
+        $this->assertEquals($expectedData, array_map(function ($item) {
+            return (array)$item;
+        }, Capsule::table('original_packages')->get()->all()));
+    }
+
+
+    /**
+     * @param int $bookingId
+     * @param int $vehicleId
+     * @return Allocation
+     */
+    protected function createAllocation($bookingId = 1, $vehicleId = 1)
+    {
+        $allocation = new Allocation();
+        $allocation->booking_id = $bookingId;
+        $allocation->vehicle_id = $vehicleId;
+        $allocation->save();
+        $this->assertEquals(1, Capsule::table('allocations')->count());
+        $this->assertEquals([
+            'id' => (string)1,
+            'booking_id' => (string)$allocation->booking_id,
+            'vehicle_id' => (string)$allocation->vehicle_id,
+            'created_at' => Carbon::now()->toDateTimeString(),
+            'updated_at' => Carbon::now()->toDateTimeString(),
+            'user_id' => null
+        ], (array)Capsule::table('allocations')->first());
+
+        return $allocation;
+    }
+
+}

From 23684b81166ff3332f89876b096df7996c9567d7 Mon Sep 17 00:00:00 2001
From: Yurii K <yurii-github@users.noreply.github.com>
Date: Sun, 15 Nov 2020 02:20:16 +0200
Subject: [PATCH 7/9] update README.md

---
 .gitignore |  1 +
 README.md  | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ca25074..723cd2f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /composer.lock
 /.phpunit.result.cache
 /.php_cs.cache
+/phpunit
\ No newline at end of file
diff --git a/README.md b/README.md
index e293f99..68ffad0 100755
--- a/README.md
+++ b/README.md
@@ -170,18 +170,19 @@ We use [SemVer](http://semver.org/) for versioning. For the versions available,
 
 ## Unit Tests
 
-In order to run the test suite, install the development dependencies:
+To run unit tests you have to obtain manually proper version of PHPUnit
 
-```bash
-$ composer install --dev
-```
-
-Then, run the following command:
+* if you have PHP version 7.0 or 7.1 please get [PHPUnit 6](https://phar.phpunit.de/phpunit-6.phar)
+* if you have PHP version 7.2 and higher please get [PHPUnit 8](https://phar.phpunit.de/phpunit-8.phar)
 
+Example
 ```bash
-$ vendor/bin/phpunit
+wget -O phpunit https://phar.phpunit.de/phpunit-8.phar
+chmod +x phpunit
+./phpunit
 ```
 
+
 ## Authors
 
 * [Claudin J. Daniel](https://github.com/topclaudy) - *Initial work*

From 1997a86faed8f88f3a7aa246036f0f529c3e4a23 Mon Sep 17 00:00:00 2001
From: Yurii K <yurii-github@users.noreply.github.com>
Date: Sun, 15 Nov 2020 02:25:11 +0200
Subject: [PATCH 8/9] revert change, but leave comment

---
 src/Database/Eloquent/Relations/BelongsTo.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Database/Eloquent/Relations/BelongsTo.php b/src/Database/Eloquent/Relations/BelongsTo.php
index 88f5dea..940dc5b 100755
--- a/src/Database/Eloquent/Relations/BelongsTo.php
+++ b/src/Database/Eloquent/Relations/BelongsTo.php
@@ -107,13 +107,10 @@ public function addEagerConstraints(array $models)
                 $keys[] = $this->related->getTable().'.'.$key;
             }
 
-            /*
-             * 5.6 - no method \Awobaz\Compoships\Database\Eloquent\Relations\HasOneOrMany::whereInMethod
-             * added in this commit (5.7.17) https://github.com/illuminate/database/commit/9af300d1c50c9ec526823c1e6548daa3949bf9a9
-             */
-             //  $this->query->whereIn($keys, $this->getEagerModelKeys($models));
-            $whereIn = $this->whereInMethod($this->related, $this->ownerKey);
-            $this->query->{$whereIn}($keys, $this->getEagerModelKeys($models));
+            // method \Awobaz\Compoships\Database\Eloquent\Relations\HasOneOrMany::whereInMethod
+            // 5.6 - does not exist
+            // 5.7 - added in 5.7.17 / https://github.com/illuminate/database/commit/9af300d1c50c9ec526823c1e6548daa3949bf9a9
+            $this->query->whereIn($keys, $this->getEagerModelKeys($models));
         } else {
             parent::addEagerConstraints($models);
         }

From 28ebcc08096a26d38cbd96d6b5535f361f283e05 Mon Sep 17 00:00:00 2001
From: Yurii K <yurii-github@users.noreply.github.com>
Date: Sun, 15 Nov 2020 02:44:37 +0200
Subject: [PATCH 9/9] drop PHP version requirement, as it is enforced by
 illuminate/database package

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index 12e5a4c..f0c63eb 100755
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,6 @@
     }
   ],
   "require": {
-    "php": ">=7.1",
     "illuminate/database": ">=5.6 <9.0"
   },
   "require-dev": {