Merge pull request #5 from olssonm/dev

Update for Laravel 5.4
olssonm · Feb 1, 2017 · 308120b · 308120b
2 parents f9be099 + ccb9b37
commit 308120b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,6 @@ php:
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer install --prefer-dist --no-interaction
+  - travis_retry composer install --no-interaction
 
-script: phpunit
+script: composer test
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-Copyright (c) 2016 Marcus Olsson <hello@marcusolsson.me>
+Copyright (c) 2017 Marcus Olsson <contact@marcusolsson.me>
 
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal

diff --git a/composer.json b/composer.json
@@ -11,17 +11,18 @@
     "authors": [
         {
             "name": "Marcus Olsson",
-            "email": "hello@marcusolsson.me",
+            "email": "contact@marcusolsson.me",
             "homepage": "https://marcusolsson.me"
         }
     ],
     "require": {
-        "illuminate/support": "~5.3",
+        "illuminate/support": "~5.4",
         "php" : ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "4.*",
-        "orchestra/testbench": "~3.3"
+        "phpunit/phpunit" : "5.7.*",
+        "orchestra/testbench": "~3.4",
+        "orchestra/testbench-browser-kit": "~3.4"
     },
     "autoload": {
         "psr-4": {
@@ -38,8 +39,9 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.x-dev"
+            "dev-master": "3.x-dev"
         }
     },
-    "minimum-stability": "stable"
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/readme.md b/readme.md
@@ -14,6 +14,7 @@ All this package does is to add a route for `/humans.txt` and the associated vie
 :---------|:----------
  5.2.x    | 1.x
  5.3.x    | 2.x
+ 5.4.x    | 3.x
 
 ## Install
 
@@ -73,7 +74,7 @@ $ phpunit
 
 The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
 
-© 2016 [Marcus Olsson](https://marcusolsson.me).
+© 2017 [Marcus Olsson](https://marcusolsson.me).
 
 [ico-version]: https://img.shields.io/packagist/v/olssonm/l5-humans.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square

diff --git a/tests/HumansTest.php b/tests/HumansTest.php
@@ -5,7 +5,7 @@
 
 use Artisan;
 
-class HumansTest extends \Orchestra\Testbench\TestCase {
+class HumansTest extends \Orchestra\Testbench\BrowserKit\TestCase {
 
 	/**
 	 * Setup
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     use Artisan;
-    class HumansTest extends \Orchestra\Testbench\TestCase {
+    class HumansTest extends \Orchestra\Testbench\BrowserKit\TestCase {
     	/**
     	 * Setup
@@ Expand Down @@