Merge pull request #1 from reliese/master

Merge upstream into base

config/models.php

@@ -52,7 +52,7 @@
         |
         */
 
-        'parent' => Reliese\Database\Eloquent\Model::class,
+        'parent' => Illuminate\Database\Eloquent\Model::class,
 
         /*
         |--------------------------------------------------------------------------
@@ -386,7 +386,7 @@
         */
         'override_pluralize_for' => [
 
-        ]
+        ],
     ],
 
     /*

src/Coders/Model/Factory.php

@@ -24,7 +24,7 @@ class Factory
     /**
      * @var \Reliese\Meta\SchemaManager
      */
-    protected $schemas;
+    protected $schemas = [];
 
     /**
      * @var \Illuminate\Filesystem\Filesystem
@@ -539,7 +539,7 @@ private function formatBaseClasses(Model $model)
      */
     private function getBaseClassName(Model $model)
     {
-        return 'Base' . $model->getClassName();
+        return 'Base'.$model->getClassName();
     }
 
     /**

src/Coders/Model/Model.php

@@ -408,20 +408,28 @@ public function shouldQualifyTableName()
      */
     public function shouldPluralizeTableName()
     {
-        $pluralize = (bool)$this->config('pluralize', true);
+        $pluralize = (bool) $this->config('pluralize', true);
 
         $overridePluralizeFor = $this->config('override_pluralize_for', []);
         if (count($overridePluralizeFor) > 0) {
             foreach ($overridePluralizeFor as $except) {
                 if ($except == $this->getTable()) {
-                    return !$pluralize;
+                    return ! $pluralize;
                 }
             }
         }
 
         return $pluralize;
     }
 
+    /**
+     * @return bool
+     */
+    public function shouldLowerCaseTableName()
+    {
+        return (bool) $this->config('lower_table_name_first', false);
+    }
+
     /**
      * @param \Reliese\Meta\Blueprint[] $references
      */
@@ -501,7 +509,7 @@ public function getQualifiedUserClassName()
      */
     public function getClassName()
     {
-        if ($this->config('lower_table_name_first', false)) {
+        if ($this->shouldLowerCaseTableName()) {
             return Str::studly(Str::lower($this->getRecordName()));
         }
 
@@ -516,6 +524,7 @@ public function getRecordName()
         if ($this->shouldPluralizeTableName()) {
             return Str::singular($this->removeTablePrefix($this->blueprint->table()));
         }
+
         return $this->removeTablePrefix($this->blueprint->table());
     }
 
@@ -699,7 +708,7 @@ public function needsTableName()
         return false === $this->shouldQualifyTableName() ||
             $this->shouldRemoveTablePrefix() ||
             $this->blueprint->table() != Str::plural($this->getRecordName()) ||
-            !$this->shouldPluralizeTableName();
+            ! $this->shouldPluralizeTableName();
     }
 
     /**

src/Coders/Model/Relations/BelongsToMany.php

@@ -77,18 +77,19 @@ public function hint()
      */
     public function name()
     {
-        if ($this->parent->shouldPluralizeTableName()) {
-            if ($this->parent->usesSnakeAttributes()) {
-                return Str::snake(Str::plural(Str::singular($this->reference->getTable(true))));
-            }
+        $tableName = $this->reference->getTable(true);
 
-            return Str::camel(Str::plural(Str::singular($this->reference->getTable(true))));
+        if ($this->parent->shouldLowerCaseTableName()) {
+            $tableName = strtolower($tableName);
+        }
+        if ($this->parent->shouldPluralizeTableName()) {
+            $tableName = Str::plural(Str::singular($tableName));
         }
         if ($this->parent->usesSnakeAttributes()) {
-            return Str::snake($this->reference->getTable(true));
+            return Str::snake($tableName);
         }
 
-        return Str::camel($this->reference->getTable(true));
+        return Str::camel($tableName);
     }
 
     /**

src/Coders/Model/Relations/HasMany.php

@@ -7,8 +7,8 @@
 
 namespace Reliese\Coders\Model\Relations;
 
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Collection;
 
 class HasMany extends HasOneOrMany
 {
@@ -27,8 +27,13 @@ public function name()
     {
         if ($this->parent->shouldPluralizeTableName()) {
             $relationBaseName = Str::plural(Str::singular($this->related->getTable(true)));
+        } else {
+            $relationBaseName = $this->related->getTable(true);
+        }
+
+        if ($this->parent->shouldLowerCaseTableName()) {
+            $relationBaseName = strtolower($relationBaseName);
         }
-        $relationBaseName = $this->related->getTable(true);
 
         switch ($this->parent->getRelationNameStrategy()) {
             case 'foreign_key':

src/Meta/Blueprint.php

@@ -208,7 +208,7 @@ public function primaryKey()
             return current($this->unique);
         }
 
-        $nullPrimaryKey = new Fluent();
+        $nullPrimaryKey = new Fluent(['columns' => []]);
 
         return $nullPrimaryKey;
     }