Merge pull request #55 from ARCANEDEV/develop

Adding Laravel 8 support

.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

.scrutinizer.yml

@@ -22,7 +22,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 6
+        runs: 4
     php_code_sniffer:
         enabled: true
         config:

README.md

@@ -25,7 +25,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/SEO-Helper/re
   * Easy setup & configuration.
   * Well documented & IDE Friendly.
   * Well tested with maximum code quality.
-  * Laravel `5.x | 6.x | 7.x` are supported.
+  * Laravel `5.x` to `8.x` are supported.
   * Made with :heart: & :coffee:.
 
 ## Table of contents

_docs/0-Home.md

@@ -11,7 +11,7 @@ SEO Helper is a package that provides tools and helpers for SEO (Search Engine O
   * Easy setup & configuration.
   * Well documented & IDE Friendly.
   * Well tested with maximum code quality.
-  * Laravel `5.x | 6.x | 7.x` are supported.
+  * Laravel `5.x` to `8.x` are supported.
   * Made with :heart: & :coffee:.
 
 ## Table of contents

_docs/1-Installation-and-Setup.md

@@ -10,18 +10,22 @@
 
 ## Version Compatibility
 
-| SEO-Helper                             | Laravel                                                                                |
-|:---------------------------------------|:---------------------------------------------------------------------------------------|
-| ![SEO-Helper v3.x][seo_helper_3_x]     | ![Laravel v7.x][laravel_7_x]                                                           |
-| ![SEO-Helper v2.x][seo_helper_2_x]     | ![Laravel v6.x][laravel_6_x]                                                           |
-| ![SEO-Helper v1.7.x][seo_helper_1_7_x] | ![Laravel v5.8][laravel_5_8]                                                           |
-| ![SEO-Helper v1.6.x][seo_helper_1_6_x] | ![Laravel v5.7][laravel_5_7]                                                           |
-| ![SEO-Helper v1.5.x][seo_helper_1_5_x] | ![Laravel v5.6][laravel_5_6]                                                           |
-| ![SEO-Helper v1.4.x][seo_helper_1_4_x] | ![Laravel v5.5][laravel_5_5]                                                           |
-| ![SEO-Helper v1.3.x][seo_helper_1_3_x] | ![Laravel v5.4][laravel_5_4]                                                           |
-| ![SEO-Helper v1.2.x][seo_helper_1_2_x] | ![Laravel v5.1][laravel_5_1] ![Laravel v5.2][laravel_5_2] ![Laravel v5.3][laravel_5_3] |
-| ![SEO-Helper v1.1.x][seo_helper_1_1_x] | ![Laravel v5.0][laravel_5_0]                                                           |
-
+| Laravel                      | SEO-Helper                             |
+|:-----------------------------|:---------------------------------------|
+| ![Laravel v8.x][laravel_8_x] | ![SEO-Helper v4.x][seo_helper_4_x]     |
+| ![Laravel v7.x][laravel_7_x] | ![SEO-Helper v3.x][seo_helper_3_x]     |
+| ![Laravel v6.x][laravel_6_x] | ![SEO-Helper v2.x][seo_helper_2_x]     |
+| ![Laravel v5.8][laravel_5_8] | ![SEO-Helper v1.7.x][seo_helper_1_7_x] |
+| ![Laravel v5.7][laravel_5_7] | ![SEO-Helper v1.6.x][seo_helper_1_6_x] |
+| ![Laravel v5.6][laravel_5_6] | ![SEO-Helper v1.5.x][seo_helper_1_5_x] |
+| ![Laravel v5.5][laravel_5_5] | ![SEO-Helper v1.4.x][seo_helper_1_4_x] |
+| ![Laravel v5.4][laravel_5_4] | ![SEO-Helper v1.3.x][seo_helper_1_3_x] |
+| ![Laravel v5.3][laravel_5_3] | ![SEO-Helper v1.2.x][seo_helper_1_2_x] |
+| ![Laravel v5.2][laravel_5_2] | ![SEO-Helper v1.2.x][seo_helper_1_2_x] |
+| ![Laravel v5.1][laravel_5_1] | ![SEO-Helper v1.2.x][seo_helper_1_2_x] |
+| ![Laravel v5.0][laravel_5_0] | ![SEO-Helper v1.1.x][seo_helper_1_1_x] |
+
+[laravel_8_x]:  https://img.shields.io/badge/v8.x-supported-brightgreen.svg?style=flat-square "Laravel v8.x"
 [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"
@@ -34,6 +38,7 @@
 [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"
 
+[seo_helper_4_x]:   https://img.shields.io/badge/version-4.x-blue.svg?style=flat-square "SEO-Helper v4.x"
 [seo_helper_3_x]:   https://img.shields.io/badge/version-3.x-blue.svg?style=flat-square "SEO-Helper v3.x"
 [seo_helper_2_x]:   https://img.shields.io/badge/version-2.x-blue.svg?style=flat-square "SEO-Helper v2.x"
 [seo_helper_1_7_x]: https://img.shields.io/badge/version-1.7.x-blue.svg?style=flat-square "SEO-Helper v1.7.x"
@@ -54,7 +59,7 @@ You can install this package via [Composer](http://getcomposer.org/) by running
 
 > **NOTE :** The package will automatically register itself if you're using Laravel `>= v5.5`, so you can skip this section.
 
-Once the package is installed, you can register the service provider in `config/app.php` in the `providers` array:
+Once the package installed, you can register the service provider in `config/app.php` in the `providers` array:
 
 ```php
 // config/app.php

composer.json

@@ -17,14 +17,14 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":                "^7.2.5",
-        "arcanedev/php-html": "^4.0",
-        "arcanedev/support":  "^7.0"
+        "php": "^7.3",
+        "arcanedev/php-html": "^5.0",
+        "arcanedev/support": "^8.0"
     },
     "require-dev": {
-        "ext-dom":             "*",
-        "orchestra/testbench": "^5.0",
-        "phpunit/phpunit":     "^8.5|^9.0"
+        "ext-dom": "*",
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -37,13 +37,23 @@
             "Arcanedev\\SeoHelper\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "phpunit",
+        "coverage": "phpunit --coverage-html build/coverage/html"
+    },
     "extra": {
+        "branch-alias": {
+            "dev-develop": "4.x-dev"
+        },
         "laravel": {
             "providers": [
                 "Arcanedev\\SeoHelper\\SeoHelperServiceProvider"
             ]
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }

phpunit.xml.dist

@@ -1,30 +1,25 @@
 <?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="Package Test Suite">
             <directory suffix=".php">./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
+    <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>
     <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>
 </phpunit>

src/Contracts/Entities/Analytics.php

@@ -9,7 +9,6 @@
 /**
  * Interface  Analytics
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities
  * @author    ARCANEDEV <[email protected]>
  */
 interface Analytics extends Renderable

src/Contracts/Entities/Description.php

@@ -9,7 +9,6 @@
 /**
  * Interface  Description
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities
  * @author    ARCANEDEV <[email protected]>
  */
 interface Description extends Renderable

src/Contracts/Entities/Keywords.php

@@ -9,7 +9,6 @@
 /**
  * Interface  Keywords
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities
  * @author    ARCANEDEV <[email protected]>
  */
 interface Keywords extends Renderable

src/Contracts/Entities/MetaCollection.php

@@ -9,7 +9,6 @@
 /**
  * Interface  MetaCollection
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities
  * @author    ARCANEDEV <[email protected]>
  */
 interface MetaCollection extends Renderable

src/Contracts/Entities/MiscTags.php

@@ -9,7 +9,6 @@
 /**
  * Interface  MiscTags
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities
  * @author    ARCANEDEV <[email protected]>
  */
 interface MiscTags extends Renderable

src/Contracts/Entities/OpenGraph.php

@@ -9,7 +9,6 @@
 /**
  * Interface  OpenGraph
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities
  * @author    ARCANEDEV <[email protected]>
  */
 interface OpenGraph extends Renderable

src/Contracts/Entities/Title.php

@@ -9,7 +9,6 @@
 /**
  * Interface  Title
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities
  * @author    ARCANEDEV <[email protected]>
  */
 interface Title extends Renderable

src/Contracts/Entities/TwitterCard.php

@@ -9,7 +9,6 @@
 /**
  * Interface  TwitterCard
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities\Twitter
  * @author    ARCANEDEV <[email protected]>
  */
 interface TwitterCard extends Renderable

src/Contracts/Entities/Webmasters.php

@@ -9,7 +9,6 @@
 /**
  * Interface  Webmasters
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities
  * @author    ARCANEDEV <[email protected]>
  */
 interface Webmasters extends Renderable

src/Contracts/Helpers/Meta.php

@@ -9,7 +9,6 @@
 /**
  * Interface  Meta
  *
- * @package   Arcanedev\SeoHelper\Contracts\Entities
  * @author    ARCANEDEV <[email protected]>
  */
 interface Meta extends Renderable

src/Contracts/Renderable.php

@@ -7,7 +7,6 @@
 /**
  * Interface  Renderable
  *
- * @package   Arcanedev\SeoHelper\Contracts
  * @author    ARCANEDEV <[email protected]>
  */
 interface Renderable

src/Contracts/SeoHelper.php

@@ -7,7 +7,6 @@
 /**
  * Interface  SeoHelper
  *
- * @package   Arcanedev\SeoHelper\Contracts
  * @author    ARCANEDEV <[email protected]>
  */
 interface SeoHelper extends Renderable

src/Contracts/SeoMeta.php

@@ -4,19 +4,16 @@
 
 namespace Arcanedev\SeoHelper\Contracts;
 
-use Arcanedev\SeoHelper\Contracts\Entities\{
-    Analytics as AnalyticsContract,
-    Description as DescriptionContract,
-    Keywords as KeywordsContract,
-    MiscTags as MiscTagsContract,
-    Title as TitleContract,
-    Webmasters as WebmastersContract
-};
+use Arcanedev\SeoHelper\Contracts\Entities\Analytics as AnalyticsContract;
+use Arcanedev\SeoHelper\Contracts\Entities\Description as DescriptionContract;
+use Arcanedev\SeoHelper\Contracts\Entities\Keywords as KeywordsContract;
+use Arcanedev\SeoHelper\Contracts\Entities\MiscTags as MiscTagsContract;
+use Arcanedev\SeoHelper\Contracts\Entities\Title as TitleContract;
+use Arcanedev\SeoHelper\Contracts\Entities\Webmasters as WebmastersContract;
 
 /**
  * Interface  SeoMeta
  *
- * @package   Arcanedev\SeoHelper\Contracts
  * @author    ARCANEDEV <[email protected]>
  */
 interface SeoMeta extends Renderable

src/Contracts/SeoOpenGraph.php

@@ -9,7 +9,6 @@
 /**
  * Interface  SeoOpenGraph
  *
- * @package   Arcanedev\SeoHelper\Contracts
  * @author    ARCANEDEV <[email protected]>
  */
 interface SeoOpenGraph extends Renderable

src/Contracts/SeoTwitter.php

@@ -9,7 +9,6 @@
 /**
  * Interface  SeoTwitter
  *
- * @package   Arcanedev\SeoHelper\Contracts
  * @author    ARCANEDEV <[email protected]>
  */
 interface SeoTwitter extends Renderable

src/Entities/AbstractMetaCollection.php

@@ -11,9 +11,8 @@
 use Illuminate\Support\Collection;
 
 /**
- * Class     MetaCollection
+ * Class     AbstractMetaCollection
  *
- * @package  Arcanedev\SeoHelper\Bases
  * @author   ARCANEDEV <[email protected]>
  */
 abstract class AbstractMetaCollection extends Collection implements MetaCollectionContract

src/Entities/Analytics.php

@@ -10,7 +10,6 @@
 /**
  * Class     Analytics
  *
- * @package  Arcanedev\SeoHelper\Entities
  * @author   ARCANEDEV <[email protected]>
  */
 class Analytics implements AnalyticsContract

src/Entities/Description.php

@@ -13,7 +13,6 @@
 /**
  * Class     Description
  *
- * @package  Arcanedev\SeoHelper\Entities
  * @author   ARCANEDEV <[email protected]>
  */
 class Description implements DescriptionContract

src/Entities/Keywords.php

@@ -11,7 +11,6 @@
 /**
  * Class     Keywords
  *
- * @package  Arcanedev\SeoHelper\Entities
  * @author   ARCANEDEV <[email protected]>
  */
 class Keywords implements KeywordsContract

src/Entities/MetaCollection.php

@@ -9,7 +9,6 @@
 /**
  * Class     MetaCollection
  *
- * @package  Arcanedev\SeoHelper\Entities
  * @author   ARCANEDEV <[email protected]>
  */
 class MetaCollection extends AbstractMetaCollection

src/Entities/MiscTags.php

@@ -10,7 +10,6 @@
 /**
  * Class     MiscTags
  *
- * @package  Arcanedev\SeoHelper\Entities
  * @author   ARCANEDEV <[email protected]>
  */
 class MiscTags implements MiscTagsContract

src/Entities/OpenGraph/Graph.php

@@ -10,7 +10,6 @@
 /**
  * Class     Graph
  *
- * @package  Arcanedev\SeoHelper\Entities\OpenGraph
  * @author   ARCANEDEV <[email protected]>
  */
 class Graph implements OpenGraphContract

src/Entities/OpenGraph/MetaCollection.php

@@ -9,7 +9,6 @@
 /**
  * Class     MetaCollection
  *
- * @package  Arcanedev\SeoHelper\Entities\OpenGraph
  * @author   ARCANEDEV <[email protected]>
  */
 class MetaCollection extends AbstractMetaCollection

src/Entities/Title.php

@@ -13,7 +13,6 @@
 /**
  * Class     Title
  *
- * @package  Arcanedev\SeoHelper\Entities
  * @author   ARCANEDEV <[email protected]>
  */
 class Title implements TitleContract