From 5455b18ddcfef55f24097ce85f1736957c265e4a Mon Sep 17 00:00:00 2001 From: "Michael Albrecht (personal)" Date: Sat, 10 Aug 2024 09:43:44 +0200 Subject: [PATCH] refactor: append bundle prefix --- .gitignore | 3 +++ compose.override.yaml.dist | 4 ++++ composer.json | 4 ++-- config/packages/neusta_converter.yaml | 3 +-- config/services.yaml | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 compose.override.yaml.dist diff --git a/.gitignore b/.gitignore index ad0719b..5af4d77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Docker +/compose.override.yaml + # Composer /composer.lock /vendor/ diff --git a/compose.override.yaml.dist b/compose.override.yaml.dist new file mode 100644 index 0000000..544f733 --- /dev/null +++ b/compose.override.yaml.dist @@ -0,0 +1,4 @@ +services: + php: + volumes: + - ~/.composer/:/.cache/composer/ diff --git a/composer.json b/composer.json index b3ead51..b40e7c5 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ }, "require": { "php": "~8.1.0 || ~8.2.0", - "pimcore/pimcore": "^10.5 || ^11.0" + "pimcore/pimcore": "^10.5 || ^11.0", + "teamneusta/converter-bundle": "^1.6" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.11", @@ -27,7 +28,6 @@ "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-symfony": "^1.2", "phpunit/phpunit": "^9.3", - "teamneusta/converter-bundle": "^1.6", "teamneusta/pimcore-testing-framework": "^0.11.1" }, "extra": { diff --git a/config/packages/neusta_converter.yaml b/config/packages/neusta_converter.yaml index ec208d2..c584aa3 100644 --- a/config/packages/neusta_converter.yaml +++ b/config/packages/neusta_converter.yaml @@ -1,10 +1,9 @@ neusta_converter: converter: - brick.converter: + pimcore.areabrick.config.brick.converter: target: Neusta\Pimcore\AreabrickConfigBundle\Bricks\Model\BrickView populators: - Neusta\Pimcore\AreabrickConfigBundle\Bricks\Populator\BrickPagePopulator properties: name: ~ id: ~ - tags: ~ diff --git a/config/services.yaml b/config/services.yaml index 05eff0e..ef3ca42 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -17,7 +17,7 @@ services: class: Neusta\Pimcore\AreabrickConfigBundle\Controller\Admin\AreabrickOverviewController public: true arguments: - $brickConverter: '@brick.converter' + $brickConverter: '@pimcore.areabrick.config.brick.converter' tags: [ 'controller.service_arguments' ] Neusta\Pimcore\AreabrickConfigBundle\Bricks\Populator\BrickPagePopulator: ~