Merge pull request #10 from ARCANEDEV/develop

Adding Laravel 8 support
ARCANEDEV · Sep 10, 2020 · 47f4861 · 47f4861
2 parents b87baed + 99025ae
commit 47f4861
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 44 deletions.
diff --git 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
@@ -22,7 +22,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 6
+        runs: 4
     php_code_sniffer:
         enabled: true
         config:

diff --git a/composer.json b/composer.json
@@ -14,13 +14,13 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":                   "^7.2.5",
-        "arcanedev/support":     "^7.1",
+        "php": "^7.3",
+        "arcanedev/support": "^8.0",
         "piwik/device-detector": "^3.13"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0",
-        "phpunit/phpunit":     "^8.0|^9.0"
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -32,11 +32,23 @@
             "Arcanedev\\Agent\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "phpunit",
+        "coverage": "phpunit --coverage-html build/coverage/html"
+    },
     "extra": {
+        "branch-alias": {
+            "dev-develop": "9.x-dev"
+        },
         "laravel": {
             "providers": [
                 "Arcanedev\\Agent\\AgentServiceProvider"
             ]
         }
-    }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,30 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-        >
+>
     <testsuites>
-        <testsuite name="Application Test Suite">
+        <testsuite name="Package Test Suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-    </php>
-    <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"/>
+            <text outputFile="build/coverage/coverage.txt" showOnlySummary="true"/>
+        </report>
+    </coverage>
 </phpunit>
diff --git a/src/Agent.php b/src/Agent.php
@@ -4,15 +4,15 @@
 
 namespace Arcanedev\Agent;
 
-use Arcanedev\Agent\Contracts\{Agent as AgentContract, Detector};
+use Arcanedev\Agent\Contracts\Agent as AgentContract;
+use Arcanedev\Agent\Contracts\Detector;
 use BadMethodCallException;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\Request;
 
 /**
  * Class     Agent
  *
- * @package  Arcanedev\Agent
  * @author   ARCANEDEV <[email protected]>
  *
  * @method  \Arcanedev\Agent\Detectors\DeviceDetector   device()

diff --git a/src/AgentServiceProvider.php b/src/AgentServiceProvider.php
@@ -10,7 +10,6 @@
 /**
  * Class     AgentServiceProvider
  *
- * @package  Arcanedev\Agent
  * @author   ARCANEDEV <[email protected]>
  */
 class AgentServiceProvider extends PackageServiceProvider implements DeferrableProvider

diff --git a/src/Contracts/Agent.php b/src/Contracts/Agent.php
@@ -9,7 +9,6 @@
 /**
  * Interface  Agent
  *
- * @package   Arcanedev\Agent\Contracts
  * @author    ARCANEDEV <[email protected]>
  */
 interface Agent

diff --git a/src/Contracts/Detector.php b/src/Contracts/Detector.php
@@ -7,10 +7,9 @@
 use Illuminate\Http\Request;
 
 /**
- * Interface     Detector
+ * Interface  Detector
  *
- * @package  Arcanedev\Agent\Contracts
- * @author   ARCANEDEV <[email protected]>
+ * @author    ARCANEDEV <[email protected]>
  */
 interface Detector
 {

diff --git a/src/Detectors/DeviceDetector.php b/src/Detectors/DeviceDetector.php
@@ -11,7 +11,6 @@
 /**
  * Class     DeviceDetector
  *
- * @package  Arcanedev\Agent\Detectors
  * @author   ARCANEDEV <[email protected]>
  *
  * @mixin  \DeviceDetector\DeviceDetector

diff --git a/src/Detectors/LanguageDetector.php b/src/Detectors/LanguageDetector.php
@@ -10,7 +10,6 @@
 /**
  * Class     LanguageDetector
  *
- * @package  Arcanedev\Agent\Detectors
  * @author   ARCANEDEV <[email protected]>
  */
 class LanguageDetector implements Detector

diff --git a/tests/AgentServiceProviderTest.php b/tests/AgentServiceProviderTest.php
@@ -1,11 +1,12 @@
-<?php namespace Arcanedev\Agent\Tests;
+<?php
 
-use Illuminate\Contracts\Support\DeferrableProvider;
+declare(strict_types=1);
+
+namespace Arcanedev\Agent\Tests;
 
 /**
  * Class     AgentServiceProviderTest
  *
- * @package  Arcanedev\Agent\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class AgentServiceProviderTest extends TestCase

diff --git a/tests/AgentTest.php b/tests/AgentTest.php
@@ -9,7 +9,6 @@
 /**
  * Class     AgentTest
  *
- * @package  Arcanedev\Agent\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class AgentTest extends TestCase

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -9,7 +9,6 @@
 /**
  * Class     TestCase
  *
- * @package  Arcanedev\Agent\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 abstract class TestCase extends BaseTestCase