From f07c999c9a3023c686da4664e4c4c2fba131b9f8 Mon Sep 17 00:00:00 2001 From: Khoubza Younes Date: Sun, 13 Dec 2020 12:01:32 +0100 Subject: [PATCH] run adapters test on laravel --- composer.json | 19 +++++----- src/Laravel/FlasherServiceProvider.php | 2 +- .../ServiceProvider/Providers/Laravel.php | 8 ++--- .../ServiceProvider/Providers/Laravel4.php | 36 ++++++++++++++++--- .../ServiceProvider/Providers/Laravel50.php | 35 ++++++++++++++++-- .../ServiceProvider/Providers/Lumen.php | 2 +- .../Tests/FlasherServiceProviderTest.php | 3 ++ .../Laravel/FlasherNotyServiceProvider.php | 3 +- .../ServiceProvider/Providers/Laravel.php | 2 +- .../ServiceProvider/Providers/Laravel4.php | 2 +- .../ServiceProvider/Providers/Lumen.php | 2 +- .../Laravel/FlasherNotyfServiceProvider.php | 3 +- .../ServiceProvider/Providers/Laravel.php | 2 +- .../ServiceProvider/Providers/Laravel4.php | 2 +- .../ServiceProvider/Providers/Lumen.php | 2 +- .../Laravel/FlasherPnotifyServiceProvider.php | 3 +- .../ServiceProvider/Providers/Laravel.php | 2 +- .../ServiceProvider/Providers/Laravel4.php | 2 +- .../ServiceProvider/Providers/Lumen.php | 2 +- src/Prime/composer.json | 3 ++ src/Prime/helpers.php | 15 ++++++++ .../FlasherSweetAlertServiceProvider.php | 3 +- .../ServiceProvider/Providers/Laravel.php | 2 +- .../ServiceProvider/Providers/Laravel4.php | 2 +- .../ServiceProvider/Providers/Lumen.php | 2 +- .../Laravel/FlasherToastrServiceProvider.php | 3 +- .../ServiceProvider/Providers/Laravel.php | 2 +- .../ServiceProvider/Providers/Laravel4.php | 2 +- .../ServiceProvider/Providers/Lumen.php | 2 +- 29 files changed, 121 insertions(+), 47 deletions(-) create mode 100644 src/Prime/helpers.php diff --git a/composer.json b/composer.json index 4dba7749..a223d072 100644 --- a/composer.json +++ b/composer.json @@ -14,20 +14,23 @@ "require": { "php": ">=5.3", "ext-json": "*", - "illuminate/support": "^4.0|^5.0|^6.0|^7.0|^8.0", - "symfony/config": "^2.7|^3.0|^4.0|^5.0", - "symfony/dependency-injection": "^2.7|^3.0|^4.0|^5.0", - "symfony/http-kernel": "^2.7|^3.0|^4.0|^5.0", - "symfony/yaml": "^2.7|^3.0|^4.0|^5.0", - "twig/twig": "^1.34|^2.0|^3.0" + "illuminate/support": "5.0.*" }, - "require-dev": { + "require-dev": { "phpunit/phpunit": "4.8.*", - "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" + "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" }, "autoload": { "psr-4": { "Flasher\\": "src/" + }, + "files": [ + "src/Prime/helpers.php" + ] + }, + "config": { + "platform": { + "php": "5.4.0" } }, "minimum-stability": "dev" diff --git a/src/Laravel/FlasherServiceProvider.php b/src/Laravel/FlasherServiceProvider.php index 504bb403..df1d0b98 100644 --- a/src/Laravel/FlasherServiceProvider.php +++ b/src/Laravel/FlasherServiceProvider.php @@ -33,7 +33,7 @@ final class FlasherServiceProvider extends ServiceProvider public function provides() { return array( - 'flasher.factory', + 'flasher', ); } diff --git a/src/Laravel/ServiceProvider/Providers/Laravel.php b/src/Laravel/ServiceProvider/Providers/Laravel.php index 3d735fdb..45a67cd0 100644 --- a/src/Laravel/ServiceProvider/Providers/Laravel.php +++ b/src/Laravel/ServiceProvider/Providers/Laravel.php @@ -33,7 +33,7 @@ class Laravel implements ServiceProviderInterface public function publishConfig(FlasherServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $provider->publishes(array($source => config_path('flasher.php')), 'config'); @@ -42,13 +42,13 @@ class Laravel implements ServiceProviderInterface public function publishAssets(FlasherServiceProvider $provider) { - $provider->publishes(array(__DIR__.'/../../Resources/public' => public_path('vendor/php-flasher/flasher/assets/js')), 'public'); + $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/public') => public_path(flasher_path('vendor/php-flasher/flasher/assets/js'))), 'public'); } public function publishTranslations(FlasherServiceProvider $provider) { - $provider->loadTranslationsFrom(__DIR__.'/../../Resources/lang', 'flasher'); - $provider->publishes(array(__DIR__.'/../../Resources/lang' => resource_path('lang/vendor/flasher'))); + $provider->loadTranslationsFrom(flasher_path(__DIR__.'/../../Resources/lang'), 'flasher'); + $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/lang') => resource_path(flasher_path('lang/vendor/flasher')))); } public function registerServices() diff --git a/src/Laravel/ServiceProvider/Providers/Laravel4.php b/src/Laravel/ServiceProvider/Providers/Laravel4.php index 82c672c9..b1d9a99e 100644 --- a/src/Laravel/ServiceProvider/Providers/Laravel4.php +++ b/src/Laravel/ServiceProvider/Providers/Laravel4.php @@ -2,10 +2,11 @@ namespace Flasher\Laravel\ServiceProvider\Providers; +use Flasher\Laravel\Config\Config; use Flasher\Laravel\FlasherServiceProvider; use Illuminate\Foundation\Application; use Illuminate\Support\Facades\Blade; -use Flasher\Laravel\Config\Config; +use Illuminate\View\Compilers\BladeCompiler; final class Laravel4 extends Laravel { @@ -16,13 +17,17 @@ final class Laravel4 extends Laravel public function publishConfig(FlasherServiceProvider $provider) { - $provider->package('php-flasher/flasher-laravel', 'flasher', __DIR__.'/../../Resources'); + $provider->package('php-flasher/flasher-laravel', 'flasher', flasher_path(__DIR__.'/../../Resources')); } public function publishAssets(FlasherServiceProvider $provider) { } + public function publishTranslations(FlasherServiceProvider $provider) + { + } + public function registerServices() { $this->app->singleton('flasher.config', function (Application $app) { @@ -34,10 +39,31 @@ final class Laravel4 extends Laravel public function registerBladeDirectives() { - Blade::extend(function ($view, $compiler) { - $pattern = $compiler->createPlainMatcher('flasher_render(.*)'); + $startsWith = function($haystack, $needle) { + return substr_compare($haystack, $needle, 0, strlen($needle)) === 0; + }; - return preg_replace($pattern, "$1render($2, 'html'); ?>", $view); + $endsWith = function($haystack, $needle) { + return substr_compare($haystack, $needle, -strlen($needle)) === 0; + }; + + Blade::extend(function ($view, BladeCompiler $compiler) use ($startsWith, $endsWith) { + $pattern = $compiler->createPlainMatcher('flasher_render(.*)'); + $matches = array(); + + preg_match($pattern, $view, $matches); + + $value = $matches[2]; + + if (!empty($value) && $startsWith($value, "(") && $endsWith($value, ")")) { + $value = substr($value, 1, -1); + } + + if (empty($value)) { + $value = "array()"; + } + + return str_replace("%criteria%", $value, $matches[1] . "render(%criteria%, 'html'); ?>"); }); } } diff --git a/src/Laravel/ServiceProvider/Providers/Laravel50.php b/src/Laravel/ServiceProvider/Providers/Laravel50.php index ca050cdb..ca7de456 100644 --- a/src/Laravel/ServiceProvider/Providers/Laravel50.php +++ b/src/Laravel/ServiceProvider/Providers/Laravel50.php @@ -2,8 +2,10 @@ namespace Flasher\Laravel\ServiceProvider\Providers; +use Flasher\Laravel\FlasherServiceProvider; use Illuminate\Foundation\Application; use Illuminate\Support\Facades\Blade; +use Illuminate\View\Compilers\BladeCompiler; final class Laravel50 extends Laravel { @@ -12,12 +14,39 @@ final class Laravel50 extends Laravel return $this->app instanceof Application && 0 === strpos(Application::VERSION, '5.0'); } + public function publishTranslations(FlasherServiceProvider $provider) + { + $provider->loadTranslationsFrom(flasher_path(__DIR__.'/../../Resources/lang'), 'flasher'); + $provider->publishes(array(flasher_path(__DIR__.'/../../Resources/lang') => base_path(flasher_path('resources/lang/vendor/flasher')))); + } + public function registerBladeDirectives() { - Blade::extend(function ($view, $compiler) { - $pattern = $compiler->createPlainMatcher('flasher_render(.*)'); + $startsWith = function($haystack, $needle) { + return substr_compare($haystack, $needle, 0, strlen($needle)) === 0; + }; - return preg_replace($pattern, "$1render($2, 'html'); ?>", $view); + $endsWith = function($haystack, $needle) { + return substr_compare($haystack, $needle, -strlen($needle)) === 0; + }; + + Blade::extend(function ($view, BladeCompiler $compiler) use ($startsWith, $endsWith) { + $pattern = $compiler->createPlainMatcher('flasher_render(.*)'); + $matches = array(); + + preg_match($pattern, $view, $matches); + + $value = $matches[2]; + + if (!empty($value) && $startsWith($value, "(") && $endsWith($value, ")")) { + $value = substr($value, 1, -1); + } + + if (empty($value)) { + $value = "array()"; + } + + return str_replace("%criteria%", $value, $matches[1] . "render(%criteria%, 'html'); ?>"); }); } } diff --git a/src/Laravel/ServiceProvider/Providers/Lumen.php b/src/Laravel/ServiceProvider/Providers/Lumen.php index 0c3ed5a9..5ab828bd 100644 --- a/src/Laravel/ServiceProvider/Providers/Lumen.php +++ b/src/Laravel/ServiceProvider/Providers/Lumen.php @@ -14,7 +14,7 @@ final class Lumen extends Laravel public function publishConfig(FlasherServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../../Resources/config/config.php')) ?: $raw; $this->app->configure('flasher'); diff --git a/src/Laravel/Tests/FlasherServiceProviderTest.php b/src/Laravel/Tests/FlasherServiceProviderTest.php index 4aefa3d2..972b6151 100644 --- a/src/Laravel/Tests/FlasherServiceProviderTest.php +++ b/src/Laravel/Tests/FlasherServiceProviderTest.php @@ -22,6 +22,9 @@ final class FlasherServiceProviderTest extends TestCase /** @var BladeCompiler $blade */ $blade = $this->app->make('view')->getEngineResolver()->resolve('blade')->getCompiler(); + $this->assertEquals("render(array(), 'html'); ?>", $blade->compileString('@flasher_render')); $this->assertEquals("render(array(), 'html'); ?>", $blade->compileString('@flasher_render()')); + $this->assertEquals("render(array(), 'html'); ?>", $blade->compileString('@flasher_render(array())')); + $this->assertEquals("render(array(\"priority\" => array(\"min\" => 4, \"max\" => 5)), 'html'); ?>", $blade->compileString('@flasher_render(array("priority" => array("min" => 4, "max" => 5)))')); } } diff --git a/src/Noty/Laravel/FlasherNotyServiceProvider.php b/src/Noty/Laravel/FlasherNotyServiceProvider.php index c7f3e63b..0a3ba574 100644 --- a/src/Noty/Laravel/FlasherNotyServiceProvider.php +++ b/src/Noty/Laravel/FlasherNotyServiceProvider.php @@ -31,8 +31,7 @@ final class FlasherNotyServiceProvider extends ServiceProvider public function provides() { return array( - 'flasher.factory.noty', - 'flasher.renderer.noty', + 'flasher.noty', ); } diff --git a/src/Noty/Laravel/ServiceProvider/Providers/Laravel.php b/src/Noty/Laravel/ServiceProvider/Providers/Laravel.php index 1a8abca6..4731d8af 100644 --- a/src/Noty/Laravel/ServiceProvider/Providers/Laravel.php +++ b/src/Noty/Laravel/ServiceProvider/Providers/Laravel.php @@ -24,7 +24,7 @@ class Laravel implements ServiceProviderInterface public function publishConfig(FlasherNotyServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $provider->publishes(array($source => config_path('flasher_noty.php')), 'config'); diff --git a/src/Noty/Laravel/ServiceProvider/Providers/Laravel4.php b/src/Noty/Laravel/ServiceProvider/Providers/Laravel4.php index 7a09c81d..03bc8e41 100644 --- a/src/Noty/Laravel/ServiceProvider/Providers/Laravel4.php +++ b/src/Noty/Laravel/ServiceProvider/Providers/Laravel4.php @@ -14,7 +14,7 @@ final class Laravel4 extends Laravel public function publishConfig(FlasherNotyServiceProvider $provider) { - $provider->package('php-flasher/flasher-noty-laravel', 'flasher_noty', __DIR__.'/../../Resources'); + $provider->package('php-flasher/flasher-noty-laravel', 'flasher_noty', flasher_path(__DIR__.'/../../Resources')); } public function mergeConfigFromNoty() diff --git a/src/Noty/Laravel/ServiceProvider/Providers/Lumen.php b/src/Noty/Laravel/ServiceProvider/Providers/Lumen.php index b2dbefb6..00dc3e28 100644 --- a/src/Noty/Laravel/ServiceProvider/Providers/Lumen.php +++ b/src/Noty/Laravel/ServiceProvider/Providers/Lumen.php @@ -14,7 +14,7 @@ final class Lumen extends Laravel public function publishConfig(FlasherNotyServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $this->app->configure('flasher_noty'); diff --git a/src/Notyf/Laravel/FlasherNotyfServiceProvider.php b/src/Notyf/Laravel/FlasherNotyfServiceProvider.php index 0d9a0fb8..004fd94b 100644 --- a/src/Notyf/Laravel/FlasherNotyfServiceProvider.php +++ b/src/Notyf/Laravel/FlasherNotyfServiceProvider.php @@ -31,8 +31,7 @@ class FlasherNotyfServiceProvider extends ServiceProvider public function provides() { return array( - 'flasher.factory.notyf', - 'flasher.renderer.notyf', + 'flasher.notyf', ); } diff --git a/src/Notyf/Laravel/ServiceProvider/Providers/Laravel.php b/src/Notyf/Laravel/ServiceProvider/Providers/Laravel.php index 1ad8f4b2..fecf324e 100644 --- a/src/Notyf/Laravel/ServiceProvider/Providers/Laravel.php +++ b/src/Notyf/Laravel/ServiceProvider/Providers/Laravel.php @@ -24,7 +24,7 @@ class Laravel implements ServiceProviderInterface public function publishConfig(FlasherNotyfServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $provider->publishes(array($source => config_path('flasher_notyf.php')), 'config'); diff --git a/src/Notyf/Laravel/ServiceProvider/Providers/Laravel4.php b/src/Notyf/Laravel/ServiceProvider/Providers/Laravel4.php index c3d9d0c7..c7219fa7 100644 --- a/src/Notyf/Laravel/ServiceProvider/Providers/Laravel4.php +++ b/src/Notyf/Laravel/ServiceProvider/Providers/Laravel4.php @@ -14,7 +14,7 @@ final class Laravel4 extends Laravel public function publishConfig(FlasherNotyfServiceProvider $provider) { - $provider->package('php-flasher/flasher-notyf-laravel', 'flasher_notyf', __DIR__.'/../../Resources'); + $provider->package('php-flasher/flasher-notyf-laravel', 'flasher_notyf', flasher_path(__DIR__.'/../../Resources')); } public function mergeConfigFromNotyf() diff --git a/src/Notyf/Laravel/ServiceProvider/Providers/Lumen.php b/src/Notyf/Laravel/ServiceProvider/Providers/Lumen.php index 7d1d37f0..cfbf502b 100644 --- a/src/Notyf/Laravel/ServiceProvider/Providers/Lumen.php +++ b/src/Notyf/Laravel/ServiceProvider/Providers/Lumen.php @@ -14,7 +14,7 @@ final class Lumen extends Laravel public function publishConfig(FlasherNotyfServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $this->app->configure('flasher_notyf'); diff --git a/src/Pnotify/Laravel/FlasherPnotifyServiceProvider.php b/src/Pnotify/Laravel/FlasherPnotifyServiceProvider.php index 6c4d14c8..3912a282 100644 --- a/src/Pnotify/Laravel/FlasherPnotifyServiceProvider.php +++ b/src/Pnotify/Laravel/FlasherPnotifyServiceProvider.php @@ -31,8 +31,7 @@ final class FlasherPnotifyServiceProvider extends ServiceProvider public function provides() { return array( - 'flasher.factory.pnotify', - 'flasher.renderer.pnotify', + 'flasher.pnotify', ); } diff --git a/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel.php b/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel.php index 295d0135..64e09b78 100644 --- a/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel.php +++ b/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel.php @@ -24,7 +24,7 @@ class Laravel implements ServiceProviderInterface public function publishConfig(FlasherPnotifyServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $provider->publishes(array($source => config_path('flasher_pnotify.php')), 'config'); diff --git a/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel4.php b/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel4.php index 851201df..2e7158f2 100644 --- a/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel4.php +++ b/src/Pnotify/Laravel/ServiceProvider/Providers/Laravel4.php @@ -14,7 +14,7 @@ final class Laravel4 extends Laravel public function publishConfig(FlasherPnotifyServiceProvider $provider) { - $provider->package('php-flasher/flasher-pnotify-laravel', 'notify_pnotify', __DIR__.'/../../Resources'); + $provider->package('php-flasher/flasher-pnotify-laravel', 'flasher_pnotify', flasher_path(__DIR__.'/../../Resources')); } public function mergeConfigFromPnotify() diff --git a/src/Pnotify/Laravel/ServiceProvider/Providers/Lumen.php b/src/Pnotify/Laravel/ServiceProvider/Providers/Lumen.php index a7740778..4ab456af 100644 --- a/src/Pnotify/Laravel/ServiceProvider/Providers/Lumen.php +++ b/src/Pnotify/Laravel/ServiceProvider/Providers/Lumen.php @@ -14,7 +14,7 @@ final class Lumen extends Laravel public function publishConfig(FlasherPnotifyServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $this->app->configure('flasher_pnotify'); diff --git a/src/Prime/composer.json b/src/Prime/composer.json index 8b6c22ef..85791df3 100644 --- a/src/Prime/composer.json +++ b/src/Prime/composer.json @@ -38,6 +38,9 @@ "psr-4": { "Flasher\\Prime\\": "" }, + "files": [ + "helpers.php" + ], "exclude-from-classmap": [ "/Tests/" ] diff --git a/src/Prime/helpers.php b/src/Prime/helpers.php new file mode 100644 index 00000000..f9e5bf35 --- /dev/null +++ b/src/Prime/helpers.php @@ -0,0 +1,15 @@ +publishes(array($source => config_path('flasher_sweet_alert.php')), 'config'); diff --git a/src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel4.php b/src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel4.php index 20ad74f4..0a95e963 100644 --- a/src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel4.php +++ b/src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel4.php @@ -14,7 +14,7 @@ final class Laravel4 extends Laravel public function publishConfig(FlasherSweetAlertServiceProvider $provider) { - $provider->package('php-flasher/flasher-sweet_alert-laravel', 'flasher_sweet_alert', __DIR__.'/../../Resources'); + $provider->package('php-flasher/flasher-sweet_alert-laravel', 'flasher_sweet_alert', flasher_path(__DIR__.'/../../Resources')); } public function mergeConfigFromSweetAlert() diff --git a/src/SweetAlert/Laravel/ServiceProvider/Providers/Lumen.php b/src/SweetAlert/Laravel/ServiceProvider/Providers/Lumen.php index 49527245..adcb6e5d 100644 --- a/src/SweetAlert/Laravel/ServiceProvider/Providers/Lumen.php +++ b/src/SweetAlert/Laravel/ServiceProvider/Providers/Lumen.php @@ -14,7 +14,7 @@ final class Lumen extends Laravel public function publishConfig(FlasherSweetAlertServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $this->app->configure('flasher_sweet_alert'); diff --git a/src/Toastr/Laravel/FlasherToastrServiceProvider.php b/src/Toastr/Laravel/FlasherToastrServiceProvider.php index a501d6a4..38e4315e 100644 --- a/src/Toastr/Laravel/FlasherToastrServiceProvider.php +++ b/src/Toastr/Laravel/FlasherToastrServiceProvider.php @@ -31,8 +31,7 @@ final class FlasherToastrServiceProvider extends ServiceProvider public function provides() { return array( - 'flasher.factory.toastr', - 'flasher.renderer.toastr', + 'flasher.toastr', ); } diff --git a/src/Toastr/Laravel/ServiceProvider/Providers/Laravel.php b/src/Toastr/Laravel/ServiceProvider/Providers/Laravel.php index 1d5c9849..e8174435 100644 --- a/src/Toastr/Laravel/ServiceProvider/Providers/Laravel.php +++ b/src/Toastr/Laravel/ServiceProvider/Providers/Laravel.php @@ -24,7 +24,7 @@ class Laravel implements ServiceProviderInterface public function publishConfig(FlasherToastrServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $provider->publishes(array($source => config_path('flasher_toastr.php')), 'config'); diff --git a/src/Toastr/Laravel/ServiceProvider/Providers/Laravel4.php b/src/Toastr/Laravel/ServiceProvider/Providers/Laravel4.php index 3b6ed0f0..11b1d21b 100644 --- a/src/Toastr/Laravel/ServiceProvider/Providers/Laravel4.php +++ b/src/Toastr/Laravel/ServiceProvider/Providers/Laravel4.php @@ -14,7 +14,7 @@ final class Laravel4 extends Laravel public function publishConfig(FlasherToastrServiceProvider $provider) { - $provider->package('php-flasher/flasher-toastr-laravel', 'flasher_toastr', __DIR__.'/../../Resources'); + $provider->package('php-flasher/flasher-toastr-laravel', 'flasher_toastr', flasher_path(__DIR__.'/../../Resources')); } public function mergeConfigFromToastr() diff --git a/src/Toastr/Laravel/ServiceProvider/Providers/Lumen.php b/src/Toastr/Laravel/ServiceProvider/Providers/Lumen.php index ffb2023a..72a3471b 100644 --- a/src/Toastr/Laravel/ServiceProvider/Providers/Lumen.php +++ b/src/Toastr/Laravel/ServiceProvider/Providers/Lumen.php @@ -14,7 +14,7 @@ final class Lumen extends Laravel public function publishConfig(FlasherToastrServiceProvider $provider) { - $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw; + $source = realpath($raw = flasher_path(__DIR__.'/../../Resources/config/config.php')) ?: $raw; $this->app->configure('flasher_toastr');