php-resta / resta-core

src/resta/Support/Str.php

Spacing +37 added lines, -37 removed lines

@@ -35,7 +35,7 @@ 
      */

     public static function after($subject, $search)

     {

-        return $search === '' ? $subject : array_reverse(explode($search, $subject, 2))[0];

+        return $search==='' ? $subject : array_reverse(explode($search, $subject, 2))[0];

     }

 

     /**

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

         $languageSpecific = static::languageSpecificCharsArray($language);

 

-        if (! is_null($languageSpecific)) {

+        if (!is_null($languageSpecific)) {

             $value = str_replace($languageSpecific[0], $languageSpecific[1], $value);

         }

 

@@ -69,7 +69,7 @@ 
      */

     public static function before($subject, $search)

     {

-        return $search === '' ? $subject : explode($search, $subject)[0];

+        return $search==='' ? $subject : explode($search, $subject)[0];

     }

 

     /**

@@ -96,8 +96,8 @@ 
      */

     public static function contains($haystack, $needles)

     {

-        foreach ((array) $needles as $needle) {

-            if ($needle !== '' && mb_strpos($haystack, $needle) !== false) {

+        foreach ((array)$needles as $needle) {

+            if ($needle!=='' && mb_strpos($haystack, $needle)!==false) {

                 return true;

             }

         }

@@ -114,8 +114,8 @@ 
      */

     public static function endsWith($haystack, $needles)

     {

-        foreach ((array) $needles as $needle) {

-            if (mb_substr($haystack, -mb_strlen($needle)) === (string) $needle) {

+        foreach ((array)$needles as $needle) {

+            if (mb_substr($haystack, -mb_strlen($needle))===(string)$needle) {

                 return true;

             }

         }

@@ -146,7 +146,7 @@ 
      */

     public static function is($pattern, $value)

     {

-        $patterns = is_array($pattern) ? $pattern : (array) $pattern;

+        $patterns = is_array($pattern) ? $pattern : (array)$pattern;

 

         if (empty($patterns)) {

             return false;

@@ -156,7 +156,7 @@ 
             // If the given value is an exact match we can of course return true right

             // from the beginning. Otherwise, we will translate asterisks and do an

             // actual pattern match against the two strings to see if they match.

-            if ($pattern == $value) {

+            if ($pattern==$value) {

                 return true;

             }

 

@@ -167,7 +167,7 @@ 
             // pattern such as "library/*", making any string check convenient.

             $pattern = str_replace('\*', '.*', $pattern);

 

-            if (preg_match('#^'.$pattern.'\z#u', $value) === 1) {

+            if (preg_match('#^'.$pattern.'\z#u', $value)===1) {

                 return true;

             }

         }

@@ -212,7 +212,7 @@ 
      */

     public static function limit($value, $limit = 100, $end = '...')

     {

-        if (mb_strwidth($value, 'UTF-8') <= $limit) {

+        if (mb_strwidth($value, 'UTF-8')<=$limit) {

             return $value;

         }

 

@@ -238,9 +238,9 @@ 
      * @param string $case

      * @return string

      */

-    public static function crop($value,$crop,$case='lower')

+    public static function crop($value, $crop, $case = 'lower')

     {

-        return static::$case(str_replace($crop,'',$value));

+        return static::$case(str_replace($crop, '', $value));

     }

 

     /**

@@ -255,7 +255,7 @@ 
     {

         preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $value, $matches);

 

-        if (! isset($matches[0]) || static::length($value) === static::length($matches[0])) {

+        if (!isset($matches[0]) || static::length($value)===static::length($matches[0])) {

             return $value;

         }

 

@@ -284,8 +284,8 @@ 
     {

         $string = '';

 

-        while (($len = strlen($string)) < $length) {

-            $size = $length - $len;

+        while (($len = strlen($string))<$length) {

+            $size = $length-$len;

 

             $bytes = random_bytes($size);

 

@@ -305,10 +305,10 @@ 
      */

     public static function replaceWordArray($word, $replace, $subject)

     {

-        if(is_array($word)){

+        if (is_array($word)) {

 

             foreach ($word as $value) {

-                $subject = str_replace($value,$replace,$subject);

+                $subject = str_replace($value, $replace, $subject);

             }

         }

 

@@ -342,14 +342,14 @@ 
      */

     public static function replaceFirst($search, $replace, $subject)

     {

-        if ($search == '') {

+        if ($search=='') {

             return $subject;

         }

 

         $position = mb_strpos($subject, $search);

 

-        if ($position !== false) {

-            return mb_substr($subject, 0, $position).$replace.mb_substr($subject, $position + mb_strlen($search));

+        if ($position!==false) {

+            return mb_substr($subject, 0, $position).$replace.mb_substr($subject, $position+mb_strlen($search));

         }

 

         return $subject;

@@ -367,8 +367,8 @@ 
     {

         $position = mb_strrpos($subject, $search);

 

-        if ($position !== false) {

-            return mb_substr($subject, 0, $position).$replace.mb_substr($subject, $position + mb_strlen($search));

+        if ($position!==false) {

+            return mb_substr($subject, 0, $position).$replace.mb_substr($subject, $position+mb_strlen($search));

         }

 

         return $subject;

@@ -423,7 +423,7 @@ 
         $title = static::ascii($title, $language);

 

         // Convert all dashes/underscores into separator

-        $flip = $separator == '-' ? '_' : '-';

+        $flip = $separator=='-' ? '_' : '-';

 

         $title = preg_replace('!['.preg_quote($flip).']+!u', $separator, $title);

 

@@ -454,7 +454,7 @@ 
             return static::$snakeCache[$key][$delimiter];

         }

 

-        if (! ctype_lower($value)) {

+        if (!ctype_lower($value)) {

             $value = preg_replace('/\s+/u', '', ucwords($value));

 

             $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));

@@ -472,8 +472,8 @@ 
      */

     public static function startsWith($haystack, $needles)

     {

-        foreach ((array) $needles as $needle) {

-            if ($needle !== '' && mb_substr($haystack, 0, mb_strlen($needle)) === (string) $needle) {

+        foreach ((array)$needles as $needle) {

+            if ($needle!=='' && mb_substr($haystack, 0, mb_strlen($needle))===(string)$needle) {

                 return true;

             }

         }

@@ -672,14 +672,14 @@ 
     {

         static $languageSpecific;

 

-        if (! isset($languageSpecific)) {

+        if (!isset($languageSpecific)) {

             $languageSpecific = [

                 'bg' => [

                     ['х', 'Х', 'щ', 'Щ', 'ъ', 'Ъ', 'ь', 'Ь'],

                     ['h', 'H', 'sht', 'SHT', 'a', 'А', 'y', 'Y'],

                 ],

                 'de' => [

-                    ['ä',  'ö',  'ü',  'Ä',  'Ö',  'Ü'],

+                    ['ä', 'ö', 'ü', 'Ä', 'Ö', 'Ü'],

                     ['ae', 'oe', 'ue', 'AE', 'OE', 'UE'],

                 ],

             ];

@@ -694,7 +694,7 @@ 
      */

     public static function slashToBackSlash($data)

     {

-        return str_replace("\\","/",$data);

+        return str_replace("\\", "/", $data);

     }

 

     /**

@@ -702,25 +702,25 @@ 
      * @param string $explode

      * @return array

      */

-    public static function stringToArray($string,$explode=".")

+    public static function stringToArray($string, $explode = ".")

     {

-        return explode($explode,$string);

+        return explode($explode, $string);

     }

 

     /**

      * @param null $removeCharacter

      * @return null|string|string[]

      */

-    public static function removeCharacterFromUri($removeCharacter=null)

+    public static function removeCharacterFromUri($removeCharacter = null)

     {

-        if($removeCharacter!==null){

+        if ($removeCharacter!==null) {

             $query = request()->query->all();

 

-            if(count($query)=='1' && isset($query[$removeCharacter])){

-                return preg_replace('@'.$removeCharacter.'=(.*)|\?@is','',fullUrl());

+            if (count($query)=='1' && isset($query[$removeCharacter])) {

+                return preg_replace('@'.$removeCharacter.'=(.*)|\?@is', '', fullUrl());

             }

 

-            return preg_replace('@'.$removeCharacter.'=\d+\&|\&'.$removeCharacter.'=\d+@is','',fullUrl());

+            return preg_replace('@'.$removeCharacter.'=\d+\&|\&'.$removeCharacter.'=\d+@is', '', fullUrl());

         }

 

     }

src/resta/Router/Route.php

Spacing +27 added lines, -27 removed lines

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

             }

         }

@@ -69,17 +69,17 @@ 
         // 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();

 

         // we set the route variables for the route assistant.

         self::updateRouteParameters($patternResolve);

 

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

@@ -106,22 +106,22 @@ 
     {

         $list = [];

 

-        if(isset(static::$routes['pattern'][$patternResolvedKey])){

+        if (isset(static::$routes['pattern'][$patternResolvedKey])) {

 

             $routeParameters = static::$routes['pattern'][$patternResolvedKey];

             $route = route();

 

-            foreach($routeParameters as $key=>$param){

+            foreach ($routeParameters as $key=>$param) {

 

-                $param = Str::replaceWordArray(['{','}','?'],'',$param);

+                $param = Str::replaceWordArray(['{', '}', '?'], '', $param);

 

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

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

                     $list[$param] = $route[$key];

                 }

             }

         }

 

-        app()->register('routeParams',$list);

+        app()->register('routeParams', $list);

     }

 

     /**

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

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

         }

     }

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

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

                 }

             }

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

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

             'controller'    => $controller,

             'namespace'     => static::$namespace,

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

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

         ];

     }

 

@@ -222,11 +222,11 @@ 
      * @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;

     }

 

 

@@ -236,11 +236,11 @@ 
      * @param null $value

      * @return bool

      */

-    public static function isOptionalVaribleRegexPattern($value=null)

+    public static function isOptionalVaribleRegexPattern($value = null)

     {

         // determines if the variable that can be used

         // in the route file meets the regex rule.

-        return preg_match('@\{[a-z]+\?\}@is',$value) ? true : false;

+        return preg_match('@\{[a-z]+\?\}@is', $value) ? true : false;

     }

 

 

src/resta/Container/GraceContainer.php

Spacing +8 added lines, -8 removed lines

@@ -48,18 +48,18 @@ 
      *

      * @throws \ReflectionException

      */

-    protected function getNameContainers($parameter,$param)

+    protected function getNameContainers($parameter, $param)

     {

         // If the parameter contains a route variable.

         // We do a custom bind for the route

-        if($this->checkNameContainer($parameter)){

+        if ($this->checkNameContainer($parameter)) {

 

             // we do the name control for the container here,

             // and if we have the name container we are checking, we make a handle make bind.

             $nameContainers = $this->nameContainers[$parameter->getName()];

-            return app()->resolve($nameContainers,[

+            return app()->resolve($nameContainers, [

                 'reflection' => $this->reflection

-            ])->resolveContainer($parameter->getDefaultValue(),$param);

+            ])->resolveContainer($parameter->getDefaultValue(), $param);

         }

 

         return [];

@@ -72,17 +72,17 @@ 
      *

      * @throws \ReflectionException

      */

-    public function graceContainerBuilder($parameter,$param)

+    public function graceContainerBuilder($parameter, $param)

     {

         // if the parameter is an object

         // but not a container object.

         // we do some useful logic bind for user benefit.

-        if($parameter->getType()!==null){

-            return app()->resolve(RepositoryContainer::class)->handle($parameter,$param);

+        if ($parameter->getType()!==null) {

+            return app()->resolve(RepositoryContainer::class)->handle($parameter, $param);

         }

 

         // In particular, name container values can be specified and

         // they are injected directly into the methods contextually.

-        return $this->getNameContainers($parameter,$param);

+        return $this->getNameContainers($parameter, $param);

     }

 }
\ No newline at end of file