From eddbb7d9739527ef16b0b2956dafdddf66460147 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 16 Nov 2013 22:04:52 -0500 Subject: [PATCH] User/assets tie-in --- app/controllers/admin/UsersController.php | 9 +- app/models/Asset.php | 8 + app/models/User.php | 15 +- app/views/backend/users/index.blade.php | 12 +- composer.json | 5 +- composer.lock | 622 +++++++++++++++------- 6 files changed, 460 insertions(+), 211 deletions(-) diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 11b254ec4f..525fb2e135 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -8,6 +8,7 @@ use Cartalyst\Sentry\Users\UserNotFoundException; use Config; use DB; use Input; +use Asset; use Lang; use Redirect; use Sentry; @@ -49,6 +50,11 @@ class UsersController extends AdminController { $users = $users->onlyTrashed(); } + + // Get the user assets + //$assets = $users->assets(); + + // Paginate the users $users = $users->paginate() ->appends(array( @@ -56,8 +62,9 @@ class UsersController extends AdminController { 'onlyTrashed' => Input::get('onlyTrashed'), )); + // Show the page - return View::make('backend/users/index', compact('users')); + return View::make('backend/users/index', compact('users', 'assets')); } /** diff --git a/app/models/Asset.php b/app/models/Asset.php index 7ab94bcdf5..5312b9ad8c 100644 --- a/app/models/Asset.php +++ b/app/models/Asset.php @@ -16,6 +16,8 @@ class Asset extends Eloquent { return parent::delete(); } + + public function depreciation() { $depreciation_id = Model::find($this->model_id)->depreciation_id; @@ -41,4 +43,10 @@ class Asset extends Eloquent { } + + public function user() + { + return $this->belongsTo('User'); + } + } diff --git a/app/models/User.php b/app/models/User.php index 036d266d75..a6f1f35deb 100755 --- a/app/models/User.php +++ b/app/models/User.php @@ -36,15 +36,16 @@ class User extends SentryUserModel { return "//gravatar.org/avatar/{$gravatar}"; } - public function numassets() + public function assetcount() { + return DB::table('assets')->where('assigned_to', $this->id)->count(); + + } + + public function userassetlist() + { + return DB::table('assets')->where('assigned_to', $this->id)->get(); - /* - $assetcount = DB::table('users') - ->join('contacts', 'users.id', '=', 'contacts.user_id') - ->join('orders', 'users.id', '=', 'orders.user_id') - ->select('users.id', 'contacts.phone', 'orders.price'); - */ } } diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php index e991fd1d16..bc8a1f447d 100755 --- a/app/views/backend/users/index.blade.php +++ b/app/views/backend/users/index.blade.php @@ -33,11 +33,11 @@ User Management :: @lang('admin/users/table.first_name') @lang('admin/users/table.last_name') @lang('admin/users/table.email') - @lang('admin/users/table.checkedout') + @lang('admin/users/table.checkedout') @lang('admin/users/table.activated') @lang('admin/users/table.last_login') @lang('admin/users/table.created_at') - @lang('table.actions') + @lang('table.actions') @@ -47,7 +47,11 @@ User Management :: {{ $user->first_name }} {{ $user->last_name }} {{ $user->email }} - + + + {{ ($user->assetcount()) }} + + {{ $user->isActivated() ? '' : ''}} @if (is_object($user->last_login)) @@ -57,8 +61,8 @@ User Management :: @endif {{ $user->created_at->diffForHumans() }} - + @if ($user->id > 3) @if ( ! is_null($user->deleted_at)) @lang('button.restore') diff --git a/composer.json b/composer.json index 6a8b9d018c..80681e901f 100755 --- a/composer.json +++ b/composer.json @@ -4,7 +4,10 @@ "keywords": ["framework", "laravel"], "require": { "laravel/framework": "4.0.*", - "cartalyst/sentry": "2.0.*" + "cartalyst/sentry": "2.0.*", + "barryvdh/laravel-debugbar": "dev-master", + "laravelbook/ardent": "dev-master" + }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 19741b3d55..26c658370e 100755 --- a/composer.lock +++ b/composer.lock @@ -3,33 +3,79 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "f77236f34f4e5e2a51b27f435a4b87de", + "hash": "1d32f61bdad0b896cc0ceeee9f9d25ba", "packages": [ + { + "name": "barryvdh/laravel-debugbar", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-debugbar.git", + "reference": "cfc8808295383419802204fc28677c52b8e7f87f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/cfc8808295383419802204fc28677c52b8e7f87f", + "reference": "cfc8808295383419802204fc28677c52b8e7f87f", + "shasum": "" + }, + "require": { + "illuminate/support": "~4.0", + "maximebf/debugbar": "dev-master", + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Barryvdh\\Debugbar": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "PHP Debugbar integration for Laravel", + "keywords": [ + "debug", + "debugbar", + "laravel", + "profiler", + "webprofiler" + ], + "time": "2013-11-06 14:11:09" + }, { "name": "cartalyst/sentry", "version": "dev-master", "source": { "type": "git", "url": "https://github.com/cartalyst/sentry.git", - "reference": "b771fdbc9720c31054925d36b5f6e7dd88aac32b" + "reference": "57e8bac9cf62089fa23bad3ec4d068f01fdf9b8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cartalyst/sentry/zipball/b771fdbc9720c31054925d36b5f6e7dd88aac32b", - "reference": "b771fdbc9720c31054925d36b5f6e7dd88aac32b", + "url": "https://api.github.com/repos/cartalyst/sentry/zipball/57e8bac9cf62089fa23bad3ec4d068f01fdf9b8f", + "reference": "57e8bac9cf62089fa23bad3ec4d068f01fdf9b8f", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "illuminate/cookie": "4.0.*", - "illuminate/database": "4.0.*", - "illuminate/session": "4.0.*", + "illuminate/cookie": "~4", + "illuminate/database": "~4", + "illuminate/session": "~4", "ircmaxell/password-compat": "1.0.*", "mockery/mockery": "0.7.2" }, "suggest": { + "happydemon/txt": "Required Text helpers when using the Kohana implementation", "illuminate/database": "Default sentry user, group and throttling implementations.", "ircmaxell/password-compat": "Default hashing uses PHP 5.5 password_* functions, with forward-compatible support." }, @@ -40,7 +86,8 @@ "Laravel 3", "Laravel 4", "CodeIgniter 3", - "FuelPHP 1" + "FuelPHP 1", + "Kohana" ], "versions": { "1": "1.1/master", @@ -96,23 +143,24 @@ "auth", "codeigniter", "fuelphp", + "kohana", "laravel", "security" ], - "time": "2013-06-18 19:54:39" + "time": "2013-11-14 10:02:16" }, { "name": "classpreloader/classpreloader", - "version": "dev-master", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/mtdowling/ClassPreloader.git", - "reference": "62c99d52ce2f1b0b8449c61e2d94f48d918222eb" + "reference": "1a50f7945b725ff2c60f234e51407d1d6e7c77c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mtdowling/ClassPreloader/zipball/62c99d52ce2f1b0b8449c61e2d94f48d918222eb", - "reference": "62c99d52ce2f1b0b8449c61e2d94f48d918222eb", + "url": "https://api.github.com/repos/mtdowling/ClassPreloader/zipball/1a50f7945b725ff2c60f234e51407d1d6e7c77c5", + "reference": "1a50f7945b725ff2c60f234e51407d1d6e7c77c5", "shasum": "" }, "require": { @@ -146,20 +194,20 @@ "class", "preload" ], - "time": "2013-05-26 16:10:36" + "time": "2013-06-24 22:58:34" }, { "name": "doctrine/annotations", - "version": "v1.1.1", + "version": "v1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "v1.1.1" + "reference": "40db0c96985aab2822edbc4848b3bd2429e02670" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/v1.1.1", - "reference": "v1.1.1", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670", + "reference": "40db0c96985aab2822edbc4848b3bd2429e02670", "shasum": "" }, "require": { @@ -188,7 +236,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -206,7 +255,7 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -217,20 +266,20 @@ "docblock", "parser" ], - "time": "2013-04-20 08:30:17" + "time": "2013-06-16 21:33:03" }, { "name": "doctrine/cache", - "version": "dev-master", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "89493d2c6e1362f581f9de1c1871cc52eb29c030" + "reference": "e16d7adf45664a50fa86f515b6d5e7f670130449" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/89493d2c6e1362f581f9de1c1871cc52eb29c030", - "reference": "89493d2c6e1362f581f9de1c1871cc52eb29c030", + "url": "https://api.github.com/repos/doctrine/cache/zipball/e16d7adf45664a50fa86f515b6d5e7f670130449", + "reference": "e16d7adf45664a50fa86f515b6d5e7f670130449", "shasum": "" }, "require": { @@ -239,6 +288,10 @@ "conflict": { "doctrine/common": ">2.2,<2.4" }, + "require-dev": { + "phpunit/phpunit": ">=3.7", + "satooshi/php-coveralls": "~0.6" + }, "type": "library", "extra": { "branch-alias": { @@ -256,9 +309,10 @@ ], "authors": [ { - "name": "Jonathan Wage", + "name": "Jonathan H. Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -276,7 +330,7 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -286,7 +340,7 @@ "cache", "caching" ], - "time": "2013-06-07 14:54:47" + "time": "2013-10-25 19:04:14" }, { "name": "doctrine/collections", @@ -294,12 +348,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "3db3ab843ff76774bee4679d4cb3a10cffb0a935" + "reference": "bcb53776a096a0c64579cc8d8ec0db62f1109fbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/3db3ab843ff76774bee4679d4cb3a10cffb0a935", - "reference": "3db3ab843ff76774bee4679d4cb3a10cffb0a935", + "url": "https://api.github.com/repos/doctrine/collections/zipball/bcb53776a096a0c64579cc8d8ec0db62f1109fbc", + "reference": "bcb53776a096a0c64579cc8d8ec0db62f1109fbc", "shasum": "" }, "require": { @@ -322,9 +376,10 @@ ], "authors": [ { - "name": "Jonathan Wage", + "name": "Jonathan H. Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -342,7 +397,7 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -353,7 +408,7 @@ "collections", "iterator" ], - "time": "2013-05-26 05:21:22" + "time": "2013-08-29 16:56:45" }, { "name": "doctrine/common", @@ -361,12 +416,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "c4255b9fbd63ee1fe52697839318af5937fced9b" + "reference": "d9dea98243c733ff589aab10e321de4f14a63ab4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/c4255b9fbd63ee1fe52697839318af5937fced9b", - "reference": "c4255b9fbd63ee1fe52697839318af5937fced9b", + "url": "https://api.github.com/repos/doctrine/common/zipball/d9dea98243c733ff589aab10e321de4f14a63ab4", + "reference": "d9dea98243c733ff589aab10e321de4f14a63ab4", "shasum": "" }, "require": { @@ -380,7 +435,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { @@ -396,7 +451,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -414,7 +470,7 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -427,39 +483,34 @@ "persistence", "spl" ], - "time": "2013-06-21 12:11:28" + "time": "2013-09-16 09:32:54" }, { "name": "doctrine/dbal", - "version": "dev-master", + "version": "2.4.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "4804a9a096f1a3f048da11b192b9df5caafc1a5d" + "reference": "c3448dc0a163becd5acb50199049996c53cade78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/4804a9a096f1a3f048da11b192b9df5caafc1a5d", - "reference": "4804a9a096f1a3f048da11b192b9df5caafc1a5d", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/c3448dc0a163becd5acb50199049996c53cade78", + "reference": "c3448dc0a163becd5acb50199049996c53cade78", "shasum": "" }, "require": { - "doctrine/common": "2.4.*@beta", + "doctrine/common": "~2.4", "php": ">=5.3.2" }, "require-dev": { "phpunit/phpunit": "3.7.*", - "symfony/console": "2.*" + "symfony/console": "~2.0" }, "suggest": { "symfony/console": "Allows use of the command line interface" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4.x-dev" - } - }, "autoload": { "psr-0": { "Doctrine\\DBAL\\": "lib/" @@ -473,7 +524,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -497,7 +549,7 @@ "persistence", "queryobject" ], - "time": "2013-06-21 19:00:38" + "time": "2013-11-12 12:38:29" }, { "name": "doctrine/inflector", @@ -626,16 +678,16 @@ }, { "name": "filp/whoops", - "version": "1.0.6", + "version": "1.0.7", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "1.0.6" + "reference": "12e144c788b275e5869ac15eda7bd0ae5da775bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/1.0.6", - "reference": "1.0.6", + "url": "https://api.github.com/repos/filp/whoops/zipball/12e144c788b275e5869ac15eda7bd0ae5da775bd", + "reference": "12e144c788b275e5869ac15eda7bd0ae5da775bd", "shasum": "" }, "require": { @@ -673,7 +725,7 @@ "whoops", "zf2" ], - "time": "2013-05-10 22:13:22" + "time": "2013-06-10 12:22:13" }, { "name": "ircmaxell/password-compat", @@ -681,12 +733,12 @@ "source": { "type": "git", "url": "https://github.com/ircmaxell/password_compat.git", - "reference": "v1.0.3" + "reference": "1fc1521b5e9794ea77e4eca30717be9635f1d4f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/v1.0.3", - "reference": "v1.0.3", + "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/1fc1521b5e9794ea77e4eca30717be9635f1d4f4", + "reference": "1fc1521b5e9794ea77e4eca30717be9635f1d4f4", "shasum": "" }, "type": "library", @@ -702,7 +754,7 @@ "authors": [ { "name": "Anthony Ferrara", - "email": "ircmaxell@ircmaxell.com", + "email": "ircmaxell@php.net", "homepage": "http://blog.ircmaxell.com" } ], @@ -714,26 +766,75 @@ ], "time": "2013-04-30 19:58:08" }, + { + "name": "jeremeamia/SuperClosure", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/jeremeamia/super_closure.git", + "reference": "d05400085f7d4ae6f20ba30d36550836c0d061e8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/d05400085f7d4ae6f20ba30d36550836c0d061e8", + "reference": "d05400085f7d4ae6f20ba30d36550836c0d061e8", + "shasum": "" + }, + "require": { + "nikic/php-parser": "~0.9", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~3.7" + }, + "type": "library", + "autoload": { + "psr-0": { + "Jeremeamia\\SuperClosure": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeremy Lindblom" + } + ], + "description": "Doing interesting things with closures like serialization.", + "homepage": "https://github.com/jeremeamia/super_closure", + "keywords": [ + "closure", + "function", + "parser", + "serializable", + "serialize", + "tokenizer" + ], + "time": "2013-10-09 04:20:00" + }, { "name": "laravel/framework", "version": "4.0.x-dev", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "8683a510b3e5541cb57d1ef6a09d66b713e42a13" + "reference": "4fd85b295e3825a2fcdf4ab25a0d9a3b79a99870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/8683a510b3e5541cb57d1ef6a09d66b713e42a13", - "reference": "8683a510b3e5541cb57d1ef6a09d66b713e42a13", + "url": "https://api.github.com/repos/laravel/framework/zipball/4fd85b295e3825a2fcdf4ab25a0d9a3b79a99870", + "reference": "4fd85b295e3825a2fcdf4ab25a0d9a3b79a99870", "shasum": "" }, "require": { "classpreloader/classpreloader": "1.0.*", - "doctrine/dbal": "2.4.x", - "filp/whoops": "1.0.6", + "doctrine/dbal": "2.4.*", + "filp/whoops": "1.0.7", "ircmaxell/password-compat": "1.0.*", - "monolog/monolog": "1.5.*", + "jeremeamia/superclosure": "1.0.*", + "monolog/monolog": "1.*", "nesbot/carbon": "1.*", "patchwork/utf8": "1.1.*", "php": ">=5.3.0", @@ -782,10 +883,10 @@ "illuminate/workbench": "self.version" }, "require-dev": { - "aws/aws-sdk-php": "2.2.*", - "iron-io/iron_mq": "1.4.4", - "mockery/mockery": "0.7.2", - "pda/pheanstalk": "2.0.*", + "aws/aws-sdk-php": "2.4.*", + "iron-io/iron_mq": "1.4.*", + "mockery/mockery": "0.8.0", + "pda/pheanstalk": "2.1.*", "phpunit/phpunit": "3.7.*" }, "type": "library", @@ -814,7 +915,9 @@ "authors": [ { "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" + "email": "taylorotwell@gmail.com", + "homepage": "https://github.com/taylorotwell", + "role": "Developer" } ], "description": "The Laravel Framework.", @@ -822,42 +925,156 @@ "framework", "laravel" ], - "time": "2013-06-20 20:50:36" + "time": "2013-11-15 04:57:21" }, { - "name": "monolog/monolog", - "version": "1.5.0", + "name": "laravelbook/ardent", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "1.5.0" + "url": "https://github.com/laravelbook/ardent.git", + "reference": "4d3b12d7afc82277ec4c77c3f59d9296d658b903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1.5.0", - "reference": "1.5.0", + "url": "https://api.github.com/repos/laravelbook/ardent/zipball/4d3b12d7afc82277ec4c77c3f59d9296d658b903", + "reference": "4d3b12d7afc82277ec4c77c3f59d9296d658b903", + "shasum": "" + }, + "require": { + "illuminate/database": "4.x", + "illuminate/support": "4.x", + "illuminate/validation": "4.x", + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "LaravelBook\\Ardent": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Max Ehsan", + "email": "contact@laravelbook.com", + "homepage": "http://laravelbook.com/", + "role": "Developer" + }, + { + "name": "Igor Santos", + "email": "igorsantos07@gmail.com", + "homepage": "http://www.igorsantos.com.br", + "role": "Developer" + } + ], + "description": "Self-validating smart models for Laravel 4's Eloquent O/RM", + "homepage": "http://laravelbook.com/", + "keywords": [ + "Active Record", + "activerecord", + "database", + "eloquent", + "framework", + "laravel", + "orm", + "sql", + "validation" + ], + "time": "2013-10-16 20:03:00" + }, + { + "name": "maximebf/debugbar", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/maximebf/php-debugbar.git", + "reference": "57344ccb95b43090dabb6292509df8e94c83ffaa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/57344ccb95b43090dabb6292509df8e94c83ffaa", + "reference": "57344ccb95b43090dabb6292509df8e94c83ffaa", "shasum": "" }, "require": { "php": ">=5.3.0", - "psr/log": ">=1.0,<2.0" + "psr/log": "~1.0" }, "require-dev": { - "doctrine/couchdb": "dev-master", - "mlehner/gelf-php": "1.0.*", - "raven/raven": "0.3.*" + "php": ">=5.3.0" }, "suggest": { + "kriswallsmith/assetic": "The best way to manage assets", + "monolog/monolog": "Log using Monolog", + "predis/predis": "Redis storage" + }, + "type": "library", + "autoload": { + "psr-0": { + "DebugBar": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + } + ], + "description": "Debug bar in the browser for php application", + "homepage": "https://github.com/maximebf/php-debugbar", + "keywords": [ + "debug" + ], + "time": "2013-11-08 17:26:30" + }, + { + "name": "monolog/monolog", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "6225b22de9dcf36546be3a0b2fa8e3d986153f57" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/6225b22de9dcf36546be3a0b2fa8e3d986153f57", + "reference": "6225b22de9dcf36546be3a0b2fa8e3d986153f57", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "psr/log": "~1.0" + }, + "require-dev": { + "aws/aws-sdk-php": "~2.4.8", + "doctrine/couchdb": "dev-master", + "mlehner/gelf-php": "1.0.*", + "phpunit/phpunit": "~3.7.0", + "raven/raven": "0.5.*", + "ruflin/elastica": "0.90.*" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", - "raven/raven": "Allow sending log messages to a Sentry server" + "raven/raven": "Allow sending log messages to a Sentry server", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -884,20 +1101,20 @@ "logging", "psr-3" ], - "time": "2013-04-23 10:09:48" + "time": "2013-11-14 19:48:31" }, { "name": "nesbot/carbon", - "version": "1.2.0", + "version": "1.4.0", "source": { "type": "git", - "url": "git://github.com/briannesbitt/Carbon.git", - "reference": "1.2.0" + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "06f0b8a99a90c5392ceccb09b75b74ff6c08ec07" }, "dist": { "type": "zip", - "url": "https://github.com/briannesbitt/Carbon/zipball/1.2.0", - "reference": "1.2.0", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/06f0b8a99a90c5392ceccb09b75b74ff6c08ec07", + "reference": "06f0b8a99a90c5392ceccb09b75b74ff6c08ec07", "shasum": "" }, "require": { @@ -906,7 +1123,7 @@ "type": "library", "autoload": { "psr-0": { - "Carbon": "." + "Carbon": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -927,7 +1144,7 @@ "datetime", "time" ], - "time": "2012-10-14 17:41:18" + "time": "2013-09-09 02:39:19" }, { "name": "nikic/php-parser", @@ -935,15 +1152,16 @@ "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "5ccf6196d6925e66568e3b8460c262e9512e4b92" + "reference": "7f4ab26732c6c0dcfeef98ee94452977ac26e82c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5ccf6196d6925e66568e3b8460c262e9512e4b92", - "reference": "5ccf6196d6925e66568e3b8460c262e9512e4b92", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/7f4ab26732c6c0dcfeef98ee94452977ac26e82c", + "reference": "7f4ab26732c6c0dcfeef98ee94452977ac26e82c", "shasum": "" }, "require": { + "ext-tokenizer": "*", "php": ">=5.2" }, "type": "library", @@ -971,25 +1189,31 @@ "parser", "php" ], - "time": "2013-05-23 13:17:59" + "time": "2013-11-15 19:27:56" }, { "name": "patchwork/utf8", - "version": "v1.1.8", + "version": "v1.1.14", "source": { "type": "git", "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git", - "reference": "v1.1.8" + "reference": "af1d74b154bc62fab79b428877a9b5ab15f9418a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/v1.1.8", - "reference": "v1.1.8", + "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/af1d74b154bc62fab79b428877a9b5ab15f9418a", + "reference": "af1d74b154bc62fab79b428877a9b5ab15f9418a", "shasum": "" }, "require": { + "lib-pcre": "*", "php": ">=5.3.0" }, + "suggest": { + "ext-mbstring": "Use Mbstring for best performance", + "lib-iconv": "Use iconv for best performance", + "lib-icu": "Use Intl for best performance" + }, "type": "library", "autoload": { "psr-0": { @@ -1008,7 +1232,7 @@ "role": "Developer" } ], - "description": "UTF-8 strings handling for PHP 5.3: portable, performant and extended", + "description": "Extensive, portable and performant handling of UTF-8 and grapheme clusters for PHP", "homepage": "https://github.com/nicolas-grekas/Patchwork-UTF8", "keywords": [ "i18n", @@ -1016,7 +1240,7 @@ "utf-8", "utf8" ], - "time": "2013-05-24 12:11:22" + "time": "2013-11-04 16:58:59" }, { "name": "predis/predis", @@ -1024,12 +1248,12 @@ "source": { "type": "git", "url": "https://github.com/nrk/predis.git", - "reference": "4576dc029f04f25438521065aa4d29419a19bf2a" + "reference": "b1a51b2ef900c28f389cc7ba498f3698b9749ce6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/4576dc029f04f25438521065aa4d29419a19bf2a", - "reference": "4576dc029f04f25438521065aa4d29419a19bf2a", + "url": "https://api.github.com/repos/nrk/predis/zipball/b1a51b2ef900c28f389cc7ba498f3698b9749ce6", + "reference": "b1a51b2ef900c28f389cc7ba498f3698b9749ce6", "shasum": "" }, "require": { @@ -1063,7 +1287,7 @@ "predis", "redis" ], - "time": "2013-06-17 09:16:07" + "time": "2013-11-09 19:00:33" }, { "name": "psr/log", @@ -1105,16 +1329,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.0.1", + "version": "v5.0.2", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "v5.0.1" + "reference": "f3917ecef35a4e4d98b303eb9fee463bc983f379" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/v5.0.1", - "reference": "v5.0.1", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/f3917ecef35a4e4d98b303eb9fee463bc983f379", + "reference": "f3917ecef35a4e4d98b303eb9fee463bc983f379", "shasum": "" }, "require": { @@ -1150,7 +1374,7 @@ "mail", "mailer" ], - "time": "2013-06-17 13:32:32" + "time": "2013-08-30 12:35:21" }, { "name": "symfony/browser-kit", @@ -1159,21 +1383,21 @@ "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "v2.3.1" + "reference": "7fc66ea3b9438080d79246cd8e5d88950c7fe4a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.3.1", - "reference": "v2.3.1", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/7fc66ea3b9438080d79246cd8e5d88950c7fe4a4", + "reference": "7fc66ea3b9438080d79246cd8e5d88950c7fe4a4", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/dom-crawler": ">=2.0,<3.0" + "symfony/dom-crawler": "~2.0" }, "require-dev": { - "symfony/css-selector": ">=2.0,<3.0", - "symfony/process": ">=2.0,<3.0" + "symfony/css-selector": "~2.0", + "symfony/process": "~2.0" }, "suggest": { "symfony/process": "" @@ -1205,7 +1429,7 @@ ], "description": "Symfony BrowserKit Component", "homepage": "http://symfony.com", - "time": "2013-05-15 15:16:47" + "time": "2013-09-26 12:37:59" }, { "name": "symfony/console", @@ -1214,19 +1438,19 @@ "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "35da735fae40d43a199ed51b30ac3f073404d1c6" + "reference": "00848d3e13cf512e77c7498c2b3b0192f61f4b18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/35da735fae40d43a199ed51b30ac3f073404d1c6", - "reference": "35da735fae40d43a199ed51b30ac3f073404d1c6", + "url": "https://api.github.com/repos/symfony/Console/zipball/00848d3e13cf512e77c7498c2b3b0192f61f4b18", + "reference": "00848d3e13cf512e77c7498c2b3b0192f61f4b18", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/event-dispatcher": ">=2.1,<3.0" + "symfony/event-dispatcher": "~2.1" }, "suggest": { "symfony/event-dispatcher": "" @@ -1258,7 +1482,7 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2013-06-15 17:55:04" + "time": "2013-11-13 21:27:40" }, { "name": "symfony/css-selector", @@ -1267,12 +1491,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/CssSelector.git", - "reference": "e4f7310ad25e71f2362236b8c1588b416b03c2be" + "reference": "8df20c54ffa650df860a3e42dbcd1fbd25a24977" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/e4f7310ad25e71f2362236b8c1588b416b03c2be", - "reference": "e4f7310ad25e71f2362236b8c1588b416b03c2be", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/8df20c54ffa650df860a3e42dbcd1fbd25a24977", + "reference": "8df20c54ffa650df860a3e42dbcd1fbd25a24977", "shasum": "" }, "require": { @@ -1309,7 +1533,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "http://symfony.com", - "time": "2013-06-17 07:15:51" + "time": "2013-10-30 08:30:20" }, { "name": "symfony/debug", @@ -1318,20 +1542,20 @@ "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "v2.3.1" + "reference": "085d4fd990493a47c1d542a98fac5475326e237f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/v2.3.1", - "reference": "v2.3.1", + "url": "https://api.github.com/repos/symfony/Debug/zipball/085d4fd990493a47c1d542a98fac5475326e237f", + "reference": "085d4fd990493a47c1d542a98fac5475326e237f", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/http-foundation": ">=2.1,<3.0", - "symfony/http-kernel": ">=2.1,<3.0" + "symfony/http-foundation": "~2.1", + "symfony/http-kernel": "~2.1" }, "suggest": { "symfony/class-loader": "", @@ -1365,7 +1589,7 @@ ], "description": "Symfony Debug Component", "homepage": "http://symfony.com", - "time": "2013-06-02 11:58:44" + "time": "2013-10-30 08:30:20" }, { "name": "symfony/dom-crawler", @@ -1374,19 +1598,19 @@ "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "761ea57ee2839c79dd04fe39b73bacd2ba133f22" + "reference": "4dc2c596b28884892da24729d9b32d01d89c1a59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/761ea57ee2839c79dd04fe39b73bacd2ba133f22", - "reference": "761ea57ee2839c79dd04fe39b73bacd2ba133f22", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/4dc2c596b28884892da24729d9b32d01d89c1a59", + "reference": "4dc2c596b28884892da24729d9b32d01d89c1a59", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/css-selector": ">=2.0,<3.0" + "symfony/css-selector": "~2.0" }, "suggest": { "symfony/css-selector": "" @@ -1418,7 +1642,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "http://symfony.com", - "time": "2013-06-23 08:16:02" + "time": "2013-10-30 08:30:20" }, { "name": "symfony/event-dispatcher", @@ -1427,19 +1651,19 @@ "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "v2.3.1" + "reference": "2d8ece3c610726a73d0c95c885134efea182610e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.1", - "reference": "v2.3.1", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/2d8ece3c610726a73d0c95c885134efea182610e", + "reference": "2d8ece3c610726a73d0c95c885134efea182610e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": ">=2.0,<3.0" + "symfony/dependency-injection": "~2.0" }, "suggest": { "symfony/dependency-injection": "", @@ -1472,7 +1696,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2013-05-13 14:36:40" + "time": "2013-10-13 06:32:10" }, { "name": "symfony/filesystem", @@ -1481,12 +1705,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "7975f9df488adbc9cef2089bac2887f14085481f" + "reference": "e558fd5d593ebe083dca199f52aed5374ab7b57a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/7975f9df488adbc9cef2089bac2887f14085481f", - "reference": "7975f9df488adbc9cef2089bac2887f14085481f", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/e558fd5d593ebe083dca199f52aed5374ab7b57a", + "reference": "e558fd5d593ebe083dca199f52aed5374ab7b57a", "shasum": "" }, "require": { @@ -1519,7 +1743,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2013-06-11 07:15:38" + "time": "2013-09-27 14:57:51" }, { "name": "symfony/finder", @@ -1528,12 +1752,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "efe739e6599b3f43610a4005818a364fbdd67ce8" + "reference": "a175521f680b178e63c5d0ab87c6b046c0990c3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/efe739e6599b3f43610a4005818a364fbdd67ce8", - "reference": "efe739e6599b3f43610a4005818a364fbdd67ce8", + "url": "https://api.github.com/repos/symfony/Finder/zipball/a175521f680b178e63c5d0ab87c6b046c0990c3f", + "reference": "a175521f680b178e63c5d0ab87c6b046c0990c3f", "shasum": "" }, "require": { @@ -1566,7 +1790,7 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2013-06-13 07:51:49" + "time": "2013-09-19 09:45:20" }, { "name": "symfony/http-foundation", @@ -1575,12 +1799,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "997715db218331076ef21c5a6ae622595755c6ef" + "reference": "1c4b897064f4f621031a0e3bc19fd7054d5e0315" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/997715db218331076ef21c5a6ae622595755c6ef", - "reference": "997715db218331076ef21c5a6ae622595755c6ef", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/1c4b897064f4f621031a0e3bc19fd7054d5e0315", + "reference": "1c4b897064f4f621031a0e3bc19fd7054d5e0315", "shasum": "" }, "require": { @@ -1616,7 +1840,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2013-06-23 08:16:02" + "time": "2013-11-13 21:27:40" }, { "name": "symfony/http-kernel", @@ -1625,31 +1849,32 @@ "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "98c849cd968571794d7cfc6edef21aa1363ce05c" + "reference": "9d45e71824fae3d02d0725c7eaeaebe019c54827" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/98c849cd968571794d7cfc6edef21aa1363ce05c", - "reference": "98c849cd968571794d7cfc6edef21aa1363ce05c", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/9d45e71824fae3d02d0725c7eaeaebe019c54827", + "reference": "9d45e71824fae3d02d0725c7eaeaebe019c54827", "shasum": "" }, "require": { "php": ">=5.3.3", - "psr/log": ">=1.0,<2.0", - "symfony/debug": ">=2.3,<3.0", - "symfony/event-dispatcher": ">=2.1,<3.0", - "symfony/http-foundation": ">=2.2,<3.0" + "psr/log": "~1.0", + "symfony/debug": "~2.3", + "symfony/event-dispatcher": "~2.1", + "symfony/http-foundation": "~2.2" }, "require-dev": { - "symfony/browser-kit": "2.2.*", - "symfony/class-loader": ">=2.1,<3.0", - "symfony/config": ">=2.0,<3.0", - "symfony/console": "2.2.*", - "symfony/dependency-injection": ">=2.0,<3.0", - "symfony/finder": ">=2.0,<3.0", - "symfony/process": ">=2.0,<3.0", - "symfony/routing": ">=2.2,<3.0", - "symfony/stopwatch": ">=2.2,<3.0" + "symfony/browser-kit": "~2.2", + "symfony/class-loader": "~2.1", + "symfony/config": "~2.0", + "symfony/console": "~2.2", + "symfony/dependency-injection": "~2.0", + "symfony/finder": "~2.0", + "symfony/process": "~2.0", + "symfony/routing": "~2.2", + "symfony/stopwatch": "~2.2", + "symfony/templating": "~2.2" }, "suggest": { "symfony/browser-kit": "", @@ -1686,7 +1911,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "http://symfony.com", - "time": "2013-06-11 13:34:17" + "time": "2013-11-14 09:43:43" }, { "name": "symfony/process", @@ -1695,12 +1920,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "f12e5857c60fa572b4f7d947276ffc2336ddea04" + "reference": "82898108f79040314a7b3ba430a72c32c7f61d14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/f12e5857c60fa572b4f7d947276ffc2336ddea04", - "reference": "f12e5857c60fa572b4f7d947276ffc2336ddea04", + "url": "https://api.github.com/repos/symfony/Process/zipball/82898108f79040314a7b3ba430a72c32c7f61d14", + "reference": "82898108f79040314a7b3ba430a72c32c7f61d14", "shasum": "" }, "require": { @@ -1733,7 +1958,7 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2013-06-23 08:16:02" + "time": "2013-10-30 08:30:20" }, { "name": "symfony/routing", @@ -1742,22 +1967,22 @@ "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "3deda53b19ee9d361b03de5268bc91533eb76235" + "reference": "7d41463094752e87a0fae60316d236abecb8a034" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/3deda53b19ee9d361b03de5268bc91533eb76235", - "reference": "3deda53b19ee9d361b03de5268bc91533eb76235", + "url": "https://api.github.com/repos/symfony/Routing/zipball/7d41463094752e87a0fae60316d236abecb8a034", + "reference": "7d41463094752e87a0fae60316d236abecb8a034", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "doctrine/common": ">=2.2,<3.0", - "psr/log": ">=1.0,<2.0", - "symfony/config": ">=2.2,<3.0", - "symfony/yaml": ">=2.0,<3.0" + "doctrine/common": "~2.2", + "psr/log": "~1.0", + "symfony/config": "~2.2", + "symfony/yaml": "~2.0" }, "suggest": { "doctrine/common": "", @@ -1791,7 +2016,7 @@ ], "description": "Symfony Routing Component", "homepage": "http://symfony.com", - "time": "2013-06-23 08:16:02" + "time": "2013-09-29 19:41:41" }, { "name": "symfony/translation", @@ -1800,20 +2025,20 @@ "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "v2.3.1" + "reference": "e0012648d7fc96d8f03bb7ca4d5e44f471a15417" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.3.1", - "reference": "v2.3.1", + "url": "https://api.github.com/repos/symfony/Translation/zipball/e0012648d7fc96d8f03bb7ca4d5e44f471a15417", + "reference": "e0012648d7fc96d8f03bb7ca4d5e44f471a15417", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/config": ">=2.0,<3.0", - "symfony/yaml": ">=2.2,<3.0" + "symfony/config": "~2.0", + "symfony/yaml": "~2.2" }, "suggest": { "symfony/config": "", @@ -1846,7 +2071,7 @@ ], "description": "Symfony Translation Component", "homepage": "http://symfony.com", - "time": "2013-05-13 14:36:40" + "time": "2013-11-13 21:27:40" } ], "packages-dev": [ @@ -1856,9 +2081,10 @@ ], "minimum-stability": "dev", - "stability-flags": [ - - ], + "stability-flags": { + "barryvdh/laravel-debugbar": 20, + "laravelbook/ardent": 20 + }, "platform": [ ],