Work on migration table functionality, update unit tests

src/Record/Relationships/AbstractRelationship.php

@@ -71,39 +71,39 @@ public function __construct(string $foreignTable, string $foreignKey, ?array $op
     /**
      * Get foreign table class
      *
-     * @return string
+     * @return string|null
      */
-    public function getForeignTable(): string
+    public function getForeignTable(): string|null
     {
         return $this->foreignTable;
     }
 
     /**
      * Get foreign key
      *
-     * @return string
+     * @return string|null
      */
-    public function getForeignKey(): string
+    public function getForeignKey(): string|null
     {
         return $this->foreignKey;
     }
 
     /**
      * Get options
      *
-     * @return array
+     * @return array|null
      */
-    public function getOptions(): array
+    public function getOptions(): array|null
     {
         return $this->options;
     }
 
     /**
      * Get child relationships
      *
-     * @return string
+     * @return string|null
      */
-    public function getChildRelationships(): string
+    public function getChildRelationships(): string|null
     {
         return $this->children;
     }

src/Record/Relationships/RelationshipInterface.php

@@ -29,23 +29,23 @@ interface RelationshipInterface
     /**
      * Get foreign table
      *
-     * @return string
+     * @return string|null
      */
-    public function getForeignTable(): string;
+    public function getForeignTable(): string|null;
 
     /**
      * Get foreign key
      *
-     * @return string
+     * @return string|null
      */
-    public function getForeignKey(): string;
+    public function getForeignKey(): string|null;
 
     /**
      * Get options
      *
-     * @return array
+     * @return array|null
      */
-    public function getOptions(): array;
+    public function getOptions(): array|null;
 
     /**
      * Get eager relationships

src/Sql/Migrator.php

@@ -280,7 +280,7 @@ public function isFile(): bool
     public function isTable(): bool
     {
         if (file_exists($this->path . DIRECTORY_SEPARATOR . '.table')) {
-            $table = file_get_contents($this->path . DIRECTORY_SEPARATOR . '.table');
+            $table = trim(file_get_contents($this->path . DIRECTORY_SEPARATOR . '.table'));
             return (class_exists($table) && is_subclass_of($table, 'Pop\Db\Record'));
         } else {
             return false;
@@ -310,7 +310,7 @@ public function hasTable(): bool
     public function getTable(): string
     {
         return (file_exists($this->path . DIRECTORY_SEPARATOR . '.table')) ?
-            file_get_contents($this->path . DIRECTORY_SEPARATOR . '.table') : '';
+            trim(file_get_contents($this->path . DIRECTORY_SEPARATOR . '.table')) : '';
     }
 
     /**

tests/Record/RelationshipTest.php

@@ -236,6 +236,10 @@ public function testBelongsToRelationship()
         $relationship = new Relationships\BelongsTo($info, 'Pop\Db\Test\TestAsset\People', 'id');
         $this->assertInstanceOf('Pop\Db\Test\TestAsset\PeopleInfo', $relationship->getChild());
         $this->assertIsArray($relationship->getEagerRelationships([1]));
+        $this->assertEquals('Pop\Db\Test\TestAsset\People', $relationship->getForeignTable());
+        $this->assertEmpty($relationship->getOptions());
+        $relationship->setChildRelationships('TestChild');
+        $this->assertEquals('TestChild', $relationship->getChildRelationships());
         $this->db->disconnect();
     }
 

tests/Sql/MigratorTest.php → tests/Sql/MigratorFileTest.php

@@ -6,7 +6,7 @@
 use Pop\Db\Sql\Migrator;
 use PHPUnit\Framework\TestCase;
 
-class MigratorTest extends TestCase
+class MigratorFileTest extends TestCase
 {
 
     protected $db = null;
@@ -29,6 +29,8 @@ public function testConstructor()
         $this->assertInstanceOf('Pop\Db\Adapter\Mysql', $migrator->db());
         $this->assertEquals(__DIR__ . '/../tmp/migrations', $migrator->getPath());
         $this->assertNull($migrator->getCurrent());
+        $this->assertFalse($migrator->hasTable());
+        $this->assertEquals('', $migrator->getTable());
         $this->db->disconnect();
     }
 

tests/Sql/MigratorTableTest.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Pop\Db\Test\Sql;
+
+use Pop\Db\Db;
+use Pop\Db\Sql\Migrator;
+use PHPUnit\Framework\TestCase;
+
+class MigratorTableTest extends TestCase
+{
+
+    protected $db = null;
+
+    public function setUp(): void
+    {
+        $this->db = Db::mysqlConnect([
+            'database' => $_ENV['MYSQL_DB'],
+            'username' => $_ENV['MYSQL_USER'],
+            'password' => $_ENV['MYSQL_PASS'],
+            'host'     => $_ENV['MYSQL_HOST']
+        ]);
+        \Pop\Db\Test\TestAsset\Migrations::setDb($this->db);
+    }
+
+    public function testConstructor()
+    {
+        $migrator = new Migrator($this->db, __DIR__ . '/../tmp/migrations2');
+        $this->assertInstanceOf('Pop\Db\Sql\Migrator', $migrator);
+        $this->assertInstanceOf('Pop\Db\Adapter\Mysql', $migrator->getDb());
+        $this->assertInstanceOf('Pop\Db\Adapter\Mysql', $migrator->db());
+        $this->assertEquals(__DIR__ . '/../tmp/migrations2', $migrator->getPath());
+        $this->assertNull($migrator->getCurrent());
+        $this->assertTrue($migrator->hasTable());
+        $this->assertEquals('Pop\Db\Test\TestAsset\Migrations', $migrator->getTable());
+        $this->db->disconnect();
+    }
+
+    public function testRun()
+    {
+        $migrator = new Migrator($this->db, __DIR__ . '/../tmp/migrations2');
+        $this->assertFalse($this->db->hasTable('test_users'));
+        $migrator->runAll();
+        $this->assertTrue($this->db->hasTable('test_users'));
+        $this->db->disconnect();
+    }
+
+    public function testRollback()
+    {
+        $migrator = new Migrator($this->db, __DIR__ . '/../tmp/migrations2');
+        $this->assertTrue($this->db->hasTable('test_users'));
+        $migrator->rollbackAll();
+        $this->assertFalse($this->db->hasTable('test_users'));
+        $this->db->disconnect();
+    }
+
+}

tests/TestAsset/Migrations.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Pop\Db\Test\TestAsset;
+
+use Pop\Db\Record;
+
+class Migrations extends Record
+{
+
+}

tests/tmp/migrations2/.table

@@ -0,0 +1 @@
+Pop\Db\Test\TestAsset\Migrations

tests/tmp/migrations2/20191206142442_test_migration.php

@@ -0,0 +1,27 @@
+<?php
+
+use Pop\Db\Sql\Migration\AbstractMigration;
+
+class TestMigration extends AbstractMigration
+{
+
+    public function up(): void
+    {
+        $schema = $this->db->createSchema();
+        $schema->create('test_users')
+            ->int('id', 16)
+            ->varchar('username', 255)
+            ->varchar('password', 255)
+            ->primary('id');
+
+        $this->db->query($schema);
+    }
+
+    public function down(): void
+    {
+        $schema = $this->db->createSchema();
+        $schema->drop('test_users');
+        $this->db->query($schema);
+    }
+
+}