php-resta / resta-core

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

Spacing +31 added lines, -31 removed lines

@@ -51,7 +51,7 @@ 
     {

         $userId = $manager->getAuth()->params['userId'];

 

-        return DeviceToken::where('user_id',$userId)->get();

+        return DeviceToken::where('user_id', $userId)->get();

     }

 

     /**

@@ -64,8 +64,8 @@ 
         return DeviceToken::where(function($query) use($token) {

 

             //where query for token

-            $query->where('token_integer',crc32(md5($token)));

-            $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));

+            $query->where('token_integer', crc32(md5($token)));

+            $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));

         });

     }

 

@@ -79,8 +79,8 @@ 
         return DeviceToken::where(function($query) use($token) {

 

             //where query for token

-            $query->where('token_integer',crc32(md5($token)));

-            $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));

+            $query->where('token_integer', crc32(md5($token)));

+            $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));

 

         });

     }

@@ -91,23 +91,23 @@ 
      * @param null|object $query

      * @return mixed

      */

-    protected function checkPasswordVerify($query=null)

+    protected function checkPasswordVerify($query = null)

     {

-        if(is_null($query) && isset($this->credentials['password'])){

-            if(!is_null($password = $this->auth->provider('password'))

-                && $password($this->credentials['password'])=='verify'){

+        if (is_null($query) && isset($this->credentials['password'])) {

+            if (!is_null($password = $this->auth->provider('password'))

+                && $password($this->credentials['password'])=='verify') {

 

                 $this->password = $this->credentials['password'];

                 $this->passwordVerify = true;

-                $this->credentials = Arr::removeKey($this->credentials,['password']);

+                $this->credentials = Arr::removeKey($this->credentials, ['password']);

 

                 return null;

             }

         }

 

-        if(is_object($query) && $query->count()){

+        if (is_object($query) && $query->count()) {

             $password = $query->first()->password;

-            if(password_verify($this->password,$password)){

+            if (password_verify($this->password, $password)) {

                 return $query;

             }

         }

@@ -137,24 +137,24 @@ 
 

             // with the callback method (eloquent model)

             // we write the where clause.

-            foreach ($this->credentials as $credential=>$credentialValue){

+            foreach ($this->credentials as $credential=>$credentialValue) {

 

-                if(!is_null($provider = $this->auth->provider($credential))){

-                    $query->where($credential,$provider($credentialValue));

+                if (!is_null($provider = $this->auth->provider($credential))) {

+                    $query->where($credential, $provider($credentialValue));

                 }

-                else{

-                    $query->where($credential,$credentialValue);

+                else {

+                    $query->where($credential, $credentialValue);

                 }

             }

 

             // for the authenticate query,

             // the user can add additional queries by the service provider.

-            if(!is_null($addQuery = $this->auth->provider('addQuery'))){

+            if (!is_null($addQuery = $this->auth->provider('addQuery'))) {

                 $addQuery($query);

             }

         });

 

-        if(false === $this->passwordVerify){

+        if (false===$this->passwordVerify) {

             return $query;

         }

 

@@ -164,10 +164,10 @@ 
     /**

      * @return void|mixed

      */

-    protected function updateToken($token=null)

+    protected function updateToken($token = null)

     {

         //if query status value is true

-        if($this->auth->params['status']){

+        if ($this->auth->params['status']) {

 

             // we go to the method that produces

             // the classical token value and get the token value.

@@ -177,7 +177,7 @@ 
             // if there is no update, we reset the status value to 0.

             $update = $this->auth->params['builder']->update(['token'=>$this->auth->params['token']]);

 

-            if(!$update){

+            if (!$update) {

                 $this->auth->params['status'] = 0;

                 $this->auth->params['exception'] = 'update';

             }

@@ -193,10 +193,10 @@ 
     {

         $token_integer = crc32(md5($this->auth->params['token']));

 

-        if(!is_null($token_integer)){

+        if (!is_null($token_integer)) {

 

-            if(DeviceToken::where('user_id',$this->auth->params['authId'])

-                    ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0){

+            if (DeviceToken::where('user_id', $this->auth->params['authId'])

+                    ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0) {

 

                 return DeviceToken::create([

                     'user_id' => $this->auth->params['authId'],

@@ -207,10 +207,10 @@ 
                     'expire' => $this->auth->getExpire(),

                 ]);

             }

-            else{

+            else {

 

-                return DeviceToken::where('user_id',$this->auth->params['authId'])

-                    ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))

+                return DeviceToken::where('user_id', $this->auth->params['authId'])

+                    ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))

                     ->update([

                         'token' => $this->auth->params['token'],

                         'token_integer' => $token_integer

@@ -230,11 +230,11 @@ 
     {

         $token_integer = crc32(md5($this->auth->getTokenSentByUser()));

 

-        if(!is_null($token_integer)){

+        if (!is_null($token_integer)) {

 

-            DeviceToken::where('token_integer',$token_integer)->delete();

+            DeviceToken::where('token_integer', $token_integer)->delete();

 

-            return (DeviceToken::where('token_integer',$token_integer)->count()) ? false : true;

+            return (DeviceToken::where('token_integer', $token_integer)->count()) ? false : true;

         }

 

     }

Braces +2 added lines, -4 removed lines

@@ -141,8 +141,7 @@ 
 

                 if(!is_null($provider = $this->auth->provider($credential))){

                     $query->where($credential,$provider($credentialValue));

-                }

-                else{

+                } else{

                     $query->where($credential,$credentialValue);

                 }

             }

@@ -206,8 +205,7 @@ 
                     'device_agent_integer' => crc32(md5($_SERVER['HTTP_USER_AGENT'])),

                     'expire' => $this->auth->getExpire(),

                 ]);

-            }

-            else{

+            } else{

 

                 return DeviceToken::where('user_id',$this->auth->params['authId'])

                     ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))

src/resta/Authenticate/ConfigProvider.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
     {

         $this->config();

 

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

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

             $this->setAuthenticateNeeds();

         }

     }

@@ -60,7 +60,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;

@@ -73,7 +73,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;

@@ -98,7 +98,7 @@ 
     {

         $this->getModel();

 

-        if($this->model=="Default"){

+        if ($this->model=="Default") {

 

             return $this->driverDefaultNamespace.'\\'.$this->getDriver().'\\UserBuilder';

         }

@@ -125,7 +125,7 @@ 
     {

         $this->getModel();

 

-        if($this->model=="Default"){

+        if ($this->model=="Default") {

 

             return $this->driverDefaultNamespace.'\\'.$this->getDriver().'\\User';

         }

@@ -193,7 +193,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;

         }

 

src/resta/Database/Migration/Src/SchemaCapsule.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
      * @param $file
      * @param $table
      */
-    public function __construct($config,$file,$table)
+    public function __construct($config, $file, $table)
     {
         $this->config                       = $config;
         $this->file                         = $file;
@@ -52,7 +52,7 @@ 
      */
     public function alter(callable $callback)
     {
-        return $this->callbackWizardInstance(__FUNCTION__,$callback);
+        return $this->callbackWizardInstance(__FUNCTION__, $callback);
     }
 
     /**
@@ -61,7 +61,7 @@ 
      */
     public function create(callable $callback)
     {
-        return $this->callbackWizardInstance(__FUNCTION__,$callback);
+        return $this->callbackWizardInstance(__FUNCTION__, $callback);
     }
 
     /**
@@ -70,7 +70,7 @@ 
     private function checkErrors($wizard)
     {
         $alterType = $wizard->getAlterType();
-        if(count($wizard->getNames())!==count($wizard->getTypes()) && (isset($alterType['group'])) && $alterType['group']!=='dropColumn'){
+        if (count($wizard->getNames())!==count($wizard->getTypes()) && (isset($alterType['group'])) && $alterType['group']!=='dropColumn') {
             $wizard->setError('name and types are not equal');
         }
     }
@@ -106,11 +106,11 @@ 
      * @param $method
      * @return string
      */
-    private function callbackWizardInstance($method,callable $callback)
+    private function callbackWizardInstance($method, callable $callback)
     {
         $wizardInstance = $this->getWizardInstance($method);
 
-        $callbackReturn = call_user_func_array($callback,[$wizardInstance]);
+        $callbackReturn = call_user_func_array($callback, [$wizardInstance]);
 
         $this->checkErrors($wizardInstance);
 

src/resta/Database/Migration/Src/GrammarStructure/Mysql/QuerySyntax.php

Braces +6 added lines, -12 removed lines

@@ -94,8 +94,7 @@ 
 
             if(current($syntaxList)!==$changeAbleField){
                 $alterSytanx = 'ALTER TABLE '.$this->table.' change '.$changeAbleField.' '.current($syntaxList).'  '.implode(' ',array_splice($syntaxList,1)).' '.$placeList;
-            }
-            else{
+            } else{
                 $alterSytanx = 'ALTER TABLE '.$this->table.' modify '.$syntax.' '.$placeList;
             }
 
@@ -167,8 +166,7 @@ 
         //get table collation
         if(isset($this->data['tableCollation']['table'])){
             $this->syntax[]=' DEFAULT CHARACTER SET '.$this->data['tableCollation']['table'];
-        }
-        else{
+        } else{
             $this->syntax[]=' DEFAULT CHARACTER SET utf8';
         }
 
@@ -176,8 +174,7 @@ 
         if($this->data['engine']!==null)
         {
             $this->syntax[]=' ENGINE='.$this->data['engine'].' ';
-        }
-        else{
+        } else{
             $this->syntax[]=' ENGINE=InnoDB ';
         }
 
@@ -185,8 +182,7 @@ 
 
         if(in_array($this->table,$existTables)){
             return false;
-        }
-        else{
+        } else{
             $query=$this->schema->getConnection()->setQueryBasic($syntax);
 
             return [
@@ -211,8 +207,7 @@ 
             
             if($group=='create'){
                 $this->syntax[]=','.implode(',',$this->data['uniqueValueList']);
-            }
-            else{
+            } else{
                 $this->alterExtras[]='ADD '.implode(',',$this->data['uniqueValueList']);
             }
             
@@ -223,8 +218,7 @@ 
 
             if($group=='create'){
                 $this->syntax[]=','.implode(',',$this->data['indexValueList']);
-            }
-            else{
+            } else{
                 $this->alterExtras[]='ADD '.implode(',',$this->data['indexValueList']); 
             }
             

Spacing +67 added lines, -67 removed lines

@@ -32,25 +32,25 @@ 
      */
     private function addColumn($alterType)
     {
-        if(isset($alterType['place'])){
+        if (isset($alterType['place'])) {
 
 
-            foreach ($alterType['place'] as $placeKey=>$placeValue){
-                $placeList=$placeKey .' '.$placeValue.'';
+            foreach ($alterType['place'] as $placeKey=>$placeValue) {
+                $placeList = $placeKey.' '.$placeValue.'';
             }
 
-            $syntax = implode("",$this->syntax);
+            $syntax = implode("", $this->syntax);
 
             $alterSytanx = 'ALTER TABLE '.$this->table.' ADD COLUMN '.$syntax.' '.$placeList;
 
-            $query=$this->schema->getConnection()->setQueryBasic($alterSytanx);
+            $query = $this->schema->getConnection()->setQueryBasic($alterSytanx);
 
-            if(count($this->alterExtras)){
-                foreach($this->alterExtras as $extra){
+            if (count($this->alterExtras)) {
+                foreach ($this->alterExtras as $extra) {
 
                     $extraSyntax = 'ALTER TABLE '.$this->table.' '.$extra.'';
 
-                    $query=$this->schema->getConnection()->setQueryBasic($extraSyntax);
+                    $query = $this->schema->getConnection()->setQueryBasic($extraSyntax);
                 }
             }
 
@@ -74,40 +74,40 @@ 
      */
     private function change($alterType)
     {
-        if(isset($alterType['place'])){
+        if (isset($alterType['place'])) {
 
-            foreach ($alterType['place'] as $placeKey=>$placeValue){
-                $placeList=$placeKey .' '.$placeValue.'';
+            foreach ($alterType['place'] as $placeKey=>$placeValue) {
+                $placeList = $placeKey.' '.$placeValue.'';
             }
 
-            $syntax = implode("",$this->syntax);
+            $syntax = implode("", $this->syntax);
 
             $columns = $this->schema->getConnection()->showColumnsFrom($this->table);
 
-            foreach ($columns as $columnKey=>$columnData){
-                if($columnData['Field']==$placeValue){
+            foreach ($columns as $columnKey=>$columnData) {
+                if ($columnData['Field']==$placeValue) {
                     $changeAbleField = $columns[$columnKey+1]['Field'];
                 }
             }
 
-            $syntaxList = explode(' ',$syntax);
+            $syntaxList = explode(' ', $syntax);
 
-            if(current($syntaxList)!==$changeAbleField){
-                $alterSytanx = 'ALTER TABLE '.$this->table.' change '.$changeAbleField.' '.current($syntaxList).'  '.implode(' ',array_splice($syntaxList,1)).' '.$placeList;
+            if (current($syntaxList)!==$changeAbleField) {
+                $alterSytanx = 'ALTER TABLE '.$this->table.' change '.$changeAbleField.' '.current($syntaxList).'  '.implode(' ', array_splice($syntaxList, 1)).' '.$placeList;
             }
-            else{
+            else {
                 $alterSytanx = 'ALTER TABLE '.$this->table.' modify '.$syntax.' '.$placeList;
             }
 
 
-            $query=$this->schema->getConnection()->setQueryBasic($alterSytanx);
+            $query = $this->schema->getConnection()->setQueryBasic($alterSytanx);
 
-            if(count($this->alterExtras)){
-                foreach($this->alterExtras as $extra){
+            if (count($this->alterExtras)) {
+                foreach ($this->alterExtras as $extra) {
 
                     $extraSyntax = 'ALTER TABLE '.$this->table.' '.$extra.'';
 
-                    $query=$this->schema->getConnection()->setQueryBasic($extraSyntax);
+                    $query = $this->schema->getConnection()->setQueryBasic($extraSyntax);
                 }
             }
 
@@ -129,17 +129,17 @@ 
      */
     private function addIndex($alterType)
     {
-        if(isset($this->syntax[0])){
+        if (isset($this->syntax[0])) {
 
             $index = $this->syntax[0];
 
-            foreach($index as $name=>$item){
+            foreach ($index as $name=>$item) {
                 $index_name = $name;
-                $indexes = implode(',',$item);
+                $indexes = implode(',', $item);
             }
             $alterSytanx = 'create index '.$index_name.' on '.$this->table.' ('.$indexes.')';
 
-            $query=$this->schema->getConnection()->setQueryBasic($alterSytanx);
+            $query = $this->schema->getConnection()->setQueryBasic($alterSytanx);
 
             return [
                 'syntax'=>$this->syntax,
@@ -160,17 +160,17 @@ 
      */
     private function addUnique($alterType)
     {
-        if(isset($this->syntax[0])){
+        if (isset($this->syntax[0])) {
 
             $unique = $this->syntax[0];
 
-            foreach($unique as $name=>$item){
+            foreach ($unique as $name=>$item) {
                 $unique_name = $name;
-                $uniques = implode(',',$item);
+                $uniques = implode(',', $item);
             }
             $alterSytanx = 'ALTER TABLE '.$this->table.' ADD CONSTRAINT '.$unique_name.' UNIQUE ('.$uniques.')';
 
-            $query=$this->schema->getConnection()->setQueryBasic($alterSytanx);
+            $query = $this->schema->getConnection()->setQueryBasic($alterSytanx);
 
             return [
                 'syntax'=>$this->syntax,
@@ -191,13 +191,13 @@ 
      */
     private function dropColumn($alterType)
     {
-        if(isset($this->syntax[0])){
+        if (isset($this->syntax[0])) {
 
             $column = rtrim($this->syntax[0]);
 
             $alterSytanx = 'alter table '.$this->table.' drop column '.$column;
 
-            $query=$this->schema->getConnection()->setQueryBasic($alterSytanx);
+            $query = $this->schema->getConnection()->setQueryBasic($alterSytanx);
 
             return [
                 'syntax'=>$this->syntax,
@@ -218,15 +218,15 @@ 
      */
     private function dropKey($alterType)
     {
-        if(isset($this->syntax[0])){
+        if (isset($this->syntax[0])) {
 
             $dropKey = $this->syntax[0];
 
-            foreach ($dropKey as $dropType=>$dropName){
+            foreach ($dropKey as $dropType=>$dropName) {
 
                 $alterSytanx = 'alter table '.$this->table.' drop '.$dropType.' '.$dropName;
 
-                $query=$this->schema->getConnection()->setQueryBasic($alterSytanx);
+                $query = $this->schema->getConnection()->setQueryBasic($alterSytanx);
 
                 return [
                     'syntax'=>$this->syntax,
@@ -256,32 +256,32 @@ 
 
         $this->getDefaultSyntaxGroup();
 
-        $this->syntax[]=')';
+        $this->syntax[] = ')';
 
         //get table collation
-        if(isset($this->data['tableCollation']['table'])){
-            $this->syntax[]=' DEFAULT CHARACTER SET '.$this->data['tableCollation']['table'];
+        if (isset($this->data['tableCollation']['table'])) {
+            $this->syntax[] = ' DEFAULT CHARACTER SET '.$this->data['tableCollation']['table'];
         }
-        else{
-            $this->syntax[]=' DEFAULT CHARACTER SET utf8';
+        else {
+            $this->syntax[] = ' DEFAULT CHARACTER SET utf8';
         }
 
         //get engine
-        if($this->data['engine']!==null)
+        if ($this->data['engine']!==null)
         {
-            $this->syntax[]=' ENGINE='.$this->data['engine'].' ';
+            $this->syntax[] = ' ENGINE='.$this->data['engine'].' ';
         }
-        else{
-            $this->syntax[]=' ENGINE=InnoDB ';
+        else {
+            $this->syntax[] = ' ENGINE=InnoDB ';
         }
 
-        $syntax = implode("",$this->syntax);
+        $syntax = implode("", $this->syntax);
 
-        if(in_array($this->table,$existTables)){
+        if (in_array($this->table, $existTables)) {
             return false;
         }
-        else{
-            $query=$this->schema->getConnection()->setQueryBasic($syntax);
+        else {
+            $query = $this->schema->getConnection()->setQueryBasic($syntax);
 
             return [
                 'syntax'=>$syntax,
@@ -296,52 +296,52 @@ 
     /**
      * @param null $group
      */
-    private function getDefaultSyntaxGroup($group=null)
+    private function getDefaultSyntaxGroup($group = null)
     {
-        $this->syntax[] = implode(",",$this->getCreateDefaultList());
+        $this->syntax[] = implode(",", $this->getCreateDefaultList());
         
         //get unique values
-        if(isset($this->data['uniqueValueList']) && count($this->data['uniqueValueList'])){
+        if (isset($this->data['uniqueValueList']) && count($this->data['uniqueValueList'])) {
             
-            if($group=='create'){
-                $this->syntax[]=','.implode(',',$this->data['uniqueValueList']);
+            if ($group=='create') {
+                $this->syntax[] = ','.implode(',', $this->data['uniqueValueList']);
             }
-            else{
-                $this->alterExtras[]='ADD '.implode(',',$this->data['uniqueValueList']);
+            else {
+                $this->alterExtras[] = 'ADD '.implode(',', $this->data['uniqueValueList']);
             }
             
         }
 
         //get index values
-        if(isset($this->data['indexValueList']) && count($this->data['indexValueList'])){
+        if (isset($this->data['indexValueList']) && count($this->data['indexValueList'])) {
 
-            if($group=='create'){
-                $this->syntax[]=','.implode(',',$this->data['indexValueList']);
+            if ($group=='create') {
+                $this->syntax[] = ','.implode(',', $this->data['indexValueList']);
             }
-            else{
-                $this->alterExtras[]='ADD '.implode(',',$this->data['indexValueList']); 
+            else {
+                $this->alterExtras[] = 'ADD '.implode(',', $this->data['indexValueList']); 
             }
             
         }
 
         //get index values for key
-        if(count($this->getKeyList())){
-            $this->syntax[]=','.implode(',',$this->getKeyList());
+        if (count($this->getKeyList())) {
+            $this->syntax[] = ','.implode(',', $this->getKeyList());
         }
 
-        if(count($this->data['references'])){
-            $this->syntax[]=$this->getReferenceSyntax($this->data['references']);
+        if (count($this->data['references'])) {
+            $this->syntax[] = $this->getReferenceSyntax($this->data['references']);
         }
 
-        if(isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='addIndex'){
+        if (isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='addIndex') {
             $this->syntax[0] = $this->data['index'];
         }
 
-        if(isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='addUnique'){
+        if (isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='addUnique') {
             $this->syntax[0] = $this->data['unique'];
         }
 
-        if(isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='dropKey'){
+        if (isset($this->syntax[0]) && $this->syntax[0]=='' && $group=='dropKey') {
             $this->syntax[0] = $this->data['key'];
         }
     }

src/resta/Database/Migration/Src/GrammarStructure/Mysql/Wizard/WizardAlter.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
 use Migratio\Contract\WizardContract;
 use Migratio\Contract\WizardAlterContract;
 
-class WizardAlter extends Wizard implements WizardContract,WizardAlterContract
+class WizardAlter extends Wizard implements WizardContract, WizardAlterContract
 {
     /**
      * @var array
@@ -32,7 +32,7 @@ 
      */
     public function after($field)
     {
-        $this->wizard->setAlterType('place',['AFTER'=>$field]);
+        $this->wizard->setAlterType('place', ['AFTER'=>$field]);
 
         return $this->wizard;
     }

src/resta/Console/Source/Migration/Migration.php

Spacing +22 added lines, -22 removed lines

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

      * @var $type

      */

-    public $type='migration';

+    public $type = 'migration';

 

     /**

      * @var array

@@ -33,8 +33,8 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['create'=>[

-        'name','table'

+    public $commandRule = ['create'=>[

+        'name', 'table'

     ],

         'push'=>[]];

 

@@ -63,14 +63,14 @@ 
 

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

 

-            if(isset($value['success'])){

+            if (isset($value['success'])) {

 

                 $list[] = true;

 

-                $pushResultFile = explode("/",$pushResult[$key]['file']);

+                $pushResultFile = explode("/", $pushResult[$key]['file']);

                 $file = end($pushResultFile);

 

-                if($pushResult[$key]['success']===true){

+                if ($pushResult[$key]['success']===true) {

 

                     $this->table->addRow([

                         $key,

@@ -82,7 +82,7 @@ 
                         'No',

                     ]);

                 }

-                else{

+                else {

 

                     $this->table->addRow([

                         $key,

@@ -98,12 +98,12 @@ 
             }

         }

 

-        if(count($list)){

-            $this->table->setHeaders(['id','table','file','type','status','message','seeder']);

+        if (count($list)) {

+            $this->table->setHeaders(['id', 'table', 'file', 'type', 'status', 'message', 'seeder']);

 

             echo $this->table->getTable();

         }

-        else{

+        else {

             echo $this->classical('No migration was found to apply');

         }

 

@@ -117,10 +117,10 @@ 
     {

         $config = $this->getConfig();

 

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

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

             $path = $config['paths'][0];

         }

-        else{

+        else {

             $path = $config['paths'][strtolower($this->argument['group'])];

         }

 

@@ -130,19 +130,19 @@ 
 

         $stubType = (!file_exists($tablePath)) ? 'create' : 'alter';

 

-        if(!file_exists($path)){

+        if (!file_exists($path)) {

 

-            $this->file->fs->mkdir($path,0777);

-            $this->file->fs->chmod($path,0777,000,true);

+            $this->file->fs->mkdir($path, 0777);

+            $this->file->fs->chmod($path, 0777, 000, true);

         }

 

-        $migrationCreate = $this->getSchema()->stub($this->argument,$stubType);

+        $migrationCreate = $this->getSchema()->stub($this->argument, $stubType);

 

         echo $this->info('Migration Create Process :');

 

-        $this->table->setHeaders(['id','method','table','style','name','type','status','message']);

+        $this->table->setHeaders(['id', 'method', 'table', 'style', 'name', 'type', 'status', 'message']);

 

-        foreach ($migrationCreate['directory'] as $key=>$data){

+        foreach ($migrationCreate['directory'] as $key=>$data) {

 

             $this->table->addRow([

                 $key,

@@ -157,7 +157,7 @@ 
             ]);

         }

 

-        foreach ($migrationCreate['file'] as $key=>$data){

+        foreach ($migrationCreate['file'] as $key=>$data) {

 

             $this->table->addRow([

                 $key,

@@ -188,13 +188,13 @@ 
             'arguments' => $this->argument

         ];

 

-        $paths['paths'] = array_merge($paths['paths'],[StaticPathModel::storeMigrationPath()]);

+        $paths['paths'] = array_merge($paths['paths'], [StaticPathModel::storeMigrationPath()]);

 

         foreach (config('database.migrations') as $key=>$item) {

-            if($key!=='default'){

+            if ($key!=='default') {

 

                 $otherMigrationPath = path()->migration().''.$item;

-                $paths['paths'] = array_merge($paths['paths'],[$key=>$otherMigrationPath]);

+                $paths['paths'] = array_merge($paths['paths'], [$key=>$otherMigrationPath]);

             }

         }

 

Braces +3 added lines, -6 removed lines

@@ -81,8 +81,7 @@ 
                         'Ok',

                         'No',

                     ]);

-                }

-                else{

+                } else{

 

                     $this->table->addRow([

                         $key,

@@ -102,8 +101,7 @@ 
             $this->table->setHeaders(['id','table','file','type','status','message','seeder']);

 

             echo $this->table->getTable();

-        }

-        else{

+        } else{

             echo $this->classical('No migration was found to apply');

         }

 

@@ -119,8 +117,7 @@ 
 

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

             $path = $config['paths'][0];

-        }

-        else{

+        } else{

             $path = $config['paths'][strtolower($this->argument['group'])];

         }

 

src/resta/Console/ConsoleCommandList.php

Spacing +11 added lines, -12 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,18 +60,18 @@ 
     public function methodCommandRule($commandRule)

     {

 

-        if(is_array($commandRule)){

+        if (is_array($commandRule)) {

 

             $list = [];

 

-            foreach ($commandRule as $rule){

-                if(!is_array($rule)){

+            foreach ($commandRule as $rule) {

+                if (!is_array($rule)) {

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

                 }

 

             }

 

-            return implode(" ",$list);

+            return implode(" ", $list);

         }

 

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

src/resta/Console/ConsoleProvider.php

Spacing +21 added lines, -21 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,25 +43,25 @@ 
      * @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'])) {

 

                 $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]);

             }

         }

 

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

             }

 

@@ -89,10 +89,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()}();

             });

 

@@ -110,12 +110,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();

             }

 

@@ -131,24 +131,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]);

     }

 

     /**

@@ -161,8 +161,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/PullManager/Pulling.php

Spacing +56 added lines, -56 removed lines

@@ -14,7 +14,7 @@ 
      */
     public function get()
     {
-        if(!isset($this->config['paths'][0])){
+        if (!isset($this->config['paths'][0])) {
             exit();
         }
         
@@ -27,11 +27,11 @@ 
 
         $list = [];
 
-        foreach ($migrations as $table=>$item){
+        foreach ($migrations as $table=>$item) {
             $list[] = strtolower($table);
         }
         
-        if(isset($arguments['only'])){
+        if (isset($arguments['only'])) {
             $dbtables = $this->getOnly($dbtables);
         }
 
@@ -40,7 +40,7 @@ 
         echo 'Toplam : '.count($dbtables).' Table';
         echo PHP_EOL;
 
-        foreach ($dbtables as $dbtablekey=>$dbtable){
+        foreach ($dbtables as $dbtablekey=>$dbtable) {
 
             $dbtablekey = $dbtablekey+1;
 
@@ -49,45 +49,45 @@ 
             $dbtable = ucfirst($dbtable);
             $makeDirectory = $directory.''.DIRECTORY_SEPARATOR.''.$dbtable;
 
-            if(!file_exists($makeDirectory)){
-                files()->makeDirectory($makeDirectory,0755,true);
-                $exist=false;
+            if (!file_exists($makeDirectory)) {
+                files()->makeDirectory($makeDirectory, 0755, true);
+                $exist = false;
             }
-            else{
-                $exist=true;
+            else {
+                $exist = true;
             }
 
             $migrationName = time().'_'.$dbtable.'';
 
-            if($exist===false){
+            if ($exist===false) {
 
-                $content = $this->getContentFile($this->getStubPath().''.DIRECTORY_SEPARATOR.'pullCreate.stub',[
+                $content = $this->getContentFile($this->getStubPath().''.DIRECTORY_SEPARATOR.'pullCreate.stub', [
                     'className' => $dbtable,
                     'informations' => $informations
                 ]);
 
-                $contentResult = files()->put($makeDirectory.''.DIRECTORY_SEPARATOR.''.$migrationName.'.php',$content);
+                $contentResult = files()->put($makeDirectory.''.DIRECTORY_SEPARATOR.''.$migrationName.'.php', $content);
             }
 
             
 
-            if(isset($contentResult) && $contentResult!==false){
+            if (isset($contentResult) && $contentResult!==false) {
                 
                 $this->schema->getConnection()->generateEntity($dbtable);
 
-                if(substr($dbtable,-1)=='s'){
-                    app()->command('model create','model:'.strtolower(substr($dbtable,0,-1)).' table:'.$dbtable.' entity:'.$dbtable);
+                if (substr($dbtable, -1)=='s') {
+                    app()->command('model create', 'model:'.strtolower(substr($dbtable, 0, -1)).' table:'.$dbtable.' entity:'.$dbtable);
                 }
-                else{
-                    app()->command('model create','model:'.strtolower($dbtable).' table:'.$dbtable.' entity:'.$dbtable);
+                else {
+                    app()->command('model create', 'model:'.strtolower($dbtable).' table:'.$dbtable.' entity:'.$dbtable);
                 }
                 
                 echo $dbtablekey.'- '.$migrationName.' ---> Ok';
             }
-            elseif($exist){
+            elseif ($exist) {
                 echo $dbtablekey.'- '.$migrationName.' ---> (Already Exist)';
             }
-            else{
+            else {
                 echo $dbtablekey.'- '.$migrationName.' ---> Fail';
             }
 
@@ -115,46 +115,46 @@ 
 
         $list = [];
 
-        foreach ($columns as $key=>$data){
+        foreach ($columns as $key=>$data) {
 
-            $data['Type'] = rtrim(str_replace('unsigned','',$data['Type']));
+            $data['Type'] = rtrim(str_replace('unsigned', '', $data['Type']));
 
             $field      = $data['Field'];
             $list[]     = '$wizard->name(\''.$field.'\')';
             $list[]     = '->'.$this->getColumnTransformers($data['Type']).'';
 
             //default block
-            if(!is_null($data['Default'])){
+            if (!is_null($data['Default'])) {
                 $default = $data['Default'];
-                $list[]     = '->default(\''.$default.'\')';
+                $list[] = '->default(\''.$default.'\')';
             }
 
-            $getIndex = $this->getIndexInformation($indexes,$data['Field']);
+            $getIndex = $this->getIndexInformation($indexes, $data['Field']);
 
             //unique block
-            if($getIndex['Non_unique']=='0' && $getIndex['Key_name']!=='PRIMARY'){
+            if ($getIndex['Non_unique']=='0' && $getIndex['Key_name']!=='PRIMARY') {
                 $indexName = $getIndex['Key_name'];
-                $list[]     = '->unique(\''.$indexName.'\')';
+                $list[] = '->unique(\''.$indexName.'\')';
             }
 
             //index block
-            if($getIndex['Non_unique']=='1' && $getIndex['Key_name']!=='PRIMARY'){
+            if ($getIndex['Non_unique']=='1' && $getIndex['Key_name']!=='PRIMARY') {
                 $columnName = $getIndex['Column_name'];
                 $indexName = $getIndex['Key_name'];
 
-                if(count($multipleIndexes[$indexName])==1){
+                if (count($multipleIndexes[$indexName])==1) {
                     $list[] = '->index(\''.$indexName.'\')';
                 }
             }
 
             //comment block
-            if(strlen($data['Comment'])>0){
+            if (strlen($data['Comment'])>0) {
                 $comment = $data['Comment'];
                 $list[] = '->comment(\''.$comment.'\')';
             }
 
             //auto increment block
-            if($data['Extra']=='auto_increment'){
+            if ($data['Extra']=='auto_increment') {
                 $list[] = '->auto_increment()';
             }
 
@@ -169,39 +169,39 @@ 
 
         //table indexes
         foreach ($multipleIndexes as $indexName=>$values) {
-            if(count($values)>1){
-                $values = '\''.implode('\',\'',$values).'\'';
+            if (count($values)>1) {
+                $values = '\''.implode('\',\'', $values).'\'';
                 $list[] = '    $wizard->table()->indexes(\''.$indexName.'\',['.$values.']);
                 ';
             }
         }
 
-        if(count($foreignKeys)){
+        if (count($foreignKeys)) {
 
             $constraintName = $foreignKeys['CONSTRAINT_NAME'];
             $key = $foreignKeys['COLUMN_NAME'];
             $referenceTable = $foreignKeys['REFERENCED_TABLE_NAME'];
             $referenceColumn = $foreignKeys['REFERENCED_COLUMN_NAME'];
 
-            if($foreignKeys['UPDATE_RULE']=='RESTRICT' && $foreignKeys['DELETE_RULE']=='RESTRICT'){
+            if ($foreignKeys['UPDATE_RULE']=='RESTRICT' && $foreignKeys['DELETE_RULE']=='RESTRICT') {
                 $list[] = '    $wizard->table()->foreign()->constraint(\''.$constraintName.'\')->key(\''.$key.'\')->references(\''.$referenceTable.'\',\''.$referenceColumn.'\');
                 ';
             }
 
-            if($foreignKeys['UPDATE_RULE']!=='RESTRICT' && $foreignKeys['DELETE_RULE']=='RESTRICT'){
+            if ($foreignKeys['UPDATE_RULE']!=='RESTRICT' && $foreignKeys['DELETE_RULE']=='RESTRICT') {
                 $rule = $foreignKeys['UPDATE_RULE'];
                 $list[] = '    $wizard->table()->foreign()->constraint(\''.$constraintName.'\')->key(\''.$key.'\')->references(\''.$referenceTable.'\',\''.$referenceColumn.'\')->onUpdate()->'.strtolower($rule).'();
                 ';
             }
 
-            if($foreignKeys['UPDATE_RULE']=='RESTRICT' && $foreignKeys['DELETE_RULE']!=='RESTRICT'){
+            if ($foreignKeys['UPDATE_RULE']=='RESTRICT' && $foreignKeys['DELETE_RULE']!=='RESTRICT') {
                 $rule = $foreignKeys['DELETE_RULE'];
                 $list[] = '    $wizard->table()->foreign()->constraint(\''.$constraintName.'\')->key(\''.$key.'\')->references(\''.$referenceTable.'\',\''.$referenceColumn.'\')->onDelete()->'.strtolower($rule).'();
                 ';
             }
         }
 
-        return implode('',$list);
+        return implode('', $list);
     }
 
     /**
@@ -212,43 +212,43 @@ 
      */
     private function getColumnTransformers($column)
     {
-        if($column=='datetime'){
+        if ($column=='datetime') {
             return 'datetime()';
         }
-        elseif($column=='longtext'){
+        elseif ($column=='longtext') {
             return 'longtext()';
         }
-        elseif($column=='date'){
+        elseif ($column=='date') {
             return 'date()';
         }
-        elseif($column=='text'){
+        elseif ($column=='text') {
             return 'text()';
         }
-        elseif($column=='timestamp'){
+        elseif ($column=='timestamp') {
             return 'timestamp()';
         }
-        elseif($column=='mediumint'){
+        elseif ($column=='mediumint') {
             return 'mediumint()';
         }
-        elseif($column=='tinyint'){
+        elseif ($column=='tinyint') {
             return 'tinyint()';
         }
-        elseif($column=='float'){
+        elseif ($column=='float') {
             return 'float()';
         }
-        elseif($column=='mediumtext'){
+        elseif ($column=='mediumtext') {
             return 'mediumtext()';
         }
-        elseif($column=='mediumblob'){
+        elseif ($column=='mediumblob') {
             return 'mediumblob()';
         }
-        elseif($column=='blob'){
+        elseif ($column=='blob') {
             return 'blob()';
         }
-        elseif(preg_match('@enum.*\((.*?)\)@',$column,$enum)){
+        elseif (preg_match('@enum.*\((.*?)\)@', $column, $enum)) {
             return 'enum(['.$enum[1].'])';
         }
-        else{
+        else {
             return $column;
         }
     }
@@ -260,11 +260,11 @@ 
      * @param $field
      * @return void|mixed
      */
-    private function getIndexInformation($index,$field)
+    private function getIndexInformation($index, $field)
     {
         foreach ($index as $key=>$item) {
 
-            if($item['Column_name'] == $field){
+            if ($item['Column_name']==$field) {
                 return $index[$key];
             }
         }
@@ -282,13 +282,13 @@ 
     {
         $arguments = $this->schema->getArguments();
         
-        $only = explode(',',$arguments['only']);
+        $only = explode(',', $arguments['only']);
         
         $list = [];
         
-        foreach($only as $table){
+        foreach ($only as $table) {
             
-            if(in_array($table,$tables) || in_array($table = strtolower($table),$tables)){
+            if (in_array($table, $tables) || in_array($table = strtolower($table), $tables)) {
                 $list[] = $table;
             }
         }
@@ -307,7 +307,7 @@ 
     {
         $list = [];
         foreach ($index as $key=>$item) {
-            if($item['Non_unique']==1 && $item['Key_name']!=='PRIMARY'){
+            if ($item['Non_unique']==1 && $item['Key_name']!=='PRIMARY') {
                 $list[$item['Key_name']][] = $item['Column_name'];
             }
         }

Braces +16 added lines, -32 removed lines

@@ -52,8 +52,7 @@ 
             if(!file_exists($makeDirectory)){
                 files()->makeDirectory($makeDirectory,0755,true);
                 $exist=false;
-            }
-            else{
+            } else{
                 $exist=true;
             }
 
@@ -77,17 +76,14 @@ 
 
                 if(substr($dbtable,-1)=='s'){
                     app()->command('model create','model:'.strtolower(substr($dbtable,0,-1)).' table:'.$dbtable.' entity:'.$dbtable);
-                }
-                else{
+                } else{
                     app()->command('model create','model:'.strtolower($dbtable).' table:'.$dbtable.' entity:'.$dbtable);
                 }
                 
                 echo $dbtablekey.'- '.$migrationName.' ---> Ok';
-            }
-            elseif($exist){
+            } elseif($exist){
                 echo $dbtablekey.'- '.$migrationName.' ---> (Already Exist)';
-            }
-            else{
+            } else{
                 echo $dbtablekey.'- '.$migrationName.' ---> Fail';
             }
 
@@ -214,41 +210,29 @@ 
     {
         if($column=='datetime'){
             return 'datetime()';
-        }
-        elseif($column=='longtext'){
+        } elseif($column=='longtext'){
             return 'longtext()';
-        }
-        elseif($column=='date'){
+        } elseif($column=='date'){
             return 'date()';
-        }
-        elseif($column=='text'){
+        } elseif($column=='text'){
             return 'text()';
-        }
-        elseif($column=='timestamp'){
+        } elseif($column=='timestamp'){
             return 'timestamp()';
-        }
-        elseif($column=='mediumint'){
+        } elseif($column=='mediumint'){
             return 'mediumint()';
-        }
-        elseif($column=='tinyint'){
+        } elseif($column=='tinyint'){
             return 'tinyint()';
-        }
-        elseif($column=='float'){
+        } elseif($column=='float'){
             return 'float()';
-        }
-        elseif($column=='mediumtext'){
+        } elseif($column=='mediumtext'){
             return 'mediumtext()';
-        }
-        elseif($column=='mediumblob'){
+        } elseif($column=='mediumblob'){
             return 'mediumblob()';
-        }
-        elseif($column=='blob'){
+        } elseif($column=='blob'){
             return 'blob()';
-        }
-        elseif(preg_match('@enum.*\((.*?)\)@',$column,$enum)){
+        } elseif(preg_match('@enum.*\((.*?)\)@',$column,$enum)){
             return 'enum(['.$enum[1].'])';
-        }
-        else{
+        } else{
             return $column;
         }
     }