#2783

diff --git a/src/app/Console/Commands/MagicCubistCommand.php b/src/app/Console/Commands/MagicCubistCommand.php
index d7afaf98677443e6f7f7443337b44638cacdb492..d63b84275b6dafa98dfd01005183cc5cd11353f2 100644 (file)
--- a/src/app/Console/Commands/MagicCubistCommand.php
+++ b/src/app/Console/Commands/MagicCubistCommand.php
@@ -53,11 +53,16 @@ class MagicCubistCommand extends Command
             $this->line('Testing ' . $item);
             /** @var $item \SplFileInfo */
             if ($item->isFile() && $item->getExtension() == 'php') {
-                $class = PHP::instanciateClassInFile($item);
-                if ($class instanceof CubistMagicModelAbstract) {
-                    $this->line('Generate code of ' . get_class($class));
-                    $class->generateCode();
+                try {
+                    $class = PHP::instanciateClassInFile($item);
+                    if ($class instanceof CubistMagicModelAbstract) {
+                        $this->line('Generate code of ' . get_class($class));
+                        $class->generateCode();
+                    }
+                } catch (\Exception $e) {
+
                 }
+
             }
         }
     }

diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index 4e0d69c764a1b02a75c9042937190e92c1e176d3..3241d58377ce4ec2915607128213e2b78bde79e7 100644 (file)
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -3,9 +3,8 @@
 
 namespace Cubist\Backpack\app\Magic\Controllers;
 
-
 use Backpack\CRUD\app\Http\Controllers\CrudController;
-use Cubist\Backpack\app\Http\Controllers\CubistCrud;
+use Cubist\Backpack\app\Magic\CubistCrud;
 use Cubist\Backpack\app\Magic\Requests\CubistMagicStoreRequest;
 use Cubist\Backpack\app\Magic\Requests\CubistMagicUpdateRequest;
 
@@ -27,9 +26,6 @@ class CubistMagicController extends CrudController
         if (!$this->_plural) {
             $this->_plural = $this->_singular . 's';
         }
-        if(!$this->_modelNamespace){
-
-        }
 
         /*
         |--------------------------------------------------------------------------