From 3581c8f364d3c3e9b9c1a62cd7773e8319a2b4cd Mon Sep 17 00:00:00 2001 From: Pimcore Bot Date: Wed, 13 Nov 2019 15:14:05 +0100 Subject: [PATCH] composer.lock updated --- composer.lock | 52 +++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/composer.lock b/composer.lock index 9f880713..e539f6a3 100644 --- a/composer.lock +++ b/composer.lock @@ -3169,21 +3169,21 @@ }, { "name": "monolog/monolog", - "version": "2.0.1", + "version": "1.25.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c" + "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9d56fd2f5533322caccdfcddbb56aedd622ef1c", - "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287", + "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287", "shasum": "" }, "require": { - "php": "^7.2", - "psr/log": "^1.0.1" + "php": ">=5.3.0", + "psr/log": "~1.0" }, "provide": { "psr/log-implementation": "1.0.0" @@ -3191,36 +3191,33 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "elasticsearch/elasticsearch": "^6.0", - "graylog2/gelf-php": "^1.4.2", - "jakub-onderka/php-parallel-lint": "^0.9", + "graylog2/gelf-php": "~1.0", + "jakub-onderka/php-parallel-lint": "0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "phpspec/prophecy": "^1.6.1", - "phpunit/phpunit": "^8.3", - "predis/predis": "^1.1", - "rollbar/rollbar": "^1.3", + "phpunit/phpunit": "~4.5", + "phpunit/phpunit-mock-objects": "2.3.0", "ruflin/elastica": ">=0.90 <3.0", + "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", - "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mbstring": "Allow to work properly with unicode symbols", - "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-mongo": "Allow sending log messages to a MongoDB server", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server", + "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -3246,7 +3243,7 @@ "logging", "psr-3" ], - "time": "2019-11-13T10:27:43+00:00" + "time": "2019-11-13T10:00:05+00:00" }, { "name": "mpratt/embera", @@ -5200,16 +5197,16 @@ }, { "name": "pimcore/pimcore", - "version": "v6.3.0", + "version": "v6.3.1", "source": { "type": "git", "url": "https://github.com/pimcore/pimcore.git", - "reference": "15e5c0c9836a2a6700f9aeb489b5999790db2c68" + "reference": "67b3d911016869105a22069bacf2414b7217b9f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pimcore/pimcore/zipball/15e5c0c9836a2a6700f9aeb489b5999790db2c68", - "reference": "15e5c0c9836a2a6700f9aeb489b5999790db2c68", + "url": "https://api.github.com/repos/pimcore/pimcore/zipball/67b3d911016869105a22069bacf2414b7217b9f7", + "reference": "67b3d911016869105a22069bacf2414b7217b9f7", "shasum": "" }, "require": { @@ -5278,6 +5275,9 @@ "zendframework/zend-paginator": "^2.7", "zendframework/zend-servicemanager": "^3.2" }, + "conflict": { + "monolog/monolog": ">=2" + }, "require-dev": { "cache/integration-tests": "^0.16.0", "codeception/codeception": "~2.4.5", @@ -5302,7 +5302,7 @@ "symfony-tests-dir": "tests", "symfony-assets-install": "relative", "branch-alias": { - "dev-master": "6.2-dev" + "dev-master": "6.3-dev" } }, "autoload": { @@ -5345,7 +5345,7 @@ "e-commerce", "rad" ], - "time": "2019-11-13T11:08:30+00:00" + "time": "2019-11-13T13:49:33+00:00" }, { "name": "pimcore/search-query-parser",