Resolve conflicts

Sylius · Oct 22, 2024 · b1c3bbf · b1c3bbf
1 parent bb40c85
commit b1c3bbf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
@@ -64,7 +64,7 @@
             <tag name="sylius.uri_based_section_resolver" priority="20" />
         </service>
 
-        <service id="sylius.http_client" alias="Psr\Http\Client\ClientInterface" public="false" />
+        <service id="sylius.http_client" alias="Psr\Http\Client\ClientInterface" />
 
         <service id="sylius.attribute_type.select" class="Sylius\Component\Attribute\AttributeType\SelectAttributeType">
             <tag name="sylius.attribute.type" attribute-type="select" label="Select"

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml
@@ -102,7 +102,6 @@
             id="sylius_admin.resource_controller.redirect_handler"
             class="Sylius\Bundle\AdminBundle\Controller\RedirectHandler"
             decorates="sylius.resource_controller.redirect_handler"
-            public="false"
         >
             <argument type="service" id=".inner" />
             <argument type="service" id="sylius.grid.filter_storage" />

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
@@ -42,11 +42,11 @@
         <service id="sylius.generator.invoice_number" class="Sylius\Component\Core\Payment\IdBasedInvoiceNumberGenerator" />
         <service id="Sylius\Component\Core\Payment\InvoiceNumberGeneratorInterface" alias="sylius.generator.invoice_number" />
 
-        <service id="sylius.uploader.image" class="Sylius\Component\Core\Uploader\ImageUploader">
+        <service id="sylius.uploader.image" class="Sylius\Component\Core\Uploader\ImageUploader" public="true">
             <argument type="service" id="sylius.adapter.filesystem.default" />
             <argument type="service" id="sylius.generator.image_path" />
         </service>
-        <service id="Sylius\Component\Core\Uploader\ImageUploaderInterface" alias="sylius.uploader.image" />
+        <service id="Sylius\Component\Core\Uploader\ImageUploaderInterface" alias="sylius.uploader.image" public="true" />
 
         <service id="sylius.adapter.filesystem.flysystem" class="Sylius\Component\Core\Filesystem\Adapter\FlysystemFilesystemAdapter">
             <argument type="service" id="sylius.storage" />