From 7bc1924269d70dc9f67b66797995b04ef08f0a0d Mon Sep 17 00:00:00 2001
From: Khoubza Younes <younes.khoubza@smile-maroc.com>
Date: Sun, 13 Dec 2020 12:58:35 +0100
Subject: [PATCH] fix tests for laravel 5.1

---
 composer.json                                 |  4 ++--
 phpunit.xml.dist                              | 10 ++++++++++
 .../ServiceProvider/Providers/Laravel.php     | 15 +++++++++++++-
 .../ServiceProvider/Providers/Laravel51.php   | 20 +++++++++++++++++++
 .../ServiceProviderManager.php                |  1 +
 5 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 src/Laravel/ServiceProvider/Providers/Laravel51.php

diff --git a/composer.json b/composer.json
index a223d072..076ab28a 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": ">=5.3",
         "ext-json": "*",
-        "illuminate/support": "5.0.*"
+        "illuminate/support": "5.1.*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.8.*",
@@ -30,7 +30,7 @@
     },
     "config": {
         "platform": {
-            "php": "5.4.0"
+            "php": "5.5.9"
         }
     },
     "minimum-stability": "dev"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 490e658d..459a22a5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -59,6 +59,16 @@
         <testsuite name="flasher pnotify symfony">
             <directory>src/Pnotify/Symfony</directory>
         </testsuite>
+
+        <testsuite name="flasher noty">
+            <directory>src/Noty/Prime</directory>
+        </testsuite>
+        <testsuite name="flasher noty laravel">
+            <directory>src/Noty/Laravel</directory>
+        </testsuite>
+        <testsuite name="flasher noty symfony">
+            <directory>src/Noty/Symfony</directory>
+        </testsuite>
     </testsuites>
     <filter>
         <whitelist>
diff --git a/src/Laravel/ServiceProvider/Providers/Laravel.php b/src/Laravel/ServiceProvider/Providers/Laravel.php
index 45a67cd0..5af3916a 100644
--- a/src/Laravel/ServiceProvider/Providers/Laravel.php
+++ b/src/Laravel/ServiceProvider/Providers/Laravel.php
@@ -112,10 +112,23 @@ class Laravel implements ServiceProviderInterface
 
     public function registerBladeDirectives()
     {
-        Blade::directive('flasher_render', function ($criteria = array()) {
+        $startsWith = function($haystack, $needle) {
+            return substr_compare($haystack, $needle, 0, strlen($needle)) === 0;
+        };
+
+        $endsWith = function($haystack, $needle) {
+            return substr_compare($haystack, $needle, -strlen($needle)) === 0;
+        };
+
+        Blade::directive('flasher_render', function ($criteria = array()) use($startsWith, $endsWith) {
+            if (!empty($criteria) && $startsWith($criteria, "(") && $endsWith($criteria, ")")) {
+                $criteria = substr($criteria, 1, -1);
+            }
+
             if (empty($criteria)) {
                 $criteria = "array()";
             }
+
             return "<?php echo app('flasher.renderer')->render($criteria, 'html'); ?>";
         });
     }
diff --git a/src/Laravel/ServiceProvider/Providers/Laravel51.php b/src/Laravel/ServiceProvider/Providers/Laravel51.php
new file mode 100644
index 00000000..712f3b58
--- /dev/null
+++ b/src/Laravel/ServiceProvider/Providers/Laravel51.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Flasher\Laravel\ServiceProvider\Providers;
+
+use Flasher\Laravel\FlasherServiceProvider;
+use Illuminate\Foundation\Application;
+
+final class Laravel51 extends Laravel
+{
+    public function shouldBeUsed()
+    {
+        return $this->app instanceof Application && 0 === strpos(Application::VERSION, '5.1');
+    }
+
+    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'))));
+    }
+}
diff --git a/src/Laravel/ServiceProvider/ServiceProviderManager.php b/src/Laravel/ServiceProvider/ServiceProviderManager.php
index d55913fd..506b30aa 100644
--- a/src/Laravel/ServiceProvider/ServiceProviderManager.php
+++ b/src/Laravel/ServiceProvider/ServiceProviderManager.php
@@ -15,6 +15,7 @@ final class ServiceProviderManager
     private $providers = array(
         'Flasher\Laravel\ServiceProvider\Providers\Laravel4',
         'Flasher\Laravel\ServiceProvider\Providers\Laravel50',
+        'Flasher\Laravel\ServiceProvider\Providers\Laravel51',
         'Flasher\Laravel\ServiceProvider\Providers\Laravel',
         'Flasher\Laravel\ServiceProvider\Providers\Lumen',
     );