Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated doctrine and emoji packages #3377

Merged
merged 1 commit into from
Dec 28, 2018
Merged

Updated doctrine and emoji packages #3377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
"ext-xml": "*",
"alt-three/badger": "^5.1",
"alt-three/bus": "^4.1",
"alt-three/emoji": "^6.1",
"alt-three/emoji": "^7.0",
"alt-three/throttle": "^3.1",
"alt-three/twitter": "^3.1",
"alt-three/validator": "^4.1",
"aws/aws-sdk-php": "^3.7",
"barryvdh/laravel-cors": "^0.11.0",
"doctrine/dbal": "2.8.*",
"doctrine/dbal": "2.9.*",
"fideloper/proxy": "^4.0",
"graham-campbell/binput": "^5.1",
"graham-campbell/exceptions": "^11.1",
Expand All @@ -67,8 +67,8 @@
"graham-campbell/testbench-core": "^3.0",
"mockery/mockery": "^1.2",
"phpunit/phpunit": "^7.4",
"symfony/css-selector": "^4.0",
"symfony/dom-crawler": "^4.0",
"symfony/css-selector": "^4.1",
"symfony/dom-crawler": "^4.1",
"tightenco/mailthief": "^0.3.14"
},
"suggest": {
Expand Down
44 changes: 24 additions & 20 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions config/emoji.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,38 @@

'token' => env('GITHUB_TOKEN', null),

/*
|--------------------------------------------------------------------------
| Cache Connection
|--------------------------------------------------------------------------
|
| Here you may tell us what cache connection to use. To use the default,
| set this to null.
|
*/

'connection' => null,
jbrooksuk marked this conversation as resolved.
Show resolved Hide resolved

/*
|--------------------------------------------------------------------------
| Cache Key
|--------------------------------------------------------------------------
|
| Here you may tell us what cache key to use for storing the emoji map.
|
*/

'key' => 'emoji',

/*
|--------------------------------------------------------------------------
| Cache Life
|--------------------------------------------------------------------------
|
| Here you may tell us how long in minutes to cache the emoji map.
|
*/

'life' => 10080,

];