php-resta / resta-core

src/resta/Console/Source/Client/Client.php

Spacing +11 added lines, -11 removed lines

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

      * @var array

      */

-    public $commandRule=['name','client'];

+    public $commandRule = ['name', 'client'];

 

     /**

      * @method create

@@ -56,35 +56,35 @@ 
 

         $this->argument['managerTraitNamespace'] = Utils::getNamespace($this->directory['clientNameDir'].'/'.$name.'Trait.php');

 

-        if(!file_exists($manager = $this->directory['clientNameDir'].'/'.$name.'Manager.php')){

+        if (!file_exists($manager = $this->directory['clientNameDir'].'/'.$name.'Manager.php')) {

             $this->touch['client/manager'] = $manager;

             $this->touch['client/managertrait'] = $this->directory['clientNameDir'].'/'.$name.'Trait.php';

             

         }

 

-        if(isset($this->argument['trait'])){

+        if (isset($this->argument['trait'])) {

             $this->argument['name'] = $this->argument['trait'];

             

-            if(!file_exists($managerCustomTrait = $this->directory['clientNameDir'].'/'.$this->argument['trait'].'Trait.php')){

+            if (!file_exists($managerCustomTrait = $this->directory['clientNameDir'].'/'.$this->argument['trait'].'Trait.php')) {

                 $this->touch['client/managercustomtrait'] = $managerCustomTrait;

             }

 

             $this->argument['managerTraitNamespace'] = Utils::getNamespace($managerCustomTrait);

         }

 

-        if(!file_exists($this->directory['clientNameCreate'].'/Client.php')){

+        if (!file_exists($this->directory['clientNameCreate'].'/Client.php')) {

             $this->touch['client/client'] = $this->directory['clientNameCreate'].'/Client.php';

             $this->touch['client/clientGenerator'] = $this->directory['clientNameCreate'].'/ClientGenerator.php';

         }

 

         $clientSourceNamespace = Utils::getNamespace($this->directory['clientSource'].'/'.$client.'.php');

 

-        if(!file_exists($clientSourceName = $this->directory['clientSource'].'/'.$client.'.php')){

+        if (!file_exists($clientSourceName = $this->directory['clientSource'].'/'.$client.'.php')) {

             $this->touch['client/source'] = $clientSourceName.'';

         }

         

 

-        if(!file_exists($this->directory['clientNameCreate'].'/ClientProvider.php')){

+        if (!file_exists($this->directory['clientNameCreate'].'/ClientProvider.php')) {

             $this->touch['client/clientProvider'] = $this->directory['clientNameCreate'].'/ClientProvider.php';

         }

 

@@ -98,13 +98,13 @@ 
 

         $nameGeneratorNamespace = Utils::getNamespace($managerPath = $this->directory['clientNameDir'].''.DIRECTORY_SEPARATOR.''.$nameManager.'.php');

 

-        $generator = new Generator(path()->version(),'ClientManager');

+        $generator = new Generator(path()->version(), 'ClientManager');

 

         $clientManager = app()->namespace()->version().'\\ClientManager';

 

         $clientManagerResolve = new $clientManager;

 

-        if(!method_exists($clientManagerResolve,strtolower($name))){

+        if (!method_exists($clientManagerResolve, strtolower($name))) {

 

             $generator->createMethod([

                 strtolower($name)

@@ -135,11 +135,11 @@ 
 

         }

 

-        $nameGenerator = new Generator($this->directory['clientNameDir'],$name.'Manager');

+        $nameGenerator = new Generator($this->directory['clientNameDir'], $name.'Manager');

 

         $nameGeneratorNamespaceResolve = new $nameGeneratorNamespace;

 

-        if(!method_exists($nameGeneratorNamespaceResolve,strtolower($client))){

+        if (!method_exists($nameGeneratorNamespaceResolve, strtolower($client))) {

 

             $nameGenerator->createMethod([

                 strtolower($client)

src/resta/Authenticate/ConfigProvider.php

Braces +1 added lines, -2 removed lines

@@ -219,8 +219,7 @@
             $table = $this->config['guard'][$this->guard]['deviceTokenRegister'];

 

             app()->register('authenticateDeviceTokenTable',$table);

-        }

-        else{

+        } else{

             app()->register('authenticateDeviceTokenTable','device_tokens');

         }

 

Spacing +10 added lines, -10 removed lines

@@ -31,7 +31,7 @@ 
     {

         $this->config();

 

-        if($this->guard=="default"){

+        if ($this->guard=="default") {

             $this->setAuthenticateNeeds();

         }

 

@@ -49,7 +49,7 @@ 
     {

         $this->config = config('authenticate');

 

-        if(!is_null($config = $this->provider('configuration'))){

+        if (!is_null($config = $this->provider('configuration'))) {

             $this->config['guard'][$this->guard] = $config($this->config['guard'][$this->guard]);

         }

 

@@ -63,7 +63,7 @@ 
      */

     public function getAddToWhere()

     {

-        if(isset($this->config['guard'][$this->guard]['addToWhere'])){

+        if (isset($this->config['guard'][$this->guard]['addToWhere'])) {

             return $this->config['guard'][$this->guard]['addToWhere'];

         }

         return null;

@@ -76,7 +76,7 @@ 
      */

     public function getConfigToken()

     {

-        if(isset($this->config['guard'][$this->guard]['token'])){

+        if (isset($this->config['guard'][$this->guard]['token'])) {

             return $this->config['guard'][$this->guard]['token'];

         }

         return null;

@@ -170,7 +170,7 @@ 
      */

     public function provider($key)

     {

-        if(app()->has('authenticate.'.$key) && is_callable($provider = app()->get('authenticate.'.$key))){

+        if (app()->has('authenticate.'.$key) && is_callable($provider = app()->get('authenticate.'.$key))) {

             return $provider;

         }

 

@@ -209,7 +209,7 @@ 
     {

         $table = $this->config['guard'][$this->guard]['table'];

 

-        app()->register('authenticateTable',$table);

+        app()->register('authenticateTable', $table);

     }

 

     /**

@@ -219,13 +219,13 @@ 
      */

     public function deviceTokenTable()

     {

-        if(isset($this->config['guard'][$this->guard]['deviceTokenRegister'])){

+        if (isset($this->config['guard'][$this->guard]['deviceTokenRegister'])) {

             $table = $this->config['guard'][$this->guard]['deviceTokenRegister'];

 

-            app()->register('authenticateDeviceTokenTable',$table);

+            app()->register('authenticateDeviceTokenTable', $table);

         }

-        else{

-            app()->register('authenticateDeviceTokenTable','device_tokens');

+        else {

+            app()->register('authenticateDeviceTokenTable', 'device_tokens');

         }

 

     }

src/resta/Authenticate/Driver/Eloquent/DeviceToken.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
     /**

      * @var array

      */

-    protected $fillable = ['user_id','token','token_integer','device_agent','device_agent_integer','expire'];

+    protected $fillable = ['user_id', 'token', 'token_integer', 'device_agent', 'device_agent_integer', 'expire'];

 

     /**

      * User constructor.

src/resta/Middleware/ExcludeMiddleware.php

Spacing +12 added lines, -12 removed lines

@@ -29,7 +29,7 @@ 
      * @param callable $callback

      * @return mixed

      */

-    public function exclude($middleware,callable $callback)

+    public function exclude($middleware, callable $callback)

     {

         $this->result = true;

 

@@ -41,7 +41,7 @@ 
 

         //if there is exclude method

         //in service middleware class

-        if($this->existMethod()){

+        if ($this->existMethod()) {

 

             //call exclude method

             /**

@@ -50,24 +50,24 @@ 
             $serviceMiddleware = $middleware['class'];

             $excludes = $serviceMiddleware->exclude();

 

-            foreach ($excludes as $excludeKey=>$excludeVal){

-                $this->excludeProcess($excludeKey,$excludeVal);

+            foreach ($excludes as $excludeKey=>$excludeVal) {

+                $this->excludeProcess($excludeKey, $excludeVal);

             }

         }

 

         //return true

-        return Utils::returnCallback($this->result,$callback);

+        return Utils::returnCallback($this->result, $callback);

     }

 

     /**

      * @param $excludeKey

      * @param $excludeVal

      */

-    private function excludeProcess($excludeKey,$excludeVal)

+    private function excludeProcess($excludeKey, $excludeVal)

     {

-        $this->excludeForAll($excludeKey,$excludeVal,function() use ($excludeKey,$excludeVal){

+        $this->excludeForAll($excludeKey, $excludeVal, function() use ($excludeKey, $excludeVal){

 

-            if($excludeKey == $this->excludeList['middleware']['middlewareName']){

+            if ($excludeKey==$this->excludeList['middleware']['middlewareName']) {

                 $this->result = true;

                 $this->inArrayExclude($excludeVal);

 

@@ -80,7 +80,7 @@ 
      */

     private function existMethod()

     {

-        return Utils::existMethod($this->excludeList['middleware']['class'],'exclude');

+        return Utils::existMethod($this->excludeList['middleware']['class'], 'exclude');

     }

 

     /**

@@ -88,8 +88,8 @@ 
      */

     private function inArrayExclude($exclude)

     {

-        foreach($exclude as $item){

-            if(in_array($item,$this->middleware['odds'])){

+        foreach ($exclude as $item) {

+            if (in_array($item, $this->middleware['odds'])) {

                 $this->result = false;

             }

         }

@@ -101,7 +101,7 @@ 
      * @param callable $callback

      * @return mixed

      */

-    private function excludeForAll($excludeKey,$excludeVal,callable $callback)

+    private function excludeForAll($excludeKey, $excludeVal, callable $callback)

     {

         return ($excludeKey=="all") ? $this->inArrayExclude($excludeVal) : call_user_func($callback);

     }

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

Spacing +22 added lines, -22 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,17 +47,17 @@ 
         $this->directory['projectDir']          = $this->projectPath();

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

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

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

+        $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();

@@ -99,11 +99,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';

@@ -121,16 +121,16 @@ 
         $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['config/redis']                = $this->config().'/Redis.php';

@@ -154,9 +154,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);

src/resta/Console/ConsoleProvider.php

Spacing +23 added lines, -23 removed lines

@@ -27,13 +27,13 @@ 
     {

         // we check that they are in

         // the console to run the console commands in the kernel.

-        if(Utils::isNamespaceExists($this->consoleClassNamespace)){

+        if (Utils::isNamespaceExists($this->consoleClassNamespace)) {

             return call_user_func($callback);

         }

 

         // if the kernel console is not found

         // then we check the existence of the specific application command and run it if it is.

-        return (new CustomConsoleProcess($this->getConsoleArgumentsWithKey(),$this))->handle();

+        return (new CustomConsoleProcess($this->getConsoleArgumentsWithKey(), $this))->handle();

 

     }

 

@@ -43,29 +43,29 @@ 
      * @param array $args

      * @return void|mixed

      */

-    protected function consoleEventHandler($args=array())

+    protected function consoleEventHandler($args = array())

     {

-        if(isset($this->app['eventDispatcher'])){

+        if (isset($this->app['eventDispatcher'])) {

 

             $listeners = event()->getListeners();

 

-            if(isset($args['event']) && isset($listeners['console'])){

+            if (isset($args['event']) && isset($listeners['console'])) {

 

-                if(strtolower($args['event'])!=='default' && isset($listeners['console'][strtolower($args['event'])])){

+                if (strtolower($args['event'])!=='default' && isset($listeners['console'][strtolower($args['event'])])) {

 

                     $event = $listeners['console'][strtolower($args['event'])];

-                    return call_user_func_array($event,['app'=>$this->app,'args'=>$args,]);

+                    return call_user_func_array($event, ['app'=>$this->app, 'args'=>$args, ]);

                 }

             }

 

-            if(isset($listeners['console']['default'])){

+            if (isset($listeners['console']['default'])) {

                 

-                if($this->app->has('arguments')){

-                    $args = array_merge($args,$this->app->get('arguments'));

+                if ($this->app->has('arguments')) {

+                    $args = array_merge($args, $this->app->get('arguments'));

                 }

 

                 $event = $listeners['console']['default'];

-                return call_user_func_array($event,['args'=>$args,'app'=>$this->app]);

+                return call_user_func_array($event, ['args'=>$args, 'app'=>$this->app]);

             }

         }

 

@@ -83,9 +83,9 @@ 
 

         //If the console executor is a custom console application; in this case we look at the kernel directory inside the application.

         //If the console class is not available on the kernel of resta, then the system will run the command class in the application.

-        return $this->checkConsoleNamespace(function(){

+        return $this->checkConsoleNamespace(function() {

 

-            if($this->isRunnableKernelCommandList()){

+            if ($this->isRunnableKernelCommandList()) {

                 exception()->badMethodCall('this command is not runnable');

             }

 

@@ -93,10 +93,10 @@ 
             $consoleArguments = $this->getConsoleArgumentsWithKey();

 

             // we get the instance data of the kernel command class of the system.

-            $commander = (new $this->consoleClassNamespace($consoleArguments,$this));

+            $commander = (new $this->consoleClassNamespace($consoleArguments, $this));

 

             // we check the command rules of each command class.

-            $this->prepareCommander($commander,function($commander){

+            $this->prepareCommander($commander, function($commander) {

                 return $commander->{$this->getConsoleClassMethod()}();

             });

 

@@ -114,12 +114,12 @@ 
     public function handle()

     {

         //get is running console

-        if($this->app->runningInConsole()){

+        if ($this->app->runningInConsole()) {

 

             error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);

 

             //run console process

-            if(count($this->getArguments())){

+            if (count($this->getArguments())) {

                 return $this->consoleProcess();

             }

 

@@ -135,24 +135,24 @@ 
      * @param callable $callback

      * @return mixed

      */

-    protected function prepareCommander(ConsoleOutputterContracts $commander,callable $callback)

+    protected function prepareCommander(ConsoleOutputterContracts $commander, callable $callback)

     {

         // closure binding custom command,move custom namespace as specific

         // call prepare commander firstly for checking command builder

-        $closureCommand = app()->resolve(ClosureDispatcher::class,['bind'=>$commander]);

+        $closureCommand = app()->resolve(ClosureDispatcher::class, ['bind'=>$commander]);

 

         //assign commander method name

         $closureCommand->prepareBind['methodName'] = $this->getConsoleClassMethod();

 

         $prepareCommander = $commander->prepareCommander($closureCommand);

 

-        if(!$prepareCommander['status']){

+        if (!$prepareCommander['status']) {

             echo $commander->exception($prepareCommander);

             die();

         }

 

         //callback custom console

-        return call_user_func_array($callback,[$commander]);

+        return call_user_func_array($callback, [$commander]);

     }

 

     /**

@@ -165,8 +165,8 @@ 
         $commandList = $this->app->commandList();

 

         //is runnable kernel command conditions

-        return !array_key_exists($this->consoleClassNamespace,$commandList) OR

-            (array_key_exists($this->consoleClassNamespace,$commandList) AND

+        return !array_key_exists($this->consoleClassNamespace, $commandList) OR

+            (array_key_exists($this->consoleClassNamespace, $commandList) AND

                 !$commandList[$this->consoleClassNamespace]['isRunnable']);

     }

 }
\ No newline at end of file

src/resta/Database/Migration/Src/Resource/PushManager/Pushing.php

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function handle()
     {
-        foreach ($this->tableFilters() as $table=>$files){
+        foreach ($this->tableFilters() as $table=>$files) {
 
             $table = strtolower($table);
 
@@ -30,28 +30,28 @@ 
 
                 $checkMigrationMain = $this->schema->getConnection()->checkMigrationMain();
                 
-                if($checkMigrationMain===false && isset($this->tableFilters()['Migrations'][0])){
-                    $this->apply($this->tableFilters()['Migrations'][0],'migrations');
+                if ($checkMigrationMain===false && isset($this->tableFilters()['Migrations'][0])) {
+                    $this->apply($this->tableFilters()['Migrations'][0], 'migrations');
                 }
                 
-                $checkMigration = $this->schema->getConnection()->checkMigration($table,$file);
+                $checkMigration = $this->schema->getConnection()->checkMigration($table, $file);
                 
-                if(!$checkMigration){
+                if (!$checkMigration) {
 
-                    $getClassName = preg_replace('@(\d+)_@is','',$file);
+                    $getClassName = preg_replace('@(\d+)_@is', '', $file);
                     $className = $this->getClassName($getClassName);
 
                     require_once ($file);
 
-                    $capsule = new SchemaCapsule($this->config,$file,$table);
+                    $capsule = new SchemaCapsule($this->config, $file, $table);
 
                     $this->list[$table][] = (new $className)->up($capsule);
 
-                    if(app()->has('arguments')){
+                    if (app()->has('arguments')) {
                         app()->terminate('arguments');
                     }
 
-                    app()->register('arguments','table',$table);
+                    app()->register('arguments', 'table', $table);
                 }
 
                 
@@ -66,14 +66,14 @@ 
      * @param $table
      * @return mixed|string
      */
-    public function apply($file,$table)
+    public function apply($file, $table)
     {
-        $getClassName = preg_replace('@(\d+)_@is','',$file);
+        $getClassName = preg_replace('@(\d+)_@is', '', $file);
         $className = $this->getClassName($getClassName);
 
         require_once ($file);
 
-        $capsule = new SchemaCapsule($this->config,$file,$table);
+        $capsule = new SchemaCapsule($this->config, $file, $table);
 
         $this->list[$table][] = (new $className)->up($capsule);