leviathonbeast/php-flasher
1
0
Fork 0
mirror of https://github.com/php-flasher/php-flasher.git synced 2026-03-31 15:07:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

run adapters test on laravel

Browse Source
This commit is contained in:
Khoubza Younes
2020-12-13 12:01:32 +01:00
parent 3eb1944711
commit f07c999c9a
29 changed files with 121 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+11 -8
View File
@@ -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"
src/Laravel/FlasherServiceProvider.php
+1 -1
View File
@@ -33,7 +33,7 @@ final class FlasherServiceProvider extends ServiceProvider
public function provides()
{
return array(
'flasher.factory',
'flasher',
);
}
src/Laravel/ServiceProvider/Providers/Laravel.php
+4 -4
View File
@@ -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()
src/Laravel/ServiceProvider/Providers/Laravel4.php
+31 -5
View File
@@ -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, "$1<?php echo app('flasher.renderer')->render($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] . "<?php echo app('flasher.renderer')->render(%criteria%, 'html'); ?>");
});
}
}
src/Laravel/ServiceProvider/Providers/Laravel50.php
+32 -3
View File
@@ -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, "$1<?php echo app('flasher.renderer')->render($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] . "<?php echo app('flasher.renderer')->render(%criteria%, 'html'); ?>");
});
}
}
src/Laravel/ServiceProvider/Providers/Lumen.php
+1 -1
View File
@@ -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');
src/Laravel/Tests/FlasherServiceProviderTest.php
+3
View File
@@ -22,6 +22,9 @@ final class FlasherServiceProviderTest extends TestCase
/** @var BladeCompiler $blade */
$blade = $this->app->make('view')->getEngineResolver()->resolve('blade')->getCompiler();
$this->assertEquals("<?php echo app('flasher.renderer')->render(array(), 'html'); ?>", $blade->compileString('@flasher_render'));
$this->assertEquals("<?php echo app('flasher.renderer')->render(array(), 'html'); ?>", $blade->compileString('@flasher_render()'));
$this->assertEquals("<?php echo app('flasher.renderer')->render(array(), 'html'); ?>", $blade->compileString('@flasher_render(array())'));
$this->assertEquals("<?php echo app('flasher.renderer')->render(array(\"priority\" => array(\"min\" => 4, \"max\" => 5)), 'html'); ?>", $blade->compileString('@flasher_render(array("priority" => array("min" => 4, "max" => 5)))'));
}
}
src/Noty/Laravel/FlasherNotyServiceProvider.php
+1 -2
View File
@@ -31,8 +31,7 @@ final class FlasherNotyServiceProvider extends ServiceProvider
public function provides()
{
return array(
'flasher.factory.noty',
'flasher.renderer.noty',
'flasher.noty',
);
}
src/Noty/Laravel/ServiceProvider/Providers/Laravel.php
+1 -1
View File
@@ -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');
src/Noty/Laravel/ServiceProvider/Providers/Laravel4.php
+1 -1
View File
@@ -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()
src/Noty/Laravel/ServiceProvider/Providers/Lumen.php
+1 -1
View File
@@ -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');
src/Notyf/Laravel/FlasherNotyfServiceProvider.php
+1 -2
View File
@@ -31,8 +31,7 @@ class FlasherNotyfServiceProvider extends ServiceProvider
public function provides()
{
return array(
'flasher.factory.notyf',
'flasher.renderer.notyf',
'flasher.notyf',
);
}
src/Notyf/Laravel/ServiceProvider/Providers/Laravel.php
+1 -1
View File
@@ -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');
src/Notyf/Laravel/ServiceProvider/Providers/Laravel4.php
+1 -1
View File
@@ -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()
src/Notyf/Laravel/ServiceProvider/Providers/Lumen.php
+1 -1
View File
@@ -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');
src/Pnotify/Laravel/FlasherPnotifyServiceProvider.php
+1 -2
View File
@@ -31,8 +31,7 @@ final class FlasherPnotifyServiceProvider extends ServiceProvider
public function provides()
{
return array(
'flasher.factory.pnotify',
'flasher.renderer.pnotify',
'flasher.pnotify',
);
}
src/Pnotify/Laravel/ServiceProvider/Providers/Laravel.php
+1 -1
View File
@@ -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');
src/Pnotify/Laravel/ServiceProvider/Providers/Laravel4.php
+1 -1
View File
@@ -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()
src/Pnotify/Laravel/ServiceProvider/Providers/Lumen.php
+1 -1
View File
@@ -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');
src/Prime/composer.json
+3
View File
@@ -38,6 +38,9 @@
"psr-4": {
"Flasher\\Prime\\": ""
},
"files": [
"helpers.php"
],
"exclude-from-classmap": [
"/Tests/"
]
src/Prime/helpers.php
+15
View File
@@ -0,0 +1,15 @@
<?php
if (!function_exists('flasher_path')) {
/**
* normalize paths for linux and windows
*
* @param string $path
*
* @return string
*/
function flasher_path($path = '')
{
return str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
}
}
src/SweetAlert/Laravel/FlasherSweetAlertServiceProvider.php
+1 -2
View File
@@ -31,8 +31,7 @@ final class FlasherSweetAlertServiceProvider extends ServiceProvider
public function provides()
{
return array(
'flasher.factory.sweet_alert',
'flasher.renderer.sweet_alert',
'flasher.sweet_alert',
);
}
src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel.php
+1 -1
View File
@@ -24,7 +24,7 @@ class Laravel implements ServiceProviderInterface
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;
$provider->publishes(array($source => config_path('flasher_sweet_alert.php')), 'config');
src/SweetAlert/Laravel/ServiceProvider/Providers/Laravel4.php
+1 -1
View File
@@ -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()
src/SweetAlert/Laravel/ServiceProvider/Providers/Lumen.php
+1 -1
View File
@@ -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');
src/Toastr/Laravel/FlasherToastrServiceProvider.php
+1 -2
View File
@@ -31,8 +31,7 @@ final class FlasherToastrServiceProvider extends ServiceProvider
public function provides()
{
return array(
'flasher.factory.toastr',
'flasher.renderer.toastr',
'flasher.toastr',
);
}
src/Toastr/Laravel/ServiceProvider/Providers/Laravel.php
+1 -1
View File
@@ -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');
src/Toastr/Laravel/ServiceProvider/Providers/Laravel4.php
+1 -1
View File
@@ -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()
src/Toastr/Laravel/ServiceProvider/Providers/Lumen.php
+1 -1
View File
@@ -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');