Merge d450214 into acb44f4

ARCANEDEV · Sep 5, 2020 · 78b2099 · 78b2099
2 parents acb44f4 + d450214
commit 78b2099
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 37 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -21,7 +21,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
@@ -20,7 +20,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LaravelActive
 
 ## Features
 
-  * Laravel `5.4` to `7.x` are supported.
+  * Laravel `5.4` to `8.x` are supported.
   * Well tested (100% code coverage with maximum code quality).
   * Well documented &amp; IDE Friendly.
   * Made with :heart: &amp; :coffee:.
@@ -44,7 +44,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-5.4%20to%207.x-orange.svg?style=flat-square
+[badge_laravel]:   https://img.shields.io/badge/Laravel-5.4%20to%208.x-orange.svg?style=flat-square
 [badge_license]:   https://img.shields.io/packagist/l/arcanedev/laravel-active.svg?style=flat-square
 [badge_build]:     https://img.shields.io/github/workflow/status/ARCANEDEV/LaravelActive/run-tests?style=flat-square
 [badge_coverage]:  https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelActive.svg?style=flat-square

diff --git a/_docs/0-Home.md b/_docs/0-Home.md
@@ -4,7 +4,7 @@ A Laravel helper to detect if the current route is active.
 
 ### Features
 
-  * Laravel `5.4` to `7.x` are supported.
+  * Laravel `5.4` to `8.x` are supported.
   * Well tested (100% code coverage with maximum code quality).
   * Well documented &amp; IDE Friendly.
   * Made with :heart: &amp; :coffee:.

diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md
@@ -8,24 +8,27 @@
 
 ## Version Compatibility
 
-| LaravelActive                                 | Laravel                      |
-|:----------------------------------------------|:-----------------------------|
-| ![LaravelActive v3.x][laravel_active_3_x]     | ![Laravel v7.x][laravel_7_x] |
-| ![LaravelActive v2.x][laravel_active_2_x]     | ![Laravel v6.x][laravel_6_x] |
-| ![LaravelActive v1.4.x][laravel_active_1_4_x] | ![Laravel v5.8][laravel_5_8] |
-| ![LaravelActive v1.3.x][laravel_active_1_3_x] | ![Laravel v5.7][laravel_5_7] |
-| ![LaravelActive v1.2.x][laravel_active_1_2_x] | ![Laravel v5.6][laravel_5_6] |
-| ![LaravelActive v1.1.x][laravel_active_1_1_x] | ![Laravel v5.5][laravel_5_5] |
-| ![LaravelActive v1.0.x][laravel_active_1_0_x] | ![Laravel v5.4][laravel_5_4] |
-
-[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                      | LaravelActive                                 |
+|:-----------------------------|:----------------------------------------------|
+| ![Laravel v8.x][laravel_8_x] | ![LaravelActive v4.x][laravel_active_4_x]     |
+| ![Laravel v7.x][laravel_7_x] | ![LaravelActive v3.x][laravel_active_3_x]     |
+| ![Laravel v6.x][laravel_6_x] | ![LaravelActive v2.x][laravel_active_2_x]     |
+| ![Laravel v5.8][laravel_5_8] | ![LaravelActive v1.4.x][laravel_active_1_4_x] |
+| ![Laravel v5.7][laravel_5_7] | ![LaravelActive v1.3.x][laravel_active_1_3_x] |
+| ![Laravel v5.6][laravel_5_6] | ![LaravelActive v1.2.x][laravel_active_1_2_x] |
+| ![Laravel v5.5][laravel_5_5] | ![LaravelActive v1.1.x][laravel_active_1_1_x] |
+| ![Laravel v5.4][laravel_5_4] | ![LaravelActive v1.0.x][laravel_active_1_0_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_active_4_x]:    https://img.shields.io/badge/version-4.x-blue.svg?style=flat-square "LaravelActive v4.x"
 [laravel_active_3_x]:    https://img.shields.io/badge/version-3.x-blue.svg?style=flat-square "LaravelActive v3.x"
 [laravel_active_2_x]:    https://img.shields.io/badge/version-2.x-blue.svg?style=flat-square "LaravelActive v2.x"
 [laravel_active_1_4_x]:  https://img.shields.io/badge/version-1.4.x-blue.svg?style=flat-square "LaravelActive v1.4.x"

diff --git 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": {
@@ -33,6 +33,9 @@
         }
     },
     "extra": {
+        "branch-alias": {
+            "dev-develop": "4.x-dev"
+        },
         "laravel": {
             "providers": [
                 "Arcanedev\\LaravelActive\\LaravelActiveServiceProvider"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -11,17 +11,17 @@
         >
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory suffix=".php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="coverage-text" target="build/logs/coverage.txt"/>
-        <log type="coverage-html" target="build/logs/coverage"/>
-    </logging>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <clover outputFile="build/coverage/clover.xml"/>
+            <html outputDirectory="build/coverage/html" lowUpperBound="50" highLowerBound="90"/>
+            <text outputFile="build/coverage/coverage.txt" showUncoveredFiles="false" showOnlySummary="true"/>
+        </report>
+    </coverage>
 </phpunit>