php-resta / resta-core

src/resta/Router/RouteMatching.php

Spacing +30 added lines, -30 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,16 +125,16 @@ 
      * @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)){
-            return array_search(max($scored),$scored);
+        if (count($scored)) {
+            return array_search(max($scored), $scored);
         }
 
         return null;
@@ -152,8 +152,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;
                 }
             }

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']);

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.