php-resta / resta-core

src/resta/Support/ClassAliasGroup.php

Indentation +18 added lines, -18 removed lines

@@ -7,32 +7,32 @@
     /**

      * @return mixed

      */

-   public function handle()

-   {

-       return $this->getConfigAliasGroup();

-   }

+    public function handle()

+    {

+        return $this->getConfigAliasGroup();

+    }

 

     /**

      * @return array

      */

-   public function getConfigAliasGroup()

-   {

-       $aliasGroup=app()->namespace()->config().'\AliasGroup';

-       if(class_exists($aliasGroup)){

-           return app()->resolve($aliasGroup)->handle();

-       }

-       return [];

-   }

+    public function getConfigAliasGroup()

+    {

+        $aliasGroup=app()->namespace()->config().'\AliasGroup';

+        if(class_exists($aliasGroup)){

+            return app()->resolve($aliasGroup)->handle();

+        }

+        return [];

+    }

 

     /**

      * @param $object

      * @param $name

      * @return void

      */

-   public static function setAlias($object,$name)

-   {

-       if((new $object) instanceof  $name === false){

-           class_alias($object,$name);

-       }

-   }

+    public static function setAlias($object,$name)

+    {

+        if((new $object) instanceof  $name === false){

+            class_alias($object,$name);

+        }

+    }

 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -17,8 +17,8 @@ 
      */

    public function getConfigAliasGroup()

    {

-       $aliasGroup=app()->namespace()->config().'\AliasGroup';

-       if(class_exists($aliasGroup)){

+       $aliasGroup = app()->namespace()->config().'\AliasGroup';

+       if (class_exists($aliasGroup)) {

            return app()->resolve($aliasGroup)->handle();

        }

        return [];

@@ -29,10 +29,10 @@ 
      * @param $name

      * @return void

      */

-   public static function setAlias($object,$name)

+   public static function setAlias($object, $name)

    {

-       if((new $object) instanceof  $name === false){

-           class_alias($object,$name);

+       if ((new $object) instanceof  $name===false) {

+           class_alias($object, $name);

        }

    }

 }
\ No newline at end of file

src/resta/Support/AppData/ServiceMiddlewareManager.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     public function exclude()

     {

         return [

-            'all'=>['hook','login','logout']

+            'all'=>['hook', 'login', 'logout']

         ];

     }

 }

src/resta/Support/Arr.php

Spacing +41 added lines, -41 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]);

             }

         }

 

src/resta/Support/VersionManager.php

Spacing +3 added lines, -3 removed lines

@@ -16,8 +16,8 @@ 
      */

     public static function getSupportedVersions()

     {

-        if(self::checkSupportedVersions()){

-            static::$supportedVersions = array_merge(static::$supportedVersions,static::supportedVersions());

+        if (self::checkSupportedVersions()) {

+            static::$supportedVersions = array_merge(static::$supportedVersions, static::supportedVersions());

         }

         return static::$supportedVersions;

     }

@@ -29,7 +29,7 @@ 
      */

     private static function checkSupportedVersions()

     {

-        return method_exists(static::class,'supportedVersions')

+        return method_exists(static::class, 'supportedVersions')

             && is_array(static::supportedVersions());

     }

 }
\ No newline at end of file

src/resta/Support/Command.php

Spacing +4 added lines, -4 removed lines

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

      * @param $args

      */

-    public function __construct($command,$args)

+    public function __construct($command, $args)

     {

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

         $this->arguments[]  = $args;

     }

@@ -35,11 +35,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/Support/ReflectionProcess.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
      */

     public function __construct($namespace = null)

     {

-        if($namespace!==null){

+        if ($namespace!==null) {

             $this->namespace = $namespace;

         }

     }

@@ -41,7 +41,7 @@ 
      */

     public function __invoke($namespace = null)

     {

-        if($namespace!==null){

+        if ($namespace!==null) {

             $this->namespace = $namespace;

         }

         return $this;

@@ -54,7 +54,7 @@ 
      */

     public function getReflectionClass()

     {

-        if(!isset(static::$singletons['reflectionClass'])){

+        if (!isset(static::$singletons['reflectionClass'])) {

             static::$singletons['reflectionClass'] = new \ReflectionClass($this->namespace);

         }

         return static::$singletons['reflectionClass'];

@@ -68,7 +68,7 @@ 
      */

     public function getReflectionMethod($method)

     {

-        return new \ReflectionMethod($this->namespace,$method);

+        return new \ReflectionMethod($this->namespace, $method);

     }

 

     /**

src/resta/Support/Dependencies.php

Spacing +2 added lines, -2 removed lines

@@ -7,14 +7,14 @@
     /**

      * @var array $bootLoaders

      */

-    protected static $bootLoaders = ['url','logger'];

+    protected static $bootLoaders = ['url', 'logger'];

 

     /**

      * load bootstrapper dependencies

      *

      * @param array $loaders

      */

-    public static function bootLoader($loaders=array())

+    public static function bootLoader($loaders = array())

     {

         app()->loadIfNotExistBoot($loaders);

     }

src/resta/Support/Traits/Macroable.php

Indentation +12 added lines, -12 removed lines

@@ -22,13 +22,13 @@ 
      * @param $class

      * @return mixed

      */

-   public function macro($class)

-   {

-       $this->class  = $class;

-       $this->macro = $this;

+    public function macro($class)

+    {

+        $this->class  = $class;

+        $this->macro = $this;

 

-       return $this;

-   }

+        return $this;

+    }

 

     /**

      * get macro property

@@ -36,10 +36,10 @@ 
      * @param $name

      * @return mixed

      */

-   public function __get($name)

-   {

-       return ClosureDispatcher::bind($this->class)->call(function() use($name){

-          return $this->{$name};

-       });

-   }

+    public function __get($name)

+    {

+        return ClosureDispatcher::bind($this->class)->call(function() use($name){

+            return $this->{$name};

+        });

+    }

 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      */

    public function macro($class)

    {

-       $this->class  = $class;

+       $this->class = $class;

        $this->macro = $this;

 

        return $this;

src/resta/Support/Str.php

Spacing +35 added lines, -35 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);

 

@@ -322,14 +322,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;

@@ -347,8 +347,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;

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

 

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

@@ -452,8 +452,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;

             }

         }

@@ -652,14 +652,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'],

                 ],

             ];

@@ -674,7 +674,7 @@ 
      */

     public static function slashToBackSlash($data)

     {

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

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

     }

 

     /**

@@ -682,25 +682,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());

         }

 

     }