fix symfony version compare

.editorconfig

@@ -0,0 +1,15 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

.github/CONTRIBUTING.md

@@ -0,0 +1,55 @@
+# Contributing
+
+Contributions are **welcome** and will be fully **credited**.
+
+Please read and understand the contribution guide before creating an issue or pull request.
+
+## Etiquette
+
+This project is open source, and as such, the maintainers give their free time to build and maintain the source code
+held within. They make the code freely available in the hope that it will be of use to other developers. It would be
+extremely unfair for them to suffer abuse or anger for their hard work.
+
+Please be considerate towards maintainers when raising issues or presenting pull requests. Let's show the
+world that developers are civilized and selfless people.
+
+It's the duty of the maintainer to ensure that all submissions to the project are of sufficient
+quality to benefit the project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used.
+
+## Viability
+
+When requesting or submitting new features, first consider whether it might be useful to others. Open
+source projects are used by many developers, who may have entirely different needs to your own. Think about
+whether or not your feature is likely to be used by other users of the project.
+
+## Procedure
+
+Before filing an issue:
+
+- Attempt to replicate the problem, to ensure that it wasn't a coincidental incident.
+- Check to make sure your feature suggestion isn't already present within the project.
+- Check the pull requests tab to ensure that the bug doesn't have a fix in progress.
+- Check the pull requests tab to ensure that the feature isn't already in progress.
+
+Before submitting a pull request:
+
+- Check the codebase to ensure that your feature doesn't already exist.
+- Check the pull requests to ensure that another person hasn't already submitted the feature or fix.
+
+## Requirements
+
+If the project maintainer has any additional requirements, you will find them listed here.
+
+- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](https://pear.php.net/package/PHP_CodeSniffer).
+
+- **Add tests!** - Your patch won't be accepted if it doesn't have tests.
+
+- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
+
+- **Consider our release cycle** - We try to follow [SemVer v2.0.0](https://semver.org/). Randomly breaking public APIs is not an option.
+
+- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
+
+- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
+
+**Happy coding**!

.github/SECURITY.md

@@ -0,0 +1,3 @@
+# Security Policy
+
+If you discover any security related issues, please email younes.khoubza@gmail.com instead of using the issue tracker.

.github/workflows/tests.yaml

@@ -1,103 +0,0 @@
-name: Running tests
-
-on:
-    push:
-    pull_request:
-    schedule:
-        -   cron: '* * * * *'
-
-jobs:
-    test:
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: true
-            matrix:
-                symfony: [5.2.*, 5.1.*, 5.0.*, 4.4.*, 4.3.*, 4.2.*, 4.1.*, 4.0.*, 3.4.*, 3.3.*, 3.2.*, 3.1.*, 3.0.*, 2.8.*, 2.7.*]
-                include:
-                    -   symfony: 5.2.*
-                        php: 7.2
-                        phpunit: 8.3.*
-
-                    -   symfony: 5.1.*
-                        php: 7.2
-                        phpunit: 8.3.*
-
-                    -   symfony: 5.0.*
-                        php: 7.2
-                        phpunit: 8.3.*
-
-                    -   symfony: 4.4.*
-                        php: 7.1
-                        phpunit: 7.0.*
-
-                    -   symfony: 4.3.*
-                        php: 7.1
-                        phpunit: 7.0.*
-
-                    -   symfony: 4.2.*
-                        php: 7.1
-                        phpunit: 7.0.*
-
-                    -   symfony: 4.1.*
-                        php: 7.1
-                        phpunit: 7.0.*
-
-                    -   symfony: 4.0.*
-                        php: 7.1
-                        phpunit: 7.0.*
-
-                    -   symfony: 3.4.*
-                        php: 5.5
-                        phpunit: 4.8.36
-
-                    -   symfony: 3.3.*
-                        php: 5.5
-                        phpunit: 4.8.36
-
-                    -   symfony: 3.2.*
-                        php: 5.5
-                        phpunit: 4.8.36
-
-                    -   symfony: 3.1.*
-                        php: 5.5
-                        phpunit: 4.8.36
-
-                    -   symfony: 3.0.*
-                        php: 5.5
-                        phpunit: 4.8.36
-
-                    -   symfony: 2.8.*
-                        php: 5.3
-                        phpunit: 4.8.36
-
-                    -   symfony: 2.7.*
-                        php: 5.3
-                        phpunit: 4.8.36
-
-        name: S${{ matrix.symfony }} - P${{ matrix.php }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v1
-
-            -   name: Cache dependencies
-                uses: actions/cache@v1
-                with:
-                    path: ~/.composer/cache/files
-                    key: dependencies-symfony-${{ matrix.symfony }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
-                    coverage: none
-
-            -   name: Install dependencies
-                run: |
-                    composer require "symfony/symfony:${{ matrix.symfony }}" "phpunit/phpunit:${{ matrix.phpunit }}" --no-interaction --no-update
-                    composer config extra.symfony.require "${{ matrix.symfony }}"
-                    composer update --prefer-dist --no-interaction --no-suggest
-
-            -   name: Execute tests
-                run: vendor/bin/phpunit

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at younes.khoubza@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

DependencyInjection/FlasherToastrExtension.php

@@ -2,17 +2,21 @@
 
 namespace Flasher\Toastr\Symfony\DependencyInjection;
 
-use Flasher\Symfony\DependencyInjection\Extension;
+use Flasher\Symfony\DependencyInjection\FlasherExtensionInterface;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-final class FlasherToastrExtension extends Extension
+final class FlasherToastrExtension extends Extension implements FlasherExtensionInterface
 {
-    protected function getConfigFileLocator()
+    public function load(array $configs, ContainerBuilder $container)
     {
-        return new FileLocator(__DIR__ . '/../Resources/config');
+        $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader->load('config.php');
     }
 
-    protected function getConfigClass()
+    public function getConfigurationClass()
     {
         return new Configuration();
     }

FlasherToastrSymfonyBundle.php

@@ -2,12 +2,19 @@
 
 namespace Flasher\Toastr\Symfony;
 
+use Flasher\Symfony\DependencyInjection\Compiler\ResourceCompilerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Flasher\Symfony\Bridge\FlasherBundle;
 use Flasher\Toastr\Symfony\DependencyInjection\FlasherToastrExtension;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class FlasherToastrSymfonyBundle extends Bundle
+class FlasherToastrSymfonyBundle extends FlasherBundle
 {
-    public function getContainerExtension()
+    protected function flasherBuild(ContainerBuilder $container)
+    {
+        $container->addCompilerPass(new ResourceCompilerPass($this->getFlasherContainerExtension()));
+    }
+
+    protected function getFlasherContainerExtension()
     {
         return new FlasherToastrExtension();
     }

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 PHP Flasher
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Resources/config/config.php

@@ -0,0 +1,21 @@
+<?php
+
+use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Flasher\Symfony\Bridge\Bridge;
+
+if (class_exists('Symfony\Component\DependencyInjection\ChildDefinition')) {
+    $definition = new ChildDefinition('flasher.notification_factory');
+} else {
+    $definition = new DefinitionDecorator('flasher.notification_factory');
+}
+
+$definition
+    ->setClass('Flasher\Toastr\Prime\ToastrFactory')
+    ->addTag('flasher.factory', array('alias' => 'toastr'));
+
+$container->setDefinition('flasher.toastr', $definition);
+
+if (Bridge::canLoadAliases()) {
+    $container->setAlias('Flasher\Toastr\Prime\ToastrFactory', 'flasher.toastr');
+}

Resources/config/config.yaml

@@ -1,8 +0,0 @@
-services:
-    flasher.toastr:
-        parent: 'flasher.notification_factory'
-        class: Flasher\Toastr\Prime\ToastrFactory
-        tags:
-            - { name: 'flasher.factory', alias: 'toastr' }
-
-    Flasher\Toastr\Prime\ToastrFactory: '@flasher.toastr'

Tests/DependencyInjection/ConfigurationTest.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace Flasher\Toastr\Symfony\Tests\DependencyInjection;
-
-use Flasher\Prime\Tests\TestCase;
-use Flasher\Toastr\Symfony\DependencyInjection\Configuration;
-use Symfony\Component\Config\Definition\Processor;
-
-class ConfigurationTest extends TestCase
-{
-    public function testDefaultConfig()
-    {
-        $config = $this->process(array());
-
-        $expected = array(
-            '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(),
-            'options' => array(
-                'progressBar' => true,
-                'timeOut' => 5000,
-            ),
-        );
-
-        $this->assertSame($expected, $config);
-    }
-
-    /**
-     * Processes an array of configurations and returns a compiled version.
-     *
-     * @param array $configs An array of raw configurations
-     *
-     * @return array A normalized array
-     */
-    private function process($configs)
-    {
-        $processor = new Processor();
-
-        return $processor->processConfiguration(new Configuration(), $configs);
-    }
-}

Tests/DependencyInjection/FlasherToastrExtensionTest.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace Flasher\Toastr\Symfony\Tests\DependencyInjection;
-
-use Flasher\Prime\Tests\TestCase;
-use Flasher\Symfony\DependencyInjection\FlasherExtension;
-use Flasher\Symfony\FlasherSymfonyBundle;
-use Flasher\Toastr\Symfony\DependencyInjection\FlasherToastrExtension;
-use Flasher\Toastr\Symfony\FlasherToastrSymfonyBundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-class FlasherToastrExtensionTest extends TestCase
-{
-    public function testContainerContainFlasherServices()
-    {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher', array());
-        $container->loadFromExtension('flasher_toastr', array());
-        $container->compile();
-
-        $this->assertTrue($container->has('flasher.toastr'));
-    }
-
-    public function testCreateInstanceOfToastrAdapter()
-    {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher');
-        $container->loadFromExtension('flasher_toastr');
-        $container->compile();
-
-        $flasher = $container->getDefinition('flasher');
-        $calls = $flasher->getMethodCalls();
-
-        $this->assertCount(2, $calls);
-        $this->assertSame('addFactory', $calls[0][0]);
-        $this->assertSame('template', $calls[0][1][0]);
-        $this->assertSame('flasher.notification_factory', (string) $calls[0][1][1]);
-
-        $this->assertSame('addFactory', $calls[1][0]);
-        $this->assertSame('toastr', $calls[1][1][0]);
-        $this->assertSame('flasher.toastr', (string) $calls[1][1][1]);
-    }
-
-    private function getRawContainer()
-    {
-        $container = new ContainerBuilder();
-
-        $container->registerExtension(new FlasherExtension());
-        $flasherBundle = new FlasherSymfonyBundle();
-        $flasherBundle->build($container);
-
-        $container->registerExtension(new FlasherToastrExtension());
-        $adapterBundle = new FlasherToastrSymfonyBundle();
-        $adapterBundle->build($container);
-
-        $container->getCompilerPassConfig()->setOptimizationPasses(array());
-        $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->getCompilerPassConfig()->setAfterRemovingPasses(array());
-
-        return $container;
-    }
-
-    private function getContainer()
-    {
-        $container = $this->getRawContainer();
-        $container->loadFromExtension('flasher', array());
-        $container->loadFromExtension('flasher_toastr', array());
-        $container->compile();
-
-        return $container;
-    }
-}

composer.json

@@ -29,23 +29,12 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3",
-        "php-flasher/flasher-symfony": "^0.4",
-        "php-flasher/flasher-toastr": "^0.4"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0"
+        "php-flasher/flasher-symfony": "^0.6.2",
+        "php-flasher/flasher-toastr": "^0.6.2"
     },
     "autoload": {
         "psr-4": {
             "Flasher\\Toastr\\Symfony\\": ""
-        },
-        "exclude-from-classmap": [
-            "/Tests/"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Flasher\\Toastr\\Symfony\\Tests\\": "Tests/"
         }
     },
     "config": {

composer.json.local

@@ -1,75 +0,0 @@
-{
-    "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
-}

phpunit.xml.dist

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="true">
-    <testsuites>
-        <testsuite name="Flasher Test Suite">
-            <directory>Tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./</directory>
-        </whitelist>
-    </filter>
-</phpunit>