From 0b6e10f04b8d47d7c78d845015e578529c4cf771 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 28 Nov 2014 15:04:27 +0000 Subject: [PATCH] Use 2 space formatting for JSON, seems to be a standard --- app.json | 43 ++++++++++--------- composer.json | 117 ++++++++++++++++++++++++++------------------------ package.json | 8 ++-- 3 files changed, 86 insertions(+), 82 deletions(-) diff --git a/app.json b/app.json index 2d741f3f..141d871a 100644 --- a/app.json +++ b/app.json @@ -1,23 +1,24 @@ { - "name": "Cachet", - "description": "Single-site Status Page with Laravel", - "keywords": [ - "status", - "tools", - "php", - "laravel" - ], - "website": "http://james-brooks.uk/cachet", - "logo": "https://raw.githubusercontent.com/cachethq/assets/f7a350ccd2e7dbdb63f4a2e91bc48f02e03f97e4/images/logo/logo-final.png", - "success_url": "/setup", - "repository": "https://github.com/cachethq/Cachet", - "keywords": ["cachet", "laravel", "status", "page"], - "addons": ["cleardb"], - "env": { - "ENV": "heroku", - "BUILDPACK_URL": "https://github.com/heroku/heroku-buildpack-php" - }, - "scripts": { - "postdeploy": "php artisan migrate; php artisan key:generate" - } + "name": "Cachet", + "description": "Single-site Status Page with Laravel", + "keywords": [ + "cachet", + "laravel", + "status", + "page" + ], + "website": "http://james-brooks.uk/cachet", + "logo": "https://raw.githubusercontent.com/cachethq/assets/f7a350ccd2e7dbdb63f4a2e91bc48f02e03f97e4/images/logo/logo-final.png", + "success_url": "/setup", + "repository": "https://github.com/cachethq/Cachet", + "addons": [ + "cleardb" + ], + "env": { + "ENV": "heroku", + "BUILDPACK_URL": "https://github.com/heroku/heroku-buildpack-php" + }, + "scripts": { + "postdeploy": "php artisan migrate; php artisan key:generate" + } } diff --git a/composer.json b/composer.json index f5ed8343..2c4e28b2 100644 --- a/composer.json +++ b/composer.json @@ -1,59 +1,62 @@ { - "name": "laravel/laravel", - "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], - "license": "MIT", - "type": "project", - "require": { - "laravel/framework": "4.2.*", - "guzzlehttp/guzzle": "~5.0", - "dingo/api": "0.6.*", - "watson/validating": "0.10.*", - "thujohn/rss": "dev-master" - }, - "require-dev": { - "phpunit/phpunit": "~4.3.0", - "mockery/mockery": "0.9.*" - }, - "autoload": { - "classmap": [ - "app/commands", - "app/controllers", - "app/models", - "app/database/migrations", - "app/database/seeds", - "app/tests/TestCase.php", - "app/filters" - ], - "psr-4": { - "CachetHQ\\": "app/CachetHq" - } - }, - "extra": { - "heroku": { - "framework": "silex", - "document-root": "public", - "index-document": "index.php", - "log-files": [ - "app/storage/logs/laravel.log" - ] - } - }, - "scripts": { - "post-install-cmd": [ - "php artisan optimize", - "chmod -R 777 app/storage public", - "php artisan migrate" - ], - "post-update-cmd": [ - "php artisan clear-compiled", - "php artisan optimize" - ], - "post-create-project-cmd": [ - "php artisan key:generate" - ] - }, - "config": { - "preferred-install": "dist" - } + "name": "laravel/laravel", + "description": "The Laravel Framework.", + "keywords": [ + "framework", + "laravel" + ], + "license": "MIT", + "type": "project", + "require": { + "laravel/framework": "4.2.*", + "guzzlehttp/guzzle": "~5.0", + "dingo/api": "0.6.*", + "watson/validating": "0.10.*", + "thujohn/rss": "dev-master" + }, + "require-dev": { + "phpunit/phpunit": "~4.3.0", + "mockery/mockery": "0.9.*" + }, + "autoload": { + "classmap": [ + "app/commands", + "app/controllers", + "app/models", + "app/database/migrations", + "app/database/seeds", + "app/tests/TestCase.php", + "app/filters" + ], + "psr-4": { + "CachetHQ\\": "app/CachetHq" + } + }, + "extra": { + "heroku": { + "framework": "silex", + "document-root": "public", + "index-document": "index.php", + "log-files": [ + "app/storage/logs/laravel.log" + ] + } + }, + "scripts": { + "post-install-cmd": [ + "php artisan optimize", + "chmod -R 777 app/storage public", + "php artisan migrate" + ], + "post-update-cmd": [ + "php artisan clear-compiled", + "php artisan optimize" + ], + "post-create-project-cmd": [ + "php artisan key:generate" + ] + }, + "config": { + "preferred-install": "dist" + } } diff --git a/package.json b/package.json index 0081e113..f45052ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "devDependencies": { - "gulp": "^3.8.8", - "laravel-elixir": "*" - } + "devDependencies": { + "gulp": "^3.8.8", + "laravel-elixir": "*" + } }