modernized test suite

now using PSR-4 autoloading

composer.json

@@ -27,7 +27,9 @@
         "php-coveralls/php-coveralls": "^2.1"
     },
     "autoload-dev":{
-        "classmap": ["tests/"]
+        "psr-4": {
+            "Plank\\Metable\\Tests\\" : "tests/"
+        }
     },
     "minimum-stability": "stable",
     "prefer-stable": true,

phpunit.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
          colors="true"
@@ -8,18 +9,18 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
->
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/integration/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <ini name="display_errors" value="true"/>
-    </php>
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+ <coverage>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix=".php">./tests/Integration/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <ini name="display_errors" value="true"/>
+  </php>
 </phpunit>

tests/integration/DataType/HandlerTest.php → tests/Integration/DataType/HandlerTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Plank\Metable\Tests\Integration\DataType;
+
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
 use Plank\Metable\DataType\ArrayHandler;
@@ -14,6 +16,10 @@
 use Plank\Metable\DataType\ObjectHandler;
 use Plank\Metable\DataType\SerializableHandler;
 use Plank\Metable\DataType\StringHandler;
+use Plank\Metable\Tests\Mocks\SampleMetable;
+use Plank\Metable\Tests\Mocks\SampleSerializable;
+use Plank\Metable\Tests\TestCase;
+use stdClass;
 
 class HandlerTest extends TestCase
 {

tests/integration/DataType/ModelCollectionHandlerTest.php → tests/Integration/DataType/ModelCollectionHandlerTest.php

@@ -1,7 +1,11 @@
 <?php
 
+namespace Plank\Metable\Tests\Integration\DataType;
+
 use Illuminate\Database\Eloquent\Collection;
 use Plank\Metable\DataType\ModelCollectionHandler;
+use Plank\Metable\Tests\Mocks\SampleMetable;
+use Plank\Metable\Tests\TestCase;
 
 class ModelCollectionHandlerTest extends TestCase
 {

tests/integration/DataType/ModelHandlerTest.php → tests/Integration/DataType/ModelHandlerTest.php

@@ -1,6 +1,10 @@
 <?php
 
+namespace Plank\Metable\Tests\Integration\DataType;
+
 use Plank\Metable\DataType\ModelHandler;
+use Plank\Metable\Tests\Mocks\SampleMetable;
+use Plank\Metable\Tests\TestCase;
 
 class ModelHandlerTest extends TestCase
 {

tests/integration/DataType/RegistryTest.php → tests/Integration/DataType/RegistryTest.php

@@ -1,8 +1,11 @@
 <?php
 
+namespace Plank\Metable\Tests\Integration\DataType;
+
 use Plank\Metable\DataType\HandlerInterface;
 use Plank\Metable\DataType\Registry;
 use Plank\Metable\Exceptions\DataTypeException;
+use Plank\Metable\Tests\TestCase;
 
 class RegistryTest extends TestCase
 {

tests/integration/MetaTest.php → tests/Integration/MetaTest.php

@@ -1,7 +1,10 @@
 <?php
 
+namespace Plank\Metable\Tests\Integration;
+
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Plank\Metable\Meta;
+use Plank\Metable\Tests\TestCase;
 
 class MetaTest extends TestCase
 {

tests/integration/MetableTest.php → tests/Integration/MetableTest.php

@@ -1,7 +1,12 @@
 <?php
 
+namespace Plank\Metable\Tests\Integration;
+
 use Illuminate\Database\Eloquent\Collection;
 use Plank\Metable\Meta;
+use Plank\Metable\Tests\Mocks\SampleMetable;
+use Plank\Metable\Tests\TestCase;
+use ReflectionClass;
 
 class MetableTest extends TestCase
 {

tests/integration/MorphTest.php → tests/Integration/MorphTest.php

@@ -1,7 +1,11 @@
 <?php
 
-use Illuminate\Support\Facades\DB;
+namespace Plank\Metable\Tests\Integration;
+
 use Plank\Metable\Meta;
+use Plank\Metable\Tests\Mocks\SampleMetable;
+use Plank\Metable\Tests\Mocks\SampleMorph;
+use Plank\Metable\Tests\TestCase;
 
 class MorphTest extends TestCase
 {

tests/_data/classes/SampleMetable.php → tests/Mocks/SampleMetable.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Plank\Metable\Tests\Mocks;
+
 use Illuminate\Database\Eloquent\Model;
 use Plank\Metable\Metable;
 

tests/_data/classes/SampleMorph.php → tests/Mocks/SampleMorph.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Plank\Metable\Tests\Mocks;
+
 use Plank\Metable\Metable;
 
 class SampleMorph extends SampleMetable

tests/_data/classes/SampleSerializable.php → tests/Mocks/SampleSerializable.php

@@ -1,5 +1,9 @@
 <?php
 
+namespace Plank\Metable\Tests\Mocks;
+
+use Serializable;
+
 class SampleSerializable implements Serializable
 {
     public $data;

tests/TestCase.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Plank\Metable\Tests;
+
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use Plank\Metable\MetableServiceProvider;
 
@@ -8,7 +10,7 @@ class TestCase extends BaseTestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->withFactories(__DIR__ . '/_data/factories');
+        $this->withFactories(__DIR__ . '/factories');
     }
 
     protected function getPackageProviders($app)
@@ -67,13 +69,14 @@ protected function getPrivateMethod($class, $method_name)
 
     protected function useDatabase()
     {
-        $artisan = $this->app->make('Illuminate\Contracts\Console\Kernel');
-        $database = $this->app['config']->get('database.default');
         $this->app->useDatabasePath(realpath(__DIR__) . '/..');
-        $this->loadMigrationsFrom(__DIR__ . '/_migrations');
-        //Remigrate all database tables
-        $artisan->call('migrate:refresh', [
-            '--database' => $database,
-        ]);
+        $this->loadMigrationsFrom(
+            [
+                '--path' => [
+                    dirname(__DIR__) . '/migrations',
+                    __DIR__ . '/migrations'
+                ]
+            ]
+        );
     }
 }

tests/factories/MetaFactory.php

@@ -0,0 +1,7 @@
+<?php
+
+use Plank\Metable\Meta;
+
+$factory->define(Meta::class, function (Faker\Generator $faker) {
+    return [];
+});

tests/_data/factories/MetableFactory.php → tests/factories/MetableFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+use Plank\Metable\Tests\Mocks\SampleMetable;
+
 $factory->define(SampleMetable::class, function (Faker\Generator $faker) {
     return [];
 });

tests/_data/factories/MorphFactory.php → tests/factories/MorphFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+use Plank\Metable\Tests\Mocks\SampleMorph;
+
 $factory->define(SampleMorph::class, function (Faker\Generator $faker) {
     return [];
 });