Merge branch '1.7' into 2.0

GSadee · GSadee · commit 1b5e3e45a4b2 · 2024-12-06T06:58:25.000+01:00
* 1.7:
  [Maintenance] Add new id for PaymentMethodTypeExtension
diff --git a/config/services.xml b/config/services.xml
@@ -29,6 +29,7 @@
         <service id="Sylius\PayPalPlugin\Form\Extension\PaymentMethodTypeExtension">
             <tag name="form.type_extension" />
         </service>
+        <service id="sylius_paypal.form.extension.payment_method" alias="Sylius\PayPalPlugin\Form\Extension\PaymentMethodTypeExtension" />
 
         <service id="Sylius\PayPalPlugin\Form\Type\PayPalConfigurationType">
             <tag name="sylius.gateway_configuration_type" type="sylius.pay_pal" label="sylius.pay_pal.label" />
diff --git a/src/Console/Command/CompletePaidPaymentsCommand.php b/src/Console/Command/CompletePaidPaymentsCommand.php
@@ -52,6 +52,13 @@ public function __construct(
                 ),
             );
         }
+
+        trigger_deprecation(
+            'sylius/paypal-plugin',
+            '1.7',
+            'The fifth argument of the constructor in class "%s" is deprecated and will be renamed to "stateMachine" in 2.0.',
+            self::class,
+        );
     }
 
     protected function configure(): void

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,13 @@ public function __construct(`
`52`	`52`	`),`
`53`	`53`	`);`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ trigger_deprecation(`
	`57`	`+ 'sylius/paypal-plugin',`
	`58`	`+ '1.7',`
	`59`	`+ 'The fifth argument of the constructor in class "%s" is deprecated and will be renamed to "stateMachine" in 2.0.',`
	`60`	`+ self::class,`
	`61`	`+ );`
`55`	`62`	`}`
`56`	`63`
`57`	`64`	`protected function configure(): void`