php-resta / resta-core

src/resta/Authenticate/Resource/AuthCheckManager.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      * @param $auth

      * @param $token

      */

-    public function __construct($auth,$token)

+    public function __construct($auth, $token)

     {

         parent::__construct($auth);

 

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

Spacing +7 added lines, -7 removed lines

@@ -52,7 +52,7 @@ 
 

         // with query we bind the returned values to the params property of the auth object.

         // and so the auth object will make a final return with these values.

-        $this->paramValues('check',$query);

+        $this->paramValues('check', $query);

     }

 

     /**

@@ -69,7 +69,7 @@ 
 

         // with query we bind the returned values to the params property of the auth object.

         // and so the auth object will make a final return with these values.

-        $this->paramValues('login',$query);

+        $this->paramValues('login', $query);

 

         // we assign the credential hash value

         // to the global of the authenticate object.

@@ -79,7 +79,7 @@ 
         // we update the token value.

         $this->updateToken();

         

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

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

             $this->saveDeviceToken();

         }

     }

@@ -97,18 +97,18 @@ 
 

         // with query we bind the returned values to the params property of the auth object.

         // and so the auth object will make a final return with these values.

-        $this->paramValues('logout',$query);

+        $this->paramValues('logout', $query);

 

         //token updating as null

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

-            if(!$this->deleteDeviceToken()){

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

+            if (!$this->deleteDeviceToken()) {

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

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

                 return false;

             }

         }

 

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

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

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

         }

     }

src/resta/Authenticate/Resource/AuthUserManager.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      * @param $deviceTokenId
      * @param AuthenticateProvider $auth
      */
-    public function __construct($deviceTokenId,$auth)
+    public function __construct($deviceTokenId, $auth)
     {
         parent::__construct($auth);
         

src/resta/Authenticate/AuthenticateBasic.php

Spacing +8 added lines, -8 removed lines

@@ -9,21 +9,21 @@ 
      * @param callable|null $callback

      * @return mixed|null

      */

-    protected function checkParamsViaAvailability($data,callable $callback=null)

+    protected function checkParamsViaAvailability($data, callable $callback = null)

     {

-        if(is_callable($data) && is_null($callback)){

+        if (is_callable($data) && is_null($callback)) {

             

             // if an authenticate is provided via the existing check method,

             // then we return the value of the data that we are checking for with callback help.

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

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

                 return call_user_func($data);

             } 

         }

         

         // if an authenticate is provided via the existing check method,

         // then we return the value of the data that we are checking for with callback help.

-        if($this->check() && isset($this->params[$data])){

-            return call_user_func_array($callback,[$this->params[$data]]);

+        if ($this->check() && isset($this->params[$data])) {

+            return call_user_func_array($callback, [$this->params[$data]]);

         }

 

         return null;

@@ -38,7 +38,7 @@ 
 

         // we will determine whether

         // the http path is correct for this method.

-        if(isset($getHttp[$type]) and $getHttp[$type]!==httpMethod()){

+        if (isset($getHttp[$type]) and $getHttp[$type]!==httpMethod()) {

             $this->getExceptionForHttp($getHttp[$type]);

         }

     }

@@ -50,8 +50,8 @@ 
     {

         // if there is a token in the headers,

         // we return the callback.

-        if(!is_null($this->getTokenSentByUser())){

-            return call_user_func_array($callback,[$this->getTokenSentByUser()]);

+        if (!is_null($this->getTokenSentByUser())) {

+            return call_user_func_array($callback, [$this->getTokenSentByUser()]);

         }

 

         //token false

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 string
@@ -27,7 +27,7 @@ 
      */
     public function after($field)
     {
-        $this->wizard->setAlterType('place',['AFTER'=>$field]);
+        $this->wizard->setAlterType('place', ['AFTER'=>$field]);
 
         return $this->wizard;
     }

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

Braces +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
         if(isset($nullable[$name])){
             if($nullable[$name]===false){
                 $nullableValue='NOT NULL';
-            }
-            else{
+            } else{
                 $nullableValue='NULL';
             }
         }
@@ -72,8 +71,7 @@ 
         
         if($this->data['types'][$nameKey]!=='timestamp'){
             $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT "'.$this->data['default'][$name].'"' : '';
-        }
-        else{
+        } else{
             $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT '.$this->data['default'][$name].'' : '';
         }
         

Spacing +28 added lines, -28 removed lines

@@ -10,16 +10,16 @@ 
      * @param $name
      * @return string
      */
-    protected function getNullableValue($nullable,$name)
+    protected function getNullableValue($nullable, $name)
     {
-        $nullableValue='';
+        $nullableValue = '';
 
-        if(isset($nullable[$name])){
-            if($nullable[$name]===false){
-                $nullableValue='NOT NULL';
+        if (isset($nullable[$name])) {
+            if ($nullable[$name]===false) {
+                $nullableValue = 'NOT NULL';
             }
-            else{
-                $nullableValue='NULL';
+            else {
+                $nullableValue = 'NULL';
             }
         }
 
@@ -59,21 +59,21 @@ 
      */
     protected function getValueWithIsset($name)
     {
-        $nameKey = array_search($name,$this->data['names']);
+        $nameKey = array_search($name, $this->data['names']);
         
         $list   = [];
-        $list[] = $this->getNullableValue($this->data['nullable'],$name);
+        $list[] = $this->getNullableValue($this->data['nullable'], $name);
         $list[] = (isset($this->data['autoIncrement'][$name])) ? 'AUTO_INCREMENT' : '';
         $list[] = (isset($this->data['primaryKey'][$name])) ? 'PRIMARY KEY' : '';
         
-        if($this->data['types'][$nameKey]=='timestamp' && !isset($this->data['default'][$nameKey])){
+        if ($this->data['types'][$nameKey]=='timestamp' && !isset($this->data['default'][$nameKey])) {
             $this->data['default'][$name] = 'CURRENT_TIMESTAMP';
         }
         
-        if($this->data['types'][$nameKey]!=='timestamp'){
+        if ($this->data['types'][$nameKey]!=='timestamp') {
             $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT "'.$this->data['default'][$name].'"' : '';
         }
-        else{
+        else {
             $list[] = (isset($this->data['default'][$name])) ? ' DEFAULT '.$this->data['default'][$name].'' : '';
         }
         
@@ -90,8 +90,8 @@ 
     protected function getUniqueValueList($name)
     {
         //get unique
-        if(isset($this->data['unique'][$name])){
-            $this->data['uniqueValueList'][]      = 'UNIQUE INDEX '.$this->data['unique'][$name]['value'].' ('.$name.' ASC)';
+        if (isset($this->data['unique'][$name])) {
+            $this->data['uniqueValueList'][] = 'UNIQUE INDEX '.$this->data['unique'][$name]['value'].' ('.$name.' ASC)';
         }
     }
 
@@ -101,8 +101,8 @@ 
     protected function getIndexValueList($name)
     {
         //get index
-        if(isset($this->data['index'][$name])){
-            $this->data['indexValueList'][]  = 'INDEX '.$this->data['index'][$name]['value'].' ('.$name.')';
+        if (isset($this->data['index'][$name])) {
+            $this->data['indexValueList'][] = 'INDEX '.$this->data['index'][$name]['value'].' ('.$name.')';
         }
     }
 
@@ -123,19 +123,19 @@ 
      */
     protected function getCreateDefaultList()
     {
-        $list               = [];
+        $list = [];
 
         foreach ($this->data['names'] as $key=>$name)
         {
             list(
-                $nullableValue,$autoIncrementValue,
-                $primaryKeyValue,$defaultValue,$commentValue
+                $nullableValue, $autoIncrementValue,
+                $primaryKeyValue, $defaultValue, $commentValue
                 ) = $this->getValueWithIsset($name);
 
             //set index values
             $this->setIndex($name);
 
-            $list[]=''.$name.' '.$this->data['types'][$key].' '.$nullableValue.' '.$defaultValue.' '.$primaryKeyValue.' '.$autoIncrementValue.' '.$commentValue.'';
+            $list[] = ''.$name.' '.$this->data['types'][$key].' '.$nullableValue.' '.$defaultValue.' '.$primaryKeyValue.' '.$autoIncrementValue.' '.$commentValue.'';
         }
 
         return $list;
@@ -146,18 +146,18 @@ 
      */
     protected function getKeyList()
     {
-        $keyList            = [];
+        $keyList = [];
 
         //multiple indexes
-        if(isset($this->data['index']['indexes'])){
+        if (isset($this->data['index']['indexes'])) {
 
-            foreach ($this->data['index']['indexes'] as $index_key=>$index_value){
+            foreach ($this->data['index']['indexes'] as $index_key=>$index_value) {
 
                 $indexesCommentValue = (isset($index_value['comment'])) ? 'COMMENT "'.$index_value['comment'].'"' : '';
 
                 $keyType    = (isset($index_value['type'])) ? ucfirst($index_value['type']) : 'KEY';
 
-                $keyList[]  = "".$keyType." ".$index_value['name']." (".implode(",",$index_value['value']).") ".$indexesCommentValue;
+                $keyList[]  = "".$keyType." ".$index_value['name']." (".implode(",", $index_value['value']).") ".$indexesCommentValue;
             }
         }
 
@@ -172,13 +172,13 @@ 
     {
         $list = [];
 
-        foreach ($reference as $constraint=>$values){
+        foreach ($reference as $constraint=>$values) {
 
-            $list[]=',CONSTRAINT '.$constraint.' FOREIGN KEY ('.$values['key'].') 
+            $list[] = ',CONSTRAINT '.$constraint.' FOREIGN KEY ('.$values['key'].') 
             REFERENCES '.$values['references']['table'].'('.$values['references']['field'].') '.$this->getOnProcess($values);
         }
 
-        return implode (" ",$list);
+        return implode(" ", $list);
     }
 
     /**
@@ -186,7 +186,7 @@ 
      */
     private function getOnProcess($referenceValue)
     {
-        if(isset($referenceValue['on']) && isset($referenceValue['onOption'])){
+        if (isset($referenceValue['on']) && isset($referenceValue['onOption'])) {
             return ''.$referenceValue['on'].' '.strtoupper($referenceValue['onOption']).'';
         }
 

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

Spacing +36 added lines, -36 removed lines

@@ -25,28 +25,28 @@ 
 
         $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);
         
-        $query=$this->schema->getConnection()->setQueryBasic($syntax);
+        $query = $this->schema->getConnection()->setQueryBasic($syntax);
 
         return [
             'syntax'=>$syntax,
@@ -62,25 +62,25 @@ 
     private function getDefaultSyntaxGroup()
     {
 
-        $this->syntax[]=implode(",",$this->getCreateDefaultList());
+        $this->syntax[] = implode(",", $this->getCreateDefaultList());
 
         //get unique values
-        if(isset($this->data['uniqueValueList']) && count($this->data['uniqueValueList'])){
-            $this->syntax[]=','.implode(',',$this->data['uniqueValueList']);
+        if (isset($this->data['uniqueValueList']) && count($this->data['uniqueValueList'])) {
+            $this->syntax[] = ','.implode(',', $this->data['uniqueValueList']);
         }
 
         //get index values
-        if(isset($this->data['indexValueList']) && count($this->data['indexValueList'])){
-            $this->syntax[]=','.implode(',',$this->data['indexValueList']);
+        if (isset($this->data['indexValueList']) && count($this->data['indexValueList'])) {
+            $this->syntax[] = ','.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']);
         }
     }
 
@@ -104,33 +104,33 @@ 
     
     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);
 
             return [
                 'syntax'=>$syntax,
@@ -143,17 +143,17 @@ 
 
     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);
 
             return [
                 'syntax'=>$syntax,

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,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';
         }
 
@@ -39,8 +38,7 @@ 
         if($this->data['engine']!==null)
         {
             $this->syntax[]=' ENGINE='.$this->data['engine'].' ';
-        }
-        else{
+        } else{
             $this->syntax[]=' ENGINE=InnoDB ';
         }
 
@@ -124,8 +122,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;
             }
             

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

Spacing +10 added lines, -10 removed lines

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

      * @var $type

      */

-    public $type='project';

+    public $type = 'project';

 

     /**

      * @var array

@@ -31,7 +31,7 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=[];

+    public $commandRule = [];

 

     /**

      * @method create

@@ -46,17 +46,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();

@@ -82,7 +82,7 @@ 
         //$this->directory['sourceDir']               = $this->sourceDir();

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

         //$this->directory['sourceSupportTraitDir']   = $this->sourceSupportDir().'/Traits';

-        $this->directory['exceptionDir']            = app()->path()->exception();

+        $this->directory['exceptionDir'] = app()->path()->exception();

 

         //set project directory

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

@@ -97,7 +97,7 @@ 
         $this->touch['kernel/worker']               = $this->provider().'/WorkerServiceProvider.php';

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

         $this->touch['kernel/role']                 = $this->provider().'/RoleServiceProvider.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';

@@ -136,7 +136,7 @@ 
         $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/authenticate']      = $this->directory['exceptionDir'].'/AuthenticateException.php';

 

         //set project touch

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

src/resta/Authenticate/AuthenticateToken.php

Spacing +5 added lines, -5 removed lines

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

      * @var null

      */

-    public $credentialHash=null;

+    public $credentialHash = null;

 

     /**

      * @return string

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

         // the absolute params property must be present

         // in the object and the params value must be the builder key.

-        if(property_exists($this,'params') and isset($this->params['builder'])){

+        if (property_exists($this, 'params') and isset($this->params['builder'])) {

 

             // a real token will be generated after

             // you get the first method of the query builder value.

@@ -24,7 +24,7 @@ 
 

             // we refer to the token closure feature on the config to enable

             // the creation of user-based tokens on the application side.

-            return $this->getTokenFromProvider($authData,function() use($authData){

+            return $this->getTokenFromProvider($authData, function() use($authData){

                 return md5(sha1($authData->id.'__'.$this->credentialHash.'__'.time().'__'.fingerPrint()));

             });

         }

@@ -37,11 +37,11 @@ 
      * @param callable $callback

      * @return mixed

      */

-    private function getTokenFromProvider($authData,callable $callback)

+    private function getTokenFromProvider($authData, callable $callback)

     {

         // if the token value is a closure value,

         // we will run a user-based token closure.

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

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

             return $token($authData);

         }