php-resta / resta-core

src/resta/Router/Route.php

Spacing +20 added lines, -20 removed lines

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

      * @return int|string

      */

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

+    public 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,14 +68,14 @@ 
         // get routes data and the resolving pattern

         // Both are interrelated.

         $routes         = self::getRoutes();

-        $patternResolve = app()->resolve(RouteMatching::class,['route'=>new self()])->getPatternResolve();

+        $patternResolve = app()->resolve(RouteMatching::class, ['route'=>new 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];

@@ -100,7 +100,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.

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

         }

     }

@@ -126,7 +126,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'];

@@ -134,22 +134,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'];

                 }

             }

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

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

             'controller'    => $controller,

             'namespace'     => static::$namespace,

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

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

         ];

     }

 

@@ -189,10 +189,10 @@ 
      * @param null $value

      * @return bool

      */

-    public static function isMatchVaribleRegexPattern($value=null)

+    public static function isMatchVaribleRegexPattern($value = null)

     {

         // determines if the variable that can be used

         // in the route file meets the regex rule.

-        return (preg_match('@\{(.*?)\}@is',$value)) ? true : false;

+        return (preg_match('@\{(.*?)\}@is', $value)) ? true : false;

     }

 }
\ No newline at end of file

src/resta/Router/RouteMatching.php

Spacing +27 added lines, -27 removed lines

@@ -23,7 +23,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);
 
@@ -39,53 +39,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];
             }
         }
 
-        $patternList = $this->matchingUrlMethod($patternList,$urlRoute);
+        $patternList = $this->matchingUrlMethod($patternList, $urlRoute);
 
-        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(!$this->route->isMatchVaribleRegexPattern($patternValue)){
-                        if($patternValue!==$urlRoute[$patternKey]){
+                foreach ($pattern as $patternKey=>$patternValue) {
+                    if (!$this->route->isMatchVaribleRegexPattern($patternValue)) {
+                        if ($patternValue!==$urlRoute[$patternKey]) {
                             $matches = false;
                         }
                     }
                 }
 
-                if($matches){
+                if ($matches) {
 
-                    $isArrayEqual = $this->route->checkArrayEqual($patternList,$urlRoute);
+                    $isArrayEqual = $this->route->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;
                 }
             }
@@ -99,38 +99,38 @@ 
      * @param $urlMethod
      * @return array
      */
-    public function matchingUrlMethod($patterns,$urlMethod)
+    public function matchingUrlMethod($patterns, $urlMethod)
     {
-        if(isset($urlMethod[0])){
+        if (isset($urlMethod[0])) {
 
             $list = [];
 
-            foreach ($patterns as $key=>$pattern){
+            foreach ($patterns as $key=>$pattern) {
 
                 // if the initial value of the pattern data is present
                 // and the first value from urlmethod does not match
                 // and does not match the custom regex variable,
                 // we empty the contents of the data.
-                if(isset($pattern[0])){
-                    if($pattern[0] !== $urlMethod[0] && !$this->route->isMatchVaribleRegexPattern($pattern[0])){
+                if (isset($pattern[0])) {
+                    if ($pattern[0]!==$urlMethod[0] && !$this->route->isMatchVaribleRegexPattern($pattern[0])) {
                         $list[$key] = [];
                     }
                 }
 
                 // if the contents of the directory are not normally emptied,
                 // we continue to save the list according to keyin status.
-                if(!isset($list[$key])){
+                if (!isset($list[$key])) {
                     $list[$key] = $pattern;
                 }
 
                 // This is very important.
                 // Route matches can be variable-based or static string-based.
                 // In this case, we remove the other matches based on the static string match.
-                if(isset($pattern[0]) && $pattern[0]==$urlMethod[0]){
+                if (isset($pattern[0]) && $pattern[0]==$urlMethod[0]) {
 
                     // static matches will not be deleted retrospectively.
                     // this condition will check this.
-                    if($this->unset===false){
+                    if ($this->unset===false) {
                         unset($list);
                         $this->unset = true;
                     }