From baff2cf93410b92d348c0b4cf81b6c516ed883fc Mon Sep 17 00:00:00 2001 From: Bradley Weston Date: Tue, 13 May 2014 22:42:33 +0100 Subject: [PATCH 1/2] Support for Laravel 4.2 I just started playing with Laravel 4.2 and got a lot of issues installing this package. I have suggested the following allowing for 4.1.* and 4.2.* installations. I believe this would work if not let me know of way. --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 9a1589558..f8810b8fd 100644 --- a/composer.json +++ b/composer.json @@ -11,17 +11,17 @@ ], "require": { "php": ">=5.4.0", - "illuminate/support": "4.1.*", + "illuminate/support": ">=4.1", "league/fractal": "~0.7" }, "require-dev": { "dingo/oauth2-server-laravel": "0.2.*", "lucadegasperi/oauth2-server-laravel": "1.0.*", - "illuminate/routing": "4.1.*", - "illuminate/events": "4.1.*", - "illuminate/auth": "4.1.*", - "illuminate/database": "4.1.*", - "illuminate/pagination": "4.1.*", + "illuminate/routing": ">=4.1", + "illuminate/events": ">=4.1", + "illuminate/auth": ">=4.1", + "illuminate/database": ">=4.1", + "illuminate/pagination": ">=4.1", "phpunit/phpunit": "~4.0", "mockery/mockery": "~0.9" }, From 27438e5676579760001188261f24f188145e2ca0 Mon Sep 17 00:00:00 2001 From: Bradley Weston Date: Tue, 13 May 2014 22:46:26 +0100 Subject: [PATCH 2/2] Updated from >= to tildas ~ --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index f8810b8fd..a197b61ae 100644 --- a/composer.json +++ b/composer.json @@ -11,17 +11,17 @@ ], "require": { "php": ">=5.4.0", - "illuminate/support": ">=4.1", + "illuminate/support": "~4.1", "league/fractal": "~0.7" }, "require-dev": { "dingo/oauth2-server-laravel": "0.2.*", "lucadegasperi/oauth2-server-laravel": "1.0.*", - "illuminate/routing": ">=4.1", - "illuminate/events": ">=4.1", - "illuminate/auth": ">=4.1", - "illuminate/database": ">=4.1", - "illuminate/pagination": ">=4.1", + "illuminate/routing": "~4.1", + "illuminate/events": "~4.1", + "illuminate/auth": "~4.1", + "illuminate/database": "~4.1", + "illuminate/pagination": "~4.1", "phpunit/phpunit": "~4.0", "mockery/mockery": "~0.9" },