php-resta / resta-core

src/resta/Middleware/MiddlewareProvider.php

Braces +8 added lines, -6 removed lines

@@ -141,7 +141,9 @@ 
 

         //method can only return fixed.

         if(!is_null($key)){

-            if(isset($$key)) return $$key;

+            if(isset($$key)) {

+                return $$key;

+            }

         }

 

         //middleware key odds

@@ -170,8 +172,7 @@ 
             // it is detected as a short name and is searched in the middleware directory.

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

                 $middlewareNamespace = $middleVal;

-            }

-            else{

+            } else{

                 $middlewareNamespace = app()->namespace()->middleware().'\\'.ucfirst($middleVal);

             }

 

@@ -271,7 +272,9 @@ 
     {

         //If the all option is present,

         //it is automatically injected into all services for the middleware application.

-        if($key==="all") return true;

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

+            return true;

+        }

 

         //service middleware key

         //if it is array,check odds

@@ -311,8 +314,7 @@ 
                 $middlewareList = array_merge($middlewareList,[$middleValue]);

                 $this->app->register('pointer','middlewareList',$middlewareList);

             }

-        }

-        else{

+        } else{

             $this->app->register('pointer','middlewareList',[$middleValue]);

         }

     }

Spacing +34 added lines, -34 removed lines

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

     public function getResolveServiceMiddleware()

     {

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

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

             return $this->app->resolve($this->serviceMiddleware);

         }

 

@@ -94,7 +94,7 @@ 
     public function handle()

     {

         //set define for middleware

-        define('middleware',true);

+        define('middleware', true);

 

         //middleware handle process

         $this->handleMiddlewareProcess();

@@ -106,7 +106,7 @@ 
      * @param string $method

      * @return void|mixed

      */

-    public function handleMiddlewareProcess($method='handle')

+    public function handleMiddlewareProcess($method = 'handle')

     {

         // the app instance is a global application example,

         // and a hash is loaded as this hash.

@@ -114,7 +114,7 @@ 
 

         // the middleware class must be subject to

         // the ServiceMiddlewareManagerContracts interface rule to be implemented.

-        if(!$this->getResolveServiceMiddleware() instanceof ServiceMiddlewareManagerContracts){

+        if (!$this->getResolveServiceMiddleware() instanceof ServiceMiddlewareManagerContracts) {

             exception()->badMethodCall('Service middleware does not have ServiceMiddlewareManagerContracts');

         }

 

@@ -131,17 +131,17 @@ 
      * @param $key null

      * @return array

      */

-    public function middlewareKeyOdds($key=null)

+    public function middlewareKeyOdds($key = null)

     {

         // identifying constants for the middleware layer.

         // with the property of the user, the user is free to determine the constants that the middleware layer wants.

-        $method     = $this->odds['method'] ?? implode("/",$this->app['routeParameters']);

+        $method     = $this->odds['method'] ?? implode("/", $this->app['routeParameters']);

         $endpoint   = $this->odds['endpoint'] ?? endpoint;

         $http       = $this->odds['http'] ?? $this->app['httpMethod'];

 

         //method can only return fixed.

-        if(!is_null($key)){

-            if(isset($$key)) return $$key;

+        if (!is_null($key)) {

+            if (isset($$key)) return $$key;

         }

 

         //middleware key odds

@@ -157,21 +157,21 @@ 
      *

      * @param array $middleware

      */

-    public function serviceMiddleware($middleware=array())

+    public function serviceMiddleware($middleware = array())

     {

         $this->show = [];

 

         //It will be run individually according to the rules of

         //the middleware classes specified for the service middleware middleware.

-        foreach($middleware as $middleVal=>$middleKey){

+        foreach ($middleware as $middleVal=>$middleKey) {

 

             // if the keys in the array in the service middleware class represent a class,

             // this value is checked, if it does not represent the class,

             // it is detected as a short name and is searched in the middleware directory.

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

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

                 $middlewareNamespace = $middleVal;

             }

-            else{

+            else {

                 $middlewareNamespace = app()->namespace()->middleware().'\\'.ucfirst($middleVal);

             }

 

@@ -190,12 +190,12 @@ 
             //it will be handled according to the following rule.

             //The exclude class will return a callback and allocate the result as bool to the exclude variable.

             //If the exclude variable is true then the middleware will be run.

-            $excludeClass->exclude($this->middleware,function($exclude) use ($middleVal){

+            $excludeClass->exclude($this->middleware, function($exclude) use ($middleVal){

 

-                if($exclude){

+                if ($exclude) {

 

                     //the condition of a specific statement to be handled

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

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

                         $this->pointer($middleVal);

 

                         //directly registered to the middleware name show property.

@@ -203,8 +203,8 @@ 
 

                         // the middleware namespace must have handletraitcontract interface property.

                         // otherwise, middleware will not work.

-                        if(false === $this->app->runningInConsole()

-                            && $this->app->resolve($this->middleware['namespace']) instanceof HandleContracts){

+                        if (false===$this->app->runningInConsole()

+                            && $this->app->resolve($this->middleware['namespace']) instanceof HandleContracts) {

                             $this->app->resolve($this->middleware['namespace'])->handle();

                         }

                     }

@@ -220,10 +220,10 @@ 
      * @param null $key

      * @param null $value

      */

-    public function setKeyOdds($key=null,$value=null)

+    public function setKeyOdds($key = null, $value = null)

     {

         //user-defined middleware constants.

-        if(!is_null($key) && !is_null($value)){

+        if (!is_null($key) && !is_null($value)) {

             $this->odds[$key] = $value;

         }

     }

@@ -240,13 +240,13 @@ 
 

         // if the service middleware does not represent a class,

         // then in this case core support is assigned as a class service middleware.

-        if(Utils::isNamespaceExists($serviceMiddleware)===false){

+        if (Utils::isNamespaceExists($serviceMiddleware)===false) {

             $serviceMiddleware = ServiceMiddlewareManager::class;

         }

 

         //We are logging the kernel for the middleware class and the exclude class

-        $this->app->register('middlewareClass',$this->app->resolve($serviceMiddleware));

-        $this->app->register('excludeClass',$this->app->resolve(ExcludeMiddleware::class));

+        $this->app->register('middlewareClass', $this->app->resolve($serviceMiddleware));

+        $this->app->register('excludeClass', $this->app->resolve(ExcludeMiddleware::class));

     }

 

     /**

@@ -254,9 +254,9 @@ 
      *

      * @param null $serviceMiddleware

      */

-    public function setserviceMiddleware($serviceMiddleware=null)

+    public function setserviceMiddleware($serviceMiddleware = null)

     {

-        if(!is_null($serviceMiddleware)){

+        if (!is_null($serviceMiddleware)) {

             $this->serviceMiddleware = $serviceMiddleware;

         }

     }

@@ -271,11 +271,11 @@ 
     {

         //If the all option is present,

         //it is automatically injected into all services for the middleware application.

-        if($key==="all") return true;

+        if ($key==="all") return true;

 

         //service middleware key

         //if it is array,check odds

-        if(is_array($key)){

+        if (is_array($key)) {

 

             //get middleware odd keys

             $odds = $this->middlewareKeyOdds();

@@ -284,8 +284,8 @@ 
             //then the middleware is conditioned and the services are individually checked according to

             //the degree of conformity with the middlewareOdds method and

             //the middleware is executed under the specified condition.

-            foreach($key as $item){

-                if(in_array($item,$odds)){

+            foreach ($key as $item) {

+                if (in_array($item, $odds)) {

                     return true;

                 }

             }

@@ -303,17 +303,17 @@ 
      */

     private function pointer($middleValue)

     {

-        if(isset($this->app['pointer']['middlewareList'])){

+        if (isset($this->app['pointer']['middlewareList'])) {

 

             $middlewareList = $this->app['pointer']['middlewareList'];

 

-            if(is_array($middlewareList)){

-                $middlewareList = array_merge($middlewareList,[$middleValue]);

-                $this->app->register('pointer','middlewareList',$middlewareList);

+            if (is_array($middlewareList)) {

+                $middlewareList = array_merge($middlewareList, [$middleValue]);

+                $this->app->register('pointer', 'middlewareList', $middlewareList);

             }

         }

-        else{

-            $this->app->register('pointer','middlewareList',[$middleValue]);

+        else {

+            $this->app->register('pointer', 'middlewareList', [$middleValue]);

         }

     }

 }
\ No newline at end of file

src/resta/Router/RouteProvider.php

Spacing +9 added lines, -9 removed lines

@@ -39,12 +39,12 @@ 
     private function getCallBindController()

     {

         //we finally process the method of the class invoked by the user as a process and prepare it for the response

-        return app()->resolve(RouteWatch::class)->watch(function(){

+        return app()->resolve(RouteWatch::class)->watch(function() {

             

             // if the method in the instance object exists,

             // this method is executed to produce the output.

-            if(method_exists($this->app['instanceController'],$this->app['method'])){

-                return DIContainerManager::callBind([$this->app['instanceController'],$this->app['method']],

+            if (method_exists($this->app['instanceController'], $this->app['method'])) {

+                return DIContainerManager::callBind([$this->app['instanceController'], $this->app['method']],

                     $this->app->applicationProviderBinding($this->app));

             }

 

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

     public function handle()

     {

-        $this->app->register('routerResult',$this->callController());

+        $this->app->register('routerResult', $this->callController());

 

         //we call our services as controller

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

@@ -80,8 +80,8 @@ 
         $namespace = $this->getControllerNamespace();

 

         //utils make bind via dependency injection named as service container

-        $this->app->register('serviceConf',$this->app['fileSystem']->callFile(StaticPathModel::getServiceConf()));

-        $this->app->register('instanceController',$this->app->resolve($namespace));

+        $this->app->register('serviceConf', $this->app['fileSystem']->callFile(StaticPathModel::getServiceConf()));

+        $this->app->register('instanceController', $this->app->resolve($namespace));

     }

 

     /**

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

         // based on the serviceConf variable,

         // we are doing parameter bindings in the method context in the routeParameters array key.

-        $this->app->register('serviceConf','routeParameters',[$method=>$parameters]);

+        $this->app->register('serviceConf', 'routeParameters', [$method=>$parameters]);

 

     }

 

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

     public function setMethodNameViaDefine($methodName)

     {

-        define('methodName',strtolower($methodName));

+        define('methodName', strtolower($methodName));

     }

 

 

@@ -141,7 +141,7 @@ 
         $fromRoutes = Route::getRouteResolve();

         $method = $fromRoutes['method'] ?? $method;

 

-        $this->app->register('method',$method);

+        $this->app->register('method', $method);

         $this->app->register('routeParameters', $this->routeParametersAssign($this->resolveMethod($method)));

 

     }

src/resta/Router/CheckEndpointForAutoService.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
      * @param callable|null $func

      * @return string

      */

-    public function getNamespaceForAutoService($instance,callable $func = null)

+    public function getNamespaceForAutoService($instance, callable $func = null)

     {

         //get namespace for auto service

         $autoServiceNamespace = $instance->autoService();

@@ -21,7 +21,7 @@ 
         $configAutoServices = config('autoservices');

 

         //auto service is invoked if auto service is allowed for any class yada config.

-        if(class_exists($autoServiceNamespace) && $configAutoServices[strtolower(endpoint)]){

+        if (class_exists($autoServiceNamespace) && $configAutoServices[strtolower(endpoint)]) {

             return $autoServiceNamespace;

         }

 

src/resta/Router/RouteAccessiblePropertyTrait.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,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/Router/RouteWatch.php

Spacing +3 added lines, -3 removed lines

@@ -12,17 +12,17 @@
      */

     public function watch(callable $callback)

     {

-        if(config('app.watch')){

+        if (config('app.watch')) {

 

             // the memory usage component provides

             // a way to profile code.

             $memoryUsage = memory_get_usage();

 

             //get controller output

-            $controllerOutput=call_user_func($callback);

+            $controllerOutput = call_user_func($callback);

 

             //save to kernel for a variable named controller Watch

-            $this->app->register('controllerWatch', 'memory',memory_get_usage() - $memoryUsage);

+            $this->app->register('controllerWatch', 'memory', memory_get_usage()-$memoryUsage);

         }

 

         // if watch config is true; in this case

src/resta/Router/Route.php

Indentation +3 added lines, -3 removed lines

@@ -173,9 +173,9 @@
 

         // in the paths data,

         // we run the route mapper values ​​and the route files one by one.

-       foreach (self::$paths as $mapper=>$controller){

-           core()->fileSystem->callFile($mapper);

-       }

+        foreach (self::$paths as $mapper=>$controller){

+            core()->fileSystem->callFile($mapper);

+        }

     }

 

     /**

Spacing +34 added lines, -34 removed lines

@@ -43,13 +43,13 @@ 
      * @param $urlRoute

      * @return int|string

      */

-    private static function checkArrayEqual($patterns,$urlRoute)

+    private static function checkArrayEqual($patterns, $urlRoute)

     {

         // calculates the equality difference between

         // the route pattern and the urlRoute value.

-        foreach ($patterns as $key=>$pattern){

+        foreach ($patterns as $key=>$pattern) {

 

-            if(Utils::isArrayEqual($pattern,$urlRoute)){

+            if (Utils::isArrayEqual($pattern, $urlRoute)) {

                 return $key;

             }

         }

@@ -68,51 +68,51 @@ 
     {

         $routes = self::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];

             }

         }

 

-        foreach ($patternList as $key=>$pattern){

+        foreach ($patternList as $key=>$pattern) {

 

-            $pattern = array_filter($pattern,'strlen');

-            $diff = Arr::arrayDiffKey($pattern,$urlRoute);

+            $pattern = array_filter($pattern, 'strlen');

+            $diff = Arr::arrayDiffKey($pattern, $urlRoute);

 

-            if($diff){

+            if ($diff) {

 

                 $matches = true;

 

-                foreach ($pattern as $patternKey=>$patternValue){

-                    if(!preg_match('@\{(.*?)\}@is',$patternValue)){

-                        if($patternValue!==$urlRoute[$patternKey]){

+                foreach ($pattern as $patternKey=>$patternValue) {

+                    if (!preg_match('@\{(.*?)\}@is', $patternValue)) {

+                        if ($patternValue!==$urlRoute[$patternKey]) {

                             $matches = false;

                         }

                     }

                 }

 

-                if($matches){

+                if ($matches) {

 

-                    $isArrayEqual = self::checkArrayEqual($patternList,$urlRoute);

+                    $isArrayEqual = self::checkArrayEqual($patternList, $urlRoute);

 

-                    if($isArrayEqual===null){

+                    if ($isArrayEqual===null) {

                         return $key;

                     }

                     return $isArrayEqual;

                 }

             }

 

-            if(count($pattern)-1 == count(route())){

-                if(preg_match('@\{[a-z]+\?\}@is',end($pattern))){

+            if (count($pattern)-1==count(route())) {

+                if (preg_match('@\{[a-z]+\?\}@is', end($pattern))) {

                     return $key;

                 }

             }

@@ -132,11 +132,11 @@ 
         $patternResolve = self::getPatternResolve();

 

         //if routes data is available in pattern resolve.

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

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

 

             // if the incoming http value is

             // the same as the real request method, the data is processed.

-            if($routes['data'][$patternResolve]['http'] == strtolower(httpMethod)){

+            if ($routes['data'][$patternResolve]['http']==strtolower(httpMethod)) {

 

                 // we are set the solved pattern to a variable.

                 $resolve = $routes['data'][$patternResolve];

@@ -161,7 +161,7 @@ 
     {

         // we will record the path data for the route.

         // We set the routeMapper variables and the route path.

-        self::setPath(function(){

+        self::setPath(function() {

 

             // we are sending

             // the controller and routes.php path.

@@ -173,7 +173,7 @@ 
 

         // in the paths data,

         // we run the route mapper values ​​and the route files one by one.

-       foreach (self::$paths as $mapper=>$controller){

+       foreach (self::$paths as $mapper=>$controller) {

            core()->fileSystem->callFile($mapper);

        }

     }

@@ -187,7 +187,7 @@ 
     {

         $routeDefinitor = call_user_func($callback);

 

-        if(isset($routeDefinitor['controllerPath']) && isset($routeDefinitor['routePath'])){

+        if (isset($routeDefinitor['controllerPath']) && isset($routeDefinitor['routePath'])) {

 

             //the route paths to be saved to the mappers static property.

             static::$mappers['routePaths'][] = $routeDefinitor['routePath'];

@@ -195,22 +195,22 @@ 
 

             // if there is endpoint,

             // then only that endpoint is transferred into the path

-            if(defined('endpoint')){

+            if (defined('endpoint')) {

 

                 $routeName      = endpoint.'Route.php';

                 $routeMapper    = $routeDefinitor['routePath'].''.DIRECTORY_SEPARATOR.''.$routeName;

 

-                if(file_exists($routeMapper) && !isset(static::$paths[$routeMapper])){

+                if (file_exists($routeMapper) && !isset(static::$paths[$routeMapper])) {

                     static::$paths[$routeMapper] = $routeDefinitor['controllerPath'];

                 }

             }

-            else{

+            else {

 

                 // if there is no endpoint,

                 // all files in the path of the route are transferred to path.

                 $allFilesInThatRoutePath = Utils::glob($routeDefinitor['routePath']);

 

-                foreach ($allFilesInThatRoutePath as $item){

+                foreach ($allFilesInThatRoutePath as $item) {

                     static::$paths[$item] = $routeDefinitor['controllerPath'];

                 }

             }

@@ -224,13 +224,13 @@ 
      * @param $function

      * @param null $controller

      */

-    public static function setRoute($params,$function,$controller=null)

+    public static function setRoute($params, $function, $controller = null)

     {

-        [$pattern,$route]   = $params;

-        [$class,$method]    = explode("@",$route);

+        [$pattern, $route]   = $params;

+        [$class, $method]    = explode("@", $route);

 

         $patternList = array_values(

-            array_filter(explode("/",$pattern),'strlen')

+            array_filter(explode("/", $pattern), 'strlen')

         );

 

         static::$routes['pattern'][] = $patternList;

@@ -240,7 +240,7 @@ 
             'http'          => $function,

             'controller'    => $controller,

             'namespace'     => static::$namespace,

-            'endpoint'      => strtolower(str_replace(StaticPathList::$controllerBundleName,'',static::$namespace))

+            'endpoint'      => strtolower(str_replace(StaticPathList::$controllerBundleName, '', static::$namespace))

         ];

     }

 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -203,8 +203,7 @@
                 if(file_exists($routeMapper) && !isset(static::$paths[$routeMapper])){

                     static::$paths[$routeMapper] = $routeDefinitor['controllerPath'];

                 }

-            }

-            else{

+            } else{

 

                 // if there is no endpoint,

                 // all files in the path of the route are transferred to path.

src/resta/Router/KernelRouterProcess.php

Spacing +9 added lines, -9 removed lines

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

      * @var array $routerSpecification

      */

-    protected $routerSpecification=[

+    protected $routerSpecification = [

         'pickRouter',

         'stackRouter'

     ];

@@ -19,8 +19,8 @@ 
      */

     private function pickRouter()

     {

-        $singleton=core();

-        $singleton->routerSpecifications['router']=(isset($singleton->pick)) ? $singleton->pick[0] : $singleton->routerResult;

+        $singleton = core();

+        $singleton->routerSpecifications['router'] = (isset($singleton->pick)) ? $singleton->pick[0] : $singleton->routerResult;

     }

 

     /**

@@ -32,7 +32,7 @@ 
         //These are the customizations that are available in the routerSpecification object.

         //By running these individually, we assign reference values to the router variable,

         //which is the actual kernel object, so route customization takes place.

-        return $this->routerProcess(function($router){

+        return $this->routerProcess(function($router) {

             return $router;

         });

     }

@@ -44,17 +44,17 @@ 
     private function routerProcess(callable $callback)

     {

         //After running the router specification sequence one by one, we collect reference values for the kernel router.

-        array_walk($this->routerSpecification,[$this,'routerSpecification']);

+        array_walk($this->routerSpecification, [$this, 'routerSpecification']);

 

         //Then we return the routerSpecifications object that is assigned for the kernel to the router method.

-        return call_user_func_array($callback,[core()->routerSpecifications['router']]);

+        return call_user_func_array($callback, [core()->routerSpecifications['router']]);

     }

 

     /**

      * @param $specification

      * @param $key

      */

-    private function routerSpecification($specification,$key)

+    private function routerSpecification($specification, $key)

     {

         $this->{$specification}();

     }

@@ -71,8 +71,8 @@ 
         //if there is no singleton pick

         //If this is the case, we collect these values and assign them to the router variable.

         //if it is not, the router will send the default value to the output.

-        if(!isset($singleton->pick)){

-            $singleton->routerSpecifications['router']=(isset($singleton->stack)) ? $singleton->stack : $singleton->routerResult;

+        if (!isset($singleton->pick)) {

+            $singleton->routerSpecifications['router'] = (isset($singleton->stack)) ? $singleton->stack : $singleton->routerResult;

         }

     }

 

src/resta/Router/RouteHttpManager.php

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
     public static function delete(...$params) : void

     {

         // the DELETE method deletes the specified resource.

-        static::setRoute($params,__FUNCTION__,static::getTracePath());

+        static::setRoute($params, __FUNCTION__, static::getTracePath());

     }

 

     /**

@@ -28,7 +28,7 @@ 
     {

         // the GET method requests a representation of the specified resource.

         // Requests using GET should only retrieve data.

-        static::setRoute($params,__FUNCTION__,static::getTracePath());

+        static::setRoute($params, __FUNCTION__, static::getTracePath());

     }

 

     /**

@@ -58,7 +58,7 @@ 
     {

         // the POST method is used to submit an entity to the specified resource,

         // often causing a change in state or side effects on the server.

-        static::setRoute($params,__FUNCTION__,static::getTracePath());

+        static::setRoute($params, __FUNCTION__, static::getTracePath());

     }

 

     /**

@@ -71,7 +71,7 @@ 
     {

         // the PUT method replaces all current representations of

         // the target resource with the request payload.

-        static::setRoute($params,__FUNCTION__,static::getTracePath());

+        static::setRoute($params, __FUNCTION__, static::getTracePath());

     }

 

     /**

src/resta/Authenticate/AuthenticateContract.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      * @param bool $objectReturn

      * @return mixed

      */

-    public function login($credentials=array(),$objectReturn=false);

+    public function login($credentials = array(), $objectReturn = false);

 

     /**

      * @return mixed