Merge pull request #7 from TheDragonCode/4.x

[4.x] Changed namespace
TheDragonCode · Nov 15, 2021 · 5a398ec · 5a398ec
2 parents ab73997 + cb5e452
commit 5a398ec
Show file tree

Hide file tree

Showing 26 changed files with 92 additions and 514 deletions.
diff --git a/.codecov.yml b/.codecov.yml
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -18,7 +18,6 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 7.4
                     extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
                     coverage: xdebug
 
@@ -31,9 +30,9 @@ jobs:
             -   name: Execute tests
                 run: |
                     mkdir -p build/logs
-                    vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+                    sudo vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
             -   name: Export
                 run: |
                     wget https://scrutinizer-ci.com/ocular.phar
-                    php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+                    sudo php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -2,263 +2,16 @@ name: phpunit
 on: [ push ]
 
 jobs:
-    laravel_54:
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [ "7.2", "7.3", "7.4" ]
-                laravel: [ "5.4.*" ]
-                support: [ "4.0" ]
-                laravel_support: [ "1.3", "2.0" ]
-
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
-
-            -   name: Composer self update
-                run: composer self-update
-
-            -   name: Install dependencies
-                run: |
-                    composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} andrey-helldar/laravel-support:^${{ matrix.laravel_support }} phpunit/phpunit:~5.7
-                    composer update --prefer-stable --prefer-dist --no-progress --no-interaction
-
-            -   name: Execute tests
-                run: vendor/bin/phpunit
-
-    laravel_55:
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [ "7.2", "7.3", "7.4" ]
-                laravel: [ "5.5.*" ]
-                support: [ "4.0" ]
-                laravel_support: [ "1.3", "2.0" ]
-
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
-
-            -   name: Composer self update
-                run: composer self-update
-
-            -   name: Install dependencies
-                run: |
-                    composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} andrey-helldar/laravel-support:^${{ matrix.laravel_support }} phpunit/phpunit:~6.0
-                    composer update --prefer-stable --prefer-dist --no-progress --no-interaction
-
-            -   name: Execute tests
-                run: vendor/bin/phpunit
-
-    laravel_56:
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [ "7.2", "7.3", "7.4" ]
-                laravel: [ "5.6.*" ]
-                support: [ "4.0" ]
-                laravel_support: [ "1.3", "2.0" ]
-
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
-
-            -   name: Composer self update
-                run: composer self-update
-
-            -   name: Install dependencies
-                run: |
-                    composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} andrey-helldar/laravel-support:^${{ matrix.laravel_support }} phpunit/phpunit:~7.0
-                    composer update --prefer-stable --prefer-dist --no-progress --no-interaction
-
-            -   name: Execute tests
-                run: vendor/bin/phpunit
-
-    laravel_57:
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [ "7.2", "7.3", "7.4" ]
-                laravel: [ "5.7.*" ]
-                support: [ "4.0" ]
-                laravel_support: [ "1.3", "2.0" ]
-
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
-
-            -   name: Composer self update
-                run: composer self-update
-
-            -   name: Install dependencies
-                run: |
-                    composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} andrey-helldar/laravel-support:^${{ matrix.laravel_support }} phpunit/phpunit:~7.0
-                    composer update --prefer-stable --prefer-dist --no-progress --no-interaction
-
-            -   name: Execute tests
-                run: vendor/bin/phpunit
-
-    laravel_58:
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [ "7.2", "7.3", "7.4" ]
-                laravel: [ "5.8.*" ]
-                support: [ "4.0" ]
-                laravel_support: [ "1.3", "2.0" ]
-
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
-
-            -   name: Composer self update
-                run: composer self-update
-
-            -   name: Install dependencies
-                run: |
-                    composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} andrey-helldar/laravel-support:^${{ matrix.laravel_support }} phpunit/phpunit:^8.0
-                    composer update --prefer-stable --prefer-dist --no-progress --no-interaction
-
-            -   name: Execute tests
-                run: vendor/bin/phpunit
-
-    laravel_6x:
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [ "7.2", "7.3", "7.4", "8.0" ]
-                laravel: [ "^6.0" ]
-                support: [ "4.0" ]
-                laravel_support: [ "1.3", "2.0" ]
-
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
-
-            -   name: Composer self update
-                run: composer self-update
-
-            -   name: Install dependencies
-                run: |
-                    composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} andrey-helldar/laravel-support:^${{ matrix.laravel_support }} phpunit/phpunit:^8.3
-                    composer update --prefer-stable --prefer-dist --no-progress --no-interaction
-
-            -   name: Execute tests
-                run: vendor/bin/phpunit
-
-    laravel_7x:
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [ "7.2", "7.3", "7.4", "8.0" ]
-                laravel: [ "^7.0" ]
-                support: [ "4.0" ]
-                laravel_support: [ "1.3", "2.0" ]
-
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
-
-            -   name: Composer self update
-                run: composer self-update
-
-            -   name: Install dependencies
-                run: |
-                    composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} andrey-helldar/laravel-support:^${{ matrix.laravel_support }}
-                    composer update --prefer-stable --prefer-dist --no-progress --no-interaction
-
-            -   name: Execute tests
-                run: vendor/bin/phpunit
-
-    laravel_8x:
+    phpunit:
         runs-on: ubuntu-latest
 
         strategy:
             fail-fast: true
             matrix:
                 php: [ "7.3", "7.4", "8.0" ]
-                laravel: [ "^8.0" ]
-                support: [ "4.0" ]
-                laravel_support: [ "1.3", "2.0" ]
+                laravel: [ "6.0", "7.0", "8.0" ]
 
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}, Laravel Support ${{ matrix.laravel_support }}
+        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
         steps:
             -   name: Checkout code
@@ -271,13 +24,10 @@ jobs:
                     extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
                     coverage: none
 
-            -   name: Composer self update
-                run: composer self-update
-
             -   name: Install dependencies
                 run: |
-                    composer require laravel/framework:${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }} andrey-helldar/laravel-support:^${{ matrix.laravel_support }}
+                    composer require laravel/framework:^${{ matrix.laravel }}
                     composer update --prefer-stable --prefer-dist --no-progress --no-interaction
 
             -   name: Execute tests
-                run: vendor/bin/phpunit
+                run: sudo vendor/bin/phpunit
diff --git a/.scrutinizer.yml b/.scrutinizer.yml