From 7dd2b7fc55a294d8c06c6dbe9a8484cae07bc6ac Mon Sep 17 00:00:00 2001 From: s-damian Date: Sun, 29 Sep 2024 17:42:45 +0200 Subject: [PATCH 1/3] Fix conflicts with ading function_exists in Support functions --- src/Illuminate/Support/functions.php | 54 +++++++++++++++------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/src/Illuminate/Support/functions.php b/src/Illuminate/Support/functions.php index 2472dfafff9a..6e76446d0c50 100644 --- a/src/Illuminate/Support/functions.php +++ b/src/Illuminate/Support/functions.php @@ -6,32 +6,36 @@ use Illuminate\Support\Defer\DeferredCallbackCollection; use Illuminate\Support\Process\PhpExecutableFinder; -/** - * Defer execution of the given callback. - * - * @param callable|null $callback - * @param string|null $name - * @param bool $always - * @return \Illuminate\Support\Defer\DeferredCallback - */ -function defer(?callable $callback = null, ?string $name = null, bool $always = false) -{ - if ($callback === null) { - return app(DeferredCallbackCollection::class); - } +if (! function_exists('defer')) { + /** + * Defer execution of the given callback. + * + * @param callable|null $callback + * @param string|null $name + * @param bool $always + * @return \Illuminate\Support\Defer\DeferredCallback + */ + function defer(?callable $callback = null, ?string $name = null, bool $always = false) + { + if ($callback === null) { + return app(DeferredCallbackCollection::class); + } - return tap( - new DeferredCallback($callback, $name, $always), - fn ($deferred) => app(DeferredCallbackCollection::class)[] = $deferred - ); + return tap( + new DeferredCallback($callback, $name, $always), + fn ($deferred) => app(DeferredCallbackCollection::class)[] = $deferred + ); + } } -/** - * Determine the PHP Binary. - * - * @return string - */ -function php_binary() -{ - return (new PhpExecutableFinder)->find(false) ?: 'php'; +if (! function_exists('defer')) { + /** + * Determine the PHP Binary. + * + * @return string + */ + function php_binary() + { + return (new PhpExecutableFinder)->find(false) ?: 'php'; + } } From a9653466e24d76430929c8fa4b1d3898d5c3069d Mon Sep 17 00:00:00 2001 From: s-damian Date: Sun, 29 Sep 2024 18:45:31 +0200 Subject: [PATCH 2/3] Fix with php_binary --- src/Illuminate/Support/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Support/functions.php b/src/Illuminate/Support/functions.php index 6e76446d0c50..5bdf86d69a17 100644 --- a/src/Illuminate/Support/functions.php +++ b/src/Illuminate/Support/functions.php @@ -28,7 +28,7 @@ function defer(?callable $callback = null, ?string $name = null, bool $always = } } -if (! function_exists('defer')) { +if (! function_exists('php_binary')) { /** * Determine the PHP Binary. * From d2daee8e466d574a3fc65708aa015e56cbdc859a Mon Sep 17 00:00:00 2001 From: s-damian Date: Sun, 29 Sep 2024 18:58:27 +0200 Subject: [PATCH 3/3] Fix with namespace --- src/Illuminate/Support/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Illuminate/Support/functions.php b/src/Illuminate/Support/functions.php index 5bdf86d69a17..3fc76f87151e 100644 --- a/src/Illuminate/Support/functions.php +++ b/src/Illuminate/Support/functions.php @@ -6,7 +6,7 @@ use Illuminate\Support\Defer\DeferredCallbackCollection; use Illuminate\Support\Process\PhpExecutableFinder; -if (! function_exists('defer')) { +if (! function_exists('Illuminate\Support\defer')) { /** * Defer execution of the given callback. * @@ -28,7 +28,7 @@ function defer(?callable $callback = null, ?string $name = null, bool $always = } } -if (! function_exists('php_binary')) { +if (! function_exists('Illuminate\Support\php_binary')) { /** * Determine the PHP Binary. *