From 196d8a116435e0c29b8b0acde3b32f4ca01904d2 Mon Sep 17 00:00:00 2001
From: Khoubza Younes <younes.khoubza@smile-maroc.com>
Date: Sun, 6 Dec 2020 17:29:32 +0100
Subject: [PATCH] update namespaces

---
 Notyf.php                                     | 10 ++++++
 NotyfBuilder.php                              | 13 ++++++++
 NotyfFactory.php                              | 32 +++++++++++++++++++
 .../NotyfRenderer.php => NotyfRenderer.php    | 19 ++++++++---
 Producer/NotyfProducer.php                    | 14 --------
 Tests/.gitkeep                                |  0
 composer.json                                 | 12 +++----
 7 files changed, 75 insertions(+), 25 deletions(-)
 create mode 100644 Notyf.php
 create mode 100644 NotyfBuilder.php
 create mode 100644 NotyfFactory.php
 rename Renderer/NotyfRenderer.php => NotyfRenderer.php (73%)
 delete mode 100644 Producer/NotyfProducer.php
 create mode 100644 Tests/.gitkeep

diff --git a/Notyf.php b/Notyf.php
new file mode 100644
index 00000000..a905234f
--- /dev/null
+++ b/Notyf.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Flasher\Notyf\Prime;
+
+use Flasher\Prime\Notification\Notification;
+
+final class Notyf extends Notification
+{
+
+}
diff --git a/NotyfBuilder.php b/NotyfBuilder.php
new file mode 100644
index 00000000..47461b5f
--- /dev/null
+++ b/NotyfBuilder.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Flasher\Notyf\Prime;
+
+use Flasher\Prime\Notification\NotificationBuilder;
+
+/**
+ * @method Pnotify getNotification()
+ */
+final class NotyfBuilder extends NotificationBuilder
+{
+
+}
diff --git a/NotyfFactory.php b/NotyfFactory.php
new file mode 100644
index 00000000..f5bf6fa1
--- /dev/null
+++ b/NotyfFactory.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Flasher\Notyf\Prime;
+
+use Flasher\Prime\Factory\AbstractFactory;
+
+final class NotyfFactory extends AbstractFactory
+{
+    /**
+     * @inheritDoc
+     */
+    public function createNotification()
+    {
+        return new Pnotify();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function createNotificationBuilder()
+    {
+        return new PnotifyBuilder($this->getEventDispatcher(), $this->createNotification(), 'notyf');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function supports($name = null, array $context = array())
+    {
+        return in_array($name, array(__CLASS__, 'notyf'));
+    }
+}
diff --git a/Renderer/NotyfRenderer.php b/NotyfRenderer.php
similarity index 73%
rename from Renderer/NotyfRenderer.php
rename to NotyfRenderer.php
index e1779805..c2400891 100644
--- a/Renderer/NotyfRenderer.php
+++ b/NotyfRenderer.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Flasher\Notyf\Prime\Renderer;
+namespace Flasher\Notyf\Prime;
 
 use Flasher\Prime\Config\ConfigInterface;
 use Flasher\Prime\Envelope;
-use Flasher\Prime\Renderer\HasGlobalOptionsInterface;
+use Flasher\Prime\Renderer\HasOptionsInterface;
 use Flasher\Prime\Renderer\HasScriptsInterface;
 use Flasher\Prime\Renderer\HasStylesInterface;
 use Flasher\Prime\Renderer\RendererInterface;
 
-class NotyfRenderer implements RendererInterface, HasScriptsInterface, HasStylesInterface, HasGlobalOptionsInterface
+final class NotyfRenderer implements RendererInterface, HasScriptsInterface, HasStylesInterface, HasOptionsInterface
 {
     /**
      * @var ConfigInterface
@@ -44,8 +44,7 @@ class NotyfRenderer implements RendererInterface, HasScriptsInterface, HasStyles
      */
     public function render(Envelope $envelope)
     {
-        $context = $envelope->getContext();
-        $options = isset($context['options']) ? $context['options'] : array();
+        $options = $envelope->getOptions();
 
         $options['message'] = $envelope->getMessage();
         $options['type'] = $envelope->getType();
@@ -73,4 +72,14 @@ class NotyfRenderer implements RendererInterface, HasScriptsInterface, HasStyles
     {
         return sprintf('if ("undefined" === typeof notyf) { var notyf = new Notyf(%s); }', json_encode($this->options));
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function supports($name = null, array $context = array())
+    {
+        return in_array($name, array(__CLASS__, 'notyf', 'Flasher\Notyf\Prime\NotyfFactory',
+                                     'Flasher\Notyf\Prime\Pnotify'
+        ));
+    }
 }
diff --git a/Producer/NotyfProducer.php b/Producer/NotyfProducer.php
deleted file mode 100644
index 934488a4..00000000
--- a/Producer/NotyfProducer.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Flasher\Notyf\Prime\Factory;
-
-final class NotyfProducer extends \Flasher\Prime\AbstractFlasher
-{
-    /**
-     * @inheritDoc
-     */
-    public function getRenderer()
-    {
-        return 'notyf';
-    }
-}
diff --git a/Tests/.gitkeep b/Tests/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/composer.json b/composer.json
index 3c6ca7a9..88d32aa1 100644
--- a/composer.json
+++ b/composer.json
@@ -26,19 +26,19 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher": "^1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.8.36"
+        "php-flasher/flasher": "dev-main"
     },
     "autoload": {
         "psr-4": {
-            "Flasher\\Notyf\\": "src"
+            "Flasher\\Notyf\\Prime\\": "",
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Flasher\\Notyf\\Tests\\": "tests/"
+            "Flasher\\Notyf\\prime\\Tests\\": "Tests/"
         }
     },
     "config": {