mirror of
https://github.com/laurent22/joplin.git
synced 2024-11-24 08:12:24 +02:00
Merge branch 'master' of github.com:laurent22/joplin
This commit is contained in:
Laurent Cozic
commit
8572dbab8f
@ -1,4 +0,0 @@
|
||||
notes
|
||||
=====
|
||||
|
||||
A Symfony project created on October 5, 2016, 4:15 pm.
|
||||
@ -7,8 +7,6 @@ parameters:
|
||||
database_name: symfony
|
||||
database_user: root
|
||||
database_password: ~
|
||||
# You should uncomment this if you want use pdo_sqlite
|
||||
# database_path: "%kernel.root_dir%/data.db3"
|
||||
|
||||
mailer_transport: smtp
|
||||
mailer_host: 127.0.0.1
|
||||
@ -17,3 +15,8 @@ parameters:
|
||||
|
||||
# A secret key that's used to generate certain security-related tokens
|
||||
secret: ThisTokenIsNotSoSecretChangeIt
|
||||
database:
|
||||
database: "%database_name%"
|
||||
host: "%database_host%"
|
||||
username: "%database_user%"
|
||||
password: "%database_password%"
|
||||
370
composer.lock
generated
370
composer.lock
generated
@ -9,35 +9,35 @@
|
||||
"packages": [
|
||||
{
|
||||
"name": "doctrine/annotations",
|
||||
"version": "v1.2.7",
|
||||
"version": "v1.3.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/annotations.git",
|
||||
"reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
|
||||
"reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
|
||||
"reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
|
||||
"url": "https://api.github.com/repos/doctrine/annotations/zipball/bd4461328621bde0ae6b1b2675fbc6aca4ceb558",
|
||||
"reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/lexer": "1.*",
|
||||
"php": ">=5.3.2"
|
||||
"php": "^5.6 || ^7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/cache": "1.*",
|
||||
"phpunit/phpunit": "4.*"
|
||||
"phpunit/phpunit": "^5.6.1"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.3.x-dev"
|
||||
"dev-master": "1.4.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Doctrine\\Common\\Annotations\\": "lib/"
|
||||
"psr-4": {
|
||||
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
@ -73,20 +73,20 @@
|
||||
"docblock",
|
||||
"parser"
|
||||
],
|
||||
"time": "2015-08-31 12:32:49"
|
||||
"time": "2016-12-30 15:59:45"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/cache",
|
||||
"version": "v1.6.0",
|
||||
"version": "v1.6.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/cache.git",
|
||||
"reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
|
||||
"reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
|
||||
"reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
|
||||
"url": "https://api.github.com/repos/doctrine/cache/zipball/b6f544a20f4807e81f7044d31e679ccbb1866dc3",
|
||||
"reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -143,7 +143,7 @@
|
||||
"cache",
|
||||
"caching"
|
||||
],
|
||||
"time": "2015-12-31 16:37:02"
|
||||
"time": "2016-10-29 11:16:17"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/collections",
|
||||
@ -213,16 +213,16 @@
|
||||
},
|
||||
{
|
||||
"name": "doctrine/common",
|
||||
"version": "v2.6.1",
|
||||
"version": "v2.7.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/common.git",
|
||||
"reference": "a579557bc689580c19fee4e27487a67fe60defc0"
|
||||
"reference": "930297026c8009a567ac051fd545bf6124150347"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0",
|
||||
"reference": "a579557bc689580c19fee4e27487a67fe60defc0",
|
||||
"url": "https://api.github.com/repos/doctrine/common/zipball/930297026c8009a567ac051fd545bf6124150347",
|
||||
"reference": "930297026c8009a567ac051fd545bf6124150347",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -231,10 +231,10 @@
|
||||
"doctrine/collections": "1.*",
|
||||
"doctrine/inflector": "1.*",
|
||||
"doctrine/lexer": "1.*",
|
||||
"php": "~5.5|~7.0"
|
||||
"php": "~5.6|~7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~4.8|~5.0"
|
||||
"phpunit/phpunit": "^5.4.6"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@ -282,24 +282,24 @@
|
||||
"persistence",
|
||||
"spl"
|
||||
],
|
||||
"time": "2015-12-25 13:18:31"
|
||||
"time": "2017-01-13 14:02:13"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/dbal",
|
||||
"version": "v2.5.5",
|
||||
"version": "v2.5.7",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/dbal.git",
|
||||
"reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9"
|
||||
"reference": "3a351369582dade60c750e2cef540eb7b568e6b3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/dbal/zipball/9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
|
||||
"reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
|
||||
"url": "https://api.github.com/repos/doctrine/dbal/zipball/3a351369582dade60c750e2cef540eb7b568e6b3",
|
||||
"reference": "3a351369582dade60c750e2cef540eb7b568e6b3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/common": ">=2.4,<2.7-dev",
|
||||
"doctrine/common": ">=2.4,<2.8-dev",
|
||||
"php": ">=5.3.2"
|
||||
},
|
||||
"require-dev": {
|
||||
@ -353,41 +353,41 @@
|
||||
"persistence",
|
||||
"queryobject"
|
||||
],
|
||||
"time": "2016-09-09 19:13:33"
|
||||
"time": "2017-01-14 21:05:28"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/doctrine-bundle",
|
||||
"version": "1.6.4",
|
||||
"version": "1.6.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/DoctrineBundle.git",
|
||||
"reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7"
|
||||
"reference": "0f0c4df366bd1d36d38a27e2f5ff128e118ac969"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/dd40b0a7fb16658cda9def9786992b8df8a49be7",
|
||||
"reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7",
|
||||
"url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/0f0c4df366bd1d36d38a27e2f5ff128e118ac969",
|
||||
"reference": "0f0c4df366bd1d36d38a27e2f5ff128e118ac969",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/dbal": "~2.3",
|
||||
"doctrine/doctrine-cache-bundle": "~1.0",
|
||||
"jdorn/sql-formatter": "~1.1",
|
||||
"php": ">=5.3.2",
|
||||
"symfony/console": "~2.3|~3.0",
|
||||
"symfony/dependency-injection": "~2.3|~3.0",
|
||||
"symfony/doctrine-bridge": "~2.2|~3.0",
|
||||
"symfony/framework-bundle": "~2.3|~3.0"
|
||||
"php": ">=5.5.9",
|
||||
"symfony/console": "~2.7|~3.0",
|
||||
"symfony/dependency-injection": "~2.7|~3.0",
|
||||
"symfony/doctrine-bridge": "~2.7|~3.0",
|
||||
"symfony/framework-bundle": "~2.7|~3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/orm": "~2.3",
|
||||
"phpunit/phpunit": "~4",
|
||||
"satooshi/php-coveralls": "~0.6.1",
|
||||
"satooshi/php-coveralls": "^1.0",
|
||||
"symfony/phpunit-bridge": "~2.7|~3.0",
|
||||
"symfony/property-info": "~2.8|~3.0",
|
||||
"symfony/validator": "~2.2|~3.0",
|
||||
"symfony/yaml": "~2.2|~3.0",
|
||||
"twig/twig": "~1.10"
|
||||
"symfony/validator": "~2.7|~3.0",
|
||||
"symfony/yaml": "~2.7|~3.0",
|
||||
"twig/twig": "~1.10|~2.0"
|
||||
},
|
||||
"suggest": {
|
||||
"doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
|
||||
@ -434,7 +434,7 @@
|
||||
"orm",
|
||||
"persistence"
|
||||
],
|
||||
"time": "2016-08-10 15:35:22"
|
||||
"time": "2017-01-07 21:47:22"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/doctrine-cache-bundle",
|
||||
@ -701,22 +701,22 @@
|
||||
},
|
||||
{
|
||||
"name": "doctrine/orm",
|
||||
"version": "v2.5.5",
|
||||
"version": "v2.5.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/doctrine2.git",
|
||||
"reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45"
|
||||
"reference": "e6c434196c8ef058239aaa0724b4aadb0107940b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/73e4be7c7b3ba26f96b781a40b33feba4dfa6d45",
|
||||
"reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45",
|
||||
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b",
|
||||
"reference": "e6c434196c8ef058239aaa0724b4aadb0107940b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/cache": "~1.4",
|
||||
"doctrine/collections": "~1.2",
|
||||
"doctrine/common": ">=2.5-dev,<2.7-dev",
|
||||
"doctrine/common": ">=2.5-dev,<2.8-dev",
|
||||
"doctrine/dbal": ">=2.5-dev,<2.6-dev",
|
||||
"doctrine/instantiator": "~1.0.1",
|
||||
"ext-pdo": "*",
|
||||
@ -773,11 +773,11 @@
|
||||
"database",
|
||||
"orm"
|
||||
],
|
||||
"time": "2016-09-10 18:51:13"
|
||||
"time": "2016-12-18 15:42:34"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/container",
|
||||
"version": "v5.3.16",
|
||||
"version": "v5.3.23",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/container.git",
|
||||
@ -820,7 +820,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/contracts",
|
||||
"version": "v5.3.16",
|
||||
"version": "v5.3.23",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/contracts.git",
|
||||
@ -862,16 +862,16 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/database",
|
||||
"version": "v5.3.16",
|
||||
"version": "v5.3.23",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/database.git",
|
||||
"reference": "c3adc9e07796d718df9f49ab325bda672a7c344a"
|
||||
"reference": "8db1197b3d3e8a7393153643774d2924cdc6d906"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/database/zipball/c3adc9e07796d718df9f49ab325bda672a7c344a",
|
||||
"reference": "c3adc9e07796d718df9f49ab325bda672a7c344a",
|
||||
"url": "https://api.github.com/repos/illuminate/database/zipball/8db1197b3d3e8a7393153643774d2924cdc6d906",
|
||||
"reference": "8db1197b3d3e8a7393153643774d2924cdc6d906",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -918,20 +918,20 @@
|
||||
"orm",
|
||||
"sql"
|
||||
],
|
||||
"time": "2016-10-04 01:41:20"
|
||||
"time": "2016-11-14 15:37:58"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/support",
|
||||
"version": "v5.3.16",
|
||||
"version": "v5.3.23",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/support.git",
|
||||
"reference": "aa685c61c88a69b2e0e86310e65ef5ad2ebf2448"
|
||||
"reference": "050d0ed3e1c0e1d129d73b2eaa14044e46a66f77"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/aa685c61c88a69b2e0e86310e65ef5ad2ebf2448",
|
||||
"reference": "aa685c61c88a69b2e0e86310e65ef5ad2ebf2448",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/050d0ed3e1c0e1d129d73b2eaa14044e46a66f77",
|
||||
"reference": "050d0ed3e1c0e1d129d73b2eaa14044e46a66f77",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -975,7 +975,7 @@
|
||||
],
|
||||
"description": "The Illuminate Support package.",
|
||||
"homepage": "https://laravel.com",
|
||||
"time": "2016-10-02 01:14:47"
|
||||
"time": "2016-11-03 15:25:28"
|
||||
},
|
||||
{
|
||||
"name": "incenteev/composer-parameter-handler",
|
||||
@ -1080,16 +1080,16 @@
|
||||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
"version": "1.21.0",
|
||||
"version": "1.22.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Seldaek/monolog.git",
|
||||
"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
|
||||
"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952",
|
||||
"reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
|
||||
"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1100,7 +1100,7 @@
|
||||
"psr/log-implementation": "1.0.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"aws/aws-sdk-php": "^2.4.9",
|
||||
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
|
||||
"doctrine/couchdb": "~1.0@dev",
|
||||
"graylog2/gelf-php": "~1.0",
|
||||
"jakub-onderka/php-parallel-lint": "0.9",
|
||||
@ -1154,30 +1154,36 @@
|
||||
"logging",
|
||||
"psr-3"
|
||||
],
|
||||
"time": "2016-07-29 03:23:52"
|
||||
"time": "2016-11-26 00:15:39"
|
||||
},
|
||||
{
|
||||
"name": "nesbot/carbon",
|
||||
"version": "1.21.0",
|
||||
"version": "1.22.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/briannesbitt/Carbon.git",
|
||||
"reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7"
|
||||
"reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
|
||||
"reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
|
||||
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
|
||||
"reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0",
|
||||
"symfony/translation": "~2.6|~3.0"
|
||||
"symfony/translation": "~2.6 || ~3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~4.0|~5.0"
|
||||
"friendsofphp/php-cs-fixer": "~2",
|
||||
"phpunit/phpunit": "~4.0 || ~5.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.23-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Carbon\\": "src/Carbon/"
|
||||
@ -1201,20 +1207,20 @@
|
||||
"datetime",
|
||||
"time"
|
||||
],
|
||||
"time": "2015-11-04 20:07:17"
|
||||
"time": "2017-01-16 07:55:07"
|
||||
},
|
||||
{
|
||||
"name": "paragonie/random_compat",
|
||||
"version": "v2.0.2",
|
||||
"version": "v2.0.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/paragonie/random_compat.git",
|
||||
"reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
|
||||
"reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
|
||||
"reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
|
||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
|
||||
"reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1249,7 +1255,7 @@
|
||||
"pseudorandom",
|
||||
"random"
|
||||
],
|
||||
"time": "2016-04-03 06:00:07"
|
||||
"time": "2016-11-07 23:38:38"
|
||||
},
|
||||
{
|
||||
"name": "psr/cache",
|
||||
@ -1346,16 +1352,16 @@
|
||||
},
|
||||
{
|
||||
"name": "sensio/distribution-bundle",
|
||||
"version": "v5.0.13",
|
||||
"version": "v5.0.18",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
|
||||
"reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281"
|
||||
"reference": "17846680901003d26d823c2e3ac9228702837916"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/7bc47dcfdbde6d567e1a834577d1c04ddb970281",
|
||||
"reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281",
|
||||
"url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/17846680901003d26d823c2e3ac9228702837916",
|
||||
"reference": "17846680901003d26d823c2e3ac9228702837916",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1394,20 +1400,20 @@
|
||||
"configuration",
|
||||
"distribution"
|
||||
],
|
||||
"time": "2016-10-08 18:50:33"
|
||||
"time": "2017-01-10 14:58:45"
|
||||
},
|
||||
{
|
||||
"name": "sensio/framework-extra-bundle",
|
||||
"version": "v3.0.16",
|
||||
"version": "v3.0.19",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
|
||||
"reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546"
|
||||
"reference": "d57c2f297d17ee82baf8cae0b16dae34a9378784"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/507a15f56fa7699f6cc8c2c7de4080b19ce22546",
|
||||
"reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546",
|
||||
"url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/d57c2f297d17ee82baf8cae0b16dae34a9378784",
|
||||
"reference": "d57c2f297d17ee82baf8cae0b16dae34a9378784",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1416,14 +1422,20 @@
|
||||
"symfony/framework-bundle": "~2.3|~3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/asset": "~2.7|~3.0",
|
||||
"symfony/browser-kit": "~2.3|~3.0",
|
||||
"symfony/dom-crawler": "~2.3|~3.0",
|
||||
"symfony/expression-language": "~2.4|~3.0",
|
||||
"symfony/finder": "~2.3|~3.0",
|
||||
"symfony/phpunit-bridge": "~2.7|~3.0",
|
||||
"symfony/phpunit-bridge": "~3.2",
|
||||
"symfony/psr-http-message-bridge": "^0.3",
|
||||
"symfony/security-bundle": "~2.4|~3.0",
|
||||
"symfony/templating": "~2.3|~3.0",
|
||||
"symfony/translation": "~2.3|~3.0",
|
||||
"symfony/twig-bundle": "~2.3|~3.0",
|
||||
"twig/twig": "~1.11|~2.0"
|
||||
"symfony/yaml": "~2.3|~3.0",
|
||||
"twig/twig": "~1.11|~2.0",
|
||||
"zendframework/zend-diactoros": "^1.3"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/expression-language": "",
|
||||
@ -1456,7 +1468,7 @@
|
||||
"annotations",
|
||||
"controllers"
|
||||
],
|
||||
"time": "2016-03-25 17:08:27"
|
||||
"time": "2017-01-10 19:42:56"
|
||||
},
|
||||
{
|
||||
"name": "sensiolabs/security-checker",
|
||||
@ -1504,23 +1516,24 @@
|
||||
},
|
||||
{
|
||||
"name": "swiftmailer/swiftmailer",
|
||||
"version": "v5.4.3",
|
||||
"version": "v5.4.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/swiftmailer/swiftmailer.git",
|
||||
"reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153"
|
||||
"reference": "cd142238a339459b10da3d8234220963f392540c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
|
||||
"reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
|
||||
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/cd142238a339459b10da3d8234220963f392540c",
|
||||
"reference": "cd142238a339459b10da3d8234220963f392540c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"mockery/mockery": "~0.9.1"
|
||||
"mockery/mockery": "~0.9.1",
|
||||
"symfony/phpunit-bridge": "~3.2"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@ -1553,20 +1566,20 @@
|
||||
"mail",
|
||||
"mailer"
|
||||
],
|
||||
"time": "2016-07-08 11:51:25"
|
||||
"time": "2016-12-29 10:02:40"
|
||||
},
|
||||
{
|
||||
"name": "symfony/monolog-bundle",
|
||||
"version": "2.11.1",
|
||||
"version": "v2.12.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/monolog-bundle.git",
|
||||
"reference": "e7caf4936c7be82bc6d68df87f1d23a0d5bf6e00"
|
||||
"reference": "b0146bdca7ba2a65f3bbe7010423c7393b29ec3f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/e7caf4936c7be82bc6d68df87f1d23a0d5bf6e00",
|
||||
"reference": "e7caf4936c7be82bc6d68df87f1d23a0d5bf6e00",
|
||||
"url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/b0146bdca7ba2a65f3bbe7010423c7393b29ec3f",
|
||||
"reference": "b0146bdca7ba2a65f3bbe7010423c7393b29ec3f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1613,20 +1626,20 @@
|
||||
"log",
|
||||
"logging"
|
||||
],
|
||||
"time": "2016-04-13 16:21:01"
|
||||
"time": "2017-01-02 19:04:26"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-apcu",
|
||||
"version": "v1.2.0",
|
||||
"version": "v1.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-apcu.git",
|
||||
"reference": "6d58bceaeea2c2d3eb62503839b18646e161cd6b"
|
||||
"reference": "5d4474f447403c3348e37b70acc2b95475b7befa"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/6d58bceaeea2c2d3eb62503839b18646e161cd6b",
|
||||
"reference": "6d58bceaeea2c2d3eb62503839b18646e161cd6b",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa",
|
||||
"reference": "5d4474f447403c3348e37b70acc2b95475b7befa",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1635,7 +1648,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.2-dev"
|
||||
"dev-master": "1.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -1666,20 +1679,20 @@
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-05-18 14:26:46"
|
||||
"time": "2016-11-14 01:06:16"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-intl-icu",
|
||||
"version": "v1.2.0",
|
||||
"version": "v1.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-intl-icu.git",
|
||||
"reference": "0f8dc2c45f69f8672379e9210bca4a115cd5146f"
|
||||
"reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/0f8dc2c45f69f8672379e9210bca4a115cd5146f",
|
||||
"reference": "0f8dc2c45f69f8672379e9210bca4a115cd5146f",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2d6e2b20d457603eefb6e614286c22efca30fdb4",
|
||||
"reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1692,7 +1705,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.2-dev"
|
||||
"dev-master": "1.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -1724,20 +1737,20 @@
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-05-18 14:26:46"
|
||||
"time": "2016-11-14 01:06:16"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-mbstring",
|
||||
"version": "v1.2.0",
|
||||
"version": "v1.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||
"reference": "dff51f72b0706335131b00a7f49606168c582594"
|
||||
"reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
|
||||
"reference": "dff51f72b0706335131b00a7f49606168c582594",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
|
||||
"reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1749,7 +1762,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.2-dev"
|
||||
"dev-master": "1.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -1783,20 +1796,20 @@
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-05-18 14:26:46"
|
||||
"time": "2016-11-14 01:06:16"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php56",
|
||||
"version": "v1.2.0",
|
||||
"version": "v1.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-php56.git",
|
||||
"reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a"
|
||||
"reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a",
|
||||
"reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/1dd42b9b89556f18092f3d1ada22cb05ac85383c",
|
||||
"reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1806,7 +1819,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.2-dev"
|
||||
"dev-master": "1.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -1839,20 +1852,20 @@
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-05-18 14:26:46"
|
||||
"time": "2016-11-14 01:06:16"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php70",
|
||||
"version": "v1.2.0",
|
||||
"version": "v1.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-php70.git",
|
||||
"reference": "a42f4b6b05ed458910f8af4c4e1121b0101b2d85"
|
||||
"reference": "13ce343935f0f91ca89605a2f6ca6f5c2f3faac2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/a42f4b6b05ed458910f8af4c4e1121b0101b2d85",
|
||||
"reference": "a42f4b6b05ed458910f8af4c4e1121b0101b2d85",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/13ce343935f0f91ca89605a2f6ca6f5c2f3faac2",
|
||||
"reference": "13ce343935f0f91ca89605a2f6ca6f5c2f3faac2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1862,7 +1875,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.2-dev"
|
||||
"dev-master": "1.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -1898,20 +1911,20 @@
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-05-18 14:26:46"
|
||||
"time": "2016-11-14 01:06:16"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-util",
|
||||
"version": "v1.2.0",
|
||||
"version": "v1.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-util.git",
|
||||
"reference": "ef830ce3d218e622b221d6bfad42c751d974bf99"
|
||||
"reference": "746bce0fca664ac0a575e465f65c6643faddf7fb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99",
|
||||
"reference": "ef830ce3d218e622b221d6bfad42c751d974bf99",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/746bce0fca664ac0a575e465f65c6643faddf7fb",
|
||||
"reference": "746bce0fca664ac0a575e465f65c6643faddf7fb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1920,7 +1933,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.2-dev"
|
||||
"dev-master": "1.3-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -1950,32 +1963,34 @@
|
||||
"polyfill",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-05-18 14:26:46"
|
||||
"time": "2016-11-14 01:06:16"
|
||||
},
|
||||
{
|
||||
"name": "symfony/swiftmailer-bundle",
|
||||
"version": "v2.3.11",
|
||||
"version": "v2.4.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/swiftmailer-bundle.git",
|
||||
"reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690"
|
||||
"reference": "ad751095576ce0c12a284e30e3fff80c91f27225"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/5e1a90f28213231ceee19c953bbebc5b5b95c690",
|
||||
"reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690",
|
||||
"url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/ad751095576ce0c12a284e30e3fff80c91f27225",
|
||||
"reference": "ad751095576ce0c12a284e30e3fff80c91f27225",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.2",
|
||||
"swiftmailer/swiftmailer": ">=4.2.0,~5.0",
|
||||
"symfony/config": "~2.3|~3.0",
|
||||
"symfony/dependency-injection": "~2.3|~3.0",
|
||||
"symfony/http-kernel": "~2.3|~3.0",
|
||||
"symfony/yaml": "~2.3|~3.0"
|
||||
"symfony/config": "~2.7|~3.0",
|
||||
"symfony/dependency-injection": "~2.7|~3.0",
|
||||
"symfony/http-kernel": "~2.7|~3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "~2.7|~3.0"
|
||||
"symfony/console": "~2.7|~3.0",
|
||||
"symfony/framework-bundle": "~2.7|~3.0",
|
||||
"symfony/phpunit-bridge": "~2.7|~3.0",
|
||||
"symfony/yaml": "~2.7|~3.0"
|
||||
},
|
||||
"suggest": {
|
||||
"psr/log": "Allows logging"
|
||||
@ -1983,7 +1998,7 @@
|
||||
"type": "symfony-bundle",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.3-dev"
|
||||
"dev-master": "2.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -2007,20 +2022,20 @@
|
||||
],
|
||||
"description": "Symfony SwiftmailerBundle",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2016-01-15 16:41:20"
|
||||
"time": "2016-12-20 04:44:33"
|
||||
},
|
||||
{
|
||||
"name": "symfony/symfony",
|
||||
"version": "v3.1.5",
|
||||
"version": "v3.1.9",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/symfony.git",
|
||||
"reference": "e7e1d01fe103de78bca6fbf7f6f4acf64482d63c"
|
||||
"reference": "8d80e330acaad0780028ecb93fa8e902eb1e9abb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/symfony/zipball/e7e1d01fe103de78bca6fbf7f6f4acf64482d63c",
|
||||
"reference": "e7e1d01fe103de78bca6fbf7f6f4acf64482d63c",
|
||||
"url": "https://api.github.com/repos/symfony/symfony/zipball/8d80e330acaad0780028ecb93fa8e902eb1e9abb",
|
||||
"reference": "8d80e330acaad0780028ecb93fa8e902eb1e9abb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2033,7 +2048,7 @@
|
||||
"symfony/polyfill-php56": "~1.0",
|
||||
"symfony/polyfill-php70": "~1.0",
|
||||
"symfony/polyfill-util": "~1.0",
|
||||
"twig/twig": "~1.26|~2.0"
|
||||
"twig/twig": "~1.28|~2.0"
|
||||
},
|
||||
"conflict": {
|
||||
"phpdocumentor/reflection-docblock": "<3.0",
|
||||
@ -2148,20 +2163,20 @@
|
||||
"keywords": [
|
||||
"framework"
|
||||
],
|
||||
"time": "2016-10-03 19:01:14"
|
||||
"time": "2017-01-12 20:44:00"
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
"version": "v1.26.1",
|
||||
"version": "v1.31.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/twigphp/Twig.git",
|
||||
"reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d"
|
||||
"reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/a09d8ee17ac1cfea29ed60c83960ad685c6a898d",
|
||||
"reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/ddc9e3e20ee9c0b6908f401ac8353635b750eca7",
|
||||
"reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2169,12 +2184,12 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/debug": "~2.7",
|
||||
"symfony/phpunit-bridge": "~2.7"
|
||||
"symfony/phpunit-bridge": "~3.2"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.26-dev"
|
||||
"dev-master": "1.31-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -2209,7 +2224,7 @@
|
||||
"keywords": [
|
||||
"templating"
|
||||
],
|
||||
"time": "2016-10-05 18:57:41"
|
||||
"time": "2017-01-11 19:36:15"
|
||||
},
|
||||
{
|
||||
"name": "yetanotherape/diff-match-patch",
|
||||
@ -2268,33 +2283,33 @@
|
||||
"packages-dev": [
|
||||
{
|
||||
"name": "sensio/generator-bundle",
|
||||
"version": "v3.0.11",
|
||||
"version": "v3.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
|
||||
"reference": "b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c"
|
||||
"reference": "ec278c0bd530edf155c4a00900577b5cb80f559e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c",
|
||||
"reference": "b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c",
|
||||
"url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/ec278c0bd530edf155c4a00900577b5cb80f559e",
|
||||
"reference": "ec278c0bd530edf155c4a00900577b5cb80f559e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"symfony/console": "~2.7|~3.0",
|
||||
"symfony/framework-bundle": "~2.7|~3.0",
|
||||
"symfony/process": "~2.7|~3.0",
|
||||
"symfony/yaml": "~2.7|~3.0"
|
||||
"symfony/yaml": "~2.7|~3.0",
|
||||
"twig/twig": "^1.28.2|^2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/orm": "~2.4",
|
||||
"symfony/doctrine-bridge": "~2.7|~3.0",
|
||||
"twig/twig": "~1.18"
|
||||
"symfony/doctrine-bridge": "~2.7|~3.0"
|
||||
},
|
||||
"type": "symfony-bundle",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.0.x-dev"
|
||||
"dev-master": "3.1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -2316,20 +2331,20 @@
|
||||
}
|
||||
],
|
||||
"description": "This bundle generates code for you",
|
||||
"time": "2016-10-10 14:17:42"
|
||||
"time": "2016-12-05 16:01:19"
|
||||
},
|
||||
{
|
||||
"name": "symfony/phpunit-bridge",
|
||||
"version": "v3.1.5",
|
||||
"version": "v3.2.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/phpunit-bridge.git",
|
||||
"reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9"
|
||||
"reference": "d32e4062c3a3dfb95709d2ca6dd89a327ae51c3b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/1f4e2059cf4ecae1053b9c3027b3fc548fd077b9",
|
||||
"reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9",
|
||||
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d32e4062c3a3dfb95709d2ca6dd89a327ae51c3b",
|
||||
"reference": "d32e4062c3a3dfb95709d2ca6dd89a327ae51c3b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2338,10 +2353,13 @@
|
||||
"suggest": {
|
||||
"symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
|
||||
},
|
||||
"bin": [
|
||||
"bin/simple-phpunit"
|
||||
],
|
||||
"type": "symfony-bridge",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.1-dev"
|
||||
"dev-master": "3.2-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -2371,7 +2389,7 @@
|
||||
],
|
||||
"description": "Symfony PHPUnit Bridge",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-08-19 06:48:39"
|
||||
"time": "2017-01-06 17:19:17"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
|
||||
@ -21,6 +21,9 @@ class Eloquent {
|
||||
$this->capsule_->addConnection($dbParams);
|
||||
$this->capsule_->bootEloquent();
|
||||
|
||||
// Fix as described in https://github.com/laravel/framework/issues/6322
|
||||
$this->capsule_->getContainer()->bind('Illuminate\Contracts\Debug\ExceptionHandler', 'AppBundle\Exception\ExceptionHandler');
|
||||
|
||||
// In order to keep things lightweight, the models aren't part of Symfony dependency
|
||||
// injection framework, so any service required by a model needs to be injected here.
|
||||
Model\File::$mimeTypes_ = $mimeTypes;
|
||||
|
||||
50
src/AppBundle/Exception/ExceptionHandler.php
Normal file
50
src/AppBundle/Exception/ExceptionHandler.php
Normal file
@ -0,0 +1,50 @@
|
||||
<?php
|
||||
namespace AppBundle\Exception;
|
||||
|
||||
use Exception;
|
||||
use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandlerContract;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class ExceptionHandler implements ExceptionHandlerContract {
|
||||
|
||||
protected $handlers = array();
|
||||
|
||||
|
||||
/**
|
||||
* Report or log an exception.
|
||||
*
|
||||
* @param \Exception $e
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function report( Exception $e ) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Render an exception into an HTTP response.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Exception $e
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function render( $request, Exception $e ) {
|
||||
return new Response( $e->getMessage(), 500 );
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Render an exception to the console.
|
||||
*
|
||||
* @param \Symfony\Component\Console\Output\OutputInterface $output
|
||||
* @param \Exception $e
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function renderForConsole( $output, Exception $e ) {
|
||||
echo $e->getMessage();
|
||||
}
|
||||
|
||||
}
|
||||
@ -780,7 +780,11 @@ class SymfonyRequirements extends RequirementCollection
|
||||
{
|
||||
$size = ini_get('realpath_cache_size');
|
||||
$size = trim($size);
|
||||
$unit = strtolower(substr($size, -1, 1));
|
||||
$unit = '';
|
||||
if (!ctype_digit($size)) {
|
||||
$unit = strtolower(substr($size, -1, 1));
|
||||
$size = (int) substr($size, 0, -1);
|
||||
}
|
||||
switch ($unit) {
|
||||
case 'g':
|
||||
return $size * 1024 * 1024 * 1024;
|
||||
|
||||
@ -270,7 +270,7 @@ $hasMinorProblems = (bool) count($minorProblems);
|
||||
}
|
||||
.sf-reset ul a,
|
||||
.sf-reset ul a:hover {
|
||||
background: url(../images/blue-arrow.png) no-repeat right 6px;
|
||||
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAICAYAAAAx8TU7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFdJREFUeNpiYACBjjOhDEiACSggCKTLgXQ5TJARqhIkcReIKxgqTGYxwvV0nDEGkmeAOIwJySiQ4HsgvseIpGo3ELsCtZ9lRDIvDCiwhwHJPEFkJwEEGACq6hdnax8y1AAAAABJRU5ErkJggg==) no-repeat right 7px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
.sf-reset ul, ol {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user