Merge pull request #5 from XetaIO/add-L56

Update the latest Laravel version
XetaIO · Mar 10, 2018 · 95e4094 · 95e4094
2 parents 55a0c1d + 5068063
commit 95e4094
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:
@@ -12,21 +12,21 @@ matrix:
   fast_finish: true
 
   allow_failures:
-    - php: 7.0
+    - php: 7.1
       env: COVERALLS=1 DEFAULT=0
 
   include:
-    - php: 7.0
+    - php: 7.1
       env: PHPCS=1 DEFAULT=0
-    - php: 7.0
+    - php: 7.1
       env: COVERALLS=1 DEFAULT=0
 
 install:
   - composer self-update
   - composer install --prefer-dist --no-interaction
 
 before_script:
-  - sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev php-coveralls/php-coveralls; fi"
   - sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"
   - phpenv rehash
   - set +H
@@ -35,7 +35,7 @@ script:
   - sh -c "if [ '$DEFAULT' = '1' ]; then vendor/bin/phpunit; fi"
   - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=PSR2 ./src; fi"
   - sh -c "if [ '$COVERALLS' = '1' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi"
-  - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/php-coveralls -c .coveralls.yml -v; fi"
 
 notifications:
   email: false
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 >
 > |Travis|Coverage|Stable Version|Downloads|Laravel|License|
 > |:-------:|:------:|:-------:|:------:|:-------:|:-------:|
-> |[![Build Status](https://img.shields.io/travis/XetaIO/Xetaravel-Mentions.svg?style=flat-square)](https://travis-ci.org/XetaIO/Xetaravel-Mentions)|[![Coverage Status](https://img.shields.io/coveralls/XetaIO/Xetaravel-Mentions/master.svg?style=flat-square)](https://coveralls.io/r/XetaIO/Xetaravel-Mentions)|[![Latest Stable Version](https://img.shields.io/packagist/v/XetaIO/Xetaravel-Mentions.svg?style=flat-square)](https://packagist.org/packages/xetaio/xetaravel-mentions)|[![Total Downloads](https://img.shields.io/packagist/dt/xetaio/xetaravel-mentions.svg?style=flat-square)](https://packagist.org/packages/xetaio/xetaravel-mentions)|[![Laravel 5.4](https://img.shields.io/badge/Laravel-5.4-f4645f.svg?style=flat-square)](http://laravel.com)|[![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](https://github.com/XetaIO/Xetaravel-Mentions/blob/master/LICENSE)|
+> |[![Build Status](https://img.shields.io/travis/XetaIO/Xetaravel-Mentions.svg?style=flat-square)](https://travis-ci.org/XetaIO/Xetaravel-Mentions)|[![Coverage Status](https://img.shields.io/coveralls/XetaIO/Xetaravel-Mentions/master.svg?style=flat-square)](https://coveralls.io/r/XetaIO/Xetaravel-Mentions)|[![Latest Stable Version](https://img.shields.io/packagist/v/XetaIO/Xetaravel-Mentions.svg?style=flat-square)](https://packagist.org/packages/xetaio/xetaravel-mentions)|[![Total Downloads](https://img.shields.io/packagist/dt/xetaio/xetaravel-mentions.svg?style=flat-square)](https://packagist.org/packages/xetaio/xetaravel-mentions)|[![Laravel 5.6](https://img.shields.io/badge/Laravel-5.6-f4645f.svg?style=flat-square)](http://laravel.com)|[![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](https://github.com/XetaIO/Xetaravel-Mentions/blob/master/LICENSE)|
 >
 > A package to parse `@mentions` from a text and mention the user with a notification.
 >
@@ -35,7 +35,7 @@
 > * [Contribute](#contribute)
 >
 > ## Requirement
-> ![PHP](https://img.shields.io/badge/PHP->=7.0-brightgreen.svg?style=flat-square)
+> ![PHP](https://img.shields.io/badge/PHP->=7.1-brightgreen.svg?style=flat-square)
 >
 > ## Installation
 >
@@ -119,7 +119,7 @@
 >          // Register a new Parser and parse the content.
 >          $parser = new MentionParser($comment);
 >          $content = $parser->parse($comment->content);
->          
+>
 >          /**
 >           * Re-assign the parsed content and save it.
 >           *
@@ -151,7 +151,7 @@
 >       * Note : If the `mention` option is set to `false`, this setting is ignored.
 >       */
 >      'notify' => true,
->      
+>
 >      /**
 >       * The character that will trigger the mention.
 >       * Note : If you modify this setting, you will also need to modify

diff --git a/composer.json b/composer.json
@@ -23,14 +23,14 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "laravel/framework": "5.4.*",
+        "php": "^7.1.3",
+        "laravel/framework": "5.6.*",
         "xety/configurator": "^1.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.4",
-        "orchestra/database": "^3.4",
-        "phpunit/phpunit": "^6.0",
+        "orchestra/testbench": "^3.6",
+        "orchestra/database": "^3.6",
+        "phpunit/phpunit": "^7.0",
         "squizlabs/php_codesniffer": "3.*"
     },
     "autoload": {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -13,10 +13,8 @@ public function setUp()
 
         $this->setupDatabase();
 
-        $this->artisan('migrate', [
-            '--database' => 'testing',
-            '--realpath' => realpath(__DIR__.'/vendor/migrations')
-        ]);
+        $this->artisan('migrate', ['--database' => 'testing']);
+        $this->loadMigrationsFrom(__DIR__ . '/vendor/migrations');
 
         config([
             'mentions.pools.users' => [