From 12a196f73229483d34a5a30150a26a5e20c18625 Mon Sep 17 00:00:00 2001 From: ARCANEDEV Date: Thu, 10 Sep 2020 20:21:31 +0100 Subject: [PATCH] Adding Laravel 8 support --- .github/workflows/run-tests.yml | 4 ++-- .scrutinizer.yml | 2 +- README.md | 4 ++-- _docs/0-Home.md | 2 +- _docs/1-Installation-and-Setup.md | 3 +++ composer.json | 11 +++++++---- phpunit.xml.dist | 33 +++++++++++++------------------ 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b9511e6..d2885e4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.2, 7.3, 7.4] + php: [7.3, 7.4] dependency-version: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }} @@ -22,7 +22,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.composer/cache/files - key: dependencies-laravel-7-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + key: dependencies-laravel-8-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 8a9285f..69d4755 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -22,7 +22,7 @@ checks: tools: external_code_coverage: timeout: 600 - runs: 6 + runs: 4 php_code_sniffer: enabled: true config: diff --git a/README.md b/README.md index 54d3f0e..eedfd29 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/Localization/ ### Features * Easy setup & configuration. - * Laravel `5.x` to `7.x` are supported. + * Laravel `5.x` to `8.x` are supported. * SEO-Friendly (Search engine optimization). * New extended Router to manage your localized routes. * Translated Eloquent Models. @@ -52,7 +52,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail. - [All Contributors][link-contributors] [badge_license]: http://img.shields.io/packagist/l/arcanedev/localization.svg?style=flat-square -[badge_laravel]: https://img.shields.io/badge/Laravel-5.x%20to%207.x-orange.svg?style=flat-square +[badge_laravel]: https://img.shields.io/badge/Laravel-5.x%20to%208.x-orange.svg?style=flat-square [badge_build]: https://img.shields.io/github/workflow/status/ARCANEDEV/Localization/run-tests?style=flat-square [badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/Localization.svg?style=flat-square [badge_quality]: https://img.shields.io/scrutinizer/g/ARCANEDEV/Localization.svg?style=flat-square diff --git a/_docs/0-Home.md b/_docs/0-Home.md index 11b21d0..ac5f355 100644 --- a/_docs/0-Home.md +++ b/_docs/0-Home.md @@ -7,7 +7,7 @@ Feel free to check out the [Releases](https://github.com/ARCANEDEV/Localization/ ### Features * Easy setup & configuration. - * Laravel `5.x` to `7.x` are supported. + * Laravel `5.x` to `8.x` are supported. * SEO-Friendly (Search engine optimization). * New extended Router to manage your localized routes. * Locales selector menu (Publishable & Customizable). diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md index 06c9ceb..efba47e 100644 --- a/_docs/1-Installation-and-Setup.md +++ b/_docs/1-Installation-and-Setup.md @@ -11,6 +11,7 @@ | Laravel | Localization | |:-----------------------------|:---------------------------------------| +| ![Laravel v8.*][laravel_8_x] | ![Localization v8.x][localization_8_x] | | ![Laravel v7.*][laravel_7_x] | ![Localization v7.x][localization_7_x] | | ![Laravel v6.*][laravel_6_x] | ![Localization v6.x][localization_6_x] | | ![Laravel v5.8][laravel_5_8] | ![Localization v5.x][localization_5_x] | @@ -23,6 +24,7 @@ | ![Laravel v5.1][laravel_5_1] | ![Localization v0.x][localization_0_x] | | ![Laravel v5.0][laravel_5_0] | ![Localization v0.x][localization_0_x] | +[laravel_8_x]: https://img.shields.io/badge/version-8.x-blue.svg?style=flat-square "Laravel v8.*" [laravel_7_x]: https://img.shields.io/badge/version-7.x-blue.svg?style=flat-square "Laravel v7.*" [laravel_6_x]: https://img.shields.io/badge/version-6.x-blue.svg?style=flat-square "Laravel v6.*" [laravel_5_8]: https://img.shields.io/badge/version-5.8-blue.svg?style=flat-square "Laravel v5.8" @@ -35,6 +37,7 @@ [laravel_5_1]: https://img.shields.io/badge/version-5.1-blue.svg?style=flat-square "Laravel v5.1" [laravel_5_0]: https://img.shields.io/badge/version-5.0-blue.svg?style=flat-square "Laravel v5.0" +[localization_8_x]: https://img.shields.io/badge/version-8.*-blue.svg?style=flat-square "Localization v8.*" [localization_7_x]: https://img.shields.io/badge/version-7.*-blue.svg?style=flat-square "Localization v7.*" [localization_6_x]: https://img.shields.io/badge/version-6.*-blue.svg?style=flat-square "Localization v6.*" [localization_5_x]: https://img.shields.io/badge/version-5.*-blue.svg?style=flat-square "Localization v5.*" diff --git a/composer.json b/composer.json index 74005f4..e16ad06 100644 --- a/composer.json +++ b/composer.json @@ -14,15 +14,15 @@ "type": "library", "license": "MIT", "require": { - "php": "^7.2.5", + "php": "^7.3", "ext-json": "*", - "arcanedev/support": "^7.0" + "arcanedev/support": "^8.0" }, "require-dev": { "ext-intl": "*", - "orchestra/testbench": "^5.0", + "orchestra/testbench": "^6.0", "mockery/mockery": "^1.3.1", - "phpunit/phpunit": "^8.5|^9.0" + "phpunit/phpunit": "^9.3" }, "autoload": { "psr-4": { @@ -40,6 +40,9 @@ "coverage": "phpunit --coverage-html build/coverage/html" }, "extra": { + "branch-alias": { + "dev-develop": "8.x-dev" + }, "laravel": { "providers": [ "Arcanedev\\Localization\\LocalizationServiceProvider", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 4574413..cd35060 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,31 +1,26 @@ - +> - ./tests/ + ./tests - - - ./src/ - - + + + ./src + + + + + + + - - - - -