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/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/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);

         }

 

src/resta/Support/Command.php

Spacing +6 added lines, -6 removed lines

@@ -19,19 +19,19 @@ 
      * @param $command

      * @param $args

      */

-    public function __construct($app,$command,$args)

+    public function __construct($app, $command, $args)

     {

         parent::__construct($app);

 

         $this->arguments[]  = 'php';

         $this->arguments[]  = 'api';

-        $this->arguments    = array_merge($this->arguments,explode(" ",$command));

+        $this->arguments    = array_merge($this->arguments, explode(" ", $command));

         $this->arguments[]  = strtolower(app);

 

-        $argsList = explode(' ',$args);

+        $argsList = explode(' ', $args);

 

         foreach ($argsList as $item) {

-            $this->arguments[]  = $item;

+            $this->arguments[] = $item;

         }

     }

 

@@ -42,11 +42,11 @@ 
      */

     public function handle()

     {

-        $process = new ProcessHandler($this->arguments,root.'');

+        $process = new ProcessHandler($this->arguments, root.'');

         $process->start();

 

         foreach ($process as $type => $data) {

-            if ($process::OUT !== $type) {

+            if ($process::OUT!==$type) {

                 return false;

             }

             return true;

src/resta/Router/RouteMatching.php

Braces +3 added lines, -1 removed lines

@@ -55,7 +55,9 @@
 
             $patternCount = $this->getPatternRealCount($pattern);
 
-            if(count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList);
+            if(count($urlRoute)==0 && count($urlRoute)==0) {

+                return array_key_first($patternList);

+            }

 
             if(isset($patternCount['optional'])){
                 $optionalCount = count($patternCount['default']) + count($patternCount['optional']);

Spacing +31 added lines, -31 removed lines

@@ -18,7 +18,7 @@ 
      * @param ApplicationContracts $app
      * @param null|object $route
      */
-    public function __construct(ApplicationContracts $app, $route=null)
+    public function __construct(ApplicationContracts $app, $route = null)
     {
         parent::__construct($app);
 
@@ -34,53 +34,53 @@ 
     {
         $routes = $this->route->getRoutes();
 
-        if(!isset($routes['pattern'])){
+        if (!isset($routes['pattern'])) {
             return [];
         }
 
         $patterns = $routes['pattern'];
-        $urlRoute = array_filter(route(),'strlen');
+        $urlRoute = array_filter(route(), 'strlen');
 
         $patternList = [];
 
-        foreach($routes['data'] as $patternKey=>$routeData){
-            if($routeData['http']==httpMethod()){
-                $patternList[$patternKey]=$patterns[$patternKey];
+        foreach ($routes['data'] as $patternKey=>$routeData) {
+            if ($routeData['http']==httpMethod()) {
+                $patternList[$patternKey] = $patterns[$patternKey];
             }
         }
 
         $scoredList = [];
 
-        foreach ($patternList as $key=>$pattern){
+        foreach ($patternList as $key=>$pattern) {
 
             $patternCount = $this->getPatternRealCount($pattern);
 
-            if(count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList);
+            if (count($urlRoute)==0 && count($urlRoute)==0) return array_key_first($patternList);
 
-            if(isset($patternCount['optional'])){
-                $optionalCount = count($patternCount['default']) + count($patternCount['optional']);
+            if (isset($patternCount['optional'])) {
+                $optionalCount = count($patternCount['default'])+count($patternCount['optional']);
             }
 
-            if(count($urlRoute) == count($patternCount['default']) ||
+            if (count($urlRoute)==count($patternCount['default']) ||
                 (isset($optionalCount) && count($urlRoute)>count($patternCount['default']) && $optionalCount>=count($urlRoute))
-            ){
+            ) {
 
-                foreach ($pattern as $pkey=>$item){
+                foreach ($pattern as $pkey=>$item) {
 
-                    if($this->route->isMatchVaribleRegexPattern($item)===false){
-                        if(isset($urlRoute[$pkey]) && $urlRoute[$pkey]==$item){
+                    if ($this->route->isMatchVaribleRegexPattern($item)===false) {
+                        if (isset($urlRoute[$pkey]) && $urlRoute[$pkey]==$item) {
                             $scoredList[$key][] = 3;
                         }
                     }
 
-                    if($this->route->isMatchVaribleRegexPattern($item) && !$this->route->isOptionalVaribleRegexPattern($item)){
-                        if(isset($urlRoute[$pkey])){
+                    if ($this->route->isMatchVaribleRegexPattern($item) && !$this->route->isOptionalVaribleRegexPattern($item)) {
+                        if (isset($urlRoute[$pkey])) {
                             $scoredList[$key][] = 2;
                         }
                     }
 
-                    if($this->route->isMatchVaribleRegexPattern($item) && $this->route->isOptionalVaribleRegexPattern($item)){
-                        if(isset($urlRoute[$pkey])){
+                    if ($this->route->isMatchVaribleRegexPattern($item) && $this->route->isOptionalVaribleRegexPattern($item)) {
+                        if (isset($urlRoute[$pkey])) {
                             $scoredList[$key][] = 1;
                         }
                     }
@@ -104,14 +104,14 @@ 
         $list = [];
         $list['default'] = [];
 
-        foreach ($pattern as $key=>$value){
-            if(($this->route->isMatchVaribleRegexPattern($value)===false) || ($this->route->isMatchVaribleRegexPattern($value)
-                    && !$this->route->isOptionalVaribleRegexPattern($value))){
+        foreach ($pattern as $key=>$value) {
+            if (($this->route->isMatchVaribleRegexPattern($value)===false) || ($this->route->isMatchVaribleRegexPattern($value)
+                    && !$this->route->isOptionalVaribleRegexPattern($value))) {
                 $list['default'][$key] = $value;
             }
 
-            if(($this->route->isMatchVaribleRegexPattern($value)
-                && $this->route->isOptionalVaribleRegexPattern($value))){
+            if (($this->route->isMatchVaribleRegexPattern($value)
+                && $this->route->isOptionalVaribleRegexPattern($value))) {
                 $list['optional'][] = true;
             }
         }
@@ -125,19 +125,19 @@ 
      * @param array $scoredList
      * @return false|int|string
      */
-    private function showKeyAccordingToScoredList($scoredList=array())
+    private function showKeyAccordingToScoredList($scoredList = array())
     {
         $scored = [];
 
-        foreach($scoredList as $key=>$item){
+        foreach ($scoredList as $key=>$item) {
             $scored[$key] = array_sum($item);
         }
 
-        if(count($scored)){
+        if (count($scored)) {
             $arrayCountValues = array_count_values($scored);
 
-            if($arrayCountValues[max($scored)]==1){
-                return array_search(max($scored),$scored);
+            if ($arrayCountValues[max($scored)]==1) {
+                return array_search(max($scored), $scored);
             }
         }
 
@@ -156,8 +156,8 @@ 
         $route = route();
 
         foreach ($pattern as $key=>$item) {
-            if($this->route->isMatchVaribleRegexPattern($item)===false){
-                if(isset($route[$key]) && $item!==$route[$key]){
+            if ($this->route->isMatchVaribleRegexPattern($item)===false) {
+                if (isset($route[$key]) && $item!==$route[$key]) {
                     return false;
                 }
             }

src/resta/Router/RouteAccessiblePropertyTrait.php

Spacing +8 added lines, -8 removed lines

@@ -36,11 +36,11 @@ 
      * @param null|string $method

      * @return array

      */

-    public static function getRoutes($method=null) : array

+    public static function getRoutes($method = null) : array

     {

         // it collects and

         // executes route data in an array.

-        if(is_null($method)){

+        if (is_null($method)) {

             return static::$routes;

         }

 

@@ -48,16 +48,16 @@ 
 

         $routes = self::getRoutes();

 

-        if(isset($routes['data'])){

-            foreach ($routes['data'] as $key=>$item){

-                if($item['http']==httpMethod()){

+        if (isset($routes['data'])) {

+            foreach ($routes['data'] as $key=>$item) {

+                if ($item['http']==httpMethod()) {

                     $httpRouteList['data'][$key] = $item;

                 }

             }

         }

 

-        if(isset($routes['pattern'],$httpRouteList['data'])){

-            foreach ($httpRouteList['data'] as $key=>$item){

+        if (isset($routes['pattern'], $httpRouteList['data'])) {

+            foreach ($httpRouteList['data'] as $key=>$item) {

                 $httpRouteList['pattern'][$key] = $routes['pattern'][$key];

             }

         }

@@ -74,7 +74,7 @@ 
     {

         // detects where the route path is coming from

         // and returns this data in the static path.

-        $trace = Utils::trace(2,'file');

+        $trace = Utils::trace(2, 'file');

 

         // the trace is returned if the variable is available

         // in the path data, otherwise it returns null.

src/resta/Support/Arr.php

Spacing +44 added lines, -44 removed lines

@@ -45,7 +45,7 @@ 
         foreach ($array as $values) {

             if ($values instanceof Collection) {

                 $values = $values->all();

-            } elseif (! is_array($values)) {

+            } elseif (!is_array($values)) {

                 continue;

             }

             $results = array_merge($results, $values);

@@ -94,7 +94,7 @@ 
     {

         $results = [];

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

-            if (is_array($value) && ! empty($value)) {

+            if (is_array($value) && !empty($value)) {

                 $results = array_merge($results, static::dot($value, $prepend.$key.'.'));

             } else {

                 $results[$prepend.$key] = $value;

@@ -180,12 +180,12 @@ 
         $result = [];

         foreach ($array as $item) {

             $item = $item instanceof Collection ? $item->all() : $item;

-            if (! is_array($item)) {

+            if (!is_array($item)) {

                 $result[] = $item;

-            } elseif ($depth === 1) {

+            } elseif ($depth===1) {

                 $result = array_merge($result, array_values($item));

             } else {

-                $result = array_merge($result, static::flatten($item, $depth - 1));

+                $result = array_merge($result, static::flatten($item, $depth-1));

             }

         }

         return $result;

@@ -200,8 +200,8 @@ 
     public static function forget(&$array, $keys)

     {

         $original = &$array;

-        $keys = (array) $keys;

-        if (count($keys) === 0) {

+        $keys = (array)$keys;

+        if (count($keys)===0) {

             return;

         }

         foreach ($keys as $key) {

@@ -213,7 +213,7 @@ 
             $parts = explode('.', $key);

             // clean up before each pass

             $array = &$original;

-            while (count($parts) > 1) {

+            while (count($parts)>1) {

                 $part = array_shift($parts);

                 if (isset($array[$part]) && is_array($array[$part])) {

                     $array = &$array[$part];

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

     public static function get($array, $key, $default = null)

     {

-        if (! static::accessible($array)) {

+        if (!static::accessible($array)) {

             return value($default);

         }

         if (is_null($key)) {

@@ -243,7 +243,7 @@ 
         if (static::exists($array, $key)) {

             return $array[$key];

         }

-        if (strpos($key, '.') === false) {

+        if (strpos($key, '.')===false) {

             return $array[$key] ?? value($default);

         }

         foreach (explode('.', $key) as $segment) {

@@ -267,11 +267,11 @@ 
         if (is_null($keys)) {

             return false;

         }

-        $keys = (array) $keys;

-        if (! $array) {

+        $keys = (array)$keys;

+        if (!$array) {

             return false;

         }

-        if ($keys === []) {

+        if ($keys===[]) {

             return false;

         }

         foreach ($keys as $key) {

@@ -300,7 +300,7 @@ 
     public static function isAssoc(array $array)

     {

         $keys = array_keys($array);

-        return array_keys($keys) !== $keys;

+        return array_keys($keys)!==$keys;

     }

     /**

      * Get a subset of the items from the given array.

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

     public static function only($array, $keys)

     {

-        return array_intersect_key($array, array_flip((array) $keys));

+        return array_intersect_key($array, array_flip((array)$keys));

     }

     /**

      * Pluck an array of values from an array.

@@ -335,7 +335,7 @@ 
             } else {

                 $itemKey = data_get($item, $key);

                 if (is_object($itemKey) && method_exists($itemKey, '__toString')) {

-                    $itemKey = (string) $itemKey;

+                    $itemKey = (string)$itemKey;

                 }

                 $results[$itemKey] = $itemValue;

             }

@@ -368,7 +368,7 @@ 
         if (is_null($key)) {

             array_unshift($array, $value);

         } else {

-            $array = [$key => $value] + $array;

+            $array = [$key => $value]+$array;

         }

         return $array;

     }

@@ -399,7 +399,7 @@ 
     {

         $requested = is_null($number) ? 1 : $number;

         $count = count($array);

-        if ($requested > $count) {

+        if ($requested>$count) {

             throw new InvalidArgumentException(

                 "You requested {$requested} items, but there are only {$count} items available."

             );

@@ -407,12 +407,12 @@ 
         if (is_null($number)) {

             return $array[array_rand($array)];

         }

-        if ((int) $number === 0) {

+        if ((int)$number===0) {

             return [];

         }

         $keys = array_rand($array, $number);

         $results = [];

-        foreach ((array) $keys as $key) {

+        foreach ((array)$keys as $key) {

             $results[] = $array[$key];

         }

         return $results;

@@ -433,12 +433,12 @@ 
             return $array = $value;

         }

         $keys = explode('.', $key);

-        while (count($keys) > 1) {

+        while (count($keys)>1) {

             $key = array_shift($keys);

             // If the key doesn't exist at this depth, we will just create an empty array

             // to hold the next value, allowing us to create the arrays to hold final

             // values at the correct depth. Then we'll keep digging into the array.

-            if (! isset($array[$key]) || ! is_array($array[$key])) {

+            if (!isset($array[$key]) || !is_array($array[$key])) {

                 $array[$key] = [];

             }

             $array = &$array[$key];

@@ -459,7 +459,7 @@ 
             shuffle($array);

         } else {

             srand($seed);

-            usort($array, function () {

+            usort($array, function() {

                 return rand(-1, 1);

             });

         }

@@ -536,16 +536,16 @@ 
      * @param array $referenceArray

      * @return array

      */

-    public static function removeSameValues($removeArray=array(),$referenceArray=array())

+    public static function removeSameValues($removeArray = array(), $referenceArray = array())

     {

         $list = [];

 

-        foreach ($removeArray as $remove){

-            if(!in_array($remove,$referenceArray)){

-                $list[]=$remove;

+        foreach ($removeArray as $remove) {

+            if (!in_array($remove, $referenceArray)) {

+                $list[] = $remove;

             }

         }

-        return array_merge($referenceArray,$list);

+        return array_merge($referenceArray, $list);

     }

 

     /**

@@ -553,9 +553,9 @@ 
      * @param $key

      * @return null

      */

-    public static function isset($array,$key)

+    public static function isset($array, $key)

     {

-        if(isset($array[$key])){

+        if (isset($array[$key])) {

             return $array[$key];

         }

         return null;

@@ -566,13 +566,13 @@ 
      * @param null $withKey

      * @return bool

      */

-    public static function isArrayWithCount($array,$withKey=null)

+    public static function isArrayWithCount($array, $withKey = null)

     {

-        if($withKey===null){

+        if ($withKey===null) {

             return is_array($array) && count($array);

         }

 

-        return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey],null);

+        return isset($array[$withKey]) && self::isArrayWithCount($array[$withKey], null);

     }

 

     /**

@@ -580,12 +580,12 @@ 
      * @param $array2

      * @return int

      */

-    public static function arrayDiffKey($array1,$array2)

+    public static function arrayDiffKey($array1, $array2)

     {

-        $forArray1 = array_diff_key($array1,$array2);

-        $forArray2 = array_diff_key($array2,$array1);

+        $forArray1 = array_diff_key($array1, $array2);

+        $forArray2 = array_diff_key($array2, $array1);

 

-        if(count($forArray1)=="0" && count($forArray2)=="0"){

+        if (count($forArray1)=="0" && count($forArray2)=="0") {

             return true;

         }

         return false;

@@ -597,12 +597,12 @@ 
      * @param $original

      * @param array $overwrite

      */

-    public static function overwriteWith($original,$overwrite=array())

+    public static function overwriteWith($original, $overwrite = array())

     {

-        foreach ($original as $key=>$item){

+        foreach ($original as $key=>$item) {

 

-            if(array_key_exists($key,$overwrite)){

-                array_splice($original,$key,0,$overwrite[$key]);

+            if (array_key_exists($key, $overwrite)) {

+                array_splice($original, $key, 0, $overwrite[$key]);

             }

         }

 

@@ -616,12 +616,12 @@ 
      * @param array $remove

      * @return array

      */

-    public static function removeKey($data,$remove=array())

+    public static function removeKey($data, $remove = array())

     {

         $list = [];

 

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

-            if(!in_array($key,$remove)){

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

+            if (!in_array($key, $remove)) {

                 $list[$key] = $value;

             }

         }

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

Spacing +9 added lines, -9 removed lines

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

     }

 

     /**

@@ -66,16 +66,16 @@ 
     {

         // using the driver object we write the query builder statement.

         // we do the values of the query with the credentials that are sent.

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

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

             $query = $provider($credentials->get());

         }

-        else{

+        else {

             $query = $this->setQuery($credentials);

         }

 

         // 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.

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

         $this->updateToken();

 

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

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

             $this->saveDeviceToken();

         }

     }

@@ -104,18 +104,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';

         }

     }

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
         // we do the values of the query with the credentials that are sent.

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

             $query = $provider($credentials->get());

-        }

-        else{

+        } else{

             $query = $this->setQuery($credentials);

         }