Merge pull request #18 from ARCANEDEV/develop

Starting Laravel 8 support
ARCANEDEV · Sep 10, 2020 · 578853a · 578853a
2 parents 02d7f31 + d1e8024
commit 578853a
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 42 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/README.md b/README.md
@@ -18,7 +18,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LaravelMarkdo
 
 ### Features
 
-  * Laravel `5.1` to `7.x` are supported.
+  * Laravel `5.1` to `8.x` are supported.
   * Easy setup & configuration.
   * Well tested (100% code coverage with maximum code quality).
   * Made with :heart: &amp; :coffee:.
@@ -43,7 +43,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail.
 - [All Contributors][link-contributors]
 
 [badge_license]:     https://img.shields.io/packagist/l/arcanedev/laravel-markdown.svg?style=flat-square
-[badge_laravel]:     https://img.shields.io/badge/Laravel-5.1%20to%207.x-orange.svg?style=flat-square
+[badge_laravel]:     https://img.shields.io/badge/Laravel-5.1%20to%208.x-orange.svg?style=flat-square
 [badge_build]:       https://img.shields.io/github/workflow/status/ARCANEDEV/LaravelMarkdown/run-tests?style=flat-square
 [badge_coverage]:    https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelMarkdown.svg?style=flat-square
 [badge_quality]:     https://img.shields.io/scrutinizer/g/ARCANEDEV/LaravelMarkdown.svg?style=flat-square

diff --git a/_docs/0-Home.md b/_docs/0-Home.md
@@ -6,7 +6,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LaravelMarkdo
 
 ### Features
 
-  * Laravel `5.1` to `7.x` are Supported.
+  * Laravel `5.1` to `8.x` are Supported.
   * Easy setup & configuration.
   * Well tested (100% code coverage with maximum code quality).
   * Made with :heart: &amp; :coffee:.

diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md
@@ -4,6 +4,7 @@
 
 | Laravel                      | Laravel Markdown                                                                              |
 |:-----------------------------|:----------------------------------------------------------------------------------------------|
+| ![Laravel v7.x][laravel_8_x] | ![Laravel Markdown v5.x][laravel_markdown_5_x]                                                |
 | ![Laravel v7.x][laravel_7_x] | ![Laravel Markdown v4.x][laravel_markdown_4_x]                                                |
 | ![Laravel v6.x][laravel_6_x] | ![Laravel Markdown v2.x][laravel_markdown_2_x] ![Laravel Markdown v3.x][laravel_markdown_3_x] |
 | ![Laravel v5.8][laravel_5_8] | ![Laravel Markdown v1.6.x][laravel_markdown_1_6_x]                                            |
@@ -16,6 +17,7 @@
 | ![Laravel v5.1][laravel_5_1] | ![Laravel Markdown v1.1.x][laravel_markdown_1_1_x]                                            |
 | ![Laravel v5.0][laravel_5_0] | ![Laravel Markdown v1.1.x][laravel_markdown_1_1_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"
@@ -28,6 +30,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"
 
+[laravel_markdown_5_x]:   https://img.shields.io/badge/version-5.x-blue.svg?style=flat-square "Laravel Markdown v5.x"
 [laravel_markdown_4_x]:   https://img.shields.io/badge/version-4.x-blue.svg?style=flat-square "Laravel Markdown v4.x"
 [laravel_markdown_3_x]:   https://img.shields.io/badge/version-3.x-blue.svg?style=flat-square "Laravel Markdown v3.x"
 [laravel_markdown_2_x]:   https://img.shields.io/badge/version-2.x-blue.svg?style=flat-square "Laravel Markdown v2.x"

diff --git a/composer.json b/composer.json
@@ -14,13 +14,13 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":                         "^7.2.5",
-        "arcanedev/support":           "^7.0",
-        "league/commonmark":           "^1.3"
+        "php": "^7.3",
+        "arcanedev/support": "^8.0",
+        "league/commonmark": "^1.3"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0",
-        "phpunit/phpunit":     "^8.5|^9.0"
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -33,14 +33,24 @@
             "Arcanedev\\LaravelMarkdown\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "phpunit",
+        "coverage": "phpunit --coverage-html build/coverage/html"
+    },
     "extra": {
+        "branch-alias": {
+            "dev-develop": "5.x-dev"
+        },
         "laravel": {
             "providers": [
                 "Arcanedev\\LaravelMarkdown\\LaravelMarkdownServiceProvider",
                 "Arcanedev\\LaravelMarkdown\\Providers\\DeferredServicesProvider"
             ]
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,29 +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>
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </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/coverage/clover.xml"/>
-        <log type="coverage-text" target="build/coverage/coverage.txt"/>
-        <log type="coverage-html" target="build/coverage/html"/>
-    </logging>
 </phpunit>
diff --git a/src/Contracts/Markdown.php b/src/Contracts/Markdown.php
@@ -5,10 +5,9 @@
 namespace Arcanedev\LaravelMarkdown\Contracts;
 
 /**
- * Interface     Markdown
+ * Interface  Markdown
  *
- * @package  Arcanedev\LaravelMarkdown\Contracts
- * @author   ARCANEDEV <[email protected]>
+ * @author    ARCANEDEV <[email protected]>
  */
 interface Markdown
 {

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

diff --git a/src/Exceptions/ParserBufferingException.php b/src/Exceptions/ParserBufferingException.php
@@ -9,7 +9,6 @@
 /**
  * Class     ParserBufferingException
  *
- * @package  Arcanedev\LaravelMarkdown\Exceptions
  * @author   ARCANEDEV <[email protected]>
  */
 class ParserBufferingException extends Exception

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

diff --git a/src/Markdown.php b/src/Markdown.php
@@ -11,7 +11,6 @@
 /**
  * Class     Markdown
  *
- * @package  Arcanedev\LaravelMarkdown
  * @author   ARCANEDEV <[email protected]>
  *
  * @method  \Illuminate\Support\HtmlString  parse(string $text)

diff --git a/src/Parsers/AbstractParser.php b/src/Parsers/AbstractParser.php
@@ -11,7 +11,6 @@
 /**
  * Class     AbstractParser
  *
- * @package  Arcanedev\LaravelMarkdown\Parsers
  * @author   ARCANEDEV <[email protected]>
  */
 abstract class AbstractParser implements Parser

diff --git a/src/Parsers/CommonMarkParser.php b/src/Parsers/CommonMarkParser.php
@@ -12,7 +12,6 @@
 /**
  * Class     CommonMarkParser
  *
- * @package  Arcanedev\LaravelMarkdown
  * @author   ARCANEDEV <[email protected]>
  */
 class CommonMarkParser extends AbstractParser

diff --git a/src/Providers/DeferredServicesProvider.php b/src/Providers/DeferredServicesProvider.php
@@ -13,7 +13,6 @@
 /**
  * Class     DeferredServicesProvider
  *
- * @package  Arcanedev\LaravelMarkdown\Providers
  * @author   ARCANEDEV <[email protected]>
  */
 class DeferredServicesProvider extends ServiceProvider implements DeferrableProvider

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

diff --git a/tests/MarkdownTest.php b/tests/MarkdownTest.php
@@ -7,9 +7,8 @@
 use Illuminate\Support\HtmlString;
 
 /**
- * Class     MarkdownParserTest
+ * Class     MarkdownTest
  *
- * @package  Arcanedev\LaravelMarkdown\Tests
  * @author   ARCANEDEV <[email protected]>
  */
 class MarkdownTest extends TestCase

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

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