Merge branch '2.0'

.gitignore

@@ -1 +1,2 @@
-vendor
+vendor
+.phpintel

.travis.yml

@@ -0,0 +1,12 @@
+language: php
+php:
+  - 5.6
+  - 7.0
+  - 7.1
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction
+
+script:
+  - vendor/bin/phpunit

README.md

@@ -4,37 +4,19 @@
 
 A small, lightweight and easy-to-use Laravel package for handling markdown. It comes with a facade, a helper function and a Blade directive to make life easier for you.
 
-This package utilizes the [Parsedown-package](http://parsedown.org/) by @erusev.
+| Laravel version | Laravel-Markdown version                                            |
+| --------------- | ------------------------------------------------------------------- |
+| 5.5             | [2.0](https://github.com/andreasindal/laravel-markdown/tree/2.0)    |
+| 5.3, 5.4        | [1.1](https://github.com/andreasindal/laravel-markdown/tree/1.1)    |
+| 5.2             | [1.0](https://github.com/andreasindal/laravel-markdown/tree/master) |
 
 ## Installation
 
 To install it, simply pull it down with Composer. Run the `php artisan vendor:publish` command to publish the configuration file.
 
     composer require andreasindal/laravel-markdown:"1.0"
 
-All you have to do is to reference the service provider under the `'providers'` array in your `config/app.php` file. If you want to use the facade as well, include a reference under the `'aliases'` array in the same file.
-
-```php
-// config/app.php
-
-'providers' => [
-    // ...
-
-    Indal\Markdown\MarkdownServiceProvider::class,
-
-    // ...
-];
-
-'aliases' => [
-    // ...
-
-    'Markdown' => Indal\Markdown\Facade::class,
-
-    // ...
-];
-```
-
-## Configuration
+Laravel 5.5 uses Package Auto-Discovery, so you do not have to manually add the MarkdownServiceProvider.
 
 ## Usage
 
@@ -99,6 +81,17 @@ $html = $parser->parse('# Hello'); // <h1>Hello</h1>
 
 ```
 
+### Drivers (NEW!)
+
+Laravel-Markdown allows you to add custom markdown drivers. In order to use a custom markdown driver, you need to create a class that implements the `Indal\Markdown\Drivers\MarkdownDriver` interface. The interface contains two methods: `text` and `line`. `text` is used to convert a block of markdown to HTML, while `line` is used to convert a single line.
+
+Laravel-Markdown ships with a `ParsedownDriver` using the [Parsedown-package](http://parsedown.org/) by @erusev.
+
+
+## Credits
+
+* Mohamed Said [(@themsaid)](https://github.com/themsaid)
+
 ## License
 
 Licensed under MIT. For more information, see the [LICENSE-file](https://github.com/andreasindal/laravel-markdown/blob/master/LICENSE).

composer.json

@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "Illuminate/Support": "^5.2",
+        "Illuminate/Support": "^5.5",
         "erusev/parsedown": "^1.6"
     },
     "autoload": {
@@ -21,6 +21,17 @@
         ]
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.2"
+        "phpunit/phpunit": "^6.0",
+        "mockery/mockery": "^0.9.9"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Indal\\Markdown\\MarkdownServiceProvider"
+            ],
+            "aliases": {
+                "Markdown": "Indal\\Markdown\\Facade"
+            }
+        }
     }
 }