From d57a016545ea3f5f106981a489f98d316829cb94 Mon Sep 17 00:00:00 2001 From: Aaron Kuzemchak Date: Thu, 2 May 2013 20:32:25 -0400 Subject: [PATCH] Upgrade Laravel --- .gitignore | 4 +- app/config/app.php | 14 + app/config/database.php | 2 + app/config/session.php | 6 +- app/config/testing/session.php | 4 +- app/config/workbench.php | 2 +- app/filters.php | 22 +- app/lang/en/validation.php | 20 +- app/start/global.php | 16 + bootstrap/autoload.php | 13 + bootstrap/start.php | 2 +- composer.json | 3 + composer.lock | 938 ++++++++++++++++++++++++++++----- public/.htaccess | 14 +- 14 files changed, 912 insertions(+), 148 deletions(-) diff --git a/.gitignore b/.gitignore index a4a593e..138bd74 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # OS .DS_Store +# Framework +/bootstrap/compiled.php + # Composer /vendor -/bootstrap/compiled.php diff --git a/app/config/app.php b/app/config/app.php index 90c60ad..1294ea9 100644 --- a/app/config/app.php +++ b/app/config/app.php @@ -15,6 +15,19 @@ 'debug' => true, + /* + |-------------------------------------------------------------------------- + | Application URL + |-------------------------------------------------------------------------- + | + | This URL is used by the console to properly generate URLs when using + | the Artisan command line tool. You should set this to the root of + | your application so that it is used when running Artisan tasks. + | + */ + + 'url' => 'http://localhost', + /* |-------------------------------------------------------------------------- | Application Timezone @@ -83,6 +96,7 @@ 'Illuminate\Foundation\Providers\KeyGeneratorServiceProvider', 'Illuminate\Log\LogServiceProvider', 'Illuminate\Mail\MailServiceProvider', + 'Illuminate\Foundation\Providers\MaintenanceServiceProvider', 'Illuminate\Database\MigrationServiceProvider', 'Illuminate\Foundation\Providers\OptimizeServiceProvider', 'Illuminate\Pagination\PaginationServiceProvider', diff --git a/app/config/database.php b/app/config/database.php index c154f76..f479bf4 100644 --- a/app/config/database.php +++ b/app/config/database.php @@ -111,6 +111,8 @@ 'redis' => array( + 'cluster' => true, + 'default' => array( 'host' => '127.0.0.1', 'port' => 6379, diff --git a/app/config/session.php b/app/config/session.php index f295a16..9808847 100644 --- a/app/config/session.php +++ b/app/config/session.php @@ -8,10 +8,10 @@ |-------------------------------------------------------------------------- | | This option controls the default session "driver" that will be used on - | requests. By default we will use the light-weight cookie driver but + | requests. By default, we will use the lightweight native driver but | you may specify any of the other wonderful drivers provided here. | - | Supported: "cookie", "file", "database", "apc", + | Supported: "native", "cookie", "database", "apc", | "memcached", "redis", "array" | */ @@ -36,7 +36,7 @@ | Session File Location |-------------------------------------------------------------------------- | - | When using the "file" session driver, we need a location where session + | When using the native session driver, we need a location where session | files may be stored. A default has been set for you but a different | location may be specified. This is only needed for file sessions. | diff --git a/app/config/testing/session.php b/app/config/testing/session.php index 338aeba..a18c1b9 100644 --- a/app/config/testing/session.php +++ b/app/config/testing/session.php @@ -8,10 +8,10 @@ |-------------------------------------------------------------------------- | | This option controls the default session "driver" that will be used on - | requets. By default, we will use the light-weight cookie driver but + | requests. By default, we will use the lightweight native driver but | you may specify any of the other wonderful drivers provided here. | - | Supported: "cookie", file", "database", "apc", + | Supported: "native", "cookie", "database", "apc", | "memcached", "redis", "array" | */ diff --git a/app/config/workbench.php b/app/config/workbench.php index 623cd19..56bee52 100644 --- a/app/config/workbench.php +++ b/app/config/workbench.php @@ -22,7 +22,7 @@ | | Like the option above, your e-mail address is used when generating new | workbench packages. The e-mail is placed in your composer.json file - | automatically whwen the package is created by the workbench tool. + | automatically after the package is created by the workbench tool. | */ diff --git a/app/filters.php b/app/filters.php index 2703d49..722b794 100644 --- a/app/filters.php +++ b/app/filters.php @@ -28,8 +28,8 @@ |-------------------------------------------------------------------------- | | The following filters are used to verify that the user of the current -| session is logged into this application. Also, a "guest" filter is -| responsible for performing the opposite. Both provide redirects. +| session is logged into this application. The "basic" filter easily +| integrates HTTP Basic authentication for quick, simple checking. | */ @@ -39,6 +39,22 @@ }); +Route::filter('auth.basic', function() +{ + return Auth::basic(); +}); + +/* +|-------------------------------------------------------------------------- +| Guest Filter +|-------------------------------------------------------------------------- +| +| The "guest" filter is the counterpart of the authentication filters as +| it simply checks that the current user is not logged in. A redirect +| response will be issued if they are, which you may freely change. +| +*/ + Route::filter('guest', function() { if (Auth::check()) return Redirect::to('/'); @@ -57,7 +73,7 @@ Route::filter('csrf', function() { - if (Session::getToken() != Input::get('_token')) + if (Session::getToken() != Input::get('csrf_token')) { throw new Illuminate\Session\TokenMismatchException; } diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php index e72372c..b0874fa 100644 --- a/app/lang/en/validation.php +++ b/app/lang/en/validation.php @@ -13,7 +13,7 @@ | */ - "accepted" => ":attribute must be accepted`", + "accepted" => ":attribute must be accepted", "active_url" => ":attribute is not a valid URL", "after" => ":attribute must be a date after :date", "alpha" => ":attribute may only contain letters", @@ -37,7 +37,6 @@ "in" => ":attribute is invalid", "integer" => ":attribute must be an integer", "ip" => ":attribute must be a valid IP address", - "match" => ":attribute is incorrectly formatted", "max" => array( "numeric" => ":attribute must be less than :max", "file" => ":attribute must be less than :max kilobytes", @@ -49,12 +48,15 @@ "file" => ":attribute must be at least :min kilobytes", "string" => ":attribute must be at least :min characters", ), - "notin" => ":attribute is invalid", - "numeric" => ":attribute must be a number", - "required" => ":attribute is required", - "required_with" => ":attribute is required when :values is present", - "same" => ":attribute and :other must match", - "size" => array( + "not_in" => ":attribute is invalid", + "numeric" => ":attribute must be a number", + "regex" => ":attribute is formatted incorrectly", + "required" => ":attribute is required", + "required_if" => ":attribute is required when :other is :value", + "required_with" => ":attribute is required when :values is present", + "required_without" => ":attribute is required when :values is not present", + "same" => ":attribute and :other must match", + "size" => array( "numeric" => ":attribute must be :size", "file" => ":attribute must be :size kilobytes", "string" => ":attribute must be :size characters", @@ -91,4 +93,4 @@ 'name' => 'Name', ), -); \ No newline at end of file +); diff --git a/app/start/global.php b/app/start/global.php index 26e6b9e..ac71eb3 100644 --- a/app/start/global.php +++ b/app/start/global.php @@ -50,6 +50,22 @@ require __DIR__.'/../errors.php'; +/* +|-------------------------------------------------------------------------- +| Maintenance Mode Handler +|-------------------------------------------------------------------------- +| +| The "down" Artisan command gives you the ability to put an application +| into maintenance mode. Here, you will define what is displayed back +| to the user if maintenace mode is in effect for this application. +| +*/ + +App::down(function() +{ + return Response::make("Be right back!", 503); +}); + /* |-------------------------------------------------------------------------- | Require The Filters File diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index 626612a..ef587e2 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -32,6 +32,19 @@ require $compiled; } +/* +|-------------------------------------------------------------------------- +| Setup Patchwork UTF-8 Handling +|-------------------------------------------------------------------------- +| +| The Patchwork library provides solid handling of UTF-8 strings as well +| as provides replacements for all mb_* and iconv type functions that +| are not available by default in PHP. We'll setup this stuff here. +| +*/ + +Patchwork\Utf8\Bootup::initAll(); + /* |-------------------------------------------------------------------------- | Register The Laravel Auto Loader diff --git a/bootstrap/start.php b/bootstrap/start.php index 32c186f..42fbaa4 100644 --- a/bootstrap/start.php +++ b/bootstrap/start.php @@ -54,7 +54,7 @@ | */ -$framework = __DIR__.'/../vendor/laravel/framework/src'; +$framework = $app['path.base'].'/vendor/laravel/framework/src'; require $framework.'/Illuminate/Foundation/start.php'; diff --git a/composer.json b/composer.json index 29d7fd4..d240686 100644 --- a/composer.json +++ b/composer.json @@ -16,5 +16,8 @@ "scripts": { "post-update-cmd": "php artisan optimize" }, + "config": { + "preferred-install": "dist" + }, "minimum-stability": "dev" } diff --git a/composer.lock b/composer.lock index bc0c7f6..604e618 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,9 @@ { - "hash": "fce97510b7d2fde5975f86150b646023", + "_readme": [ + "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": "9484098c768f029f3b0af7560f42b9b7", "packages": [ { "name": "classpreloader/classpreloader", @@ -48,18 +52,542 @@ ], "time": "2013-03-03 02:54:09" }, + { + "name": "doctrine/annotations", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "v1.1.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/v1.1.1", + "reference": "v1.1.1", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "php": ">=5.3.2" + }, + "require-dev": { + "doctrine/cache": "1.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Annotations\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "time": "2013-04-20 08:30:17" + }, + { + "name": "doctrine/cache", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/cache.git", + "reference": "b5716ea776f349a0fedcf0e7d032386c1f696f76" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/cache/zipball/b5716ea776f349a0fedcf0e7d032386c1f696f76", + "reference": "b5716ea776f349a0fedcf0e7d032386c1f696f76", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Cache\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Caching library offering an object-oriented API for many cache backends", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "cache", + "caching" + ], + "time": "2013-03-17 13:59:02" + }, + { + "name": "doctrine/collections", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/collections.git", + "reference": "df2138bcb467533bfe6b3a01301d480aec008b93" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/collections/zipball/df2138bcb467533bfe6b3a01301d480aec008b93", + "reference": "df2138bcb467533bfe6b3a01301d480aec008b93", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Collections\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Collections Abstraction library", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "array", + "collections", + "iterator" + ], + "time": "2013-03-17 14:01:33" + }, + { + "name": "doctrine/common", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common.git", + "reference": "3506be7467dbd4f923691a00555cf80065d32e59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/common/zipball/3506be7467dbd4f923691a00555cf80065d32e59", + "reference": "3506be7467dbd4f923691a00555cf80065d32e59", + "shasum": "" + }, + "require": { + "doctrine/annotations": "1.*", + "doctrine/cache": "1.*", + "doctrine/collections": "1.*", + "doctrine/inflector": "1.*", + "doctrine/lexer": "1.*", + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "collections", + "eventmanager", + "persistence", + "spl" + ], + "time": "2013-04-16 21:50:30" + }, + { + "name": "doctrine/dbal", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal.git", + "reference": "1d8d6bcfec388e17480b2c8953820b7c3e6d0850" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/1d8d6bcfec388e17480b2c8953820b7c3e6d0850", + "reference": "1d8d6bcfec388e17480b2c8953820b7c3e6d0850", + "shasum": "" + }, + "require": { + "doctrine/common": "2.4.x-dev", + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*", + "symfony/console": "2.*" + }, + "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/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Database Abstraction Layer", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "dbal", + "persistence", + "queryobject" + ], + "time": "2013-05-01 17:26:25" + }, + { + "name": "doctrine/inflector", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "8b4b3ccec7aafc596e2fc1e593c9f2e78f939c8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b4b3ccec7aafc596e2fc1e593c9f2e78f939c8c", + "reference": "8b4b3ccec7aafc596e2fc1e593c9f2e78f939c8c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Inflector\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "inflection", + "pluralize", + "singularize", + "string" + ], + "time": "2013-04-10 16:14:30" + }, + { + "name": "doctrine/lexer", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/lexer.git", + "reference": "bc0e1f0cc285127a38c6c8ea88bc5dba2fd53e94" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/bc0e1f0cc285127a38c6c8ea88bc5dba2fd53e94", + "reference": "bc0e1f0cc285127a38c6c8ea88bc5dba2fd53e94", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "lexer", + "parser" + ], + "time": "2013-03-07 12:15:25" + }, + { + "name": "filp/whoops", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/filp/whoops.git", + "reference": "1.0.4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/filp/whoops/zipball/1.0.4", + "reference": "1.0.4", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "mockery/mockery": "dev-master", + "silex/silex": "1.0.*@dev" + }, + "type": "library", + "autoload": { + "psr-0": { + "Whoops": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Filipe Dobreira", + "homepage": "https://github.com/filp", + "role": "Developer" + } + ], + "description": "php error handling for cool kids", + "homepage": "https://github.com/filp/whoops", + "keywords": [ + "error", + "exception", + "handling", + "library", + "silex-provider", + "whoops", + "zf2" + ], + "time": "2013-04-24 15:55:28" + }, { "name": "ircmaxell/password-compat", "version": "1.0.x-dev", "source": { "type": "git", "url": "https://github.com/ircmaxell/password_compat.git", - "reference": "v1.0.0" + "reference": "v1.0.3" }, "dist": { "type": "zip", - "url": "https://github.com/ircmaxell/password_compat/archive/v1.0.0.zip", - "reference": "v1.0.0", + "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/v1.0.3", + "reference": "v1.0.3", "shasum": "" }, "type": "library", @@ -85,7 +613,7 @@ "hashing", "password" ], - "time": "2013-01-14 16:49:31" + "time": "2013-04-30 19:58:08" }, { "name": "laravel/framework", @@ -93,32 +621,37 @@ "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e5addd3c1f80bdb129eb8c84b947328bcf92808e" + "reference": "a678268ff6cbb41160fc89d477b8e1e0e596bd39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e5addd3c1f80bdb129eb8c84b947328bcf92808e", - "reference": "e5addd3c1f80bdb129eb8c84b947328bcf92808e", + "url": "https://api.github.com/repos/laravel/framework/zipball/a678268ff6cbb41160fc89d477b8e1e0e596bd39", + "reference": "a678268ff6cbb41160fc89d477b8e1e0e596bd39", "shasum": "" }, "require": { "classpreloader/classpreloader": "1.0.*", + "doctrine/dbal": "2.4.x", + "filp/whoops": "1.0.4", "ircmaxell/password-compat": "1.0.*", - "monolog/monolog": "1.4.*", - "patchwork/utf8": "1.0.*", - "php": ">=5.3.7", - "swiftmailer/swiftmailer": "4.3.*", - "symfony/browser-kit": "2.2.*", - "symfony/console": "2.2.*", - "symfony/css-selector": "2.2.*", - "symfony/dom-crawler": "2.2.*", - "symfony/event-dispatcher": "2.2.*", - "symfony/finder": "2.2.*", - "symfony/http-foundation": "2.2.*", - "symfony/http-kernel": "2.2.*", - "symfony/process": "2.2.*", - "symfony/routing": "2.2.*", - "symfony/translation": "2.2.*" + "monolog/monolog": "1.5.*", + "nesbot/carbon": "1.*", + "patchwork/utf8": "1.1.*", + "php": ">=5.3.0", + "predis/predis": "0.8.*", + "swiftmailer/swiftmailer": "5.0.*", + "symfony/browser-kit": "2.3.*", + "symfony/console": "2.3.*", + "symfony/css-selector": "2.3.*", + "symfony/debug": "2.3.*", + "symfony/dom-crawler": "2.3.*", + "symfony/event-dispatcher": "2.3.*", + "symfony/finder": "2.3.*", + "symfony/http-foundation": "2.3.*", + "symfony/http-kernel": "2.3.*", + "symfony/process": "2.3.*", + "symfony/routing": "2.3.*", + "symfony/translation": "2.3.*" }, "replace": { "illuminate/auth": "self.version", @@ -134,6 +667,7 @@ "illuminate/filesystem": "self.version", "illuminate/foundation": "self.version", "illuminate/hashing": "self.version", + "illuminate/html": "self.version", "illuminate/http": "self.version", "illuminate/log": "self.version", "illuminate/mail": "self.version", @@ -162,6 +696,11 @@ } }, "autoload": { + "classmap": [ + [ + "src/Illuminate/Queue/IlluminateQueueClosure.php" + ] + ], "files": [ "src/Illuminate/Support/helpers.php" ], @@ -184,7 +723,7 @@ "framework", "laravel" ], - "time": "2013-03-30 15:49:13" + "time": "2013-05-02 20:31:06" }, { "name": "monolog/monolog", @@ -192,12 +731,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "3f8c37b23c893ab72d85b6deb02cea9e215d2d3c" + "reference": "b264026cba83b4f02ebea7d908a6340a9fd010ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3f8c37b23c893ab72d85b6deb02cea9e215d2d3c", - "reference": "3f8c37b23c893ab72d85b6deb02cea9e215d2d3c", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b264026cba83b4f02ebea7d908a6340a9fd010ac", + "reference": "b264026cba83b4f02ebea7d908a6340a9fd010ac", "shasum": "" }, "require": { @@ -219,7 +758,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -246,7 +785,50 @@ "logging", "psr-3" ], - "time": "2013-03-28 10:41:04" + "time": "2013-04-24 15:45:58" + }, + { + "name": "nesbot/carbon", + "version": "1.2.0", + "source": { + "type": "git", + "url": "git://github.com/briannesbitt/Carbon.git", + "reference": "1.2.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/briannesbitt/Carbon/zipball/1.2.0", + "reference": "1.2.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Carbon": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Brian Nesbitt", + "email": "brian@nesbot.com", + "homepage": "http://nesbot.com" + } + ], + "description": "A simple API extension for DateTime.", + "homepage": "https://github.com/briannesbitt/Carbon", + "keywords": [ + "date", + "datetime", + "time" + ], + "time": "2012-10-14 17:41:18" }, { "name": "nikic/php-parser", @@ -254,12 +836,12 @@ "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "5fca55702b4e035b60a7b1cbac538572db47121d" + "reference": "8e686ce7a7bab35a0bc205715d23a1bc90c93b04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5fca55702b4e035b60a7b1cbac538572db47121d", - "reference": "5fca55702b4e035b60a7b1cbac538572db47121d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8e686ce7a7bab35a0bc205715d23a1bc90c93b04", + "reference": "8e686ce7a7bab35a0bc205715d23a1bc90c93b04", "shasum": "" }, "require": { @@ -290,20 +872,20 @@ "parser", "php" ], - "time": "2013-03-05 14:42:24" + "time": "2013-04-15 18:56:45" }, { "name": "patchwork/utf8", - "version": "v1.0.4", + "version": "v1.1.3", "source": { "type": "git", "url": "https://github.com/nicolas-grekas/Patchwork-UTF8.git", - "reference": "v1.0.4" + "reference": "v1.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/nicolas-grekas/Patchwork-UTF8/archive/v1.0.4.zip", - "reference": "v1.0.4", + "url": "https://api.github.com/repos/nicolas-grekas/Patchwork-UTF8/zipball/v1.1.3", + "reference": "v1.1.3", "shasum": "" }, "require": { @@ -311,9 +893,10 @@ }, "type": "library", "autoload": { - "files": [ - "bootup.utf8.php" - ] + "psr-0": { + "Patchwork": "class/", + "Normalizer": "class/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -334,7 +917,54 @@ "utf-8", "utf8" ], - "time": "2012-12-13 08:48:39" + "time": "2013-04-18 18:46:28" + }, + { + "name": "predis/predis", + "version": "0.8.x-dev", + "source": { + "type": "git", + "url": "https://github.com/nrk/predis.git", + "reference": "d6fa4a32920e340159ecbc9a5cabaa0e192df021" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nrk/predis/zipball/d6fa4a32920e340159ecbc9a5cabaa0e192df021", + "reference": "d6fa4a32920e340159ecbc9a5cabaa0e192df021", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "suggest": { + "ext-curl": "Allows access to Webdis when paired with phpiredis", + "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" + }, + "type": "library", + "autoload": { + "psr-0": { + "Predis": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniele Alessandri", + "email": "suppakilla@gmail.com", + "homepage": "http://clorophilla.net" + } + ], + "description": "Flexible and feature-complete PHP client library for Redis", + "homepage": "http://github.com/nrk/predis", + "keywords": [ + "nosql", + "predis", + "redis" + ], + "time": "2013-03-30 15:16:13" }, { "name": "psr/log", @@ -380,12 +1010,12 @@ "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "7d490f435afdde9b54633bc2ecab6c153720614a" + "reference": "a64528efec37173a6dabaedb0e678beffdb446f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/7d490f435afdde9b54633bc2ecab6c153720614a", - "reference": "7d490f435afdde9b54633bc2ecab6c153720614a", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/a64528efec37173a6dabaedb0e678beffdb446f0", + "reference": "a64528efec37173a6dabaedb0e678beffdb446f0", "shasum": "" }, "require": { @@ -394,7 +1024,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -404,7 +1034,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "MIT" ], "authors": [ { @@ -421,21 +1051,21 @@ "mail", "mailer" ], - "time": "2013-03-22 14:03:11" + "time": "2013-04-30 17:36:15" }, { "name": "symfony/browser-kit", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/BrowserKit", "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "d55e7ffd7f10bead48adb03b208bc67bd53926bb" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/d55e7ffd7f10bead48adb03b208bc67bd53926bb", - "reference": "d55e7ffd7f10bead48adb03b208bc67bd53926bb", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { @@ -452,7 +1082,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -476,30 +1106,33 @@ ], "description": "Symfony BrowserKit Component", "homepage": "http://symfony.com", - "time": "2013-03-15 10:14:31" + "time": "2013-04-30 07:16:44" }, { "name": "symfony/console", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "d146fc32a9cf13bc479820e515048298a34cd432" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/d146fc32a9cf13bc479820e515048298a34cd432", - "reference": "d146fc32a9cf13bc479820e515048298a34cd432", + "url": "https://api.github.com/repos/symfony/Console/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/event-dispatcher": ">=2.1,<3.0" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -523,21 +1156,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2013-03-19 20:48:08" + "time": "2013-04-30 07:16:44" }, { "name": "symfony/css-selector", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/CssSelector", "source": { "type": "git", "url": "https://github.com/symfony/CssSelector.git", - "reference": "v2.2.0-RC3" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { @@ -546,7 +1179,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -566,25 +1199,85 @@ { "name": "Symfony Community", "homepage": "http://symfony.com/contributors" + }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" } ], "description": "Symfony CssSelector Component", "homepage": "http://symfony.com", - "time": "2013-01-17 15:25:59" + "time": "2013-04-11 06:50:46" + }, + { + "name": "symfony/debug", + "version": "dev-master", + "target-dir": "Symfony/Component/Debug", + "source": { + "type": "git", + "url": "https://github.com/symfony/Debug.git", + "reference": "211f4a9307add219ea332a3f210752784744d32b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Debug/zipball/211f4a9307add219ea332a3f210752784744d32b", + "reference": "211f4a9307add219ea332a3f210752784744d32b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/http-foundation": ">=2.1,<3.0", + "symfony/http-kernel": ">=2.1,<3.0" + }, + "suggest": { + "symfony/class-loader": "~2.1", + "symfony/http-foundation": "~2.1", + "symfony/http-kernel": "~2.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Debug\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Debug Component", + "homepage": "http://symfony.com", + "time": "2013-05-01 17:15:41" }, { "name": "symfony/dom-crawler", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/DomCrawler", "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "09f1c2512873cea65045db48076cf363920fb819" + "reference": "59b171317b17b60a5df830e09e02961563323e8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/09f1c2512873cea65045db48076cf363920fb819", - "reference": "09f1c2512873cea65045db48076cf363920fb819", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/59b171317b17b60a5df830e09e02961563323e8d", + "reference": "59b171317b17b60a5df830e09e02961563323e8d", "shasum": "" }, "require": { @@ -599,7 +1292,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -623,21 +1316,21 @@ ], "description": "Symfony DomCrawler Component", "homepage": "http://symfony.com", - "time": "2013-03-20 13:55:39" + "time": "2013-04-22 05:03:23" }, { "name": "symfony/event-dispatcher", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "v2.2.0-RC3" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { @@ -653,7 +1346,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -677,7 +1370,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2013-02-11 11:26:43" + "time": "2013-02-11 11:27:01" }, { "name": "symfony/filesystem", @@ -686,12 +1379,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "414e4f741f2b0750a92925ada7a1864f94715388" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/414e4f741f2b0750a92925ada7a1864f94715388", - "reference": "414e4f741f2b0750a92925ada7a1864f94715388", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { @@ -724,21 +1417,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2013-01-31 21:39:01" + "time": "2013-05-01 07:15:46" }, { "name": "symfony/finder", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "c67f01a50fea3c2897a74ebbb64e3f7d83728d0f" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/c67f01a50fea3c2897a74ebbb64e3f7d83728d0f", - "reference": "c67f01a50fea3c2897a74ebbb64e3f7d83728d0f", + "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { @@ -747,7 +1440,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -771,21 +1464,21 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2013-03-12 11:39:20" + "time": "2013-04-25 12:12:10" }, { "name": "symfony/http-foundation", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "6af424d4fee81987e76bc76aa4e811859ca70bac" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/6af424d4fee81987e76bc76aa4e811859ca70bac", - "reference": "6af424d4fee81987e76bc76aa4e811859ca70bac", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { @@ -794,7 +1487,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -821,28 +1514,29 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2013-03-23 07:49:54" + "time": "2013-04-30 17:05:37" }, { "name": "symfony/http-kernel", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "3bfc8fda577fb671b2d9395a59fbc87f449fa61f" + "reference": "f6e305f7c138c265b0fb84733b691ab505ee5921" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/3bfc8fda577fb671b2d9395a59fbc87f449fa61f", - "reference": "3bfc8fda577fb671b2d9395a59fbc87f449fa61f", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/f6e305f7c138c265b0fb84733b691ab505ee5921", + "reference": "f6e305f7c138c265b0fb84733b691ab505ee5921", "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,<2.3-dev" + "symfony/http-foundation": ">=2.2,<2.4-dev" }, "require-dev": { "symfony/browser-kit": "2.2.*", @@ -852,8 +1546,8 @@ "symfony/dependency-injection": ">=2.0,<3.0", "symfony/finder": ">=2.0,<3.0", "symfony/process": ">=2.0,<3.0", - "symfony/routing": ">=2.2,<2.3-dev", - "symfony/stopwatch": ">=2.2,<2.3-dev" + "symfony/routing": ">=2.2,<2.4-dev", + "symfony/stopwatch": ">=2.2,<2.4-dev" }, "suggest": { "symfony/browser-kit": "2.2.*", @@ -866,7 +1560,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -890,21 +1584,21 @@ ], "description": "Symfony HttpKernel Component", "homepage": "http://symfony.com", - "time": "2013-03-23 10:43:44" + "time": "2013-05-01 16:29:33" }, { "name": "symfony/process", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "521c1f4047204a198d7d98bb69f2508bfe83a5e0" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/521c1f4047204a198d7d98bb69f2508bfe83a5e0", - "reference": "521c1f4047204a198d7d98bb69f2508bfe83a5e0", + "url": "https://api.github.com/repos/symfony/Process/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { @@ -913,7 +1607,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -937,21 +1631,21 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2013-03-23 07:49:54" + "time": "2013-04-30 07:21:49" }, { "name": "symfony/routing", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "a8599d5735c5f1f994cfbf91f59851add9c9f627" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/a8599d5735c5f1f994cfbf91f59851add9c9f627", - "reference": "a8599d5735c5f1f994cfbf91f59851add9c9f627", + "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { @@ -960,7 +1654,7 @@ "require-dev": { "doctrine/common": ">=2.2,<3.0", "psr/log": ">=1.0,<2.0", - "symfony/config": ">=2.2,<2.3-dev", + "symfony/config": ">=2.2,<2.4-dev", "symfony/yaml": ">=2.0,<3.0" }, "suggest": { @@ -971,7 +1665,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -995,28 +1689,28 @@ ], "description": "Symfony Routing Component", "homepage": "http://symfony.com", - "time": "2013-03-14 09:39:13" + "time": "2013-04-26 09:39:57" }, { "name": "symfony/translation", - "version": "2.2.x-dev", + "version": "dev-master", "target-dir": "Symfony/Component/Translation", "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "cdbeaa8d76d176df3762510c857d246f94387ef3" + "reference": "v2.3.0-BETA1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/cdbeaa8d76d176df3762510c857d246f94387ef3", - "reference": "cdbeaa8d76d176df3762510c857d246f94387ef3", + "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.3.0-BETA1", + "reference": "v2.3.0-BETA1", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/config": ">=2.0,<2.3-dev", + "symfony/config": ">=2.0,<2.4-dev", "symfony/yaml": ">=2.2,<3.0" }, "suggest": { @@ -1026,7 +1720,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -1050,7 +1744,7 @@ ], "description": "Symfony Translation Component", "homepage": "http://symfony.com", - "time": "2013-03-18 14:27:58" + "time": "2013-04-30 17:05:37" } ], "packages-dev": [ diff --git a/public/.htaccess b/public/.htaccess index 0e85365..a3432c2 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,8 +1,10 @@ -php_value magic_quotes_gpc Off - - Options -MultiViews - RewriteEngine On - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^ index.php [L] + Options -MultiViews + RewriteEngine On + + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^(.+)/$ http://%{HTTP_HOST}/$1 [R=301,L] + + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ index.php [L] \ No newline at end of file