From 69fa60b91c82dff92f12c820afea6254409997aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Wed, 29 Jan 2020 03:31:34 +0100 Subject: [PATCH] Added generateUrl method for getting assets (#3258) * Added generateUrl method for getting assets * Fix return types --- app/Helpers/GenerateUrl.php | 32 ++++++++++++++++++++++++++++ tests/Integration/UploadFileTest.php | 5 +++++ 2 files changed, 37 insertions(+) create mode 100644 app/Helpers/GenerateUrl.php diff --git a/app/Helpers/GenerateUrl.php b/app/Helpers/GenerateUrl.php new file mode 100644 index 000000000000..82c05b0a09d1 --- /dev/null +++ b/app/Helpers/GenerateUrl.php @@ -0,0 +1,32 @@ +disk)->url($document->path); + + if($url && $absolute) return url($url); + + if ($url) return $url; + + return null; +} \ No newline at end of file diff --git a/tests/Integration/UploadFileTest.php b/tests/Integration/UploadFileTest.php index 31bb992da3d6..3a2b4aca57b9 100644 --- a/tests/Integration/UploadFileTest.php +++ b/tests/Integration/UploadFileTest.php @@ -47,5 +47,10 @@ class UploadFileTest extends TestCase ); $this->assertNotNull($document); + + print_r([ + 'relative' => generateUrl($document), + 'full' => generateUrl($document, true) + ]); } }