Merge branch 'master' into 9.x

Author: dmitry-ivanov

src/Helpers/Artisan/BackgroundCommand.php

@@ -9,45 +9,29 @@ class BackgroundCommand
 {
     /**
      * The artisan command.
-     *
-     * @var string
      */
-    private $command;
+    private string $command;
 
     /**
      * The command which should be executed before.
-     *
-     * @var string
      */
-    private $before;
+    private string $before;
 
     /**
      * The command which should be executed after.
-     *
-     * @var string
      */
-    private $after;
+    private string $after;
 
     /**
      * Create background command by the given parameters.
-     *
-     * @param string $command
-     * @param string $before
-     * @param string $after
-     * @return \Illuminated\Helpers\Artisan\BackgroundCommand
      */
-    public static function factory(string $command, string $before = '', string $after = '')
+    public static function factory(string $command, string $before = '', string $after = ''): self
     {
         return new self($command, $before, $after);
     }
 
     /**
      * Create a new instance of the background command.
-     *
-     * @param string $command
-     * @param string $before
-     * @param string $after
-     * @return void
      */
     public function __construct(string $command, string $before = '', string $after = '')
     {
@@ -58,10 +42,8 @@ public function __construct(string $command, string $before = '', string $after
 
     /**
      * Run the command in background.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
         $command = $this->composeCommand();
 
@@ -74,10 +56,8 @@ public function run()
 
     /**
      * Compose the command.
-     *
-     * @return string
      */
-    protected function composeCommand()
+    protected function composeCommand(): string
     {
         return collect()
             ->when($this->before, function (Collection $collection) {
@@ -92,20 +72,16 @@ protected function composeCommand()
 
     /**
      * Get the path to PHP executable.
-     *
-     * @return string
      */
-    protected function getPhpExecutable()
+    protected function getPhpExecutable(): string
     {
         return (new PhpExecutableFinder)->find();
     }
 
     /**
      * Get the path to artisan.
-     *
-     * @return string
      */
-    protected function getArtisan()
+    protected function getArtisan(): string
     {
         return defined('ARTISAN_BINARY') ? ARTISAN_BINARY : 'artisan';
     }

src/Helpers/System/OS.php

@@ -6,10 +6,8 @@ class OS
 {
     /**
      * Check whether the operating system is Windows or not.
-     *
-     * @return bool
      */
-    public static function isWindows()
+    public static function isWindows(): bool
     {
         return stripos(php_uname(), 'windows') === 0;
     }

src/array.php

@@ -5,12 +5,8 @@
 if (!function_exists('array_except_value')) {
     /**
      * Remove the given values from the array.
-     *
-     * @param array $array
-     * @param mixed $except
-     * @return array
      */
-    function array_except_value(array $array, $except)
+    function array_except_value(array $array, mixed $except): array
     {
         if (!is_array($except)) {
             $except = [$except];
@@ -27,13 +23,8 @@ function array_except_value(array $array, $except)
 if (!function_exists('multiarray_set')) {
     /**
      * Set the value for each item of the multidimensional array using "dot" notation.
-     *
-     * @param array $multiarray
-     * @param mixed $key
-     * @param mixed $value
-     * @return array
      */
-    function multiarray_set(array &$multiarray, $key, $value)
+    function multiarray_set(array &$multiarray, mixed $key, mixed $value): array
     {
         foreach ($multiarray as &$array) {
             Arr::set($array, $key, $value);
@@ -48,14 +39,8 @@ function multiarray_set(array &$multiarray, $key, $value)
      * Sort the multidimensional array by several fields.
      *
      * Use either SORT_ASC or SORT_DESC for `sort` arguments.
-     *
-     * @param array $multiarray
-     * @param string $field1
-     * @param int $sort1
-     * @param null $_
-     * @return array
      */
-    function multiarray_sort_by(array $multiarray, $field1 = null, $sort1 = null, $_ = null)
+    function multiarray_sort_by(array $multiarray, mixed $field1 = null, mixed $sort1 = null, mixed $_ = null): array
     {
         $arguments = collect(func_get_args());
 

src/artisan.php

@@ -7,13 +7,8 @@
      * Call the given artisan console command in background.
      *
      * Code execution continues immediately, without waiting for results.
-     *
-     * @param string $command
-     * @param string $before
-     * @param string $after
-     * @return void
      */
-    function call_in_background(string $command, string $before = '', string $after = '')
+    function call_in_background(string $command, string $before = '', string $after = ''): void
     {
         BackgroundCommand::factory($command, $before, $after)->run();
     }

src/date.php

@@ -6,11 +6,8 @@
 if (!function_exists('to_default_timezone')) {
     /**
      * Convert the given datetime to the default timezone (see `app.timezone` config).
-     *
-     * @param mixed $datetime
-     * @return mixed
      */
-    function to_default_timezone($datetime)
+    function to_default_timezone(mixed $datetime): mixed
     {
         return empty($datetime)
             ? $datetime

src/db.php

@@ -6,10 +6,8 @@
 if (!function_exists('db_is_sqlite')) {
     /**
      * Check whether the default database connection driver is `sqlite` or not.
-     *
-     * @return bool
      */
-    function db_is_sqlite()
+    function db_is_sqlite(): bool
     {
         $connection = DB::getDefaultConnection();
 
@@ -20,10 +18,8 @@ function db_is_sqlite()
 if (!function_exists('db_is_mysql')) {
     /**
      * Check whether the default database connection driver is `mysql` or not.
-     *
-     * @return bool
      */
-    function db_is_mysql()
+    function db_is_mysql(): bool
     {
         $connection = DB::getDefaultConnection();
 
@@ -34,10 +30,8 @@ function db_is_mysql()
 if (!function_exists('db_mysql_now')) {
     /**
      * Get the current MySQL datetime.
-     *
-     * @return string
      */
-    function db_mysql_now()
+    function db_mysql_now(): string
     {
         return DB::selectOne('select now() as now')->now;
     }
@@ -46,11 +40,8 @@ function db_mysql_now()
 if (!function_exists('db_mysql_variable')) {
     /**
      * Get value of the specified MySQL variable.
-     *
-     * @param string $name
-     * @return string|false
      */
-    function db_mysql_variable(string $name)
+    function db_mysql_variable(string $name): string|false
     {
         return DB::selectOne('show variables where variable_name = ?', [$name])->Value ?? false;
     }

src/debug.php

@@ -3,10 +3,8 @@
 if (!function_exists('backtrace_as_string')) {
     /**
      * Get backtrace without arguments, as a string.
-     *
-     * @return string
      */
-    function backtrace_as_string()
+    function backtrace_as_string(): string
     {
         ob_start();
 
@@ -19,10 +17,8 @@ function backtrace_as_string()
 if (!function_exists('minimized_backtrace_as_string')) {
     /**
      * Get minimized backtrace, as a string.
-     *
-     * @return string
      */
-    function minimized_backtrace_as_string()
+    function minimized_backtrace_as_string(): string
     {
         $backtrace = explode("\n", backtrace_as_string());
 

src/filesystem.php

@@ -5,12 +5,8 @@
 if (!function_exists('relative_path')) {
     /**
      * Get a relative path for the given folders.
-     *
-     * @param string $to
-     * @param string $from
-     * @return string
      */
-    function relative_path(string $to, string $from)
+    function relative_path(string $to, string $from): string
     {
         return (new Filesystem)->makePathRelative(realpath($to), realpath($from));
     }

src/format.php

@@ -8,11 +8,8 @@
      * 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
-     *
-     * @param mixed $var
-     * @return string
      */
-    function get_dump($var)
+    function get_dump(mixed $var): string
     {
         $cloner = new VarCloner();
         $cloner->setMaxItems(-1);
@@ -35,12 +32,8 @@ function get_dump($var)
 if (!function_exists('format_bytes')) {
     /**
      * Format bytes into kilobytes, megabytes, gigabytes or terabytes.
-     *
-     * @param int $bytes
-     * @param int $precision
-     * @return string
      */
-    function format_bytes(int $bytes, int $precision = 2)
+    function format_bytes(int $bytes, int $precision = 2): string
     {
         $units = ['B', 'KB', 'MB', 'GB', 'TB'];
 
@@ -56,11 +49,8 @@ function format_bytes(int $bytes, int $precision = 2)
 if (!function_exists('format_xml')) {
     /**
      * Format the given XML string using new lines and indents.
-     *
-     * @param string $xml
-     * @return string
      */
-    function format_xml(string $xml)
+    function format_xml(string $xml): string
     {
         $dom = dom_import_simplexml(new SimpleXMLElement($xml))->ownerDocument;
 

src/json.php

@@ -3,12 +3,8 @@
 if (!function_exists('is_json')) {
     /**
      * Check whether the given value is a valid JSON-encoded string or not.
-     *
-     * @param mixed $value
-     * @param bool $return
-     * @return bool|array
      */
-    function is_json($value, bool $return = false)
+    function is_json(mixed $value, bool $return = false): array|bool
     {
         if (empty($value) || !is_string($value)) {
             return false;