php-resta / resta-core

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

Spacing +34 added lines, -34 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,13 +177,13 @@ 
             // 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';

             }

-            else{

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

-                    if(false === $after($this->auth->params['builder']->first())){

+            else {

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

+                    if (false===$after($this->auth->params['builder']->first())) {

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

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

                     }

@@ -203,10 +203,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'],

@@ -217,10 +217,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

@@ -240,11 +240,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 +3 added lines, -6 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);

                 }

             }

@@ -180,8 +179,7 @@ 
             if(!$update){

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

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

-            }

-            else{

+            } else{

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

                     if(false === $after($this->auth->params['builder']->first())){

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

@@ -216,8 +214,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/AuthenticateResponse.php

Spacing +7 added lines, -7 removed lines

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

         // if the status value is true,

         // we send output generated from the token value.

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

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

             $this->setAuthenticateSuccess(true);

             return true;

         }

@@ -40,7 +40,7 @@ 
     {

         // if the status value is true,

         // we send output generated from the token value.

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

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

             return true;

         }

 

@@ -53,11 +53,11 @@ 
      */

     protected function getResult()

     {

-        $result= [];

+        $result = [];

 

         // if the status value is true,

         // we send output generated from the token value.

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

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

             $result['message']                  = 'token success';

             $result['token']                    = $this->params['token'];

             $result['user']                     = $this->params['data'];

@@ -79,12 +79,12 @@ 
      *

      * @param bool $value

      */

-    private function setAuthenticateSuccess($value=true)

+    private function setAuthenticateSuccess($value = true)

     {

-        if(app()->has('authenticateSuccess')){

+        if (app()->has('authenticateSuccess')) {

             app()->terminate('authenticateSuccess');

         }

 

-        app()->register('authenticateSuccess',$value);

+        app()->register('authenticateSuccess', $value);

     }

 }
\ No newline at end of file

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

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 

 class User extends Eloquent

 {

-    protected $hidden = ['id','password','token'];

+    protected $hidden = ['id', 'password', 'token'];

 

     /**

      * User constructor.

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

Spacing +11 added lines, -11 removed lines

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

      * @var array

      */

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

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

 

     /**

      * @method create

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

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

 

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

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

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

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

             

         }

 

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

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

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

             

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

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

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

             }

 

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

         }

 

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

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

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

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

         }

 

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

 

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

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

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

         }

         

 

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

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

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

         }

 

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

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

 

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

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

 

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

 

         $clientManagerResolve = new $clientManager;

 

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

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

 

             $generator->createMethod([

                 strtolower($name)

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

         }

 

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

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

 

         $nameGeneratorNamespaceResolve = new $nameGeneratorNamespace;

 

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

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

 

             $nameGenerator->createMethod([

                 strtolower($client)

src/resta/Authenticate/ConfigProvider.php

Braces +1 added lines, -2 removed lines

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

 

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

-        }

-        else{

+        } else{

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

         }

 

Spacing +10 added lines, -10 removed lines

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

         $this->config();

 

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

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

             $this->setAuthenticateNeeds();

         }

 

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

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

 

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

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

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

         }

 

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

     public function getAddToWhere()

     {

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

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

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

         }

         return null;

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

     public function getConfigToken()

     {

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

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

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

         }

         return null;

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

     public function provider($key)

     {

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

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

             return $provider;

         }

 

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

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

 

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

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

     }

 

     /**

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

     public function deviceTokenTable()

     {

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

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

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

 

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

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

         }

-        else{

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

+        else {

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

         }

 

     }

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

Spacing +1 added lines, -1 removed lines

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

      * @var array

      */

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

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

 

     /**

      * User constructor.

src/resta/Middleware/ExcludeMiddleware.php

Spacing +12 added lines, -12 removed lines

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

      * @return mixed

      */

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

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

     {

         $this->result = true;

 

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

         //if there is exclude method

         //in service middleware class

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

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

 

             //call exclude method

             /**

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

             $excludes = $serviceMiddleware->exclude();

 

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

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

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

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

             }

         }

 

         //return true

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

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

     }

 

     /**

      * @param $excludeKey

      * @param $excludeVal

      */

-    private function excludeProcess($excludeKey,$excludeVal)

+    private function excludeProcess($excludeKey, $excludeVal)

     {

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

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

 

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

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

                 $this->result = true;

                 $this->inArrayExclude($excludeVal);

 

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

     private function existMethod()

     {

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

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

     }

 

     /**

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

     private function inArrayExclude($exclude)

     {

-        foreach($exclude as $item){

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

+        foreach ($exclude as $item) {

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

                 $this->result = false;

             }

         }

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

      * @return mixed

      */

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

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

     {

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

     }