Merge pull request #3377 from CachetHQ/upgrades

Updated doctrine and emoji packages
cachethq · Dec 28, 2018 · 59df070 · 59df070
2 parents 12c22c0 + 3fca9e6
commit 59df070
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -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",
@@ -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": {

diff --git a/composer.lock b/composer.lock
diff --git a/config/emoji.php b/config/emoji.php
@@ -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,
+
+    /*
+    |--------------------------------------------------------------------------
+    | 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,
+
 ];