Merge branch 'pt-12040/5.2/remove-installments' into 'master'

PT-12040 - Remove in-shop installments integration

See merge request shopware/5/services/swagpaymentpaypalunified!40

Author: mitelg

.githooks/pre-commit

@@ -157,7 +157,7 @@ class PreCommitChecks
             return;
         }
 
-        exec('./../../../vendor/phpstan/phpstan/phpstan.phar analyse .', $output, $return);
+        exec('./../../../vendor/bin/phpstan analyse .', $output, $return);
         if ($return !== 0) {
             $this->error = true;
         }

.gitlab-ci.yml

@@ -50,7 +50,7 @@ PHP analyze:
         - cp /usr/local/bin/composer composer.phar
         - php composer.phar install
         - vendor/bin/php-cs-fixer fix --dry-run -v --config=custom/plugins/SwagPaymentPayPalUnified/.php_cs.dist --format=junit | tee php-cs-fixer.xml
-        - vendor/phpstan/phpstan/phpstan.phar analyse custom/plugins/SwagPaymentPayPalUnified -c custom/plugins/SwagPaymentPayPalUnified/phpstan.neon
+        - vendor/bin/phpstan analyse custom/plugins/SwagPaymentPayPalUnified -c custom/plugins/SwagPaymentPayPalUnified/phpstan.neon
     artifacts:
         reports:
             junit: shopware/php-cs-fixer.xml

Components/Document/InstallmentsDocumentHandler.php

@@ -19,11 +19,6 @@ class PaymentMethodProvider
      */
     const PAYPAL_UNIFIED_PAYMENT_METHOD_NAME = 'SwagPaymentPayPalUnified';
 
-    /**
-     * The technical name of the installments payment method.
-     */
-    const PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME = 'SwagPaymentPayPalUnifiedInstallments';
-
     /**
      * @var ModelManager
      */
@@ -39,23 +34,11 @@ public function __construct(ModelManager $modelManager = null)
 
     /**
      * @see PaymentMethodProvider::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME
-     * @see PaymentMethodProvider::PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME
-     *
-     * @param string $name
      *
      * @return Payment|null
      */
-    public function getPaymentMethodModel($name = self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME)
+    public function getPaymentMethodModel()
     {
-        if ($name === self::PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME) {
-            /** @var Payment|null $payment */
-            $payment = $this->modelManager->getRepository(Payment::class)->findOneBy([
-                'name' => self::PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME,
-            ]);
-
-            return $payment;
-        }
-
         /** @var Payment|null $payment */
         $payment = $this->modelManager->getRepository(Payment::class)->findOneBy([
             'name' => self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME,
@@ -66,14 +49,12 @@ public function getPaymentMethodModel($name = self::PAYPAL_UNIFIED_PAYMENT_METHO
 
     /**
      * @see PaymentMethodProvider::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME
-     * @see PaymentMethodProvider::PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME
      *
-     * @param string $name
-     * @param bool   $active
+     * @param bool $active
      */
-    public function setPaymentMethodActiveFlag($active, $name = self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME)
+    public function setPaymentMethodActiveFlag($active)
     {
-        $paymentMethod = $this->getPaymentMethodModel($name);
+        $paymentMethod = $this->getPaymentMethodModel();
         if ($paymentMethod) {
             $paymentMethod->setActive($active);
 
@@ -84,39 +65,43 @@ public function setPaymentMethodActiveFlag($active, $name = self::PAYPAL_UNIFIED
 
     /**
      * @see PaymentMethodProvider::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME
-     * @see PaymentMethodProvider::PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME
-     *
-     * @param string $name
      *
      * @return bool
      */
-    public function getPaymentMethodActiveFlag(Connection $connection, $name = self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME)
+    public function getPaymentMethodActiveFlag(Connection $connection)
     {
         $sql = 'SELECT `active` FROM s_core_paymentmeans WHERE `name`=:paymentName';
 
         return (bool) $connection->fetchColumn($sql, [
-            ':paymentName' => $name === self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME
-                ? self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME
-                : self::PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME,
+            ':paymentName' => self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME,
         ]);
     }
 
     /**
      * @see PaymentMethodProvider::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME
-     * @see PaymentMethodProvider::PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME
      *
-     * @param string $name
+     * @return int
+     */
+    public function getPaymentId(Connection $connection)
+    {
+        $sql = 'SELECT `id` FROM s_core_paymentmeans WHERE `name`=:paymentName';
+
+        return (int) $connection->fetchColumn($sql, [
+            ':paymentName' => self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME,
+        ]);
+    }
+
+    /**
+     * @deprecated since 3.0.0. Will be removed with 4.0.0. Only used for managing old installment payments in the backend module
      *
      * @return int
      */
-    public function getPaymentId(Connection $connection, $name = self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME)
+    public function getInstallmentPaymentId(Connection $connection)
     {
         $sql = 'SELECT `id` FROM s_core_paymentmeans WHERE `name`=:paymentName';
 
         return (int) $connection->fetchColumn($sql, [
-            ':paymentName' => $name === self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME
-                ? self::PAYPAL_UNIFIED_PAYMENT_METHOD_NAME
-                : self::PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME,
+            ':paymentName' => 'SwagPaymentPayPalUnifiedInstallments',
         ]);
     }
 }

Components/PaymentMethodProvider.php

@@ -22,10 +22,6 @@ final class PaymentStatus
      * The default status for approved orders
      */
     const PAYMENT_STATUS_PAID = 12;
-    /**
-     * @deprecated Deprecated since 2.5.0, will be removed in 3.0.0, use PAYMENT_STATUS_PAID instead
-     */
-    const PAYMENT_STATUS_APPROVED = self::PAYMENT_STATUS_PAID;
     /**
      * The default status for open orders
      */