Merge pull request #84 from andrey-helldar/9.x

[9.x] Big project changes and support for Laravel-Lang/lang 9
Laravel-Lang · Apr 14, 2021 · 127e84c · 127e84c
2 parents 55f9294 + b642a2a
commit 127e84c
Show file tree

Hide file tree

Showing 120 changed files with 2,866 additions and 2,957 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,13 +1,13 @@
 * text=auto
 
+.github/ export-ignore
+docs/ export-ignore
 tests/ export-ignore
 
 .codecov.yml export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.scrutinizer.yml export-ignore
 .styleci.yml export-ignore
+
 phpunit.php export-ignore
 phpunit.yml export-ignore
-
-composer.lock export-ignore
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -21,9 +21,8 @@ jobs:
                     php-version: 7.4
                     extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
                     coverage: xdebug
-
-            -   name: Composer self update
-                run: composer self-update
+                env:
+                    COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             -   name: Install dependencies
                 run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -2,17 +2,16 @@ name: phpunit
 on: [ push ]
 
 jobs:
-    laravel_80:
+    laravel:
         runs-on: ubuntu-latest
 
         strategy:
             fail-fast: true
             matrix:
                 php: [ "7.3", "7.4", "8.0" ]
-                laravel: [ "8.0" ]
-                support: [ "2.0", "3.0" ]
+                laravel: [ "7.0", "8.0" ]
 
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.support }}
+        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
 
         steps:
             -   name: Checkout code
@@ -24,47 +23,12 @@ jobs:
                     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 }}
-                    composer update --prefer-stable --prefer-dist --no-progress --no-interaction
-
-            -   name: Execute tests
-                run: sudo vendor/bin/phpunit
-
-    laravel_70:
-        runs-on: ubuntu-latest
-
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [ "7.2", "7.3", "7.4", "8.0" ]
-                laravel: [ "7.0" ]
-                support: [ "2.0", "3.0" ]
-
-        name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}, Support ${{ matrix.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
+                env:
+                    COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             -   name: Install dependencies
                 run: |
-                    composer require laravel/framework:^${{ matrix.laravel }} andrey-helldar/support:^${{ matrix.support }}
+                    composer require laravel/framework:^${{ matrix.laravel }}
                     composer update --prefer-stable --prefer-dist --no-progress --no-interaction
 
             -   name: Execute tests

diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,5 @@ build/
 *.cache
 *.clover
 *.orig
-test.php
 
 composer.lock