diff --git a/.gitattributes b/.gitattributes index 6313b56..d46478e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,17 @@ * text=auto eol=lf + +*.blade.php diff=html +*.css diff=css +*.html diff=html +*.md diff=markdown +*.php diff=php + +/.github export-ignore +/tests export-ignore +.editorconfig export-ignore +.gitattributes export-ignore +.gitignore export-ignore +.styleci.yml export-ignore +.phpunit-watcher.yml export-ignor +README.md export-ignore +phpunit.xml.dist export-ignore diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 424b471..c868886 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,24 +10,26 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [7.3, 7.4, 8.0, 8.1] - laravel: [^7.0, ^8.0, ^9.0] + php: [7.4, 8.0, 8.1] + laravel: [^8.0, ^9.0, ^10.0] #stability: [prefer-lowest, prefer-stable] stability: [prefer-stable] exclude: - - php: 7.3 - laravel: 9 - php: 7.4 laravel: 9 + - php: 7.4 + laravel: 10 + - php: 8.0 + laravel: 10 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.composer/cache/files key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} @@ -46,4 +48,4 @@ jobs: run: vendor/bin/phpunit --verbose - name: Coverage - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 diff --git a/.gitignore b/.gitignore index 57a9d9d..3833b89 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,4 @@ -vendor -composer.phar +/vendor composer.lock -.DS_Store -Thumbs.db -phpunit.xml clover.xml -.idea -.vscode .phpunit.result.cache diff --git a/composer.json b/composer.json index ca9ad08..50ab2af 100644 --- a/composer.json +++ b/composer.json @@ -18,16 +18,16 @@ } ], "require": { - "php": "^7.3|^8.0", - "illuminate/contracts": "^7.0|^8.0|^9.0", - "illuminate/translation": "^7.0|^8.0|^9.0" + "php": "^7.4|^8.0", + "illuminate/contracts": "^8.0|^9.0|^10.0", + "illuminate/translation": "^8.0|^9.0|^10.0" }, "require-dev": { - "graham-campbell/testbench": "^5.7", - "illuminate/filesystem": "^7.0|^8.0|^9.0", - "mockery/mockery": "^1.4", - "phpunit/phpunit": "^8.5|^9.5", - "spatie/phpunit-watcher": "^1.0" + "graham-campbell/testbench": "^6.0", + "illuminate/filesystem": "^8.0|^9.0|^10.0", + "mockery/mockery": "^1.6", + "phpunit/phpunit": "^9.5|^10.0", + "spatie/phpunit-watcher": "^1.23" }, "autoload": { "psr-4": { diff --git a/tests/TestCase.php b/tests/TestCase.php index e2c907f..8f42c7f 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -9,10 +9,8 @@ abstract class TestCase extends AbstractPackageTestCase { /** * Get the service provider class. - * - * @return string */ - protected function getServiceProviderClass() + protected static function getServiceProviderClass(): string { return TranslationServiceProvider::class; }