Skip to content

Commit fa341f4

Browse files
ProkyonnProkyonn
committed
Add missing service configurations
1 parent 69c006e commit fa341f4

File tree

8 files changed

+96
-16
lines changed

8 files changed

+96
-16
lines changed

‎src/Sulu/Bundle/CategoryBundle/DependencyInjection/SuluCategoryExtension.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public function load(array $configs, ContainerBuilder $container)
5050
}
5151

5252
if (
53-
InstalledVersions::isInstalled('sulu/sulu-content-bundle')
54-
&& \version_compare(InstalledVersions::getVersion('sulu/sulu-content-bundle') ?? '0.0.0', '0.9', '>=')
55-
&& \version_compare(InstalledVersions::getVersion('sulu/sulu-content-bundle') ?? '0.0.0', '0.10', '<')
53+
InstalledVersions::isInstalled('sulu/content-bundle')
54+
&& \version_compare(InstalledVersions::getVersion('sulu/content-bundle') ?? '0.0.0', '0.9', '>=')
55+
&& \version_compare(InstalledVersions::getVersion('sulu/content-bundle') ?? '0.0.0', '0.10', '<')
5656
) {
5757
$loader->load('services_content.xml');
5858
}

‎src/Sulu/Bundle/CategoryBundle/Infrastructure/Sulu/Content/PropertyResolver/SingleCategorySelectionPropertyResolver.php

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/*
6+
* This file is part of Sulu.
7+
*
8+
* (c) Sulu GmbH
9+
*
10+
* This source file is subject to the MIT license that is bundled
11+
* with this source code in the file LICENSE.
12+
*/
13+
14+
namespace Sulu\Bundle\CategoryBundle\Infrastructure\Sulu\Content\PropertyResolver;
15+
16+
use Sulu\Bundle\CategoryBundle\Infrastructure\Sulu\Content\ResourceLoader\CategoryResourceLoader;
17+
use Sulu\Bundle\ContentBundle\Content\Application\ContentResolver\Value\ContentView;
18+
use Sulu\Bundle\ContentBundle\Content\Application\PropertyResolver\PropertyResolverInterface;
19+
20+
/**
21+
* @internal if you need to override this service, create a new service with based on PropertyResolverInterface instead of extending this class
22+
*
23+
* @final
24+
*/
25+
class SingleCategorySelectionPropertyResolver implements PropertyResolverInterface
26+
{
27+
public function resolve(mixed $data, string $locale, array $params = []): ContentView
28+
{
29+
if (!\is_string($data) || '' === $data) {
30+
return ContentView::create([], $params);
31+
}
32+
33+
/** @var string $resourceLoaderKey */
34+
$resourceLoaderKey = $params['resourceLoader'] ?? CategoryResourceLoader::getKey();
35+
36+
return ContentView::createResolvables(
37+
$data,
38+
$resourceLoaderKey,
39+
$params,
40+
);
41+
}
42+
43+
public static function getType(): string
44+
{
45+
return 'single_category_selection';
46+
}
47+
}

‎src/Sulu/Bundle/CategoryBundle/Resources/config/services_content.xml

+10-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55
<services>
66
<!-- Property Resolver -->
7-
<service id="sulu_category.property_resolver.category_selection"
8-
class="Sulu\Bundle\CategoryBundle\Infrastructure\Content\PropertyResolver\Resolver\CategorySelectionPropertyResolver">
7+
<service id="sulu_category.category_selection_property_resolver"
8+
class="Sulu\Bundle\CategoryBundle\Infrastructure\Sulu\Content\PropertyResolver\CategorySelectionPropertyResolver">
9+
<tag name="sulu_content.property_resolver"/>
10+
</service>
11+
12+
<service id="sulu_category.single_category_selection_property_resolver"
13+
class="Sulu\Bundle\CategoryBundle\Infrastructure\Sulu\Content\PropertyResolver\CategorySelectionPropertyResolver">
14+
915
<tag name="sulu_content.property_resolver"/>
1016
</service>
1117

1218
<!-- Resource Loader -->
13-
<service id="sulu_category.resource_loader.category"
14-
class="Sulu\Bundle\CategoryBundle\Infrastructure\Content\ResourceLoader\CategoryResourceLoader">
19+
<service id="sulu_category.category_resource_loader"
20+
class="Sulu\Bundle\CategoryBundle\Infrastructure\Sulu\Content\ResourceLoader\CategoryResourceLoader">
1521
<argument type="service" id="sulu_category.category_manager"/>
1622

1723
<tag name="sulu_content.resource_loader" type="media"/>

‎src/Sulu/Bundle/ContactBundle/DependencyInjection/SuluContactExtension.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,9 @@ public function load(array $configs, ContainerBuilder $container)
279279
$loader->load('command.xml');
280280

281281
if (
282-
InstalledVersions::isInstalled('sulu/sulu-content-bundle')
283-
&& \version_compare(InstalledVersions::getVersion('sulu/sulu-content-bundle') ?? '0.0.0', '0.9', '>=')
284-
&& \version_compare(InstalledVersions::getVersion('sulu/sulu-content-bundle') ?? '0.0.0', '0.10', '<')
282+
InstalledVersions::isInstalled('sulu/content-bundle')
283+
&& \version_compare(InstalledVersions::getVersion('sulu/content-bundle') ?? '0.0.0', '0.9', '>=')
284+
&& \version_compare(InstalledVersions::getVersion('sulu/content-bundle') ?? '0.0.0', '0.10', '<')
285285
) {
286286
$loader->load('services_content.xml');
287287
}

‎src/Sulu/Bundle/MediaBundle/DependencyInjection/SuluMediaExtension.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,9 @@ public function load(array $configs, ContainerBuilder $container)
366366
}
367367

368368
if (
369-
InstalledVersions::isInstalled('sulu/sulu-content-bundle')
370-
&& \version_compare(InstalledVersions::getVersion('sulu/sulu-content-bundle') ?? '0.0.0', '0.9', '>=')
371-
&& \version_compare(InstalledVersions::getVersion('sulu/sulu-content-bundle') ?? '0.0.0', '0.10', '<')
369+
InstalledVersions::isInstalled('sulu/content-bundle')
370+
&& \version_compare(InstalledVersions::getVersion('sulu/content-bundle') ?? '0.0.0', '0.9', '>=')
371+
&& \version_compare(InstalledVersions::getVersion('sulu/content-bundle') ?? '0.0.0', '0.10', '<')
372372
) {
373373
$loader->load('services_content.xml');
374374
}

‎src/Sulu/Bundle/MediaBundle/Resources/config/services_content.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55
<services>
66
<!-- Property Resolver -->
7-
<service id="sulu_media.property_resolver.media_selection"
8-
class="Sulu\Bundle\MediaBundle\Infrastructure\Sulu\Content\PropertyResolver\Resolver\MediaSelectionPropertyResolver">
7+
<service id="sulu_media.media_selection_property_resolver"
8+
class="Sulu\Bundle\MediaBundle\Infrastructure\Sulu\Content\PropertyResolver\MediaSelectionPropertyResolver">
99
<tag name="sulu_content.property_resolver"/>
1010
</service>
1111

1212
<!-- Resource Loader -->
13-
<service id="sulu_media.resource_loader.media"
13+
<service id="sulu_media.media_resource_loader"
1414
class="Sulu\Bundle\MediaBundle\Infrastructure\Sulu\Content\ResourceLoader\MediaResourceLoader">
1515
<argument type="service" id="sulu_media.media_manager"/>
1616

‎src/Sulu/Bundle/TagBundle/DependencyInjection/SuluTagExtension.php

+9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Sulu\Bundle\TagBundle\DependencyInjection;
1313

14+
use Composer\InstalledVersions;
1415
use Sulu\Bundle\PersistenceBundle\DependencyInjection\PersistenceExtensionTrait;
1516
use Sulu\Bundle\TagBundle\Tag\TagInterface;
1617
use Sulu\Bundle\TagBundle\Tag\TagRepositoryInterface;
@@ -93,5 +94,13 @@ public function load(array $configs, ContainerBuilder $container)
9394
if (\array_key_exists('SuluTrashBundle', $bundles)) {
9495
$loader->load('services_trash.xml');
9596
}
97+
98+
if (
99+
InstalledVersions::isInstalled('sulu/content-bundle')
100+
&& \version_compare(InstalledVersions::getVersion('sulu/content-bundle') ?? '0.0.0', '0.9', '>=')
101+
&& \version_compare(InstalledVersions::getVersion('sulu/content-bundle') ?? '0.0.0', '0.10', '<')
102+
) {
103+
$loader->load('services_content.xml');
104+
}
96105
}
97106
}

‎src/Sulu/Bundle/TagBundle/Resources/config/services_content.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
5+
<services>
6+
<!-- Content Property Resolvers -->
7+
<service id="sulu_tag.tag_selection_property_resolver" class="Sulu\Bundle\TagBundle\Infrastructure\Sulu\Content\PropertyResolver\TagSelectionPropertyResolver">
8+
<tag name="sulu_content.property_resolver"/>
9+
</service>
10+
11+
<!-- Content Resource Loaders -->
12+
<service id="sulu_tag.tag_resource_loader" class="Sulu\Bundle\TagBundle\Infrastructure\Sulu\Content\ResourceLoader\TagResourceLoader">
13+
<argument type="service" id="sulu.repository.tag"/>
14+
15+
<tag name="sulu_content.resource_loader"/>
16+
</service>
17+
</services>
18+
</container>

0 commit comments

Comments
 (0)