php-resta / resta-core

src/resta/Console/Source/Request/Request.php

Spacing +6 added lines, -6 removed lines

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

      * @var $type

      */

-    public $type='request';

+    public $type = 'request';

 

     /**

      * @var array

@@ -32,15 +32,15 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['request'];

+    public $commandRule = ['request'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

-        $request=$this->argument['request'];

+        $request = $this->argument['request'];

 

 

         $this->directory['requestCreate']   = path()->request();

@@ -50,12 +50,12 @@ 
         //set project directory

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

 

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

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

             $this->touch['source/request'] = $this->directory['requestCreate'].'/Request.php';

             $this->touch['source/requestGenerator'] = $this->directory['requestCreate'].'/RequestGenerator.php';

         }

 

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

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

             $this->touch['source/requestProvider'] = $this->directory['requestCreate'].'/RequestProvider.php';

         }

 

src/resta/Console/Source/Token/Token.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
     /**

      * @var $type

      */

-    public $type='token';

+    public $type = 'token';

 

     /**

      * @var array

@@ -31,20 +31,20 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['key'];

+    public $commandRule = ['key'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

         //

-        $clientApiToken=StaticPathModel::appMiddlewarePath($this->projectName()).'\\ClientApiToken';

-        $resolveClientApiToken=DIContainerManager::resolve($clientApiToken,$this->app->app->applicationProviderBinding($this->app->app));

+        $clientApiToken = StaticPathModel::appMiddlewarePath($this->projectName()).'\\ClientApiToken';

+        $resolveClientApiToken = DIContainerManager::resolve($clientApiToken, $this->app->app->applicationProviderBinding($this->app->app));

 

         //

-        $key=lcfirst($this->argument['key']);

+        $key = lcfirst($this->argument['key']);

 

         echo $this->info($resolveClientApiToken->createToken($key));

     }

src/resta/Console/Source/Command/Command.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
     /**

      * @var $type

      */

-    public $type='command';

+    public $type = 'command';

 

     /**

      * @var array

@@ -25,13 +25,13 @@ 
     /**

      * @var $commandRule

      */

-    protected $commandRule=['command'];

+    protected $commandRule = ['command'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

         $this->directory['commandDir'] = path()->command();

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

@@ -40,7 +40,7 @@ 
         //set project directory

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

 

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

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

 

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

 

src/resta/Console/ConsoleArguments.php

Spacing +25 added lines, -25 removed lines

@@ -16,7 +16,7 @@ 
     {

 

         //if there is no arguments constant

-        if(!defined('arguments'))  define ('arguments',['api']);

+        if (!defined('arguments'))  define('arguments', ['api']);

 

         //get psr standard console arguments

         return core()->consoleArguments = Utils::upperCase(arguments);

@@ -26,7 +26,7 @@ 
      * @method getConsoleClass

      * @return mixed

      */

-    public function getConsoleClass(){

+    public function getConsoleClass() {

 

         return current($this->getArguments());

     }

@@ -35,7 +35,7 @@ 
      * @method getConsoleClassMethod

      * @return mixed

      */

-    public function getConsoleClassMethod(){

+    public function getConsoleClassMethod() {

 

         return $this->getArguments()[1];

     }

@@ -44,44 +44,44 @@ 
      * @method getConsoleClassMethod

      * @return mixed

      */

-    public function getConsoleClassRealArguments(){

+    public function getConsoleClassRealArguments() {

 

-        return array_slice($this->getArguments(),2);

+        return array_slice($this->getArguments(), 2);

     }

 

     /**

      * @method getConsoleArgumentsWithKey

      * @return array

      */

-    public function getConsoleArgumentsWithKey(){

+    public function getConsoleArgumentsWithKey() {

 

         //get console class real arguments

-        $getConsoleClassRealArguments=$this->getConsoleClassRealArguments();

+        $getConsoleClassRealArguments = $this->getConsoleClassRealArguments();

 

-        $listKey=[];

-        $listKey['project']=null;

+        $listKey = [];

+        $listKey['project'] = null;

 

-        if(property_exists($this,'consoleClassNamespace')){

+        if (property_exists($this, 'consoleClassNamespace')) {

             $listKey['class'] = strtolower(class_basename($this->consoleClassNamespace));

             $listKey['classMethod'] = strtolower($this->getConsoleClassMethod());

         }

 

-        foreach($getConsoleClassRealArguments as $key=>$value){

+        foreach ($getConsoleClassRealArguments as $key=>$value) {

 

-            if($key=="0"){

+            if ($key=="0") {

 

-                $listKey['project']=$value;

+                $listKey['project'] = $value;

             }

-            else{

+            else {

 

-                $colonExplode=explode(":",$value);

-                $listKey[strtolower($colonExplode[0])]=ucfirst($colonExplode[1]);

+                $colonExplode = explode(":", $value);

+                $listKey[strtolower($colonExplode[0])] = ucfirst($colonExplode[1]);

             }

 

         }

 

         //get app version

-        $listKey['version']=UrlVersionIdentifier::version();

+        $listKey['version'] = UrlVersionIdentifier::version();

 

         return $listKey;

 

@@ -90,7 +90,7 @@ 
     /**

      * @return string

      */

-    public function consoleClassNamespace(){

+    public function consoleClassNamespace() {

         return 'Resta\Console\\Source\\'.$this->getConsoleClass().'\\'.$this->getConsoleClass();

     }

 

@@ -101,18 +101,18 @@ 
     public function defineAppnameForCustomConsole()

     {

 

-        $arguments=$this->getArguments();

+        $arguments = $this->getArguments();

 

-        $getConsoleArgumentsWithKey=$this->getConsoleArgumentsWithKey();

+        $getConsoleArgumentsWithKey = $this->getConsoleArgumentsWithKey();

 

-        if(isset($arguments[2])){

-            $app=$arguments[2];

+        if (isset($arguments[2])) {

+            $app = $arguments[2];

         }

 

-        if(!defined('group')){

-            define('group',StaticPathList::$projectPrefixGroup);

+        if (!defined('group')) {

+            define('group', StaticPathList::$projectPrefixGroup);

         }

 

-        if(!defined('app') and isset($arguments[2])) define('app',$app);

+        if (!defined('app') and isset($arguments[2])) define('app', $app);

     }

 }
\ No newline at end of file

Braces +7 added lines, -4 removed lines

@@ -16,7 +16,9 @@ 
     {

 

         //if there is no arguments constant

-        if(!defined('arguments'))  define ('arguments',['api']);

+        if(!defined('arguments')) {

+            define ('arguments',['api']);

+        }

 

         //get psr standard console arguments

         return core()->consoleArguments = Utils::upperCase(arguments);

@@ -71,8 +73,7 @@ 
             if($key=="0"){

 

                 $listKey['project']=$value;

-            }

-            else{

+            } else{

 

                 $colonExplode=explode(":",$value);

                 $listKey[strtolower($colonExplode[0])]=ucfirst($colonExplode[1]);

@@ -113,6 +114,8 @@ 
             define('group',StaticPathList::$projectPrefixGroup);

         }

 

-        if(!defined('app') and isset($arguments[2])) define('app',$app);

+        if(!defined('app') and isset($arguments[2])) {

+            define('app',$app);

+        }

     }

 }
\ No newline at end of file

src/resta/Console/ConsoleOutputter.php

Spacing +24 added lines, -24 removed lines

@@ -40,7 +40,7 @@ 
     /**

      * @var $directory

      */

-    public $directory=array();

+    public $directory = array();

 

     /**

      * @var $app

@@ -55,7 +55,7 @@ 
     /**

      * @var $touch

      */

-    public $touch=array();

+    public $touch = array();

 

     /**

      * ConsoleOutputter constructor.

@@ -63,7 +63,7 @@ 
      * @param $app

      * @param $command

      */

-    public function __construct($argument,$app) {

+    public function __construct($argument, $app) {

 

         // Set up shell colors

         $this->foreground_colors['black'] = '0;30';

@@ -92,14 +92,14 @@ 
         $this->background_colors['cyan'] = '46';

         $this->background_colors['light_gray'] = '47';

 

-        $this->app=$app;

-        $this->argument=$argument;

-        $this->file=new FileProcess();

-        $table=require_once ('ConsoleTable.php');

-        $this->table=new \console_table();

+        $this->app = $app;

+        $this->argument = $argument;

+        $this->file = new FileProcess();

+        $table = require_once ('ConsoleTable.php');

+        $this->table = new \console_table();

 

 

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

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

 

             $this->argument['repositoryNamespace']  = app()->namespace()->repository();

             $this->argument['modelNamespace']       = app()->namespace()->model();

@@ -107,10 +107,10 @@ 
             $this->argument['versionNamespace']     = app()->namespace()->version();

 

 

-            $this->argument['project']=$this->argument['project'].'\\'.StaticPathList::$projectPrefixGroup;

+            $this->argument['project'] = $this->argument['project'].'\\'.StaticPathList::$projectPrefixGroup;

 

 

-            $this->project=StaticPathModel::appPath().'/'.str_replace('\\','/',$this->argument['project']);

+            $this->project = StaticPathModel::appPath().'/'.str_replace('\\', '/', $this->argument['project']);

             

 

         }

@@ -127,11 +127,11 @@ 
         return array_keys($this->background_colors);

     }

 

-    public function ReadStdin($prompt=null, $valid_inputs=null, $default = '') {

-        while(!isset($input) || (is_array($valid_inputs) && !in_array($input, $valid_inputs)) || ($valid_inputs == 'is_file' && !is_file($input))) {

+    public function ReadStdin($prompt = null, $valid_inputs = null, $default = '') {

+        while (!isset($input) || (is_array($valid_inputs) && !in_array($input, $valid_inputs)) || ($valid_inputs=='is_file' && !is_file($input))) {

             echo $this->input($prompt);

             $input = strtolower(trim(fgets(STDIN)));

-            if(empty($input) && !empty($default)) {

+            if (empty($input) && !empty($default)) {

                 $input = $default;

             }

         }

@@ -142,22 +142,22 @@ 
      * @param $commander

      * @return string

      */

-    public function exception($commander){

+    public function exception($commander) {

         return $this->error('[['.$commander['argument'].']] parameter is missing for commander');

     }

 

     /**

      * @param $data

      */

-    public function checkGroupArgument($data,$seperate="\\"){

+    public function checkGroupArgument($data, $seperate = "\\") {

 

-        $dataParse=explode("\\",$data);

+        $dataParse = explode("\\", $data);

 

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

-            $argument=current($dataParse).''.$seperate.''.$this->argument['group'];

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

+            $argument = current($dataParse).''.$seperate.''.$this->argument['group'];

         }

-        else{

-            $argument=current($dataParse);

+        else {

+            $argument = current($dataParse);

         }

 

         return $argument;

@@ -166,12 +166,12 @@ 
     /**

      * @param $string

      */

-    public function consoleLogger($string,$level)

+    public function consoleLogger($string, $level)

     {

-        if(config('app')!==null && config('app.consoleLogger')){

+        if (config('app')!==null && config('app.consoleLogger')) {

 

             logger('console')->{$level}([

-                'argument'  => implode(" ",core()->consoleArguments),

+                'argument'  => implode(" ", core()->consoleArguments),

                 'result'    => $string,

             ]);

         }

Braces +1 added lines, -2 removed lines

@@ -155,8 +155,7 @@
 

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

             $argument=current($dataParse).''.$seperate.''.$this->argument['group'];

-        }

-        else{

+        } else{

             $argument=current($dataParse);

         }

 

src/resta/Console/ConsoleBindings.php

Spacing +11 added lines, -11 removed lines

@@ -20,12 +20,12 @@ 
      * @method bindConsoleShared

      * @return array

      */

-    private function bindConsoleShared(){

+    private function bindConsoleShared() {

 

         //We assign the values assigned to the console object to the bindings array.

         //The console object represents the classes to be bound for the kernel object console.

         //if the array returns false on an if condition, the array will be automatically detected as empty.

-        if(isset($this->app['consoleShared']) and is_array($this->app['consoleShared'])){

+        if (isset($this->app['consoleShared']) and is_array($this->app['consoleShared'])) {

             return $this->app['consoleShared'];

         }

         return [];

@@ -36,7 +36,7 @@ 
      * @param $container

      * @return void

      */

-    public function bindForAppCommand($object,$container){

+    public function bindForAppCommand($object, $container) {

 

         //We need a definition of the application name from the data supplied with the console variables.

         //The specified app variable is important to us in the command that is run in the application.

@@ -54,8 +54,8 @@ 
         //we send the value to the bind method without callback after checking the bind object to be loaded for the console.

         //This is the value found in the bindings variable.

         //Thus, we get the binding objects required for the console independently of the http method installation.

-        if(isset($this->bindings[$object])){

-            $this->app->{$appresolve}($object,$this->bindings[$object]);

+        if (isset($this->bindings[$object])) {

+            $this->app->{$appresolve}($object, $this->bindings[$object]);

         }

     }

 

@@ -64,25 +64,25 @@ 
      * @param $callback

      * @param $container

      */

-    public function console($object,$callback,$container){

+    public function console($object, $callback, $container) {

 

         //If the console argument is an operator that exists in the resta kernel,

         //we run a callback method to check it. The bindings for the custom application commander will be run.

-        $this->bindForAppCommand($object,$container);

+        $this->bindForAppCommand($object, $container);

 

         //closure object

         $callBackResolve = Utils::callbackProcess($callback);

 

         // if the callbackresolve variable represents a class,

         // we directly register it's resolved status to the container object.

-        if(Utils::isNamespaceExists($callBackResolve)){

-            $this->app->register($object,$this->app->resolve(Utils::callbackProcess($callback)));

+        if (Utils::isNamespaceExists($callBackResolve)) {

+            $this->app->register($object, $this->app->resolve(Utils::callbackProcess($callback)));

         }

-        else{

+        else {

 

             // if callbackresolve doesn't represent a class,

             // we're register it's no resolved status.

-            $this->app->register($object,Utils::callbackProcess($callback));

+            $this->app->register($object, Utils::callbackProcess($callback));

         }

 

 

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
         // we directly register it's resolved status to the container object.

         if(Utils::isNamespaceExists($callBackResolve)){

             $this->app->register($object,$this->app->resolve(Utils::callbackProcess($callback)));

-        }

-        else{

+        } else{

 

             // if callbackresolve doesn't represent a class,

             // we're register it's no resolved status.

src/resta/Console/Color.php

Indentation +2 added lines, -2 removed lines

@@ -217,7 +217,7 @@ 
     function convert($string, $colored = true)

     {

         static $conversions = array ( // static so the array doesn't get built

-                                      // everytime

+                                        // everytime

             // %y - yellow, and so on... {{{

             '%y' => array('color' => 'yellow'),

             '%g' => array('color' => 'green' ),

@@ -260,7 +260,7 @@ 
             $string = str_replace('%%', '% ', $string);

             foreach ($conversions as $key => $value) {

                 $string = str_replace($key, Console_Color::color($value),

-                          $string);

+                            $string);

             }

             $string = str_replace('% ', '%', $string);

 

Spacing +26 added lines, -26 removed lines

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

 

 

-$GLOBALS['_CONSOLE_COLOR_CODES'] = array (

+$GLOBALS['_CONSOLE_COLOR_CODES'] = array(

     'color' => array(

             'black'  => 30,

             'red'    => 31,

@@ -112,7 +112,7 @@ 
             $color      = @$color['color'];

         }

 

-        if ($color == 'reset') {

+        if ($color=='reset') {

             return "\033[0m";

         }

 

@@ -216,37 +216,37 @@ 
      */

     function convert($string, $colored = true)

     {

-        static $conversions = array ( // static so the array doesn't get built

+        static $conversions = array( // static so the array doesn't get built

                                       // everytime

             // %y - yellow, and so on... {{{

             '%y' => array('color' => 'yellow'),

-            '%g' => array('color' => 'green' ),

-            '%b' => array('color' => 'blue'  ),

-            '%r' => array('color' => 'red'   ),

+            '%g' => array('color' => 'green'),

+            '%b' => array('color' => 'blue'),

+            '%r' => array('color' => 'red'),

             '%p' => array('color' => 'purple'),

             '%m' => array('color' => 'purple'),

-            '%c' => array('color' => 'cyan'  ),

-            '%w' => array('color' => 'grey'  ),

-            '%k' => array('color' => 'black' ),

-            '%n' => array('color' => 'reset' ),

-            '%Y' => array('color' => 'yellow',  'style' => 'light'),

-            '%G' => array('color' => 'green',   'style' => 'light'),

-            '%B' => array('color' => 'blue',    'style' => 'light'),

-            '%R' => array('color' => 'red',     'style' => 'light'),

-            '%P' => array('color' => 'purple',  'style' => 'light'),

-            '%M' => array('color' => 'purple',  'style' => 'light'),

-            '%C' => array('color' => 'cyan',    'style' => 'light'),

-            '%W' => array('color' => 'grey',    'style' => 'light'),

-            '%K' => array('color' => 'black',   'style' => 'light'),

-            '%N' => array('color' => 'reset',   'style' => 'light'),

+            '%c' => array('color' => 'cyan'),

+            '%w' => array('color' => 'grey'),

+            '%k' => array('color' => 'black'),

+            '%n' => array('color' => 'reset'),

+            '%Y' => array('color' => 'yellow', 'style' => 'light'),

+            '%G' => array('color' => 'green', 'style' => 'light'),

+            '%B' => array('color' => 'blue', 'style' => 'light'),

+            '%R' => array('color' => 'red', 'style' => 'light'),

+            '%P' => array('color' => 'purple', 'style' => 'light'),

+            '%M' => array('color' => 'purple', 'style' => 'light'),

+            '%C' => array('color' => 'cyan', 'style' => 'light'),

+            '%W' => array('color' => 'grey', 'style' => 'light'),

+            '%K' => array('color' => 'black', 'style' => 'light'),

+            '%N' => array('color' => 'reset', 'style' => 'light'),

             '%3' => array('background' => 'yellow'),

-            '%2' => array('background' => 'green' ),

-            '%4' => array('background' => 'blue'  ),

-            '%1' => array('background' => 'red'   ),

+            '%2' => array('background' => 'green'),

+            '%4' => array('background' => 'blue'),

+            '%1' => array('background' => 'red'),

             '%5' => array('background' => 'purple'),

-            '%6' => array('background' => 'cyan'  ),

-            '%7' => array('background' => 'grey'  ),

-            '%0' => array('background' => 'black' ),

+            '%6' => array('background' => 'cyan'),

+            '%7' => array('background' => 'grey'),

+            '%0' => array('background' => 'black'),

             // Don't use this, I can't stand flashing text

             '%F' => array('style' => 'blink'),

             '%U' => array('style' => 'underline'),

src/resta/Console/ConsoleCommandList.php

Spacing +10 added lines, -11 removed lines

@@ -15,25 +15,24 @@ 
     {

         $getCommandList = app()->commandList();

 

-        $this->table->setHeaders(['command','project','params','description']);

+        $this->table->setHeaders(['command', 'project', 'params', 'description']);

 

         $app = $this;

 

-        foreach ($getCommandList as $command=>$runnable){

+        foreach ($getCommandList as $command=>$runnable) {

 

-            $commandInstance = app()->resolve($command,['argument'=>[]]);

+            $commandInstance = app()->resolve($command, ['argument'=>[]]);

 

             $className = class_basename($commandInstance);

 

-            ClosureDispatcher::bind($commandInstance)->call(function() use($app,$className)

+            ClosureDispatcher::bind($commandInstance)->call(function() use($app, $className)

             {

-                if(isset($this->runnableMethods)){

+                if (isset($this->runnableMethods)) {

 

-                    foreach ($this->runnableMethods as $method=>$description){

+                    foreach ($this->runnableMethods as $method=>$description) {

 

                         $commandRule = (isset($this->commandRule[$method])) ?

-                            $app->methodCommandRule($this->commandRule[$method]) :

-                            $app->methodCommandRule($this->commandRule);

+                            $app->methodCommandRule($this->commandRule[$method]) : $app->methodCommandRule($this->commandRule);

 

                         $projectStatus = (isset($this->projectStatus)) ? 'YES' : 'NO';

 

@@ -61,15 +60,15 @@ 
     public function methodCommandRule($commandRule)

     {

 

-        if(is_array($commandRule)){

+        if (is_array($commandRule)) {

 

             $list = [];

 

-            foreach ($commandRule as $rule){

+            foreach ($commandRule as $rule) {

                 $list[] = $rule.':['.$rule.']';

             }

 

-            return implode(" ",$list);

+            return implode(" ", $list);

         }

 

         return '['.$commandRule.']';

src/resta/Console/ConsolePrepare.php

Spacing +12 added lines, -13 removed lines

@@ -9,7 +9,7 @@ 
     /**

      * @var array $prepareBind

      */

-    protected $prepareBind=[];

+    protected $prepareBind = [];

 

     /**

      * @param $commander

@@ -17,7 +17,7 @@ 
      */

     public function prepareCommander($commander)

     {

-        $commander=$commander->call(function() use($commander){

+        $commander = $commander->call(function() use($commander){

 

             return [

                 'commandRule'   => $this->commandRule,

@@ -35,16 +35,15 @@ 
      */

     protected function resolveParameters($commander)

     {

-        if(isset($commander['commandRule'][$commander['method']])){

-            $methodCommanderRule     = $commander['commandRule'][$commander['method']];

+        if (isset($commander['commandRule'][$commander['method']])) {

+            $methodCommanderRule = $commander['commandRule'][$commander['method']];

         }

 

-        $commandRule             = (isset($methodCommanderRule)) ? $methodCommanderRule :

-            $this->getDefaultCommandRules($commander['commandRule']);

+        $commandRule = (isset($methodCommanderRule)) ? $methodCommanderRule : $this->getDefaultCommandRules($commander['commandRule']);

 

-        foreach ($commandRule as $key=>$value){

-            if(!preg_match('@\?.+@is',$value)){

-                if(!isset($commander['arguments'][$value]) OR $commander['arguments'][$value]==""){

+        foreach ($commandRule as $key=>$value) {

+            if (!preg_match('@\?.+@is', $value)) {

+                if (!isset($commander['arguments'][$value]) OR $commander['arguments'][$value]=="") {

                     return [

                         'status'=>false,

                         'argument'=>$value,

@@ -66,12 +65,12 @@ 
     {

         $list = [];

 

-        if(!is_array($rules)) $rules = [];

+        if (!is_array($rules)) $rules = [];

 

-        foreach ($rules as $key=>$rule){

+        foreach ($rules as $key=>$rule) {

 

-            if(!is_array($rules[$key])){

-                $list[$key]=$rule;

+            if (!is_array($rules[$key])) {

+                $list[$key] = $rule;

             }

         }

 

Braces +3 added lines, -1 removed lines

@@ -66,7 +66,9 @@
     {

         $list = [];

 

-        if(!is_array($rules)) $rules = [];

+        if(!is_array($rules)) {

+            $rules = [];

+        }

 

         foreach ($rules as $key=>$rule){