diff --git a/composer.json b/composer.json index 56a34d10c..b4c0bd43b 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,6 @@ "zendframework/zend-json": "^2.6.1 || ^3.0", "zendframework/zend-log": "^2.7.1", "zendframework/zend-psr7bridge": "^0.2", - "zendframework/zend-serializer": "^2.6.1", "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "^4.5" }, @@ -49,7 +48,6 @@ "zendframework/zend-mvc-plugin-identity": "To access the authenticated identity (per zend-authentication) in controllers", "zendframework/zend-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers", "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", - "zendframework/zend-serializer": "Zend\\Serializer component", "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application", "zendframework/zend-view": "Zend\\View component" }, diff --git a/composer.lock b/composer.lock index a3d8c2216..433f2a2b5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "cd0fe5067e93aed7142c09b298263178", - "content-hash": "30bd9cc041c2f9b5e488e11f88d05864", + "hash": "c1762db8230b9e35c36582a8a88bcab0", + "content-hash": "ef73bfdbbdc7c5a56b020be89dba9da5", "packages": [ { "name": "container-interop/container-interop", @@ -487,16 +487,16 @@ }, { "name": "zendframework/zend-validator", - "version": "2.7.0", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-validator.git", - "reference": "268312231763ef6275d9580e54a4179fda7542e8" + "reference": "dbacb36514ebc0ec96b9263730eaaa6f0c502197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/268312231763ef6275d9580e54a4179fda7542e8", - "reference": "268312231763ef6275d9580e54a4179fda7542e8", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/dbacb36514ebc0ec96b9263730eaaa6f0c502197", + "reference": "dbacb36514ebc0ec96b9263730eaaa6f0c502197", "shasum": "" }, "require": { @@ -554,7 +554,7 @@ "validator", "zf2" ], - "time": "2016-04-06 15:33:40" + "time": "2016-04-06 15:44:10" }, { "name": "zendframework/zend-view", @@ -2402,40 +2402,35 @@ }, { "name": "zendframework/zend-json", - "version": "2.6.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-json.git", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28" + "reference": "f42a1588e75c2a3e338cd94c37906231e616daab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", - "reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28", + "url": "https://api.github.com/repos/zendframework/zend-json/zipball/f42a1588e75c2a3e338cd94c37906231e616daab", + "reference": "f42a1588e75c2a3e338cd94c37906231e616daab", "shasum": "" }, "require": { "php": "^5.5 || ^7.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-server": "^2.6.1", - "zendframework/zend-stdlib": "^2.5 || ^3.0", - "zendframework/zendxml": "^1.0.2" + "squizlabs/php_codesniffer": "^2.3", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { - "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server", - "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server", - "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses", - "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" + "zendframework/zend-json-server": "For implementing JSON-RPC servers", + "zendframework/zend-xml2json": "For converting XML documents to JSON" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" } }, "autoload": { @@ -2453,7 +2448,7 @@ "json", "zf2" ], - "time": "2016-02-04 21:20:26" + "time": "2016-04-01 02:34:00" }, { "name": "zendframework/zend-log", @@ -2519,56 +2514,6 @@ ], "time": "2016-02-18 17:20:07" }, - { - "name": "zendframework/zend-math", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-math.git", - "reference": "395ebb981e01f2fc708ba07d8ee0d86f6e3e9ed6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-math/zipball/395ebb981e01f2fc708ba07d8ee0d86f6e3e9ed6", - "reference": "395ebb981e01f2fc708ba07d8ee0d86f6e3e9ed6", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "ircmaxell/random-lib": "~1.1", - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "ext-bcmath": "If using the bcmath functionality", - "ext-gmp": "If using the gmp functionality", - "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Math\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-math", - "keywords": [ - "math", - "zf2" - ], - "time": "2016-02-02 23:15:14" - }, { "name": "zendframework/zend-psr7bridge", "version": "0.2.1", @@ -2617,58 +2562,6 @@ "psr-7" ], "time": "2015-12-15 21:35:42" - }, - { - "name": "zendframework/zend-serializer", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-serializer.git", - "reference": "0d9556cb75045481de1869fd1962cacdaca7ef88" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/0d9556cb75045481de1869fd1962cacdaca7ef88", - "reference": "0d9556cb75045481de1869fd1962cacdaca7ef88", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-json": "^2.5", - "zendframework/zend-math": "^2.6", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.0", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" - }, - "suggest": { - "zendframework/zend-servicemanager": "To support plugin manager support" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Serializer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover", - "homepage": "https://github.com/zendframework/zend-serializer", - "keywords": [ - "serializer", - "zf2" - ], - "time": "2016-02-03 18:36:25" } ], "aliases": [], diff --git a/doc/book/migration/to-v3-0.md b/doc/book/migration/to-v3-0.md index 5d03ac88f..2c2206d52 100644 --- a/doc/book/migration/to-v3-0.md +++ b/doc/book/migration/to-v3-0.md @@ -218,6 +218,23 @@ $ composer require zendframework/zend-mvc-plugin-prg `Zend\Mvc\Controller\Plugin\PostRedirectGet` becomes `Zend\Mvc\Plugin\Prg\PostRedirectGet`. However, it is still mapped as `prg()`. +## Serializer integration + +In version 2, zend-mvc exposed a `SerializerAdapterManager` service by default, and +provided specifications to zend-modulemanager's `ServiceListener` +to allow modules to provide serializer configuration. + +This functionality is now removed from zend-mvc. It is now exposed directly by +the [zend-serializer](https://github.com/zendframework/zend-serializer) component +itself. To add it, install zend-serializer + +```bash +$ composer require zendframework/zend-serializer +``` + +Note: the above assumes you have already installed zend-component-installer, per +the section above on [dependency reduction](#dependency-reduction). + ## Validator integration In version 2, zend-mvc exposed a `ValidatorManager` service by default, and diff --git a/src/Service/ModuleManagerFactory.php b/src/Service/ModuleManagerFactory.php index 8309105a8..528068390 100644 --- a/src/Service/ModuleManagerFactory.php +++ b/src/Service/ModuleManagerFactory.php @@ -79,12 +79,6 @@ public function __invoke(ContainerInterface $container, $name, array $options = 'Zend\ModuleManager\Feature\RouteProviderInterface', 'getRouteConfig' ); - $serviceListener->addServiceManager( - 'SerializerAdapterManager', - 'serializers', - 'Zend\ModuleManager\Feature\SerializerProviderInterface', - 'getSerializerConfig' - ); $serviceListener->addServiceManager( 'HydratorManager', 'hydrators', diff --git a/src/Service/SerializerAdapterPluginManagerFactory.php b/src/Service/SerializerAdapterPluginManagerFactory.php deleted file mode 100644 index 005001d4d..000000000 --- a/src/Service/SerializerAdapterPluginManagerFactory.php +++ /dev/null @@ -1,17 +0,0 @@ - 'Zend\Mvc\Service\PaginatorPluginManagerFactory', 'Request' => 'Zend\Mvc\Service\RequestFactory', 'Response' => 'Zend\Mvc\Service\ResponseFactory', - 'SerializerAdapterManager' => 'Zend\Mvc\Service\SerializerAdapterPluginManagerFactory', 'ViewHelperManager' => 'Zend\Mvc\Service\ViewHelperManagerFactory', View\Http\DefaultRenderingStrategy::class => HttpDefaultRenderingStrategyFactory::class, 'ViewFeedStrategy' => 'Zend\Mvc\Service\ViewFeedStrategyFactory',