php-resta / resta-core

src/resta/Console/Source/Controller/Controller.php

Spacing +33 added lines, -33 removed lines

@@ -18,7 +18,7 @@ 
     /**

      * @var $type

      */

-    public $type='controller';

+    public $type = 'controller';

 

     /**

      * @var array

@@ -37,9 +37,9 @@ 
     /**

      * @var array

      */

-    protected $commandRule=[

+    protected $commandRule = [

         'create'    => ['controller'],

-        'rename'    => ['controller','rename'],

+        'rename'    => ['controller', 'rename'],

         'all'       => [],

     ];

 

@@ -55,7 +55,7 @@ 
 

         $this->argument['bundleName'] = $controller.''.StaticPathList::$controllerBundleName;

 

-        if(!file_exists(app()->path()->controller())){

+        if (!file_exists(app()->path()->controller())) {

             $this->directory['createController'] = app()->path()->controller();

         }

 

@@ -73,7 +73,7 @@ 
 

         $fullNamespaceForController             = $this->argument['controllerNamespace'].'\\'.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'];

 

-        $this->directory['routes']       = path()->route();

+        $this->directory['routes'] = path()->route();

 

         $routePath = $this->directory['routes'].''.DIRECTORY_SEPARATOR.''.$controller.'Route.php';

 

@@ -81,9 +81,9 @@ 
         // we get to the service directory, which is called the controller.

         $this->file->makeDirectory($this);

 

-        if(isset($this->argument['resource']) && file_exists($this->directory['endpoint'])){

+        if (isset($this->argument['resource']) && file_exists($this->directory['endpoint'])) {

 

-            $this->touch['service/resource']   = $this->directory['resource'].''.DIRECTORY_SEPARATOR.''.$this->argument['resource'].'.php';

+            $this->touch['service/resource'] = $this->directory['resource'].''.DIRECTORY_SEPARATOR.''.$this->argument['resource'].'.php';

 

             $this->file->touch($this);

 

@@ -91,30 +91,30 @@ 
             echo $this->classical(' > Resource Controller called as "'.$this->argument['resource'].'" has been successfully created in the '.$this->directory['resource'].'');

 

         }

-        elseif(isset($this->argument['file']) && file_exists($this->directory['endpoint'])){

-            if(isset($this->argument['type']) && $this->argument['type']=='Crud'){

+        elseif (isset($this->argument['file']) && file_exists($this->directory['endpoint'])) {

+            if (isset($this->argument['type']) && $this->argument['type']=='Crud') {

 

-                $this->touch['service/controllerfilecrud']   = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''. $this->argument['callClassPrefix'].'.php';

+                $this->touch['service/controllerfilecrud'] = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''.$this->argument['callClassPrefix'].'.php';

 

-                $this->file->touch($this,[

+                $this->file->touch($this, [

                     'stub'=>'Controller_Create'

                 ]);

 

-                files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->get("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@get");');

-                files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->post("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@create");');

-                files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->put("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@update");');

+                files()->append($routePath, PHP_EOL.'Route::namespace(\''.$controller.'\')->get("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@get");');

+                files()->append($routePath, PHP_EOL.'Route::namespace(\''.$controller.'\')->post("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@create");');

+                files()->append($routePath, PHP_EOL.'Route::namespace(\''.$controller.'\')->put("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@update");');

                 //files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->delete("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@delete");');

 

             }

-            else{

+            else {

 

-                $this->touch['service/controllerfile']   = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''. $this->argument['callClassPrefix'].'.php';

+                $this->touch['service/controllerfile'] = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''.$this->argument['callClassPrefix'].'.php';

 

-                $this->file->touch($this,[

+                $this->file->touch($this, [

                     'stub'=>'Controller_Create'

                 ]);

 

-                files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->get("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@index");');

+                files()->append($routePath, PHP_EOL.'Route::namespace(\''.$controller.'\')->get("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@index");');

 

             }

 

@@ -122,21 +122,21 @@ 
             echo $this->classical(' > Controller called as "'.$this->argument['file'].'" has been successfully created in the '.$this->directory['endpoint'].'');

 

         }

-        else{

+        else {

 

             // we process the processes related to file creation operations.

             // and then create files related to the touch method of the file object as it is in the directory process.

 

-            if(isset($this->argument['type']) && $this->argument['type']=='Crud'){

+            if (isset($this->argument['type']) && $this->argument['type']=='Crud') {

 

                 $this->argument['file'] = $this->argument['serviceClass'];

 

-                $this->touch['service/controllerfilecrud']  = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'.php';

+                $this->touch['service/controllerfilecrud']  = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'].'.php';

                 $this->touch['service/routecrud']           = $routePath;

 

             }

-            else{

-                $this->touch['service/endpoint']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'.php';

+            else {

+                $this->touch['service/endpoint']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''.$this->argument['callClassPrefix'].'.php';

                 $this->touch['service/route']           = $routePath;

 

             }

@@ -147,10 +147,10 @@ 
             //$this->touch['service/conf']            = $this->directory['configuration'].''.DIRECTORY_SEPARATOR.'ServiceConf.php';

             //$this->touch['service/dummy']           = $this->directory['configuration'].''.DIRECTORY_SEPARATOR.'Dummy.yaml';

             //$this->touch['service/doc']             = $this->directory['configuration'].''.DIRECTORY_SEPARATOR.'Doc.yaml';

-            $this->touch['service/readme']          = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.'README.md';

+            $this->touch['service/readme'] = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.'README.md';

             //$this->touch['service/policy']          = $this->directory['policy'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'Policy.php';

 

-            $this->file->touch($this,[

+            $this->file->touch($this, [

                 'stub'=>'Controller_Create'

             ]);

 

@@ -174,24 +174,24 @@ 
     {

         $path = path()->controller().'/'.$this->argument['controller'].''.StaticPathList::$controllerBundleName;

 

-        if(file_exists($path)){

+        if (file_exists($path)) {

 

-            $newPathName = str_replace($this->argument['controller'],$this->argument['rename'],$path);

+            $newPathName = str_replace($this->argument['controller'], $this->argument['rename'], $path);

 

 

-            rename($path,$newPathName);

+            rename($path, $newPathName);

 

             $getAllFiles = files()->getAllFilesInDirectory($newPathName);

 

-            $getPathWithPhpExtensions = Utils::getPathWithPhpExtension($getAllFiles,$newPathName);

+            $getPathWithPhpExtensions = Utils::getPathWithPhpExtension($getAllFiles, $newPathName);

 

-            foreach ($getPathWithPhpExtensions as $getPathWithPhpExtension){

+            foreach ($getPathWithPhpExtensions as $getPathWithPhpExtension) {

 

-                $withoutFullPath = str_replace($newPathName,"",$getPathWithPhpExtension);

+                $withoutFullPath = str_replace($newPathName, "", $getPathWithPhpExtension);

 

                 $newName = $newPathName."".preg_replace("((.*)".$this->argument['controller'].")", "$1".$this->argument['rename'], $withoutFullPath);

 

-                rename($getPathWithPhpExtension,$newName);

+                rename($getPathWithPhpExtension, $newName);

 

                 Utils::changeClass($newName,

                     [

@@ -210,7 +210,7 @@ 
      */

     private function docUpdate()

     {

-        $docPath = $this->directory['configuration'] .'/Doc.yaml';

+        $docPath = $this->directory['configuration'].'/Doc.yaml';

 

         $doc = Utils::yaml($docPath);

 

Braces +4 added lines, -8 removed lines

@@ -90,8 +90,7 @@ 
             // and as a result we print the result on the console screen.

             echo $this->classical(' > Resource Controller called as "'.$this->argument['resource'].'" has been successfully created in the '.$this->directory['resource'].'');

 

-        }

-        elseif(isset($this->argument['file']) && file_exists($this->directory['endpoint'])){

+        } elseif(isset($this->argument['file']) && file_exists($this->directory['endpoint'])){

             if(isset($this->argument['type']) && $this->argument['type']=='Crud'){

 

                 $this->touch['service/controllerfilecrud']   = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''. $this->argument['callClassPrefix'].'.php';

@@ -105,8 +104,7 @@ 
                 files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->put("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@update");');

                 //files()->append($routePath,PHP_EOL.'Route::namespace(\''.$controller.'\')->delete("/'.strtolower($this->argument['file']).'","'.$this->argument['file'].'Controller@delete");');

 

-            }

-            else{

+            } else{

 

                 $this->touch['service/controllerfile']   = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].''. $this->argument['callClassPrefix'].'.php';

 

@@ -121,8 +119,7 @@ 
             // and as a result we print the result on the console screen.

             echo $this->classical(' > Controller called as "'.$this->argument['file'].'" has been successfully created in the '.$this->directory['endpoint'].'');

 

-        }

-        else{

+        } else{

 

             // we process the processes related to file creation operations.

             // and then create files related to the touch method of the file object as it is in the directory process.

@@ -134,8 +131,7 @@ 
                 $this->touch['service/controllerfilecrud']  = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'.php';

                 $this->touch['service/routecrud']           = $routePath;

 

-            }

-            else{

+            } else{

                 $this->touch['service/endpoint']        = $this->directory['endpoint'].''.DIRECTORY_SEPARATOR.''.$this->argument['serviceClass'].''. $this->argument['callClassPrefix'].'.php';

                 $this->touch['service/route']           = $routePath;

 

src/resta/Console/Source/Project/Project.php

Spacing +24 added lines, -24 removed lines

@@ -15,7 +15,7 @@ 
     /**

      * @var $type

      */

-    public $type='project';

+    public $type = 'project';

 

     /**

      * @var array

@@ -32,7 +32,7 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=[];

+    public $commandRule = [];

 

     /**

      * @method create

@@ -47,18 +47,18 @@ 
         $this->directory['projectDir']          = $this->projectPath();

         $this->argument['exceptionNamespace']   = app()->namespace()->exception();

         $this->argument['resourcePath']         = app()->path()->appResourche();

-        $this->argument['commandNamespace']           = app()->namespace()->command();

-        $this->argument['testNamespace']             = app()->namespace()->tests();

+        $this->argument['commandNamespace'] = app()->namespace()->command();

+        $this->argument['testNamespace'] = app()->namespace()->tests();

 

-        $recursiveDefaultDirectory = explode("\\",$this->argument['project']);

+        $recursiveDefaultDirectory = explode("\\", $this->argument['project']);

         $this->argument['applicationName'] = pos($recursiveDefaultDirectory);

         $recursiveDefaultDirectory[] = 'V1';

         $recursiveDefaultDirectoryList = [];

 

-        foreach (array_slice($recursiveDefaultDirectory,1) as $defaultDirectory){

+        foreach (array_slice($recursiveDefaultDirectory, 1) as $defaultDirectory) {

 

-            $recursiveDefaultDirectoryList[]=$defaultDirectory;

-            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/",$recursiveDefaultDirectoryList);

+            $recursiveDefaultDirectoryList[] = $defaultDirectory;

+            $this->directory[$defaultDirectory.'Path'] = $this->projectPath().''.implode("/", $recursiveDefaultDirectoryList);

         }

 

         //$this->directory['optionalDir'] = $this->optional();

@@ -101,11 +101,11 @@ 
         $this->touch['kernel/exception']            = $this->provider().'/ExceptionServiceProvider.php';

         $this->touch['kernel/response']             = $this->provider().'/ResponseServiceProvider.php';

         $this->touch['kernel/entity']               = $this->provider().'/EntityServiceProvider.php';

-        $this->touch['kernel/cache']               = $this->provider().'/CacheServiceProvider.php';

+        $this->touch['kernel/cache'] = $this->provider().'/CacheServiceProvider.php';

         $this->touch['kernel/authenticate']         = $this->provider().'/AuthenticateServiceProvider.php';

         $this->touch['kernel/role']                 = $this->provider().'/RoleServiceProvider.php';

         $this->touch['kernel/track']                = $this->provider().'/TrackServiceProvider.php';

-        $this->touch['test/testcase']              = $this->test().'/TestCase.php';

+        $this->touch['test/testcase'] = $this->test().'/TestCase.php';

         $this->touch['kernel/consoleevent']         = $this->provider().'/ConsoleEventServiceProvider.php';

         $this->touch['middleware/authenticate']     = $this->middleware().'/Authenticate.php';

         $this->touch['middleware/ratelimit']        = $this->middleware().'/RateLimit.php';

@@ -123,19 +123,19 @@ 
         $this->touch['resource/index']              = $this->resource().'/index.html';

         $this->touch['resource/index']              = $this->resource().'/'.StaticPathModel::$cache.'/index.html';

         $this->touch['stub/index']                  = $this->stub().'/index.html';

-        $this->touch['stub/cccrudapp']              = $this->directory['stubControllerCreateCrudFileDir'] .'/app.stub';

-        $this->touch['stub/cccrudconf']              = $this->directory['stubControllerCreateCrudFileDir'] .'/conf.stub';

-        $this->touch['stub/cccrudcontrollerfilecrud']              = $this->directory['stubControllerCreateCrudFileDir'] .'/controllerfilecrud.stub';

-        $this->touch['stub/cccruddeveloper']              = $this->directory['stubControllerCreateCrudFileDir'] .'/developer.stub';

-        $this->touch['stub/cccruddoc']              = $this->directory['stubControllerCreateCrudFileDir'] .'/doc.stub';

-        $this->touch['stub/cccruddummy']              = $this->directory['stubControllerCreateCrudFileDir'] .'/dummy.stub';

-        $this->touch['stub/cccrudroute']              = $this->directory['stubControllerCreateCrudFileDir'] .'/routecrud.stub';

-        $this->touch['stub/cccrudpolicy']              = $this->directory['stubControllerCreateCrudFileDir'] .'/policy.stub';

-        $this->touch['stub/cccrudreadme']              = $this->directory['stubControllerCreateCrudFileDir'] .'/readme.stub';

-        $this->touch['stub/cccrudresourceindex']              = $this->directory['stubControllerCreateCrudFileDir'] .'/resourceIndex.stub';

+        $this->touch['stub/cccrudapp']              = $this->directory['stubControllerCreateCrudFileDir'].'/app.stub';

+        $this->touch['stub/cccrudconf'] = $this->directory['stubControllerCreateCrudFileDir'].'/conf.stub';

+        $this->touch['stub/cccrudcontrollerfilecrud'] = $this->directory['stubControllerCreateCrudFileDir'].'/controllerfilecrud.stub';

+        $this->touch['stub/cccruddeveloper'] = $this->directory['stubControllerCreateCrudFileDir'].'/developer.stub';

+        $this->touch['stub/cccruddoc'] = $this->directory['stubControllerCreateCrudFileDir'].'/doc.stub';

+        $this->touch['stub/cccruddummy']              = $this->directory['stubControllerCreateCrudFileDir'].'/dummy.stub';

+        $this->touch['stub/cccrudroute']              = $this->directory['stubControllerCreateCrudFileDir'].'/routecrud.stub';

+        $this->touch['stub/cccrudpolicy']              = $this->directory['stubControllerCreateCrudFileDir'].'/policy.stub';

+        $this->touch['stub/cccrudreadme']              = $this->directory['stubControllerCreateCrudFileDir'].'/readme.stub';

+        $this->touch['stub/cccrudresourceindex'] = $this->directory['stubControllerCreateCrudFileDir'].'/resourceIndex.stub';

         $this->touch['config/hateoas']              = $this->config().'/Hateoas.php';

         //$this->touch['config/response']             = $this->config().'/Response.php';

-        $this->touch['command/clientEntity']          = $this->directory['commandDir'].'/ClientEntity.php';

+        $this->touch['command/clientEntity'] = $this->directory['commandDir'].'/ClientEntity.php';

         $this->touch['config/redis']                = $this->config().'/Redis.php';

         $this->touch['config/app']                  = $this->config().'/App.php';

         $this->touch['config/autoservice']          = $this->config().'/AutoServices.php';

@@ -157,9 +157,9 @@ 
         $this->touch['app/gitignore']               = $this->projectPath().'/.gitignore';

         $this->touch['app/composer']                = $this->projectPath().'/composer.json';

         $this->touch['test/index']                  = $this->storage().'/index.html';

-        $this->touch['exception/authenticate']      = $this->directory['exceptionDir'] .'/AuthenticateException.php';

-        $this->touch['exception/noinput']           = $this->directory['exceptionDir'] .'/NoInputException.php';

-        $this->touch['helpers/general']              = $this->directory['helperDir'] .'/General.php';

+        $this->touch['exception/authenticate']      = $this->directory['exceptionDir'].'/AuthenticateException.php';

+        $this->touch['exception/noinput']           = $this->directory['exceptionDir'].'/NoInputException.php';

+        $this->touch['helpers/general'] = $this->directory['helperDir'].'/General.php';

 

         //set project touch

         $this->file->touch($this);