From ab99d25b446789e6ef7d59dd38072b1e96726a40 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 29 May 2019 15:02:35 +0200 Subject: [PATCH] #2783 --- src/app/Console/Commands/CubistCommand.php | 4 ++-- src/app/Console/Commands/GenerateCommand.php | 4 ++-- src/app/Console/Commands/MigrateCommand.php | 1 - src/app/Magic/Controllers/CubistMagicControllerTrait.php | 4 ++-- src/app/Magic/Fields/Field.php | 4 ++-- ...agicModelAbstract.php => CubistMagicAbstractModel.php} | 2 +- src/app/Magic/Models/CubistMagicModel.php | 8 ++++++++ src/app/Magic/Models/CubistMagicNestedModel.php | 2 +- 8 files changed, 18 insertions(+), 11 deletions(-) rename src/app/Magic/Models/{CubistMagicModelAbstract.php => CubistMagicAbstractModel.php} (99%) create mode 100644 src/app/Magic/Models/CubistMagicModel.php diff --git a/src/app/Console/Commands/CubistCommand.php b/src/app/Console/Commands/CubistCommand.php index af8c97f..455b40c 100644 --- a/src/app/Console/Commands/CubistCommand.php +++ b/src/app/Console/Commands/CubistCommand.php @@ -4,7 +4,7 @@ namespace Cubist\Backpack\app\Console\Commands; -use Cubist\Backpack\app\Magic\Models\CubistMagicModelAbstract; +use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel; use Cubist\Util\Files\Files; use Cubist\Util\PHP; use Illuminate\Console\Command; @@ -71,7 +71,7 @@ class CubistCommand extends Command if ($item->isFile() && $item->getExtension() == 'php') { try { $class = PHP::instanciateClassInFile($item); - if ($class instanceof CubistMagicModelAbstract) { + if ($class instanceof CubistMagicAbstractModel) { if (is_callable($callback)) { call_user_func($callback, $class); } diff --git a/src/app/Console/Commands/GenerateCommand.php b/src/app/Console/Commands/GenerateCommand.php index 45a9cb8..b4d1449 100644 --- a/src/app/Console/Commands/GenerateCommand.php +++ b/src/app/Console/Commands/GenerateCommand.php @@ -2,7 +2,7 @@ namespace Cubist\Backpack\app\Console\Commands; -use Cubist\Backpack\app\Magic\Models\CubistMagicModelAbstract; +use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel; use Cubist\Backpack\app\Magic\Util; class GenerateCommand extends CubistCommand @@ -51,7 +51,7 @@ class GenerateCommand extends CubistCommand } /** - * @param $model CubistMagicModelAbstract + * @param $model CubistMagicAbstractModel */ public function _generate($model) { diff --git a/src/app/Console/Commands/MigrateCommand.php b/src/app/Console/Commands/MigrateCommand.php index ffdcb20..735cab9 100644 --- a/src/app/Console/Commands/MigrateCommand.php +++ b/src/app/Console/Commands/MigrateCommand.php @@ -4,7 +4,6 @@ namespace Cubist\Backpack\app\Console\Command; use Cubist\Backpack\app\Console\Commands\CubistCommand; -use Cubist\Backpack\app\Magic\Models\CubistMagicModelAbstract; use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Schema; diff --git a/src/app/Magic/Controllers/CubistMagicControllerTrait.php b/src/app/Magic/Controllers/CubistMagicControllerTrait.php index d44f414..fb5f8a0 100644 --- a/src/app/Magic/Controllers/CubistMagicControllerTrait.php +++ b/src/app/Magic/Controllers/CubistMagicControllerTrait.php @@ -3,7 +3,7 @@ namespace Cubist\Backpack\app\Magic\Controllers; use Cubist\Backpack\app\Magic\Fields\Field; -use Cubist\Backpack\app\Magic\Models\CubistMagicModelAbstract; +use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel; use Cubist\Backpack\app\Magic\Requests\CubistMagicStoreRequest; use Cubist\Backpack\app\Magic\Requests\CubistMagicUpdateRequest; @@ -53,7 +53,7 @@ trait CubistMagicControllerTrait } /** - * @return CubistMagicModelAbstract + * @return CubistMagicAbstractModel */ public function getModelInstance() { diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php index 6466d3b..25eb624 100644 --- a/src/app/Magic/Fields/Field.php +++ b/src/app/Magic/Fields/Field.php @@ -7,7 +7,7 @@ use Cubist\Backpack\app\Magic\CubistMagicAttribute; use Doctrine\DBAL\Schema\Table; use Exception; use Illuminate\Support\Str; -use Cubist\Backpack\app\Magic\Models\CubistMagicModelAbstract; +use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel; class Field { @@ -106,7 +106,7 @@ class Field public function defineDbColumn($table) { $name = $this->getAttribute('name'); - $table->addColumn($name, CubistMagicModelAbstract::toDoctrineType($this->_databaseType), $this->_databaseAttributes); + $table->addColumn($name, CubistMagicAbstractModel::toDoctrineType($this->_databaseType), $this->_databaseAttributes); if ($this->_databaseUnique) { $table->addUniqueIndex([$name]); } diff --git a/src/app/Magic/Models/CubistMagicModelAbstract.php b/src/app/Magic/Models/CubistMagicAbstractModel.php similarity index 99% rename from src/app/Magic/Models/CubistMagicModelAbstract.php rename to src/app/Magic/Models/CubistMagicAbstractModel.php index 04ab127..ee9daca 100644 --- a/src/app/Magic/Models/CubistMagicModelAbstract.php +++ b/src/app/Magic/Models/CubistMagicAbstractModel.php @@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Model; use Cubist\Backpack\app\Magic\CubistMagicAttribute; use Illuminate\Support\Str; -class CubistMagicModelAbstract extends Model +class CubistMagicAbstractModel extends Model { use CubistMagicAttribute; use SluggableScopeHelpers; diff --git a/src/app/Magic/Models/CubistMagicModel.php b/src/app/Magic/Models/CubistMagicModel.php new file mode 100644 index 0000000..8fdb583 --- /dev/null +++ b/src/app/Magic/Models/CubistMagicModel.php @@ -0,0 +1,8 @@ +