From 2ee6dbfd3f5307734c626418e3ba7533db76ca36 Mon Sep 17 00:00:00 2001 From: Igor Melnikov <imelnikov@magento.com> Date: Fri, 4 Nov 2016 17:46:27 -0500 Subject: [PATCH] MAGETWO-60442: Add optional SerializerInterface dependency to child classes of \Magento\Framework\Config\Data Adding class and __constructor descriptions --- dev/tests/integration/etc/install-config-mysql.php.dist | 2 +- .../Magento/Framework/App/ResourceConnection/Config.php | 2 ++ lib/internal/Magento/Framework/Config/Data.php | 2 +- lib/internal/Magento/Framework/Config/Data/Scoped.php | 5 +++++ .../Framework/Interception/PluginList/PluginList.php | 9 +++++++-- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dev/tests/integration/etc/install-config-mysql.php.dist b/dev/tests/integration/etc/install-config-mysql.php.dist index 981d1bd0734..6fffcb22b50 100644 --- a/dev/tests/integration/etc/install-config-mysql.php.dist +++ b/dev/tests/integration/etc/install-config-mysql.php.dist @@ -7,7 +7,7 @@ return [ 'db-host' => 'localhost', 'db-user' => 'root', - 'db-password' => 'vagrant', + 'db-password' => '123123q', 'db-name' => 'magento_integration_tests', 'db-prefix' => '', 'backend-frontname' => 'backend', diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/Config.php b/lib/internal/Magento/Framework/App/ResourceConnection/Config.php index da0b4d3b033..79500c4b107 100644 --- a/lib/internal/Magento/Framework/App/ResourceConnection/Config.php +++ b/lib/internal/Magento/Framework/App/ResourceConnection/Config.php @@ -21,6 +21,8 @@ class Config extends \Magento\Framework\Config\Data\Scoped implements ConfigInte protected $_connectionNames = []; /** + * Constructor + * * @param Config\Reader $reader * @param \Magento\Framework\Config\ScopeInterface $configScope * @param \Magento\Framework\Config\CacheInterface $cache diff --git a/lib/internal/Magento/Framework/Config/Data.php b/lib/internal/Magento/Framework/Config/Data.php index 57b6769d3e5..1169abafccd 100644 --- a/lib/internal/Magento/Framework/Config/Data.php +++ b/lib/internal/Magento/Framework/Config/Data.php @@ -68,7 +68,7 @@ class Data implements \Magento\Framework\Config\DataInterface /** * @var SerializerInterface */ - protected $serializer; + private $serializer; /** * Constructor diff --git a/lib/internal/Magento/Framework/Config/Data/Scoped.php b/lib/internal/Magento/Framework/Config/Data/Scoped.php index 02379834c5e..f9c151e867b 100644 --- a/lib/internal/Magento/Framework/Config/Data/Scoped.php +++ b/lib/internal/Magento/Framework/Config/Data/Scoped.php @@ -55,6 +55,11 @@ class Scoped extends \Magento\Framework\Config\Data */ protected $_loadedScopes = []; + /** + * @var SerializerInterface + */ + private $serializer; + /** * Constructor * diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php index dc3ddea2c6f..eacd4e84932 100644 --- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php +++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php @@ -82,6 +82,11 @@ class PluginList extends Scoped implements InterceptionPluginList */ private $logger; + /** + * @var SerializerInterface + */ + private $serializer; + /** * Constructor * @@ -111,8 +116,8 @@ class PluginList extends Scoped implements InterceptionPluginList $cacheId = 'plugins', SerializerInterface $serializer = null ) { - $serializer = $serializer ?: $objectManager->get(Serialize::class); - parent::__construct($reader, $configScope, $cache, $cacheId, $serializer); + $this->serializer = $serializer ?: $objectManager->get(Serialize::class); + parent::__construct($reader, $configScope, $cache, $cacheId, $this->serializer); $this->_omConfig = $omConfig; $this->_relations = $relations; $this->_definitions = $definitions; -- GitLab