Deprecate service definition

Sylius · Oct 15, 2020 · ac92058 · ac92058
1 parent 2d831bd
commit ac92058
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/src/Repository/DoctrineInvoiceRepository.php b/src/Repository/DoctrineInvoiceRepository.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\InvoicingPlugin\Repository;
 
-@trigger_error('The "DoctrineInvoiceRepository" class is deprecated since version 0.11.1 Use standardized class located at "src/Doctrine/ORM/" instead.');
+@trigger_error('The "DoctrineInvoiceRepository" class is deprecated since version 1.0.0 Use standardized class located at "src/Doctrine/ORM/" instead.');
 
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\InvoicingPlugin\Entity\InvoiceInterface;

diff --git a/src/Repository/InvoiceRepository.php b/src/Repository/InvoiceRepository.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\InvoicingPlugin\Repository;
 
-@trigger_error('The "InvoiceRepository" interface is deprecated since version 0.11.1 Use standardized interface located at "src/Doctrine/ORM/" instead.');
+@trigger_error('The "InvoiceRepository" interface is deprecated since version 1.0.0 Use standardized interface located at "src/Doctrine/ORM/" instead.');
 
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\InvoicingPlugin\Entity\InvoiceInterface;

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -10,13 +10,21 @@
 
         <service id="sylius_invoicing_plugin.date_time_provider" class="Sylius\InvoicingPlugin\SystemDateTimeProvider" />
 
+        <service id="sylius_invoicing_plugin.custom_repository.invoice" class="Sylius\InvoicingPlugin\Repository\DoctrineInvoiceRepository">
+            <deprecated>
+                The "%service_id%" service is deprecated since version 0.11.1
+                and will be removed in version 1.0.0
+                use sylius_invoicing_plugin.repository.invoice service instead
+            </deprecated>
+        </service>
+
         <service id="sylius_invoicing_plugin.email.invoice_email_sender" class="Sylius\InvoicingPlugin\Email\InvoiceEmailSender">
             <argument type="service" id="sylius.email_sender" />
             <argument type="service" id="sylius_invoicing_plugin.generator.invoice_pdf_file" />
         </service>
 
         <service id="sylius_invoicing_plugin.command_handler.send_invoice_email" class="Sylius\InvoicingPlugin\CommandHandler\SendInvoiceEmailHandler">
-            <argument type="service" id="sylius_invoicing_plugin.custom_repository.invoice" />
+            <argument type="service" id="sylius_invoicing_plugin.repository.invoice" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius_invoicing_plugin.email.invoice_email_sender" />
             <tag name="messenger.message_handler" />

diff --git a/src/Resources/config/services/actions.xml b/src/Resources/config/services/actions.xml
@@ -5,13 +5,13 @@
         <defaults autoconfigure="true" autowire="true" public="true" />
 
         <service id="sylius_invoicing_plugin.ui.action.download_invoice" class="Sylius\InvoicingPlugin\Ui\Action\DownloadInvoiceAction">
-            <argument type="service" id="sylius_invoicing_plugin.custom_repository.invoice" />
+            <argument type="service" id="sylius_invoicing_plugin.repository.invoice" />
             <argument type="service" id="security.authorization_checker" />
             <argument type="service" id="sylius_invoicing_plugin.generator.invoice_pdf_file" />
         </service>
 
         <service id="sylius_invoicing_plugin.ui.action.resend_invoice" class="Sylius\InvoicingPlugin\Ui\Action\Admin\ResendInvoiceAction">
-            <argument type="service" id="sylius_invoicing_plugin.custom_repository.invoice" />
+            <argument type="service" id="sylius_invoicing_plugin.repository.invoice" />
             <argument type="service" id="sylius_invoicing_plugin.email.invoice_email_sender" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="router" />

diff --git a/src/Resources/config/services/events.xml b/src/Resources/config/services/events.xml
@@ -7,7 +7,7 @@
         <service id="sylius_invoicing_plugin.event_producer.order_payment_paid" class="Sylius\InvoicingPlugin\EventProducer\OrderPaymentPaidProducer">
             <argument type="service" id="sylius_invoicing_plugin.event_bus" />
             <argument type="service" id="sylius_invoicing_plugin.date_time_provider" />
-            <argument type="service" id="sylius_invoicing_plugin.custom_repository.invoice" />
+            <argument type="service" id="sylius_invoicing_plugin.repository.invoice" />
         </service>
 
         <service id="sylius_invoicing_plugin.event_listener.order_placed" class="Sylius\InvoicingPlugin\EventListener\CreateInvoiceOnOrderPlacedListener">

diff --git a/src/Resources/config/services/generators.xml b/src/Resources/config/services/generators.xml
@@ -32,7 +32,7 @@
         </service>
 
         <service id="sylius_invoicing_plugin.creator.invoice" class="Sylius\InvoicingPlugin\Creator\InvoiceCreator">
-            <argument type="service" id="sylius_invoicing_plugin.custom_repository.invoice" />
+            <argument type="service" id="sylius_invoicing_plugin.repository.invoice" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius_invoicing_plugin.generator.invoice" />
         </service>

diff --git a/tests/Behat/Resources/services.xml b/tests/Behat/Resources/services.xml
@@ -10,14 +10,14 @@
             <argument type="service" id="Tests\Sylius\InvoicingPlugin\Behat\Page\Admin\Invoice\IndexPageInterface" />
             <argument type="service" id="Tests\Sylius\InvoicingPlugin\Behat\Page\Admin\Invoice\ShowPageInterface" />
             <argument type="service" id="Tests\Sylius\InvoicingPlugin\Behat\Page\Admin\Order\ShowPageInterface" />
-            <argument type="service" id="sylius_invoicing_plugin.custom_repository.invoice" />
+            <argument type="service" index="invoiceRepository" id="" />
             <argument type="service" id="sylius.behat.notification_checker"/>
         </service>
 
         <service id="Tests\Sylius\InvoicingPlugin\Behat\Context\Ui\Shop\CustomerBrowsingInvoicesContext" public="true">
             <argument type="service" id="Tests\Sylius\InvoicingPlugin\Behat\Page\Shop\Order\ShowPageInterface" />
             <argument type="service" id="Tests\Sylius\InvoicingPlugin\Behat\Page\Shop\Order\DownloadInvoicePageInterface" />
-            <argument type="service" id="sylius_invoicing_plugin.custom_repository.invoice" />
+            <argument type="service" id="sylius_invoicing_plugin.repository.invoice" />
         </service>
 
         <service id="Tests\Sylius\InvoicingPlugin\Behat\Context\Domain\InvoiceEmailContext" public="true" >
@@ -26,13 +26,13 @@
 
         <service id="Tests\Sylius\InvoicingPlugin\Behat\Context\Domain\GeneratingInvoiceContext" public="true">
             <argument type="service" id="sylius_invoicing_plugin.manager.invoice" />
-            <argument type="service" id="sylius_invoicing_plugin.custom_repository.invoice" />
+            <argument type="service" id="sylius_invoicing_plugin.repository.invoice" />
         </service>
 
         <service id="Tests\Sylius\InvoicingPlugin\Behat\Context\Cli\InvoicesGenerationContext" public="true">
             <argument type="service" id="kernel" />
             <argument type="service" id="sylius_invoicing_plugin.creator.mass_invoices" />
-            <argument type="service" id="sylius_invoicing_plugin.custom_repository.invoice" />
+            <argument type="service" id="sylius_invoicing_plugin.repository.invoice" />
             <argument type="service" id="sylius.repository.order" />
         </service>