From ae2d2e6cff47d76c4f6adfeb9d2213dfde1d683f Mon Sep 17 00:00:00 2001 From: ARCANEDEV Date: Sun, 18 Oct 2015 16:18:43 +0100 Subject: [PATCH] Updating composer.json --- composer.json | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 1295d89..ac7dbfa 100644 --- a/composer.json +++ b/composer.json @@ -1,27 +1,28 @@ { - "name": "arcanedev/laravel-html", + "name": "arcanedev/laravel-html", "description": "HTML and Form Builders for the Laravel Framework", - "keywords": ["laravel", "html", "form", "arcanesoft"], - "homepage": "https://github.com/ARCANEDEV/LaravelHtml", - "license": "MIT", + "keywords": ["arcanedev", "arcanesoft", "laravel", "html", "form"], + "homepage": "https://github.com/ARCANEDEV/LaravelHtml", "authors": [ { - "name": "ARCANEDEV", - "email": "arcanedev.maroc@gmail.com", + "name": "ARCANEDEV", + "email": "arcanedev.maroc@gmail.com", "homepage": "https://github.com/ARCANEDEV" } ], + "type": "library", + "license": "MIT", "require": { - "php": ">=5.5.9", - "arcanedev/support": "~3.0", - "illuminate/routing": "~5.1.0", - "illuminate/session": "~5.1.0" + "php": ">=5.5.9", + "arcanedev/support": "~3.0", + "illuminate/routing": "~5.1.0", + "illuminate/session": "~5.1.0" }, "require-dev": { "orchestra/testbench": "~3.1.0", - "phpunit/phpunit": "~4.0", - "phpunit/phpcov": "~2.0", - "mockery/mockery": "~0.9" + "phpunit/phpcov": "~2.0", + "phpunit/phpunit": "~4.0|~5.0", + "mockery/mockery": "~0.9" }, "autoload": { "psr-4": { @@ -33,5 +34,10 @@ "psr-4": { "Arcanedev\\LaravelHtml\\Tests\\": "tests/" } + }, + "extra": { + "branch-alias": { + "dev-master": "5.2-dev" + } } }