From 115b097929870b1b04c1e902924a65ca49343870 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 03:56:46 +0300 Subject: [PATCH] composer update jms/serializer-bundle to ^2. --- app/config/config.yml | 3 --- composer.json | 2 +- composer.lock | 50 ++++++++++++++++++++++--------------------- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index afd105c..f3bf799 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -79,9 +79,6 @@ swiftmailer: password: "%mailer_password%" spool: { type: memory } -jms_serializer: - enable_short_alias: false - knp_markdown: parser: service: app.point.markdown_parser diff --git a/composer.json b/composer.json index 459b5d7..ed8b80b 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "sensio/framework-extra-bundle": "^5.0.0", "incenteev/composer-parameter-handler": "^2.0", "ob/highcharts-bundle": "^1.2", - "jms/serializer-bundle": "^1.1", + "jms/serializer-bundle": "^2", "knplabs/knp-markdown-bundle": "^1.4", "knplabs/knp-paginator-bundle": "^2.5", "unreal4u/telegram-api": "^2.2", diff --git a/composer.lock b/composer.lock index 577908c..18040b0 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": "25070b6017a4491a6e112ec681985169", + "content-hash": "e625671965c67f8b010d7f159092beed", "packages": [ { "name": "composer/ca-bundle", @@ -2012,60 +2012,62 @@ }, { "name": "jms/serializer-bundle", - "version": "1.5.0", - "target-dir": "JMS/SerializerBundle", + "version": "2.4.3", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5" + "reference": "e5231652ce24b8673b2ac70bc76b0cabaf35deea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/85ee039a2b7f89d77c403e33cee7b43a875c31e5", - "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/e5231652ce24b8673b2ac70bc76b0cabaf35deea", + "reference": "e5231652ce24b8673b2ac70bc76b0cabaf35deea", "shasum": "" }, "require": { - "jms/serializer": "^1.7", - "php": ">=5.4.0", + "jms/serializer": "^1.10", + "php": "^5.4|^7.0", "phpoption/phpoption": "^1.1.0", - "symfony/framework-bundle": "~2.3|~3.0" + "symfony/framework-bundle": "~2.3|~3.0|~4.0" }, "require-dev": { - "doctrine/doctrine-bundle": "*", "doctrine/orm": "*", - "phpunit/phpunit": "^4.2|^5.0", - "symfony/browser-kit": "*", - "symfony/class-loader": "*", - "symfony/css-selector": "*", - "symfony/expression-language": "~2.6|~3.0", - "symfony/finder": "*", + "phpunit/phpunit": "^4.8.35|^5.4.3|^6.0", + "symfony/expression-language": "~2.6|~3.0|~4.0", + "symfony/finder": "^2.3|^3.0|^4.0", "symfony/form": "*", - "symfony/process": "*", "symfony/stopwatch": "*", "symfony/twig-bundle": "*", "symfony/validator": "*", "symfony/yaml": "*" }, "suggest": { - "jms/di-extra-bundle": "Required to get lazy loading (de)serialization visitors, ~1.3" + "jms/di-extra-bundle": "Required to get lazy loading (de)serialization visitors, ~1.3", + "symfony/finder": "Required for cache warmup, supported versions ^2.3|^3.0|^4.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "2.4-dev" } }, "autoload": { - "psr-0": { - "JMS\\SerializerBundle": "" - } + "psr-4": { + "JMS\\SerializerBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "MIT" ], "authors": [ + { + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + }, { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com" @@ -2080,7 +2082,7 @@ "serialization", "xml" ], - "time": "2017-05-10T10:17:17+00:00" + "time": "2018-12-09T07:52:19+00:00" }, { "name": "knplabs/knp-components",