update workflows test yml

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: composer
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/workflows/tests.yaml

@@ -4,7 +4,7 @@ on:
     push:
     pull_request:
     schedule:
-        -   cron: '0 * * * *'
+        -   cron: '* * * * *'
 
 jobs:
     test:

.gitignore

@@ -1,5 +1,5 @@
-.idea/
-vendor/
+.idea
+vendor
 composer.lock
 .phpunit.result.cache
 .phpcs-cache

DependencyInjection/Configuration.php

@@ -26,59 +26,20 @@ final class Configuration implements ConfigurationInterface
                 ->arrayNode('scripts')
                     ->prototype('scalar')->end()
                     ->defaultValue(array(
-                        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                        'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.js',
-                        '/bundles/flashertoastr/flasher-toastr.js',
+                        'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                        'https://cdn.jsdelivr.net/npm/@flasher/flasher-toastr@0.1.3/dist/flasher-toastr.min.js',
                     ))
                 ->end()
                 ->arrayNode('styles')
                     ->prototype('scalar')->end()
-                    ->defaultValue(array(
-                        'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.css',
-                    ))
+                    ->defaultValue(array())
                 ->end()
                 ->arrayNode('options')
                     ->prototype('variable')->end()
                     ->ignoreExtraKeys(false)
                     ->defaultValue(array(
-                        'closeButton'       => true,
-                        'closeClass'        => 'toast-close-button',
-                        'closeDuration'     => 300,
-                        'closeEasing'       => 'swing',
-                        'closeHtml'         => '<button><i class="icon-off"></i></button>',
-                        'closeMethod'       => 'fadeOut',
-                        'closeOnHover'      => true,
-                        'containerId'       => 'toast-container',
-                        'debug'             => false,
-                        'escapeHtml'        => false,
-                        'extendedTimeOut'   => 10000,
-                        'hideDuration'      => 1000,
-                        'hideEasing'        => 'linear',
-                        'hideMethod'        => 'fadeOut',
-                        'iconClass'         => 'toast-info',
-                        'iconClasses'       => array(
-                            'error'   => 'toast-error',
-                            'info'    => 'toast-info',
-                            'success' => 'toast-success',
-                            'warning' => 'toast-warning',
-                        ),
-                        'messageClass'      => 'toast-message',
-                        'newestOnTop'       => false,
-                        'onHidden'          => null,
-                        'onShown'           => null,
-                        'positionClass'     => 'toast-top-right',
-                        'preventDuplicates' => false,
-                        'progressBar'       => true,
-                        'progressClass'     => 'toast-progress',
-                        'rtl'               => false,
-                        'showDuration'      => 300,
-                        'showEasing'        => 'swing',
-                        'showMethod'        => 'fadeIn',
-                        'tapToDismiss'      => true,
-                        'target'            => 'body',
-                        'timeOut'           => 5000,
-                        'titleClass'        => 'toast-title',
-                        'toastClass'        => 'toast',
+                       'progressBar' => true,
+                       'timeOut'     => 5000,
                     ))
                 ->end()
             ->end()

DependencyInjection/FlasherToastrExtension.php

@@ -2,44 +2,24 @@
 
 namespace Flasher\Toastr\Symfony\DependencyInjection;
 
+use Flasher\Symfony\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-final class FlasherToastrExtension extends Extension implements PrependExtensionInterface
+final class FlasherToastrExtension extends Extension
 {
     /**
-     * {@inheritdoc}
-     *
-     * @throws \Exception
+     * @inheritDoc
      */
-    public function load(array $configs, ContainerBuilder $container)
+    protected function getConfigFileLocator()
     {
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('config.yaml');
-
-        $configuration = new Configuration();
-        $this->processConfiguration($configuration, $configs);
+        return new FileLocator(__DIR__.'/../Resources/config');
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
-    public function prepend(ContainerBuilder $container)
+    protected function getConfigClass()
     {
-        if (!$container->hasExtension('flasher')) {
-            throw new \RuntimeException('[Flasher\Symfony\FlasherBundle] is not registered');
-        }
-
-        $configs = $container->getExtensionConfig($this->getAlias());
-        $config = $this->processConfiguration(new Configuration(), $configs);
-
-        $container->prependExtensionConfig('flasher', array(
-            'adapters' => array(
-                'toastr' => $config,
-            ),
-        ));
+        return new Configuration();
     }
 }

FlasherToastrBundle.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Flasher\Toastr\Symfony;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class FlasherToastrBundle extends Bundle
-{
-}

FlasherToastrSymfonyBundle.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Flasher\Toastr\Symfony;
+
+use Flasher\Toastr\Symfony\DependencyInjection\FlasherToastrExtension;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class FlasherToastrSymfonyBundle extends Bundle
+{
+    public function getContainerExtension()
+    {
+        return new FlasherToastrExtension();
+    }
+}

Resources/public/flasher-toastr.js

@@ -1,16 +0,0 @@
-PHPFlasher.addFactory('toastr', (function () {
-    'use strict';
-
-    var exports = {};
-
-    exports.render = function (data) {
-        var notification = data.notification;
-        toastr[notification.type](notification.message, notification.title, notification.options);
-    };
-
-    exports.renderOptions = function (options) {
-        toastr.options = options;
-    };
-
-    return exports;
-})());

Tests/DependencyInjection/ConfigurationTest.php

@@ -13,54 +13,15 @@ class ConfigurationTest extends TestCase
         $config = $this->process(array());
 
         $expected = array(
-            'scripts'                  => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js',
-                'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.js',
-                '/bundles/flashertoastr/flasher-toastr.js',
+            'scripts' => array(
+                'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
+                'https://cdn.jsdelivr.net/npm/@flasher/flasher-toastr@0.1.3/dist/flasher-toastr.min.js',
             ),
-            'styles'                   => array(
-                'https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.css',
-            ),
-            'options' =>array(
-                        'closeButton'       => true,
-                        'closeClass'        => 'toast-close-button',
-                        'closeDuration'     => 300,
-                        'closeEasing'       => 'swing',
-                        'closeHtml'         => '<button><i class="icon-off"></i></button>',
-                        'closeMethod'       => 'fadeOut',
-                        'closeOnHover'      => true,
-                        'containerId'       => 'toast-container',
-                        'debug'             => false,
-                        'escapeHtml'        => false,
-                        'extendedTimeOut'   => 10000,
-                        'hideDuration'      => 1000,
-                        'hideEasing'        => 'linear',
-                        'hideMethod'        => 'fadeOut',
-                        'iconClass'         => 'toast-info',
-                        'iconClasses'       => array(
-                            'error'   => 'toast-error',
-                            'info'    => 'toast-info',
-                            'success' => 'toast-success',
-                            'warning' => 'toast-warning',
-                        ),
-                        'messageClass'      => 'toast-message',
-                        'newestOnTop'       => false,
-                        'onHidden'          => null,
-                        'onShown'           => null,
-                        'positionClass'     => 'toast-top-right',
-                        'preventDuplicates' => false,
-                        'progressBar'       => true,
-                        'progressClass'     => 'toast-progress',
-                        'rtl'               => false,
-                        'showDuration'      => 300,
-                        'showEasing'        => 'swing',
-                        'showMethod'        => 'fadeIn',
-                        'tapToDismiss'      => true,
-                        'target'            => 'body',
-                        'timeOut'           => 5000,
-                        'titleClass'        => 'toast-title',
-                        'toastClass'        => 'toast',
-                    )
+            'styles' => array(),
+            'options' => array(
+                'progressBar' => true,
+                'timeOut' => 5000,
+            )
         );
 
         $this->assertSame($expected, $config);

Tests/DependencyInjection/FlasherToastrExtensionTest.php

@@ -4,9 +4,9 @@ namespace Flasher\Toastr\Symfony\Tests\DependencyInjection;
 
 use Flasher\Prime\Tests\TestCase;
 use Flasher\Symfony\DependencyInjection\FlasherExtension;
-use Flasher\Symfony\FlasherBundle;
+use Flasher\Symfony\FlasherSymfonyBundle;
 use Flasher\Toastr\Symfony\DependencyInjection\FlasherToastrExtension;
-use Flasher\Toastr\Symfony\FlasherToastrBundle;
+use Flasher\Toastr\Symfony\FlasherToastrSymfonyBundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class FlasherToastrExtensionTest extends TestCase
@@ -41,23 +41,16 @@ class FlasherToastrExtensionTest extends TestCase
         $this->assertSame('flasher.toastr', (string) $calls[1][1][1]);
     }
 
-    public function testConfigurationInjectedIntoFlasherConfig()
-    {
-        $container = $this->getContainer();
-        $config = $container->get('flasher.config');
-        $this->assertNotEmpty($config->get('adapters.toastr'));
-    }
-
     private function getRawContainer()
     {
         $container = new ContainerBuilder();
 
         $container->registerExtension(new FlasherExtension());
-        $flasherBundle = new FlasherBundle();
+        $flasherBundle = new FlasherSymfonyBundle();
         $flasherBundle->build($container);
 
         $container->registerExtension(new FlasherToastrExtension());
-        $adapterBundle = new FlasherToastrBundle();
+        $adapterBundle = new FlasherToastrSymfonyBundle();
         $adapterBundle->build($container);
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
@@ -70,6 +63,8 @@ class FlasherToastrExtensionTest extends TestCase
     private function getContainer()
     {
         $container = $this->getRawContainer();
+        $container->loadFromExtension('flasher', array());
+        $container->loadFromExtension('flasher_toastr', array());
         $container->compile();
 
         return $container;

composer.json.local

@@ -0,0 +1,75 @@
+{
+    "name": "php-flasher/flasher-toastr-symfony",
+    "type": "symfony-bundle",
+    "description": "PHP Flasher Symfony adapter for Toastr",
+    "keywords": [
+        "yoeunes",
+        "notify",
+        "php",
+        "laravel",
+        "symfony",
+        "Lumen",
+        "notifications",
+        "messages",
+        "alerts",
+        "pnotify",
+        "toastr ",
+        "bundle",
+        "flex"
+    ],
+    "homepage": "https://php-flasher.github.io/",
+    "authors": [
+        {
+            "name": "Younes Khoubza",
+            "email": "younes.khoubza@gmail.com",
+            "homepage": "https://github.com/yoeunes",
+            "role": "Developer"
+        }
+    ],
+    "license": "MIT",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../../Symfony",
+            "options": {
+                "symlink": true
+            }
+        },
+        {
+            "type": "path",
+            "url": "../Prime",
+            "options": {
+                "symlink": true
+            }
+        }
+    ],
+    "require": {
+        "php": ">=5.3",
+        "php-flasher/flasher-symfony": "@dev",
+        "php-flasher/flasher-toastr": "@dev"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Flasher\\Toastr\\Symfony\\": ""
+        },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Flasher\\Toastr\\Symfony\\Tests\\": "Tests/"
+        }
+    },
+    "config": {
+        "sort-packages": true,
+        "platform": {
+            "php": "5.3.10"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}