Merge branch 'master' into 7.x

# Conflicts:
#	README.md

Author: dmitry-ivanov

README.md

@@ -26,7 +26,7 @@ function array_except_value(array $array, $except)
 
 if (!function_exists('multiarray_set')) {
     /**
-     * Set value for each item of the multidimensional array using "dot" notation.
+     * Set the value for each item of the multidimensional array using "dot" notation.
      *
      * @param array $multiarray
      * @param mixed $key

src/array.php

@@ -5,7 +5,7 @@
 
 if (!function_exists('to_default_timezone')) {
     /**
-     * Convert datetime to the default timezone (`app.timezone` config parameter).
+     * Convert the given datetime to the default timezone (see `app.timezone` config).
      *
      * @param mixed $datetime
      * @return mixed

src/date.php

@@ -4,7 +4,7 @@
 
 if (!function_exists('relative_path')) {
     /**
-     * Get relative path for the given folders.
+     * Get a relative path for the given folders.
      *
      * @param string $to
      * @param string $from

src/filesystem.php

@@ -5,7 +5,7 @@
 
 if (!function_exists('get_dump')) {
     /**
-     * Get nicely formatted string representation of the variable, using Symfony VarDumper Component.
+     * Get a nicely formatted string representation of the variable, using the Symfony VarDumper Component.
      *
      * @see https://symfony.com/doc/current/components/var_dumper/introduction.html
      *
@@ -55,7 +55,7 @@ function format_bytes(int $bytes, int $precision = 2)
 
 if (!function_exists('format_xml')) {
     /**
-     * Format XML string using new lines and indents.
+     * Format the given XML string using new lines and indents.
      *
      * @param string $xml
      * @return string

src/format.php

@@ -4,17 +4,17 @@
     /**
      * Check whether the given value is a valid JSON-encoded string or not.
      *
-     * @param mixed $string
+     * @param mixed $value
      * @param bool $return
      * @return bool|array
      */
-    function is_json($string, bool $return = false)
+    function is_json($value, bool $return = false)
     {
-        if (empty($string) || !is_string($string)) {
+        if (empty($value) || !is_string($value)) {
             return false;
         }
 
-        $decoded = json_decode($string, true);
+        $decoded = json_decode($value, true);
         if (json_last_error() !== JSON_ERROR_NONE) {
             return false;
         }

src/json.php

@@ -2,10 +2,12 @@
 
 if (!function_exists('str_lower')) {
     /**
-     * Convert string to lowercase, assuming it's using the `UTF-8` encoding.
+     * Convert string to lowercase, assuming it's in the `UTF-8` encoding.
      *
      * @param string $string
      * @return string
+     *
+     * @deprecated Use Illuminate\Support\Str::lower() instead.
      */
     function str_lower(string $string)
     {
@@ -15,10 +17,12 @@ function str_lower(string $string)
 
 if (!function_exists('str_upper')) {
     /**
-     * Convert string to uppercase, assuming it's using the `UTF-8` encoding.
+     * Convert string to uppercase, assuming it's in the `UTF-8` encoding.
      *
      * @param string $string
      * @return string
+     *
+     * @deprecated Use Illuminate\Support\Str::upper() instead.
      */
     function str_upper(string $string)
     {

src/str.php

@@ -4,7 +4,7 @@
 
 if (!function_exists('xml_to_array')) {
     /**
-     * Convert XML string to array.
+     * Convert the given XML to array.
      *
      * @param SimpleXMLElement|string $xml
      * @return array
@@ -21,7 +21,7 @@ function xml_to_array($xml)
 
 if (!function_exists('array_to_xml')) {
     /**
-     * Convert array to XML string.
+     * Convert the given array to XML string.
      *
      * @param array $array
      * @param string $rootElement