Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .env.ci
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ DB_USERNAME=hackgreenville
DB_PASSWORD=test

BROADCAST_DRIVER=log
CACHE_DRIVER=file
# Tests must use an isolated in-memory cache. A persistent driver leaks
# Cache::remember() values (e.g. the homepage stats) across test methods.
CACHE_STORE=array
SESSION_DRIVER=file
SESSION_LIFETIME=120
QUEUE_DRIVER=sync
Expand Down
2 changes: 1 addition & 1 deletion .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ MYSQL_PASSWORD="${DB_PASSWORD}"
MYSQL_ALLOW_EMPTY_PASSWORD="yes"

BROADCAST_DRIVER=log
CACHE_DRIVER=file
CACHE_STORE=file
SESSION_DRIVER=file
SESSION_LIFETIME=120
QUEUE_DRIVER=sync
Expand Down
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ DB_USERNAME=homestead
DB_PASSWORD=secret

BROADCAST_DRIVER=log
# Setting the cache driver to "array" will disable the cache
CACHE_DRIVER=file
# Setting the cache store to "array" will disable the cache
CACHE_STORE=file
SESSION_DRIVER=file
SESSION_LIFETIME=120
QUEUE_DRIVER=sync
Expand Down
4 changes: 3 additions & 1 deletion .env.testing
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ DB_CONNECTION=sqlite
DB_HOST=:memory:

BROADCAST_DRIVER=log
CACHE_DRIVER=file
# Tests must use an isolated in-memory cache. A persistent driver leaks
# Cache::remember() values (e.g. the homepage stats) across test methods.
CACHE_STORE=array
SESSION_DRIVER=file
SESSION_LIFETIME=120
QUEUE_DRIVER=sync
Expand Down
30 changes: 14 additions & 16 deletions config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
| Default Cache Store
|--------------------------------------------------------------------------
|
| This option controls the default cache connection that gets used while
| using this caching library. This connection is used when another is
| not explicitly specified when executing a given caching function.
|
| Supported: "apc", "array", "database", "file", "memcached", "redis"
| This option controls the default cache store that will be used by the
| framework. This connection is utilized if another isn't explicitly
| specified when running a cache operation inside the application.
|
*/

'default' => env('CACHE_DRIVER', 'file'),
'default' => env('CACHE_STORE', 'file'),

/*
|--------------------------------------------------------------------------
Expand All @@ -39,37 +37,37 @@
],

'database' => [
'driver' => 'database',
'table' => 'cache',
'driver' => 'database',
'table' => 'cache',
'connection' => null,
],

'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache/data'),
'path' => storage_path('framework/cache/data'),
],

'memcached' => [
'driver' => 'memcached',
'driver' => 'memcached',
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
'sasl' => [
'sasl' => [
env('MEMCACHED_USERNAME'),
env('MEMCACHED_PASSWORD'),
],
'options' => [
'options' => [
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
],
'servers' => [
'servers' => [
[
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'weight' => 100,
],
],
],

'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
],

Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<php>
<env name="APP_ENV" value="testing"/>
<env name="BCRYPT_ROUNDS" value="4"/>
<env name="CACHE_DRIVER" value="array"/>
<env name="CACHE_STORE" value="array"/>
<env name="DB_CONNECTION" value="sqlite"/>
<env name="DB_DATABASE" value=":memory:"/>
<env name="MAIL_MAILER" value="array"/>
Expand Down
Loading