diff --git a/composer.json b/composer.json index 5c50c2d26063..65c665c81844 100644 --- 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 index 36d963024218..89bb70ea840e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "72d1c09394a4734e13155112d3c5c547", + "content-hash": "1bd7ae2a0b16cd5d1f058e5499a8ed15", "packages": [ { "name": "alt-three/badger", @@ -127,16 +127,16 @@ }, { "name": "alt-three/emoji", - "version": "v6.1.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/AltThree/Emoji.git", - "reference": "a0512f21dc946676315178f254717c6714bf667f" + "reference": "e0eab12ca83e0ec56908fc066227e7da7f97d7f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/Emoji/zipball/a0512f21dc946676315178f254717c6714bf667f", - "reference": "a0512f21dc946676315178f254717c6714bf667f", + "url": "https://api.github.com/repos/AltThree/Emoji/zipball/e0eab12ca83e0ec56908fc066227e7da7f97d7f0", + "reference": "e0eab12ca83e0ec56908fc066227e7da7f97d7f0", "shasum": "" }, "require": { @@ -150,12 +150,13 @@ "graham-campbell/analyzer": "^2.1", "graham-campbell/markdown": "^10.2", "graham-campbell/testbench": "^5.1", + "mockery/mockery": "^1.0", "phpunit/phpunit": "^6.5|^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "7.0-dev" }, "laravel": { "providers": [ @@ -184,7 +185,7 @@ "emoji", "parser" ], - "time": "2018-09-29T10:43:23+00:00" + "time": "2018-12-28T16:34:12+00:00" }, { "name": "alt-three/throttle", @@ -819,16 +820,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.8.1", + "version": "v2.9.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "a9019c1e3232eacace373a6ba957a85b66a255c1" + "reference": "ec74d6e300d78fbc896669c3ca57ef9719adc9c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/a9019c1e3232eacace373a6ba957a85b66a255c1", - "reference": "a9019c1e3232eacace373a6ba957a85b66a255c1", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/ec74d6e300d78fbc896669c3ca57ef9719adc9c6", + "reference": "ec74d6e300d78fbc896669c3ca57ef9719adc9c6", "shasum": "" }, "require": { @@ -838,11 +839,10 @@ "php": "^7.1" }, "require-dev": { - "doctrine/coding-standard": "^4.0", + "doctrine/coding-standard": "^5.0", "jetbrains/phpstorm-stubs": "^2018.1.2", "phpstan/phpstan": "^0.10.1", - "phpunit/phpunit": "^7.1.2", - "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5", + "phpunit/phpunit": "^7.4", "symfony/console": "^2.0.5|^3.0|^4.0", "symfony/phpunit-bridge": "^3.4.5|^4.0.5" }, @@ -855,13 +855,13 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8.x-dev", + "dev-master": "2.9.x-dev", "dev-develop": "3.0.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\DBAL\\": "lib/" + "psr-4": { + "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" } }, "notification-url": "https://packagist.org/downloads/", @@ -886,15 +886,19 @@ "email": "jonwage@gmail.com" } ], - "description": "Database Abstraction Layer", - "homepage": "http://www.doctrine-project.org", + "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.", + "homepage": "https://www.doctrine-project.org/projects/dbal.html", "keywords": [ + "abstraction", "database", "dbal", + "mysql", "persistence", + "pgsql", + "php", "queryobject" ], - "time": "2018-12-04T06:44:25+00:00" + "time": "2018-12-14T04:51:13+00:00" }, { "name": "doctrine/event-manager", diff --git a/config/emoji.php b/config/emoji.php index d7964b23443a..38834500e338 100644 --- 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, + ];