Add support for Laravel 6.0

Author: bonzai

.gitignore

@@ -2,3 +2,4 @@ vendor/
 composer.lock
 coverage.xml
 phpunit.xml
+.phpunit.result.cache

.travis.yml

@@ -3,8 +3,8 @@ language: php
 sudo: false
 
 php:
-  - 7.1
   - 7.2
+  - 7.3
 
 before_script:
   - travis_retry composer self-update

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## v3.0.0 (2019-09-03)
+
+- Added support for Laravel 6.0.
+
 ## v2.0.2 (2019-04-09)
 
 - Added support for Laravel 5.8.

composer.json

@@ -12,12 +12,12 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/support": "^6.0",
         "symfony/polyfill-mbstring": "^1.0",
-        "spatie/laravel-html": "^2.19"
+        "spatie/laravel-html": "^2.23"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0|^7.0",
+        "phpunit/phpunit": "^8.0",
         "mockery/mockery": "^1.1"
     },
     "autoload": {

src/Cursor.php

@@ -5,6 +5,7 @@
 namespace OsiemSiedem\Autolink;
 
 use Iterator;
+use Illuminate\Support\Arr;
 
 class Cursor implements Iterator
 {
@@ -127,7 +128,7 @@ public function getState(): array
      */
     public function setState(array $state): void
     {
-        $this->position = array_get($state, 'position', 0);
+        $this->position = Arr::get($state, 'position', 0);
     }
 
     /**

src/Filters/LimitLengthFilter.php

@@ -4,6 +4,7 @@
 
 namespace OsiemSiedem\Autolink\Filters;
 
+use Illuminate\Support\Str;
 use OsiemSiedem\Autolink\Contracts\Filter;
 use OsiemSiedem\Autolink\Contracts\Element;
 
@@ -42,7 +43,7 @@ public function filter(Element $element): Element
     {
         $title = $element->getTitle();
 
-        $title = str_limit($title, $this->limit, $this->end);
+        $title = Str::limit($title, $this->limit, $this->end);
 
         $element->setTitle($title);
 

src/Parser.php

@@ -4,6 +4,7 @@
 
 namespace OsiemSiedem\Autolink;
 
+use Illuminate\Support\Arr;
 use OsiemSiedem\Autolink\Contracts\Parser as ElementParser;
 
 class Parser
@@ -97,7 +98,7 @@ public function parse(string $text): array
                 continue;
             }
 
-            $parsers = array_get($this->elementParsers, $character);
+            $parsers = Arr::get($this->elementParsers, $character);
 
             if (is_null($parsers)) {
                 continue;

src/Parsers/AbstractParser.php

@@ -4,6 +4,7 @@
 
 namespace OsiemSiedem\Autolink\Parsers;
 
+use Illuminate\Support\Arr;
 use OsiemSiedem\Autolink\Cursor;
 use OsiemSiedem\Autolink\Contracts\Parser;
 
@@ -139,7 +140,7 @@ protected function trimMoreDelimeters(Cursor $cursor, int $start, int $end): ?ar
      */
     protected function getMatchingParenthesis(string $parenthesis): ?string
     {
-        return array_get([
+        return Arr::get([
             '"' => '"',
             "'" => "'",
             ')' => '(',

src/Parsers/UrlParser.php

@@ -4,6 +4,7 @@
 
 namespace OsiemSiedem\Autolink\Parsers;
 
+use Illuminate\Support\Str;
 use OsiemSiedem\Autolink\Cursor;
 use OsiemSiedem\Autolink\Contracts\Element;
 use OsiemSiedem\Autolink\Elements\UrlElement;
@@ -92,6 +93,6 @@ protected function validateProtocol(Cursor $cursor, int $start): bool
     {
         $text = strtolower($cursor->getText($start, 8));
 
-        return starts_with($text, $this->protocols);
+        return Str::startsWith($text, $this->protocols);
     }
 }

tests/AutolinkTest.php

@@ -4,6 +4,7 @@
 
 namespace OsiemSiedem\Tests\Autolink;
 
+use Illuminate\Support\Str;
 use OsiemSiedem\Autolink\Parser;
 use OsiemSiedem\Autolink\Autolink;
 use OsiemSiedem\Autolink\HtmlRenderer;
@@ -44,7 +45,7 @@ private function generateLink(string $title, string $href = null): string
             $href = $title;
         }
 
-        if ( ! starts_with($href, ['http', 'https', 'mailto'])) {
+        if ( ! Str::startsWith($href, ['http', 'https', 'mailto'])) {
             $href = 'http://'.$href;
         }