Merge branch 'tzurbaev-patch-laravel-54'

zachleigh · Jan 25, 2017 · dc6c7d1 · dc6c7d1
2 parents 2d7c361 + 01bf78a
commit dc6c7d1
Show file tree

Hide file tree

Showing 4 changed files with 425 additions and 326 deletions.
diff --git a/README.md b/README.md
@@ -21,6 +21,13 @@
   - [Contributing](#contributing)
 
 ### Upgrade Information
+##### From 1.0.* to 1.1.0
+1.1.0 adds Lumen support and support for Laravel 5.4 (thanks tzurbaev). There should be no breaking changes. If using Laravel 5.3, please use [Version 1.0.5](https://github.com/zachleigh/laravel-property-bag/tree/v1.0.5):
+```
+composer require zachleigh/laravel-property-bag:1.0.*
+```
+
+##### From 0.9.* to 1.0.0
 Version 1.0.0 brings major changes to the package that make it incompatible with previous versions. The package was essentially rewritten making upgrade from 0.9.7 to 1.0.0 difficult at best. 
 
 ### About

diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
     },
 
     "require-dev": {
-        "laravel/laravel": "5.3.*",
+        "laravel/laravel": "~5.3",
+        "laravel/browser-kit-testing": "~1.0",
         "phpunit/phpunit": "~4.0"
     },