Skip to content

Commit

Permalink
Merge d4a507e into a5f1df7
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamCampbell committed Nov 1, 2013
2 parents a5f1df7 + d4a507e commit 8cc1436
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 15 deletions.
8 changes: 3 additions & 5 deletions src/Orchestra/Testbench/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,31 +88,29 @@ protected function getApplicationProviders()
'Illuminate\Foundation\Providers\ArtisanServiceProvider',
'Illuminate\Auth\AuthServiceProvider',
'Illuminate\Cache\CacheServiceProvider',
'Illuminate\Foundation\Providers\CommandCreatorServiceProvider',
'Illuminate\Session\CommandsServiceProvider',
'Illuminate\Foundation\Providers\ComposerServiceProvider',
'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
'Illuminate\Routing\ControllerServiceProvider',
'Illuminate\Cookie\CookieServiceProvider',
'Illuminate\Database\DatabaseServiceProvider',
'Illuminate\Encryption\EncryptionServiceProvider',
'Illuminate\Filesystem\FilesystemServiceProvider',
'Illuminate\Hashing\HashServiceProvider',
'Illuminate\Html\HtmlServiceProvider',
'Illuminate\Foundation\Providers\KeyGeneratorServiceProvider',
'Illuminate\Log\LogServiceProvider',
'Illuminate\Mail\MailServiceProvider',
'Illuminate\Database\MigrationServiceProvider',
'Illuminate\Pagination\PaginationServiceProvider',
'Illuminate\Foundation\Providers\PublisherServiceProvider',
'Illuminate\Remote\RemoteServiceProvider',
'Illuminate\Queue\QueueServiceProvider',
'Illuminate\Redis\RedisServiceProvider',
'Illuminate\Remote\RemoteServiceProvider',
'Illuminate\Auth\Reminders\ReminderServiceProvider',
'Illuminate\Database\SeedServiceProvider',
'Illuminate\Session\SessionServiceProvider',
'Illuminate\Translation\TranslationServiceProvider',
'Illuminate\Validation\ValidationServiceProvider',
'Illuminate\View\ViewServiceProvider',
'Illuminate\Workbench\WorkbenchServiceProvider',
);
}

Expand Down
5 changes: 3 additions & 2 deletions src/fixture/app/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
|--------------------------------------------------------------------------
|
| This key is used by the Illuminate encrypter service and should be set
| to a random, long string, otherwise these encrypted values will not
| be safe. Make sure to change it before deploying any application!
| to a random, 32 character string, otherwise these encrypted strings
| will not be safe. Please do this before deploying an application!
|
*/

Expand All @@ -79,4 +79,5 @@
*/

'manifest' => storage_path().'/meta',

);
12 changes: 10 additions & 2 deletions src/fixture/app/config/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
|--------------------------------------------------------------------------
|
| This option controls the authentication driver that will be utilized.
| This drivers manages the retrieval and authentication of the users
| This driver manages the retrieval and authentication of the users
| attempting to get access to protected areas of your application.
|
| Supported: "database", "eloquent"
Expand Down Expand Up @@ -52,11 +52,19 @@
| that should be used as your password reminder e-mail. You will also
| be able to set the name of the table that holds the reset tokens.
|
| The "expire" time is the number of minutes that the reminder should be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
*/

'reminder' => array(

'email' => 'emails.auth.reminder', 'table' => 'password_reminders',
'email' => 'emails.auth.reminder',

'table' => 'password_reminders',

'expire' => 60,

),

Expand Down
2 changes: 1 addition & 1 deletion src/fixture/app/config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
|
| This table keeps track of all the migrations that have already run for
| your application. Using this information, we can determine which of
| the migrations on disk have not actually be run in the databases.
| the migrations on disk haven't actually been run in the database.
|
*/

Expand Down
5 changes: 5 additions & 0 deletions src/fixture/app/config/queue.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@
'queue' => 'your-queue-name',
),

'redis' => array(
'driver' => 'redis',
'queue' => 'default',
),

),

);
10 changes: 6 additions & 4 deletions src/fixture/app/config/session.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,28 @@
| requests. By default, we will use the lightweight native driver but
| you may specify any of the other wonderful drivers provided here.
|
| Supported: "native", "cookie", "database", "apc",
| Supported: "file", "cookie", "database", "apc",
| "memcached", "redis", "array"
|
*/

'driver' => 'native',
'driver' => 'file',

/*
|--------------------------------------------------------------------------
| Session Lifetime
|--------------------------------------------------------------------------
|
| Here you may specify the number of minutes that you wish the session
| to be allowed to remain idle for it is expired. If you want them
| to immediately expire when the browser closes, set it to zero.
| to be allowed to remain idle before it expires. If you want them
| to immediately expire on the browser closing, set that option.
|
*/

'lifetime' => 120,

'expire_on_close' => false,

/*
|--------------------------------------------------------------------------
| Session File Location
Expand Down
2 changes: 1 addition & 1 deletion src/fixture/app/config/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
|
*/

'pagination' => 'pagination::slider',
'pagination' => 'pagination::slider-3',

);

0 comments on commit 8cc1436

Please sign in to comment.