diff --git a/src/Laravel/.github/workflows/tests.yaml b/.github/workflows/laravel.yaml similarity index 98% rename from src/Laravel/.github/workflows/tests.yaml rename to .github/workflows/laravel.yaml index 54ff57a1..ec06b990 100644 --- a/src/Laravel/.github/workflows/tests.yaml +++ b/.github/workflows/laravel.yaml @@ -119,4 +119,4 @@ jobs: composer update --prefer-dist --no-interaction --no-suggest - name: Execute tests - run: vendor/bin/phpunit + run: vendor/bin/phpunit --configuration=phpunit-laravel.xml diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml deleted file mode 100644 index 6dcf0609..00000000 --- a/.github/workflows/php.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: PHP Composer - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Validate composer.json and composer.lock - run: composer validate --strict - - - name: Cache Composer packages - id: composer-cache - uses: actions/cache@v2 - with: - path: vendor - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-php- - - - name: Install dependencies - run: composer install --prefer-dist --no-progress - - # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit" - # Docs: https://getcomposer.org/doc/articles/scripts.md - - # - name: Run test suite - # run: composer run-script test diff --git a/src/Cli/Symfony/.github/workflows/tests.yaml b/.github/workflows/symfony.yaml similarity index 63% rename from src/Cli/Symfony/.github/workflows/tests.yaml rename to .github/workflows/symfony.yaml index cf31a25f..21d7378e 100644 --- a/src/Cli/Symfony/.github/workflows/tests.yaml +++ b/.github/workflows/symfony.yaml @@ -12,8 +12,41 @@ jobs: 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.*] + symfony: + - 5.4.* + - 5.3.* + - 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.* + - 2.6.* + - 2.5.* + - 2.4.* + - 2.3.* + - 2.2.* + - 2.1.* + - 2.0.* + include: + - symfony: 5.4.* + php: 7.2 + phpunit: 8.3.* + + - symfony: 5.3.* + php: 7.2 + phpunit: 8.3.* + - symfony: 5.2.* php: 7.2 phpunit: 8.3.* @@ -74,6 +107,34 @@ jobs: php: 5.3 phpunit: 4.8.36 + - symfony: 2.6.* + php: 5.3 + phpunit: 4.8.36 + + - symfony: 2.5.* + php: 5.3 + phpunit: 4.8.36 + + - symfony: 2.4.* + php: 5.3 + phpunit: 4.8.36 + + - symfony: 2.3.* + php: 5.3 + phpunit: 4.8.36 + + - symfony: 2.2.* + php: 5.3 + phpunit: 4.8.36 + + - symfony: 2.1.* + php: 5.3 + phpunit: 4.8.36 + + - symfony: 2.0.* + php: 5.3 + phpunit: 4.8.36 + name: S${{ matrix.symfony }} - P${{ matrix.php }} steps: @@ -100,4 +161,4 @@ jobs: composer update --prefer-dist --no-interaction --no-suggest - name: Execute tests - run: vendor/bin/phpunit + run: vendor/bin/phpunit --configuration=phpunit-symfony.xml diff --git a/composer.json b/composer.json index e2479bed..a522bd38 100755 --- a/composer.json +++ b/composer.json @@ -13,7 +13,17 @@ ], "require": { "php": ">=5.3", - "ext-json": "*" + "ext-json": "*", + "illuminate/support": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", + "symfony/config": "^2.0|^3.0|^4.0|^5.0|^6.0", + "symfony/dependency-injection": "^2.0|^3.0|^4.0|^5.0|^6.0", + "symfony/http-kernel": "^2.0|^3.0|^4.0|^5.0|^6.0", + "symfony/twig-bundle": "^2.0|^3.0|^4.0|^5.0|^6.0", + "symfony/console": "^2.0|^3.0|^4.0|^5.0|^6.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0", + "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" }, "autoload": { "psr-4": { @@ -26,8 +36,14 @@ "src/Noty/Laravel/Resources/functions/noty.php", "src/Notyf/Laravel/Resources/functions/notyf.php", "src/Pnotify/Laravel/Resources/functions/pnotify.php", - "src/SweetAlert/Laravel/Resources/functions/sweetAlert.php" + "src/SweetAlert/Laravel/Resources/functions/sweetAlert.php", + "src/Cli/Laravel/Resources/functions/cli.php" ] }, + "autoload-dev": { + "psr-4": { + "Flasher\\Tests\\": "tests/" + } + }, "minimum-stability": "dev" } diff --git a/phpunit-laravel.xml b/phpunit-laravel.xml new file mode 100644 index 00000000..f332bb05 --- /dev/null +++ b/phpunit-laravel.xml @@ -0,0 +1,36 @@ + + + + + src/ + + + + + tests/Prime + + + tests/Laravel + + + tests/Toastr/Laravel + + + tests/Notyf/Laravel + + + tests/SweetAlert/Laravel + + + tests/Pnotify/Laravel + + + tests/Noty/Laravel + + + diff --git a/phpunit-symfony.xml b/phpunit-symfony.xml new file mode 100644 index 00000000..ba50bca5 --- /dev/null +++ b/phpunit-symfony.xml @@ -0,0 +1,36 @@ + + + + + src/ + + + + + tests/Prime + + + tests/Symfony + + + tests/Toastr/Symfony + + + tests/Notyf/Symfony + + + tests/SweetAlert/Symfony + + + tests/Pnotify/Symfony + + + tests/Noty/Symfony + + + diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 00000000..320afbcd --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,18 @@ + + + + + src/ + + + + + tests + + + diff --git a/phpunit.xml.dist b/phpunit.xml.dist deleted file mode 100644 index 459a22a5..00000000 --- a/phpunit.xml.dist +++ /dev/null @@ -1,78 +0,0 @@ - - - - - src/Prime - - - src/Laravel - - - src/Symfony - - - - src/Toastr/Prime - - - src/Toastr/Laravel - - - src/Toastr/Symfony - - - - src/Notyf/Prime - - - src/Notyf/Laravel - - - src/Notyf/Symfony - - - - src/SweetAlert/Prime - - - src/SweetAlert/Laravel - - - src/SweetAlert/Symfony - - - - src/Pnotify/Prime - - - src/Pnotify/Laravel - - - src/Pnotify/Symfony - - - - src/Noty/Prime - - - src/Noty/Laravel - - - src/Noty/Symfony - - - - - src/ - - - diff --git a/src/Cli/Laravel/.github/workflows/tests.yaml b/src/Cli/Laravel/.github/workflows/tests.yaml deleted file mode 100644 index 220db4f1..00000000 --- a/src/Cli/Laravel/.github/workflows/tests.yaml +++ /dev/null @@ -1,118 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*, 5.4.*, 5.3.*, 5.2.*, 5.1.*, 5.0.*, 4.2.*, 4.1.*, 4.0.*] - include: - - laravel: 8.* - testbench: 6.* - php: 7.3 - phpunit: 9.3.* - - - laravel: 7.* - testbench: 5.* - php: 7.3 - phpunit: 8.4.* - - - laravel: 6.* - testbench: 4.* - php: 7.2 - phpunit: 8.3.* - - - laravel: 5.8.* - testbench: 3.8.* - php: 7.1 - phpunit: 7.5.* - - - laravel: 5.7.* - testbench: 3.7.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.6.* - testbench: 3.6.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.5.* - testbench: 3.5.* - php: 7.0 - phpunit: 6.0.* - - - laravel: 5.4.* - testbench: 3.4.* - php: 5.6 - phpunit: 5.7.* - - - laravel: 5.3.* - testbench: 3.3.* - php: 5.6 - phpunit: 4.8.* - - - laravel: 5.2.* - testbench: 3.2.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.1.* - testbench: 3.1.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.0.* - testbench: 3.0.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.2.* - testbench: 2.2.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.1.* - testbench: 2.1.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.0.* - testbench: 2.0.* - php: 5.4 - phpunit: 4.8.* - - name: L${{ matrix.laravel }} - 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-laravel-${{ matrix.laravel }}-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 - # ini-values: memory_limit=-1 - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" "orchestra/testbench:${{ matrix.testbench }}" monolog/monolog --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Cli/Laravel/helpers.php b/src/Cli/Laravel/Resources/functions/cli.php similarity index 100% rename from src/Cli/Laravel/helpers.php rename to src/Cli/Laravel/Resources/functions/cli.php diff --git a/src/Cli/Laravel/Tests/.gitkeep b/src/Cli/Laravel/Tests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Cli/Laravel/composer.json b/src/Cli/Laravel/composer.json index 92d7b52c..c5c17096 100644 --- a/src/Cli/Laravel/composer.json +++ b/src/Cli/Laravel/composer.json @@ -32,26 +32,14 @@ "php-flasher/flasher-laravel": "^0.5", "php-flasher/flasher-cli": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0", - "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" - }, "autoload": { "psr-4": { "Flasher\\Cli\\Laravel\\": "" }, - "exclude-from-classmap": [ - "/Tests/" - ], "files": [ - "helpers.php" + "Resources/functions/cli.php" ] }, - "autoload-dev": { - "psr-4": { - "Flasher\\Cli\\Laravel\\Tests\\": "Tests/" - } - }, "extra": { "laravel": { "providers": [ diff --git a/src/Cli/Laravel/phpunit.xml.dist b/src/Cli/Laravel/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Cli/Laravel/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Cli/Prime/.github/workflows/tests.yaml b/src/Cli/Prime/.github/workflows/tests.yaml deleted file mode 100644 index b01da530..00000000 --- a/src/Cli/Prime/.github/workflows/tests.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4 ] - - name: php ${{ matrix.php }} - ${{ matrix.dependency-version }} - - steps: - - name: Checkout code - uses: actions/checkout@v1 - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - - - name: Require phpunit 4.8 for php <= 5.6 - if: matrix.php <= 5.6 - run: composer require "phpunit/phpunit:4.8.36" --no-interaction --no-update - - - name: Require phpunit 6 for php >= 7.0 - if: matrix.php >= 7.0 - run: composer require "phpunit/phpunit:6.*" --no-interaction --no-update - - - name: Require phpunit 9 for php >= 7.3 - if: matrix.php >= 7.3 - run: composer require "phpunit/phpunit:9.*" --no-interaction --no-update - - - name: Install dependencies - run: composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Cli/Prime/Tests/.gitkeep b/src/Cli/Prime/Tests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Cli/Prime/composer.json b/src/Cli/Prime/composer.json index 44a216c0..64340347 100644 --- a/src/Cli/Prime/composer.json +++ b/src/Cli/Prime/composer.json @@ -30,20 +30,9 @@ "php": ">=5.3", "php-flasher/flasher": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Cli\\Prime\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Cli\\Prime\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Cli/Prime/phpunit.xml.dist b/src/Cli/Prime/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Cli/Prime/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Cli/Symfony/Tests/.gitkeep b/src/Cli/Symfony/Tests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Cli/Symfony/composer.json b/src/Cli/Symfony/composer.json index 1d344f05..9bd07eb1 100644 --- a/src/Cli/Symfony/composer.json +++ b/src/Cli/Symfony/composer.json @@ -34,20 +34,9 @@ "php-flasher/flasher-symfony": "^0.5", "php-flasher/flasher-cli": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Cli\\Symfony\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Cli\\Symfony\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Cli/Symfony/phpunit.xml.dist b/src/Cli/Symfony/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Cli/Symfony/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Laravel/ServiceProvider/Providers/Laravel.php b/src/Laravel/ServiceProvider/Providers/Laravel.php index 656ce1fc..14b23116 100755 --- a/src/Laravel/ServiceProvider/Providers/Laravel.php +++ b/src/Laravel/ServiceProvider/Providers/Laravel.php @@ -71,7 +71,7 @@ class Laravel implements ServiceProviderInterface protected function registerCommonServices() { $this->app->singleton('flasher', function (Application $app) { - $flasher = new Flasher($app['flasher.config']); + $flasher = new Flasher($app['flasher.config'], $app['flasher.response_manager']); $flasher->addFactory('template', $app['flasher.template']); return $flasher; diff --git a/src/Laravel/composer.json b/src/Laravel/composer.json index 9018363c..5f240146 100644 --- a/src/Laravel/composer.json +++ b/src/Laravel/composer.json @@ -30,29 +30,17 @@ "license": "MIT", "require": { "php": ">=5.3", - "illuminate/support": "^4.0|^5.0|^6.0|^7.0|^8.0", + "illuminate/support": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", "php-flasher/flasher": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0", - "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" - }, "autoload": { "psr-4": { "Flasher\\Laravel\\": "" }, - "exclude-from-classmap": [ - "/Tests/" - ], "files": [ "helpers.php" ] }, - "autoload-dev": { - "psr-4": { - "Flasher\\Laravel\\Tests\\": "Tests/" - } - }, "extra": { "laravel": { "providers": [ diff --git a/src/Laravel/phpunit.xml.dist b/src/Laravel/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Laravel/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Livewire/.github/workflows/tests.yaml b/src/Livewire/.github/workflows/tests.yaml deleted file mode 100644 index 71511b16..00000000 --- a/src/Livewire/.github/workflows/tests.yaml +++ /dev/null @@ -1,55 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: true - matrix: - laravel: [8.*, 7.*] - os: - - ubuntu-latest - include: - - laravel: 8.* - testbench: 6.* - php: 7.3 - phpunit: 9.3.* - - - laravel: 7.* - testbench: 5.* - php: 7.3 - phpunit: 8.4.* - - name: ${{ matrix.os }} - L${{ matrix.laravel }} - 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-laravel-${{ matrix.laravel }}-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 - ini-values: memory_limit=-1 - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" "orchestra/testbench:${{ matrix.testbench }}" monolog/monolog --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Livewire/Tests/.gitkeep b/src/Livewire/Tests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Livewire/composer.json b/src/Livewire/composer.json index bbf39f07..850483c9 100644 --- a/src/Livewire/composer.json +++ b/src/Livewire/composer.json @@ -37,14 +37,6 @@ "autoload": { "psr-4": { "Flasher\\Livewire\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Livewire\\Tests\\": "Tests/" } }, "extra": { diff --git a/src/Livewire/phpunit.xml.dist b/src/Livewire/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Livewire/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Noty/Laravel/.github/workflows/tests.yaml b/src/Noty/Laravel/.github/workflows/tests.yaml deleted file mode 100644 index 220db4f1..00000000 --- a/src/Noty/Laravel/.github/workflows/tests.yaml +++ /dev/null @@ -1,118 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*, 5.4.*, 5.3.*, 5.2.*, 5.1.*, 5.0.*, 4.2.*, 4.1.*, 4.0.*] - include: - - laravel: 8.* - testbench: 6.* - php: 7.3 - phpunit: 9.3.* - - - laravel: 7.* - testbench: 5.* - php: 7.3 - phpunit: 8.4.* - - - laravel: 6.* - testbench: 4.* - php: 7.2 - phpunit: 8.3.* - - - laravel: 5.8.* - testbench: 3.8.* - php: 7.1 - phpunit: 7.5.* - - - laravel: 5.7.* - testbench: 3.7.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.6.* - testbench: 3.6.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.5.* - testbench: 3.5.* - php: 7.0 - phpunit: 6.0.* - - - laravel: 5.4.* - testbench: 3.4.* - php: 5.6 - phpunit: 5.7.* - - - laravel: 5.3.* - testbench: 3.3.* - php: 5.6 - phpunit: 4.8.* - - - laravel: 5.2.* - testbench: 3.2.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.1.* - testbench: 3.1.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.0.* - testbench: 3.0.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.2.* - testbench: 2.2.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.1.* - testbench: 2.1.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.0.* - testbench: 2.0.* - php: 5.4 - phpunit: 4.8.* - - name: L${{ matrix.laravel }} - 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-laravel-${{ matrix.laravel }}-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 - # ini-values: memory_limit=-1 - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" "orchestra/testbench:${{ matrix.testbench }}" monolog/monolog --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Noty/Laravel/composer.json b/src/Noty/Laravel/composer.json index 9807dfa7..8244730f 100644 --- a/src/Noty/Laravel/composer.json +++ b/src/Noty/Laravel/composer.json @@ -32,26 +32,14 @@ "php-flasher/flasher-laravel": "^0.5", "php-flasher/flasher-noty": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0", - "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" - }, "autoload": { "psr-4": { "Flasher\\Noty\\Laravel\\": "" }, "files": [ "Resources/functions/noty.php" - ], - "exclude-from-classmap": [ - "/Tests/" ] }, - "autoload-dev": { - "psr-4": { - "Flasher\\Noty\\Laravel\\Tests\\": "Tests/" - } - }, "extra": { "laravel": { "providers": [ diff --git a/src/Noty/Laravel/phpunit.xml.dist b/src/Noty/Laravel/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Noty/Laravel/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Noty/Prime/.github/workflows/tests.yaml b/src/Noty/Prime/.github/workflows/tests.yaml deleted file mode 100644 index b01da530..00000000 --- a/src/Noty/Prime/.github/workflows/tests.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4 ] - - name: php ${{ matrix.php }} - ${{ matrix.dependency-version }} - - steps: - - name: Checkout code - uses: actions/checkout@v1 - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - - - name: Require phpunit 4.8 for php <= 5.6 - if: matrix.php <= 5.6 - run: composer require "phpunit/phpunit:4.8.36" --no-interaction --no-update - - - name: Require phpunit 6 for php >= 7.0 - if: matrix.php >= 7.0 - run: composer require "phpunit/phpunit:6.*" --no-interaction --no-update - - - name: Require phpunit 9 for php >= 7.3 - if: matrix.php >= 7.3 - run: composer require "phpunit/phpunit:9.*" --no-interaction --no-update - - - name: Install dependencies - run: composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Noty/Prime/Tests/.gitkeep b/src/Noty/Prime/Tests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Noty/Prime/composer.json b/src/Noty/Prime/composer.json index 2159c88c..8ee44832 100644 --- a/src/Noty/Prime/composer.json +++ b/src/Noty/Prime/composer.json @@ -28,20 +28,9 @@ "php": ">=5.3", "php-flasher/flasher": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Noty\\Prime\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Noty\\Prime\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Noty/Prime/phpunit.xml.dist b/src/Noty/Prime/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Noty/Prime/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Noty/Symfony/.github/workflows/tests.yaml b/src/Noty/Symfony/.github/workflows/tests.yaml deleted file mode 100644 index cf31a25f..00000000 --- a/src/Noty/Symfony/.github/workflows/tests.yaml +++ /dev/null @@ -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 diff --git a/src/Noty/Symfony/composer.json b/src/Noty/Symfony/composer.json index 02942c9f..ba41de5d 100644 --- a/src/Noty/Symfony/composer.json +++ b/src/Noty/Symfony/composer.json @@ -32,20 +32,9 @@ "php-flasher/flasher-symfony": "^0.5", "php-flasher/flasher-noty": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Noty\\Symfony\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Noty\\Symfony\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Noty/Symfony/composer.json.local b/src/Noty/Symfony/composer.json.local deleted file mode 100644 index 87152876..00000000 --- a/src/Noty/Symfony/composer.json.local +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "php-flasher/flasher-noty-symfony", - "type": "symfony-bundle", - "description": "PHP Flasher Symfony adapter for Noty", - "keywords": [ - "yoeunes", - "notify", - "php", - "laravel", - "symfony", - "Lumen", - "notifications", - "messages", - "alerts", - "pnotify", - "noty ", - "bundle", - "flex" - ], - "homepage": "https://php-flasher.github.io/", - "authors": [ - { - "name": "Younes Khoubza", - "email": "younes.khoubza@gmail.com", - "homepage": "https://github.com/yoeunes", - "role": "Developer" - } - ], - "repositories": [ - { - "type": "path", - "url": "../../Symfony", - "options": { - "symlink": true - } - }, - { - "type": "path", - "url": "../Prime", - "options": { - "symlink": true - } - } - ], - "license": "MIT", - "require": { - "php": ">=5.3", - "php-flasher/flasher-symfony": "@dev", - "php-flasher/flasher-noty": "@dev" - }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, - "autoload": { - "psr-4": { - "Flasher\\Noty\\Symfony\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Noty\\Symfony\\Tests\\": "Tests/" - } - }, - "config": { - "sort-packages": true, - "platform": { - "php": "5.3.10" - } - }, - "minimum-stability": "dev", - "prefer-stable": true -} diff --git a/src/Noty/Symfony/phpunit.xml.dist b/src/Noty/Symfony/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Noty/Symfony/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Notyf/Laravel/.github/workflows/tests.yaml b/src/Notyf/Laravel/.github/workflows/tests.yaml deleted file mode 100644 index 220db4f1..00000000 --- a/src/Notyf/Laravel/.github/workflows/tests.yaml +++ /dev/null @@ -1,118 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*, 5.4.*, 5.3.*, 5.2.*, 5.1.*, 5.0.*, 4.2.*, 4.1.*, 4.0.*] - include: - - laravel: 8.* - testbench: 6.* - php: 7.3 - phpunit: 9.3.* - - - laravel: 7.* - testbench: 5.* - php: 7.3 - phpunit: 8.4.* - - - laravel: 6.* - testbench: 4.* - php: 7.2 - phpunit: 8.3.* - - - laravel: 5.8.* - testbench: 3.8.* - php: 7.1 - phpunit: 7.5.* - - - laravel: 5.7.* - testbench: 3.7.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.6.* - testbench: 3.6.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.5.* - testbench: 3.5.* - php: 7.0 - phpunit: 6.0.* - - - laravel: 5.4.* - testbench: 3.4.* - php: 5.6 - phpunit: 5.7.* - - - laravel: 5.3.* - testbench: 3.3.* - php: 5.6 - phpunit: 4.8.* - - - laravel: 5.2.* - testbench: 3.2.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.1.* - testbench: 3.1.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.0.* - testbench: 3.0.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.2.* - testbench: 2.2.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.1.* - testbench: 2.1.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.0.* - testbench: 2.0.* - php: 5.4 - phpunit: 4.8.* - - name: L${{ matrix.laravel }} - 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-laravel-${{ matrix.laravel }}-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 - # ini-values: memory_limit=-1 - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" "orchestra/testbench:${{ matrix.testbench }}" monolog/monolog --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Notyf/Laravel/composer.json b/src/Notyf/Laravel/composer.json index d1882c5a..4230f45a 100644 --- a/src/Notyf/Laravel/composer.json +++ b/src/Notyf/Laravel/composer.json @@ -33,26 +33,14 @@ "php-flasher/flasher-laravel": "^0.5", "php-flasher/flasher-notyf": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0", - "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" - }, "autoload": { "psr-4": { "Flasher\\Notyf\\Laravel\\": "" }, "files": [ "Resources/functions/notyf.php" - ], - "exclude-from-classmap": [ - "/Tests/" ] }, - "autoload-dev": { - "psr-4": { - "Flasher\\Notyf\\Laravel\\Tests\\": "Tests/" - } - }, "extra": { "laravel": { "providers": [ diff --git a/src/Notyf/Laravel/phpunit.xml.dist b/src/Notyf/Laravel/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Notyf/Laravel/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Notyf/Prime/.github/workflows/tests.yaml b/src/Notyf/Prime/.github/workflows/tests.yaml deleted file mode 100644 index 3813f24e..00000000 --- a/src/Notyf/Prime/.github/workflows/tests.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4] - - name: php ${{ matrix.php }} - ${{ matrix.dependency-version }} - - steps: - - name: Checkout code - uses: actions/checkout@v1 - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - - - name: Require phpunit 4.8 for php <= 5.6 - if: matrix.php <= 5.6 - run: composer require "phpunit/phpunit:4.8.36" --no-interaction --no-update - - - name: Require phpunit 6 for php >= 7.0 - if: matrix.php >= 7.0 - run: composer require "phpunit/phpunit:6.*" --no-interaction --no-update - - - name: Require phpunit 9 for php >= 7.3 - if: matrix.php >= 7.3 - run: composer require "phpunit/phpunit:9.*" --no-interaction --no-update - - - name: Install dependencies - run: composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Notyf/Prime/Tests/.gitkeep b/src/Notyf/Prime/Tests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Notyf/Prime/composer.json b/src/Notyf/Prime/composer.json index faa71ef3..5256c7c7 100644 --- a/src/Notyf/Prime/composer.json +++ b/src/Notyf/Prime/composer.json @@ -29,20 +29,9 @@ "php": ">=5.3", "php-flasher/flasher": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Notyf\\Prime\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Notyf\\Prime\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Notyf/Prime/phpunit.xml.dist b/src/Notyf/Prime/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Notyf/Prime/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Notyf/Symfony/.github/workflows/tests.yaml b/src/Notyf/Symfony/.github/workflows/tests.yaml deleted file mode 100644 index cf31a25f..00000000 --- a/src/Notyf/Symfony/.github/workflows/tests.yaml +++ /dev/null @@ -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 diff --git a/src/Notyf/Symfony/composer.json b/src/Notyf/Symfony/composer.json index 2d684c64..7e3cf621 100644 --- a/src/Notyf/Symfony/composer.json +++ b/src/Notyf/Symfony/composer.json @@ -34,20 +34,9 @@ "php-flasher/flasher-symfony": "^0.5", "php-flasher/flasher-notyf": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Notyf\\Symfony\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Notyf\\Symfony\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Notyf/Symfony/phpunit.xml.dist b/src/Notyf/Symfony/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Notyf/Symfony/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Pnotify/Laravel/.github/workflows/tests.yaml b/src/Pnotify/Laravel/.github/workflows/tests.yaml deleted file mode 100644 index 220db4f1..00000000 --- a/src/Pnotify/Laravel/.github/workflows/tests.yaml +++ /dev/null @@ -1,118 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*, 5.4.*, 5.3.*, 5.2.*, 5.1.*, 5.0.*, 4.2.*, 4.1.*, 4.0.*] - include: - - laravel: 8.* - testbench: 6.* - php: 7.3 - phpunit: 9.3.* - - - laravel: 7.* - testbench: 5.* - php: 7.3 - phpunit: 8.4.* - - - laravel: 6.* - testbench: 4.* - php: 7.2 - phpunit: 8.3.* - - - laravel: 5.8.* - testbench: 3.8.* - php: 7.1 - phpunit: 7.5.* - - - laravel: 5.7.* - testbench: 3.7.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.6.* - testbench: 3.6.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.5.* - testbench: 3.5.* - php: 7.0 - phpunit: 6.0.* - - - laravel: 5.4.* - testbench: 3.4.* - php: 5.6 - phpunit: 5.7.* - - - laravel: 5.3.* - testbench: 3.3.* - php: 5.6 - phpunit: 4.8.* - - - laravel: 5.2.* - testbench: 3.2.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.1.* - testbench: 3.1.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.0.* - testbench: 3.0.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.2.* - testbench: 2.2.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.1.* - testbench: 2.1.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.0.* - testbench: 2.0.* - php: 5.4 - phpunit: 4.8.* - - name: L${{ matrix.laravel }} - 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-laravel-${{ matrix.laravel }}-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 - # ini-values: memory_limit=-1 - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" "orchestra/testbench:${{ matrix.testbench }}" monolog/monolog --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Pnotify/Laravel/composer.json b/src/Pnotify/Laravel/composer.json index 811ea4ad..da2d091d 100644 --- a/src/Pnotify/Laravel/composer.json +++ b/src/Pnotify/Laravel/composer.json @@ -32,26 +32,14 @@ "php-flasher/flasher-laravel": "^0.5", "php-flasher/flasher-pnotify": "^0.5" }, - "require-dev": { - "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0", - "phpunit/phpunit": "6.*" - }, "autoload": { "psr-4": { "Flasher\\Pnotify\\Laravel\\": "" }, "files": [ "Resources/functions/pnotify.php" - ], - "exclude-from-classmap": [ - "/Tests/" ] }, - "autoload-dev": { - "psr-4": { - "Flasher\\Pnotify\\Laravel\\Tests\\": "Tests/" - } - }, "extra": { "laravel": { "providers": [ diff --git a/src/Pnotify/Laravel/phpunit.xml.dist b/src/Pnotify/Laravel/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Pnotify/Laravel/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Pnotify/Prime/.github/workflows/tests.yaml b/src/Pnotify/Prime/.github/workflows/tests.yaml deleted file mode 100644 index 1924fc6d..00000000 --- a/src/Pnotify/Prime/.github/workflows/tests.yaml +++ /dev/null @@ -1,50 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4 ] - name: php ${{ matrix.php }} - ${{ matrix.dependency-version }} - - steps: - - name: Checkout code - uses: actions/checkout@v1 - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - - - name: Require phpunit 4.8 for php <= 5.6 - if: matrix.php <= 5.6 - run: composer require "phpunit/phpunit:4.8.36" --no-interaction --no-update - - - name: Require phpunit 6 for php >= 7.0 - if: matrix.php >= 7.0 - run: composer require "phpunit/phpunit:6.*" --no-interaction --no-update - - - name: Require phpunit 9 for php >= 7.3 - if: matrix.php >= 7.3 - run: composer require "phpunit/phpunit:9.*" --no-interaction --no-update - - - name: Install dependencies - run: composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Pnotify/Prime/Tests/.gitkeep b/src/Pnotify/Prime/Tests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Pnotify/Prime/composer.json b/src/Pnotify/Prime/composer.json index 7084f240..39b3b469 100644 --- a/src/Pnotify/Prime/composer.json +++ b/src/Pnotify/Prime/composer.json @@ -29,20 +29,9 @@ "php": ">=5.3", "php-flasher/flasher": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Pnotify\\Prime\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Pnotify\\Prime\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Pnotify/Prime/phpunit.xml.dist b/src/Pnotify/Prime/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Pnotify/Prime/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Pnotify/Symfony/.github/workflows/tests.yaml b/src/Pnotify/Symfony/.github/workflows/tests.yaml deleted file mode 100644 index cf31a25f..00000000 --- a/src/Pnotify/Symfony/.github/workflows/tests.yaml +++ /dev/null @@ -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 diff --git a/src/Pnotify/Symfony/composer.json b/src/Pnotify/Symfony/composer.json index 2f231039..ec3bb359 100644 --- a/src/Pnotify/Symfony/composer.json +++ b/src/Pnotify/Symfony/composer.json @@ -32,20 +32,9 @@ "php-flasher/flasher-symfony": "^0.5", "php-flasher/flasher-pnotify": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Pnotify\\Symfony\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Pnotify\\Symfony\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Pnotify/Symfony/phpunit.xml.dist b/src/Pnotify/Symfony/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Pnotify/Symfony/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Prime/.github/workflows/tests.yaml b/src/Prime/.github/workflows/tests.yaml deleted file mode 100644 index b01da530..00000000 --- a/src/Prime/.github/workflows/tests.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4 ] - - name: php ${{ matrix.php }} - ${{ matrix.dependency-version }} - - steps: - - name: Checkout code - uses: actions/checkout@v1 - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - - - name: Require phpunit 4.8 for php <= 5.6 - if: matrix.php <= 5.6 - run: composer require "phpunit/phpunit:4.8.36" --no-interaction --no-update - - - name: Require phpunit 6 for php >= 7.0 - if: matrix.php >= 7.0 - run: composer require "phpunit/phpunit:6.*" --no-interaction --no-update - - - name: Require phpunit 9 for php >= 7.3 - if: matrix.php >= 7.3 - run: composer require "phpunit/phpunit:9.*" --no-interaction --no-update - - - name: Install dependencies - run: composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Prime/.scrutinizer.yml b/src/Prime/.scrutinizer.yml deleted file mode 100644 index 4c5972b9..00000000 --- a/src/Prime/.scrutinizer.yml +++ /dev/null @@ -1,33 +0,0 @@ -filter: - paths: [ "." ] - excluded_paths: [ "Tests/*" ] -checks: - php: - code_rating: true - remove_extra_empty_lines: true - remove_php_closing_tag: true - remove_trailing_whitespace: true - fix_use_statements: - remove_unused: true - preserve_multiple: false - preserve_blanklines: true - order_alphabetically: true - fix_php_opening_tag: true - fix_linefeed: true - fix_line_ending: true - fix_identation_4spaces: true - fix_doc_comments: true -tools: - external_code_coverage: - timeout: 1800 - runs: 6 - php_code_coverage: false - php_code_sniffer: - config: - standard: PSR2 - filter: - paths: [ '.' ] - php_loc: - enabled: true - excluded_dirs: [ vendor ] - php_sim: false diff --git a/src/Prime/composer.json b/src/Prime/composer.json index 4c2fd422..ca11b2b5 100644 --- a/src/Prime/composer.json +++ b/src/Prime/composer.json @@ -32,25 +32,14 @@ "require": { "php": ">=5.3" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Prime\\": "" }, "files": [ "helpers.php" - ], - "exclude-from-classmap": [ - "/Tests/" ] }, - "autoload-dev": { - "psr-4": { - "Flasher\\Prime\\Tests\\": "Tests/" - } - }, "config": { "sort-packages": true }, diff --git a/src/Prime/phpstan.neon b/src/Prime/phpstan.neon deleted file mode 100644 index 4e87fcb8..00000000 --- a/src/Prime/phpstan.neon +++ /dev/null @@ -1,9 +0,0 @@ -parameters: - checkMissingIterableValueType: false - excludes_analyse: - - Tests/ - ignoreErrors: - - '#Call to an undefined method Flasher\\Prime\\Stamp\\StampInterface::#' - - '#Array \(array\) does not accept array.#' - - '#Else branch is unreachable because ternary operator condition is always true.#' - - '#has no return typehint specified.#' diff --git a/src/Prime/phpunit.xml.dist b/src/Prime/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Prime/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/SweetAlert/Laravel/.github/workflows/tests.yaml b/src/SweetAlert/Laravel/.github/workflows/tests.yaml deleted file mode 100644 index 220db4f1..00000000 --- a/src/SweetAlert/Laravel/.github/workflows/tests.yaml +++ /dev/null @@ -1,118 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*, 5.4.*, 5.3.*, 5.2.*, 5.1.*, 5.0.*, 4.2.*, 4.1.*, 4.0.*] - include: - - laravel: 8.* - testbench: 6.* - php: 7.3 - phpunit: 9.3.* - - - laravel: 7.* - testbench: 5.* - php: 7.3 - phpunit: 8.4.* - - - laravel: 6.* - testbench: 4.* - php: 7.2 - phpunit: 8.3.* - - - laravel: 5.8.* - testbench: 3.8.* - php: 7.1 - phpunit: 7.5.* - - - laravel: 5.7.* - testbench: 3.7.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.6.* - testbench: 3.6.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.5.* - testbench: 3.5.* - php: 7.0 - phpunit: 6.0.* - - - laravel: 5.4.* - testbench: 3.4.* - php: 5.6 - phpunit: 5.7.* - - - laravel: 5.3.* - testbench: 3.3.* - php: 5.6 - phpunit: 4.8.* - - - laravel: 5.2.* - testbench: 3.2.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.1.* - testbench: 3.1.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.0.* - testbench: 3.0.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.2.* - testbench: 2.2.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.1.* - testbench: 2.1.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.0.* - testbench: 2.0.* - php: 5.4 - phpunit: 4.8.* - - name: L${{ matrix.laravel }} - 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-laravel-${{ matrix.laravel }}-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 - # ini-values: memory_limit=-1 - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" "orchestra/testbench:${{ matrix.testbench }}" monolog/monolog --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/SweetAlert/Laravel/composer.json b/src/SweetAlert/Laravel/composer.json index bdbfb6d5..12f238f5 100644 --- a/src/SweetAlert/Laravel/composer.json +++ b/src/SweetAlert/Laravel/composer.json @@ -33,26 +33,14 @@ "php-flasher/flasher-laravel": "^0.5", "php-flasher/flasher-sweet-alert": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0", - "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" - }, "autoload": { "psr-4": { "Flasher\\SweetAlert\\Laravel\\": "" }, "files": [ "Resources/functions/sweetAlert.php" - ], - "exclude-from-classmap": [ - "/Tests/" ] }, - "autoload-dev": { - "psr-4": { - "Flasher\\SweetAlert\\Laravel\\Tests\\": "Tests/" - } - }, "extra": { "laravel": { "providers": [ diff --git a/src/SweetAlert/Laravel/phpunit.xml.dist b/src/SweetAlert/Laravel/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/SweetAlert/Laravel/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/SweetAlert/Prime/.github/workflows/tests.yaml b/src/SweetAlert/Prime/.github/workflows/tests.yaml deleted file mode 100644 index b01da530..00000000 --- a/src/SweetAlert/Prime/.github/workflows/tests.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4 ] - - name: php ${{ matrix.php }} - ${{ matrix.dependency-version }} - - steps: - - name: Checkout code - uses: actions/checkout@v1 - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - - - name: Require phpunit 4.8 for php <= 5.6 - if: matrix.php <= 5.6 - run: composer require "phpunit/phpunit:4.8.36" --no-interaction --no-update - - - name: Require phpunit 6 for php >= 7.0 - if: matrix.php >= 7.0 - run: composer require "phpunit/phpunit:6.*" --no-interaction --no-update - - - name: Require phpunit 9 for php >= 7.3 - if: matrix.php >= 7.3 - run: composer require "phpunit/phpunit:9.*" --no-interaction --no-update - - - name: Install dependencies - run: composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/SweetAlert/Prime/Tests/.gitkeep b/src/SweetAlert/Prime/Tests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/SweetAlert/Prime/phpunit.xml.dist b/src/SweetAlert/Prime/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/SweetAlert/Prime/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/SweetAlert/Symfony/.github/workflows/tests.yaml b/src/SweetAlert/Symfony/.github/workflows/tests.yaml deleted file mode 100644 index cf31a25f..00000000 --- a/src/SweetAlert/Symfony/.github/workflows/tests.yaml +++ /dev/null @@ -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 diff --git a/src/SweetAlert/Symfony/composer.json b/src/SweetAlert/Symfony/composer.json index cee846e9..377074b3 100644 --- a/src/SweetAlert/Symfony/composer.json +++ b/src/SweetAlert/Symfony/composer.json @@ -33,20 +33,9 @@ "php-flasher/flasher-symfony": "^0.5", "php-flasher/flasher-sweet-alert": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\SweetAlert\\Symfony\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\SweetAlert\\Symfony\\Tests\\": "Tests/" } }, "config": { diff --git a/src/SweetAlert/Symfony/phpunit.xml.dist b/src/SweetAlert/Symfony/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/SweetAlert/Symfony/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Symfony/.github/workflows/tests.yaml b/src/Symfony/.github/workflows/tests.yaml deleted file mode 100644 index cf31a25f..00000000 --- a/src/Symfony/.github/workflows/tests.yaml +++ /dev/null @@ -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 diff --git a/src/Symfony/composer.json b/src/Symfony/composer.json index 222d57cc..447e647e 100644 --- a/src/Symfony/composer.json +++ b/src/Symfony/composer.json @@ -36,20 +36,9 @@ "symfony/twig-bundle": "^2.0|^3.0|^4.0|^5.0|^6.0", "symfony/console": "^2.0|^3.0|^4.0|^5.0|^6.0" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Symfony\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Symfony\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Symfony/phpunit.xml.dist b/src/Symfony/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Symfony/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Toastr/Laravel/.github/workflows/tests.yaml b/src/Toastr/Laravel/.github/workflows/tests.yaml deleted file mode 100644 index 220db4f1..00000000 --- a/src/Toastr/Laravel/.github/workflows/tests.yaml +++ /dev/null @@ -1,118 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*, 5.4.*, 5.3.*, 5.2.*, 5.1.*, 5.0.*, 4.2.*, 4.1.*, 4.0.*] - include: - - laravel: 8.* - testbench: 6.* - php: 7.3 - phpunit: 9.3.* - - - laravel: 7.* - testbench: 5.* - php: 7.3 - phpunit: 8.4.* - - - laravel: 6.* - testbench: 4.* - php: 7.2 - phpunit: 8.3.* - - - laravel: 5.8.* - testbench: 3.8.* - php: 7.1 - phpunit: 7.5.* - - - laravel: 5.7.* - testbench: 3.7.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.6.* - testbench: 3.6.* - php: 7.1 - phpunit: 7.0.* - - - laravel: 5.5.* - testbench: 3.5.* - php: 7.0 - phpunit: 6.0.* - - - laravel: 5.4.* - testbench: 3.4.* - php: 5.6 - phpunit: 5.7.* - - - laravel: 5.3.* - testbench: 3.3.* - php: 5.6 - phpunit: 4.8.* - - - laravel: 5.2.* - testbench: 3.2.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.1.* - testbench: 3.1.* - php: 5.5 - phpunit: 4.8.* - - - laravel: 5.0.* - testbench: 3.0.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.2.* - testbench: 2.2.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.1.* - testbench: 2.1.* - php: 5.4 - phpunit: 4.8.* - - - laravel: 4.0.* - testbench: 2.0.* - php: 5.4 - phpunit: 4.8.* - - name: L${{ matrix.laravel }} - 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-laravel-${{ matrix.laravel }}-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 - # ini-values: memory_limit=-1 - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" "orchestra/testbench:${{ matrix.testbench }}" monolog/monolog --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Toastr/Laravel/composer.json b/src/Toastr/Laravel/composer.json index faa4b668..a0497339 100644 --- a/src/Toastr/Laravel/composer.json +++ b/src/Toastr/Laravel/composer.json @@ -32,26 +32,14 @@ "php-flasher/flasher-laravel": "^0.5", "php-flasher/flasher-toastr": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0", - "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" - }, "autoload": { "psr-4": { "Flasher\\Toastr\\Laravel\\": "" }, "files": [ "Resources/functions/toastr.php" - ], - "exclude-from-classmap": [ - "/Tests/" ] }, - "autoload-dev": { - "psr-4": { - "Flasher\\Toastr\\Laravel\\Tests\\": "Tests/" - } - }, "extra": { "laravel": { "providers": [ diff --git a/src/Toastr/Laravel/composer.json.local b/src/Toastr/Laravel/composer.json.local deleted file mode 100644 index af12b154..00000000 --- a/src/Toastr/Laravel/composer.json.local +++ /dev/null @@ -1,82 +0,0 @@ -{ - "name": "php-flasher/flasher-toastr-laravel", - "description": "PHP Flasher Laravel 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": "../../Laravel", - "options": { - "symlink": true - } - }, - { - "type": "path", - "url": "../Prime", - "options": { - "symlink": true - } - } - ], - "require": { - "php": ">=5.3", - "php-flasher/flasher-laravel": "@dev", - "php-flasher/flasher-toastr": "@dev" - }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0", - "orchestra/testbench": "^2.0|^3.0|^4.0|^5.0|^6.0" - }, - "autoload": { - "psr-4": { - "Flasher\\Toastr\\Laravel\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Toastr\\Laravel\\Tests\\": "Tests/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Flasher\\Toastr\\Laravel\\FlasherToastrServiceProvider" - ] - } - }, - "config": { - "sort-packages": true, - "platform": { - "php": "5.3.10" - } - }, - "minimum-stability": "dev", - "prefer-stable": true -} diff --git a/src/Toastr/Laravel/phpunit.xml.dist b/src/Toastr/Laravel/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Toastr/Laravel/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Toastr/Prime/.github/workflows/tests.yaml b/src/Toastr/Prime/.github/workflows/tests.yaml deleted file mode 100644 index b01da530..00000000 --- a/src/Toastr/Prime/.github/workflows/tests.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: Running tests - -on: - push: - pull_request: - schedule: - - cron: '* * * * *' - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4 ] - - name: php ${{ matrix.php }} - ${{ matrix.dependency-version }} - - steps: - - name: Checkout code - uses: actions/checkout@v1 - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - coverage: none - - - name: Require phpunit 4.8 for php <= 5.6 - if: matrix.php <= 5.6 - run: composer require "phpunit/phpunit:4.8.36" --no-interaction --no-update - - - name: Require phpunit 6 for php >= 7.0 - if: matrix.php >= 7.0 - run: composer require "phpunit/phpunit:6.*" --no-interaction --no-update - - - name: Require phpunit 9 for php >= 7.3 - if: matrix.php >= 7.3 - run: composer require "phpunit/phpunit:9.*" --no-interaction --no-update - - - name: Install dependencies - run: composer update --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit diff --git a/src/Toastr/Prime/Tests/.gitkeep b/src/Toastr/Prime/Tests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Toastr/Prime/composer.json b/src/Toastr/Prime/composer.json index 8e7ab171..c49db1d1 100644 --- a/src/Toastr/Prime/composer.json +++ b/src/Toastr/Prime/composer.json @@ -28,20 +28,9 @@ "php": ">=5.3", "php-flasher/flasher": "^0.5" }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0|^6.0|^7.0|^8.0|^9.0" - }, "autoload": { "psr-4": { "Flasher\\Toastr\\Prime\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "autoload-dev": { - "psr-4": { - "Flasher\\Toastr\\Prime\\Tests\\": "Tests/" } }, "config": { diff --git a/src/Toastr/Prime/phpunit.xml.dist b/src/Toastr/Prime/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Toastr/Prime/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Toastr/Symfony/.github/workflows/tests.yaml b/src/Toastr/Symfony/.github/workflows/tests.yaml deleted file mode 100644 index cf31a25f..00000000 --- a/src/Toastr/Symfony/.github/workflows/tests.yaml +++ /dev/null @@ -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 diff --git a/src/Toastr/Symfony/composer.json b/src/Toastr/Symfony/composer.json index bd7cc8f6..900af287 100644 --- a/src/Toastr/Symfony/composer.json +++ b/src/Toastr/Symfony/composer.json @@ -32,20 +32,9 @@ "php-flasher/flasher-symfony": "^0.5", "php-flasher/flasher-toastr": "^0.5" }, - "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": { diff --git a/src/Toastr/Symfony/composer.json.local b/src/Toastr/Symfony/composer.json.local deleted file mode 100644 index 1db32e39..00000000 --- a/src/Toastr/Symfony/composer.json.local +++ /dev/null @@ -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 -} diff --git a/src/Toastr/Symfony/phpunit.xml.dist b/src/Toastr/Symfony/phpunit.xml.dist deleted file mode 100644 index 3b5c944f..00000000 --- a/src/Toastr/Symfony/phpunit.xml.dist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Tests - - - - - ./ - - - diff --git a/src/Laravel/Tests/Config/ConfigTest.php b/tests/Laravel/Config/ConfigTest.php similarity index 86% rename from src/Laravel/Tests/Config/ConfigTest.php rename to tests/Laravel/Config/ConfigTest.php index 61c6370d..9639752c 100644 --- a/src/Laravel/Tests/Config/ConfigTest.php +++ b/tests/Laravel/Config/ConfigTest.php @@ -1,9 +1,9 @@ array( - 'https://cdn.jsdelivr.net/npm/@flasher/flasher-notyf@0.1.6/dist/flasher-notyf.min.js', + 'https://cdn.jsdelivr.net/npm/@flasher/flasher-notyf@0.1.8/dist/flasher-notyf.min.js', ), 'styles' => array(), 'options' => array( diff --git a/src/Notyf/Symfony/Tests/DependencyInjection/FlasherNotyfExtensionTest.php b/tests/Notyf/Symfony/DependencyInjection/FlasherNotyfExtensionTest.php similarity index 95% rename from src/Notyf/Symfony/Tests/DependencyInjection/FlasherNotyfExtensionTest.php rename to tests/Notyf/Symfony/DependencyInjection/FlasherNotyfExtensionTest.php index a4cd3638..edbef5eb 100644 --- a/src/Notyf/Symfony/Tests/DependencyInjection/FlasherNotyfExtensionTest.php +++ b/tests/Notyf/Symfony/DependencyInjection/FlasherNotyfExtensionTest.php @@ -1,10 +1,10 @@ addListener('Flasher\Prime\Tests\EventDispatcher\Event', array($listener, 'preFoo')); + $dispatcher->addListener('Flasher\Tests\Prime\EventDispatcher\Event', array($listener, 'preFoo')); $dispatcher->addListener('NotFoundEvent', array($listener, 'postFoo')); $return = $dispatcher->dispatch($event); @@ -73,7 +73,7 @@ class EventDispatcherTest extends TestCase $this->assertTrue($listener->preFooInvoked); $this->assertFalse($listener->postFooInvoked); - $this->assertInstanceOf('Flasher\Prime\Tests\EventDispatcher\Event', $return); + $this->assertInstanceOf('Flasher\Tests\Prime\EventDispatcher\Event', $return); $this->assertEquals($event, $return); } @@ -87,7 +87,7 @@ class EventDispatcherTest extends TestCase }; $event = new Event(); - $dispatcher->addListener('Flasher\Prime\Tests\EventDispatcher\Event', $listener); + $dispatcher->addListener('Flasher\Tests\Prime\EventDispatcher\Event', $listener); $dispatcher->addListener('AnotherEvent', $listener); $dispatcher->dispatch($event); $this->assertEquals(1, $invoked); @@ -104,8 +104,8 @@ class EventDispatcherTest extends TestCase // postFoo() stops the propagation, so only one listener should // be executed // Manually set priority to enforce $listener to be called first - $dispatcher->addListener('Flasher\Prime\Tests\EventDispatcher\Event', array($listener, 'postFoo'), 10); - $dispatcher->addListener('Flasher\Prime\Tests\EventDispatcher\Event', array($otherListener, 'preFoo')); + $dispatcher->addListener('Flasher\Tests\Prime\EventDispatcher\Event', array($listener, 'postFoo'), 10); + $dispatcher->addListener('Flasher\Tests\Prime\EventDispatcher\Event', array($otherListener, 'preFoo')); $dispatcher->dispatch($event); $this->assertTrue($listener->postFooInvoked); $this->assertFalse($otherListener->postFooInvoked); @@ -127,9 +127,9 @@ class EventDispatcherTest extends TestCase $listener3 = function () use (&$invoked) { $invoked[] = '3'; }; - $dispatcher->addListener('Flasher\Prime\Tests\EventDispatcher\Event', $listener1, -10); - $dispatcher->addListener('Flasher\Prime\Tests\EventDispatcher\Event', $listener2); - $dispatcher->addListener('Flasher\Prime\Tests\EventDispatcher\Event', $listener3, 10); + $dispatcher->addListener('Flasher\Tests\Prime\EventDispatcher\Event', $listener1, -10); + $dispatcher->addListener('Flasher\Tests\Prime\EventDispatcher\Event', $listener2); + $dispatcher->addListener('Flasher\Tests\Prime\EventDispatcher\Event', $listener3, 10); $dispatcher->dispatch($event); $this->assertEquals(array('3', '2', '1'), $invoked); } diff --git a/src/Prime/Tests/Filter/CriteriaBuilderTest.php b/tests/Prime/Filter/CriteriaBuilderTest.php similarity index 92% rename from src/Prime/Tests/Filter/CriteriaBuilderTest.php rename to tests/Prime/Filter/CriteriaBuilderTest.php index 4e1c8d23..f985cc08 100644 --- a/src/Prime/Tests/Filter/CriteriaBuilderTest.php +++ b/tests/Prime/Filter/CriteriaBuilderTest.php @@ -1,10 +1,10 @@ array( 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js', - 'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.1.3/dist/flasher-sweet-alert.min.js', + 'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.2.1/dist/flasher-sweet-alert.min.js', ), 'styles' => array(), 'options' => array( diff --git a/src/SweetAlert/Symfony/Tests/DependencyInjection/FlasherSweetAlertExtensionTest.php b/tests/SweetAlert/Symfony/DependencyInjection/FlasherSweetAlertExtensionTest.php similarity index 95% rename from src/SweetAlert/Symfony/Tests/DependencyInjection/FlasherSweetAlertExtensionTest.php rename to tests/SweetAlert/Symfony/DependencyInjection/FlasherSweetAlertExtensionTest.php index a9805188..d026c4a3 100644 --- a/src/SweetAlert/Symfony/Tests/DependencyInjection/FlasherSweetAlertExtensionTest.php +++ b/tests/SweetAlert/Symfony/DependencyInjection/FlasherSweetAlertExtensionTest.php @@ -1,8 +1,8 @@ 'template', 'root_script' => 'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.2.2/dist/flasher.min.js', + 'root_scripts' => array(), 'template_factory' => array( 'default' => 'tailwindcss', 'templates' => array( diff --git a/src/Symfony/Tests/DependencyInjection/FlasherExtensionTest.php b/tests/Symfony/DependencyInjection/FlasherExtensionTest.php similarity index 93% rename from src/Symfony/Tests/DependencyInjection/FlasherExtensionTest.php rename to tests/Symfony/DependencyInjection/FlasherExtensionTest.php index fe286aa1..61ed4d23 100644 --- a/src/Symfony/Tests/DependencyInjection/FlasherExtensionTest.php +++ b/tests/Symfony/DependencyInjection/FlasherExtensionTest.php @@ -1,10 +1,10 @@