From abfd6bd851836c3952beacf9f8bc9a47f3761b37 Mon Sep 17 00:00:00 2001 From: George Githae Date: Wed, 10 Aug 2022 16:21:22 +0300 Subject: [PATCH 1/3] Update to v6 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bc47292..cf759bf 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ ], "minimum-stability": "stable", "require": { - "akeneo/pim-community-dev": "^4.0.0" + "akeneo/pim-community-dev": "^6.0" }, "require-dev": { "phpspec/phpspec": "^5.0", From 527b3042639e129704a579bf88f4a984f1b091ee Mon Sep 17 00:00:00 2001 From: George Githae Date: Fri, 9 Sep 2022 02:06:59 +0300 Subject: [PATCH 2/3] Updated getConfigTree in ConfigurationBuilderPass.php to implement new TreeBuilder construct --- .../Compiler/ConfigurationBuilderPass.php | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/DependencyInjection/Compiler/ConfigurationBuilderPass.php b/DependencyInjection/Compiler/ConfigurationBuilderPass.php index 1e1adfc..c7c2ebf 100644 --- a/DependencyInjection/Compiler/ConfigurationBuilderPass.php +++ b/DependencyInjection/Compiler/ConfigurationBuilderPass.php @@ -143,28 +143,28 @@ protected function parseConfigFile(NodeInterface $configTree, $file) */ protected function getConfigTree() { - $treeBuilder = new TreeBuilder(); - $root = $treeBuilder->root('custom_entities'); - $root + $treeBuilder = new TreeBuilder('custom_entities'); + $node = $treeBuilder->getRootNode(); + $node ->useAttributeAsKey('name') ->prototype('array') - ->addDefaultsIfNotSet() - ->children() - ->scalarNode('name')->end() - ->scalarNode('class')->defaultNull()->end() - ->scalarNode('entity_class')->defaultNull()->end() - ->scalarNode('extends')->defaultValue('default')->end() - ->arrayNode('options') - ->prototype('variable') - ->end() + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('name')->end() + ->scalarNode('class')->defaultNull()->end() + ->scalarNode('entity_class')->defaultNull()->end() + ->scalarNode('extends')->defaultValue('default')->end() + ->arrayNode('options') + ->prototype('variable') ->end() - ->booleanNode('abstract')->defaultFalse()->end() - ->arrayNode('actions') - ->prototype('variable') - ->end() + ->end() + ->booleanNode('abstract')->defaultFalse()->end() + ->arrayNode('actions') + ->prototype('variable') ->end() ->end() - ->end(); + ->end() + ->end(); return $treeBuilder->buildTree(); } From 715c98a8d29ecd4aab2334077944d97a64c46b1e Mon Sep 17 00:00:00 2001 From: George Githae Date: Fri, 9 Sep 2022 20:32:00 +0300 Subject: [PATCH 3/3] Updated docker-compose.yml to akeneo v6 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e33bb23..b9a1b26 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: fpm: - image: akeneo/pim-php-dev:4.0 + image: akeneo/pim-php-dev:6.0 environment: COMPOSER_HOME: /home/docker/.composer user: www-data