From e141da7dd487c99f932225135fe22b06fbf7a372 Mon Sep 17 00:00:00 2001 From: ARCANEDEV Date: Thu, 10 Sep 2020 18:20:12 +0100 Subject: [PATCH] Starting the Laravel v8 support --- .github/workflows/run-tests.yml | 4 +-- .scrutinizer.yml | 2 +- README.md | 4 +-- _docs/0-Home.md | 4 +-- _docs/1-Installation-and-Setup.md | 52 +++++++++++++++++-------------- _docs/2-Configuration.md | 1 + composer.json | 18 ++++++++--- config/breadcrumbs.php | 1 + phpunit.xml.dist | 33 +++++++++----------- views/bootstrap-3.blade.php | 26 +++++++--------- views/bootstrap-4.blade.php | 26 +++++++--------- views/bootstrap-5.blade.php | 15 +++++++++ views/foundation-5.blade.php | 26 +++++++--------- views/foundation-6.blade.php | 34 ++++++++++---------- 14 files changed, 133 insertions(+), 113 deletions(-) create mode 100644 views/bootstrap-5.blade.php diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index abe2e14..5b8e007 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 461a6dd..f8b5f23 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/Breadcrumbs/r * Well tested with maximum code quality. * Easy setup & configuration. - * Laravel `5.x` to ` 7.x` are supported. + * Laravel `5.x` to ` 8.x` are supported. * Twitter Bootstrap `v3 | v4` are supported. * ZURB Foundation `v5 | v6` are supported. * Well documented & IDE Friendly. @@ -45,7 +45,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail. - [ARCANEDEV][link-author] - [All Contributors][link-contributors] -[badge_laravel]: https://img.shields.io/badge/Laravel%20supported-5.x%20to%207.x-orange.svg?style=flat-square +[badge_laravel]: https://img.shields.io/badge/Laravel%20supported-5.x%20to%208.x-orange.svg?style=flat-square [badge_license]: https://img.shields.io/packagist/l/arcanedev/breadcrumbs.svg?style=flat-square [badge_build]: https://img.shields.io/github/workflow/status/ARCANEDEV/Breadcrumbs/run-tests?style=flat-square [badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/Breadcrumbs.svg?style=flat-square diff --git a/_docs/0-Home.md b/_docs/0-Home.md index a5ae4ba..1c77e6d 100644 --- a/_docs/0-Home.md +++ b/_docs/0-Home.md @@ -1,12 +1,12 @@ # Breadcrumbs -A simple breadcrumbs generator helper. +A simple breadcrumbs' generator helper. ### Features * Well tested with maximum code quality. * Easy setup & configuration. - * Laravel `5.x` to ` 7.x` are supported. + * Laravel `5.x` to ` 8.x` are supported. * Twitter Bootstrap `v3 | v4` are supported. * ZURB Foundation `v5 | v6` are supported. * Well documented & IDE Friendly. diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md index a6baa60..67d8f3c 100644 --- a/_docs/1-Installation-and-Setup.md +++ b/_docs/1-Installation-and-Setup.md @@ -8,29 +8,35 @@ ## Version Compatibility -| Breadcrumbs | Laravel | -|:-----------------------------------------|:--------------------------------------------------------------------------------------------------------------------| -| ![Breadcrumbs v5.x][breadcrumbs_5_x] | ![Laravel v7.x][laravel_7_x] | -| ![Breadcrumbs v4.x][breadcrumbs_4_x] | ![Laravel v6.x][laravel_6_x] | -| ![Breadcrumbs v3.4.x][breadcrumbs_3_4_x] | ![Laravel v5.8][laravel_5_8] | -| ![Breadcrumbs v3.3.x][breadcrumbs_3_3_x] | ![Laravel v5.7][laravel_5_7] | -| ![Breadcrumbs v3.2.x][breadcrumbs_3_2_x] | ![Laravel v5.6][laravel_5_6] | -| ![Breadcrumbs v3.1.x][breadcrumbs_3_1_x] | ![Laravel v5.5][laravel_5_5] | -| ![Breadcrumbs v3.0.x][breadcrumbs_3_0_x] | ![Laravel v5.4][laravel_5_4] | -| ![Breadcrumbs v2.x][breadcrumbs_2_x] | ![Laravel v5.0][laravel_5_0] ![Laravel v5.1][laravel_5_1] ![Laravel v5.2][laravel_5_2] ![Laravel v5.3][laravel_5_3] | - -[laravel_7_x]: https://img.shields.io/badge/v7.x-supported-brightgreen.svg?style=flat-square "Laravel v7.x" -[laravel_6_x]: https://img.shields.io/badge/v6.x-supported-brightgreen.svg?style=flat-square "Laravel v6.x" -[laravel_5_8]: https://img.shields.io/badge/v5.8-supported-brightgreen.svg?style=flat-square "Laravel v5.8" -[laravel_5_7]: https://img.shields.io/badge/v5.7-supported-brightgreen.svg?style=flat-square "Laravel v5.7" -[laravel_5_6]: https://img.shields.io/badge/v5.6-supported-brightgreen.svg?style=flat-square "Laravel v5.6" -[laravel_5_5]: https://img.shields.io/badge/v5.5-supported-brightgreen.svg?style=flat-square "Laravel v5.5" -[laravel_5_4]: https://img.shields.io/badge/v5.4-supported-brightgreen.svg?style=flat-square "Laravel v5.4" -[laravel_5_3]: https://img.shields.io/badge/v5.3-supported-brightgreen.svg?style=flat-square "Laravel v5.3" -[laravel_5_2]: https://img.shields.io/badge/v5.2-supported-brightgreen.svg?style=flat-square "Laravel v5.2" -[laravel_5_1]: https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1" -[laravel_5_0]: https://img.shields.io/badge/v5.0-supported-brightgreen.svg?style=flat-square "Laravel v5.0" - +| Laravel | Breadcrumbs | +|:-----------------------------|:-----------------------------------------| +| ![Laravel v8.x][laravel_8_x] | ![Breadcrumbs v6.x][breadcrumbs_6_x] | +| ![Laravel v7.x][laravel_7_x] | ![Breadcrumbs v5.x][breadcrumbs_5_x] | +| ![Laravel v6.x][laravel_6_x] | ![Breadcrumbs v4.x][breadcrumbs_4_x] | +| ![Laravel v5.8][laravel_5_8] | ![Breadcrumbs v3.4.x][breadcrumbs_3_4_x] | +| ![Laravel v5.7][laravel_5_7] | ![Breadcrumbs v3.3.x][breadcrumbs_3_3_x] | +| ![Laravel v5.6][laravel_5_6] | ![Breadcrumbs v3.2.x][breadcrumbs_3_2_x] | +| ![Laravel v5.5][laravel_5_5] | ![Breadcrumbs v3.1.x][breadcrumbs_3_1_x] | +| ![Laravel v5.4][laravel_5_4] | ![Breadcrumbs v3.0.x][breadcrumbs_3_0_x] | +| ![Laravel v5.3][laravel_5_3] | ![Breadcrumbs v2.x][breadcrumbs_2_x] | +| ![Laravel v5.2][laravel_5_2] | ![Breadcrumbs v2.x][breadcrumbs_2_x] | +| ![Laravel v5.1][laravel_5_1] | ![Breadcrumbs v2.x][breadcrumbs_2_x] | +| ![Laravel v5.0][laravel_5_0] | ![Breadcrumbs v2.x][breadcrumbs_2_x] | + +[laravel_8_x]: https://img.shields.io/badge/version-8.x-blue.svg?style=flat-square "Laravel v8.x" +[laravel_7_x]: https://img.shields.io/badge/version-7.x-blue.svg?style=flat-square "Laravel v7.x" +[laravel_6_x]: https://img.shields.io/badge/version-6.x-blue.svg?style=flat-square "Laravel v6.x" +[laravel_5_8]: https://img.shields.io/badge/version-5.8-blue.svg?style=flat-square "Laravel v5.8" +[laravel_5_7]: https://img.shields.io/badge/version-5.7-blue.svg?style=flat-square "Laravel v5.7" +[laravel_5_6]: https://img.shields.io/badge/version-5.6-blue.svg?style=flat-square "Laravel v5.6" +[laravel_5_5]: https://img.shields.io/badge/version-5.5-blue.svg?style=flat-square "Laravel v5.5" +[laravel_5_4]: https://img.shields.io/badge/version-5.4-blue.svg?style=flat-square "Laravel v5.4" +[laravel_5_3]: https://img.shields.io/badge/version-5.3-blue.svg?style=flat-square "Laravel v5.3" +[laravel_5_2]: https://img.shields.io/badge/version-5.2-blue.svg?style=flat-square "Laravel v5.2" +[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" + +[breadcrumbs_6_x]: https://img.shields.io/badge/version-6.x-blue.svg?style=flat-square "Breadcrumbs v6.x" [breadcrumbs_5_x]: https://img.shields.io/badge/version-5.x-blue.svg?style=flat-square "Breadcrumbs v5.x" [breadcrumbs_4_x]: https://img.shields.io/badge/version-4.x-blue.svg?style=flat-square "Breadcrumbs v4.x" [breadcrumbs_3_4_x]: https://img.shields.io/badge/version-3.4.x-blue.svg?style=flat-square "Breadcrumbs v3.4.x" diff --git a/_docs/2-Configuration.md b/_docs/2-Configuration.md index 9b31c60..abf50f2 100644 --- a/_docs/2-Configuration.md +++ b/_docs/2-Configuration.md @@ -24,6 +24,7 @@ return [ // Twitter Bootstrap 'bootstrap-3' => 'breadcrumbs::bootstrap-3', 'bootstrap-4' => 'breadcrumbs::bootstrap-4', + 'bootstrap-5' => 'breadcrumbs::bootstrap-5', // Zurb Foundation 'foundation-5' => 'breadcrumbs::foundation-5', diff --git a/composer.json b/composer.json index ae9b454..d6ff757 100644 --- a/composer.json +++ b/composer.json @@ -14,12 +14,12 @@ "type": "library", "license": "MIT", "require": { - "php": "^7.2.5", - "arcanedev/support": "^7.0" + "php": "^7.3", + "arcanedev/support": "^8.0" }, "require-dev": { - "orchestra/testbench": "^5.0", - "phpunit/phpunit": "^8.5|^9.0" + "orchestra/testbench": "^6.0", + "phpunit/phpunit": "^9.3" }, "autoload": { "psr-4": { @@ -32,13 +32,23 @@ "Arcanedev\\Breadcrumbs\\Tests\\": "tests/" } }, + "scripts": { + "test": "phpunit", + "coverage": "phpunit --coverage-html build/coverage/html" + }, "extra": { + "branch-alias": { + "dev-develop": "6.x-dev" + }, "laravel": { "providers": [ "Arcanedev\\Breadcrumbs\\BreadcrumbsServiceProvider" ] } }, + "config": { + "sort-packages": true + }, "minimum-stability": "dev", "prefer-stable": true } diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php index 3916158..81855a5 100644 --- a/config/breadcrumbs.php +++ b/config/breadcrumbs.php @@ -15,6 +15,7 @@ // Twitter Bootstrap 'bootstrap-3' => 'breadcrumbs::bootstrap-3', 'bootstrap-4' => 'breadcrumbs::bootstrap-4', + 'bootstrap-5' => 'breadcrumbs::bootstrap-5', // Zurb Foundation 'foundation-5' => 'breadcrumbs::foundation-5', diff --git a/phpunit.xml.dist b/phpunit.xml.dist index e838c23..7ff2bcc 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,27 +1,22 @@ - +> - ./tests/ + ./tests - - - ./src/ - - - - - - - + + + ./src + + + + + + + diff --git a/views/bootstrap-3.blade.php b/views/bootstrap-3.blade.php index f05a06d..1799797 100644 --- a/views/bootstrap-3.blade.php +++ b/views/bootstrap-3.blade.php @@ -1,17 +1,15 @@ @if ($breadcrumbs) - @endif diff --git a/views/bootstrap-4.blade.php b/views/bootstrap-4.blade.php index 3a8c3d7..2d4fcbf 100644 --- a/views/bootstrap-4.blade.php +++ b/views/bootstrap-4.blade.php @@ -1,17 +1,15 @@ @if ($breadcrumbs) -
    - @foreach ($breadcrumbs as $crumb) - ' : ''; - ?> +
      + @foreach ($breadcrumbs as $crumb) + @php($icon = isset($crumb['icon']) ? ' ' : '') - @if ($crumb['url'] && ! $crumb['last']) -
    1. - {!! $icon !!}{{ $crumb['title'] }} -
      2. - @else -
    2. {!! $icon !!}{{ $crumb['title'] }}
      3. - @endif - @endforeach -
    + @if ($crumb['url'] && ! $crumb['last']) +
  1. + {!! $icon !!}{{ $crumb['title'] }} +
    2. + @else +
  2. {!! $icon !!}{{ $crumb['title'] }}
    3. + @endif + @endforeach +
@endif diff --git a/views/bootstrap-5.blade.php b/views/bootstrap-5.blade.php new file mode 100644 index 0000000..e491697 --- /dev/null +++ b/views/bootstrap-5.blade.php @@ -0,0 +1,15 @@ +@if ($breadcrumbs) +
    + @foreach ($breadcrumbs as $crumb) + @php($icon = isset($crumb['icon']) ? ' ' : '') + + @if ($crumb['url'] && ! $crumb['last']) +
  1. + {!! $icon !!}{{ $crumb['title'] }} +
    2. + @else +
  2. {!! $icon !!}{{ $crumb['title'] }}
    3. + @endif + @endforeach +
+@endif diff --git a/views/foundation-5.blade.php b/views/foundation-5.blade.php index 37412a5..41f05e2 100644 --- a/views/foundation-5.blade.php +++ b/views/foundation-5.blade.php @@ -1,17 +1,15 @@ @if ($breadcrumbs) - @endif diff --git a/views/foundation-6.blade.php b/views/foundation-6.blade.php index 8a67624..e805a0d 100644 --- a/views/foundation-6.blade.php +++ b/views/foundation-6.blade.php @@ -1,21 +1,19 @@ @if ($breadcrumbs) - @endif