Merge pull request #125 in PLUG_OPEN/swagpaymentpaypalunified from pt-9290/5.2/remove-setting-tables-uninstall to master

* commit 'b92d3e085271b65d6c97bd0e98077b3e8adadbea':
  PT-9290 - Remove setting tables on uninstall

Author: mitelg

Setup/Uninstaller.php

@@ -8,6 +8,7 @@
 
 namespace SwagPaymentPayPalUnified\Setup;
 
+use Doctrine\DBAL\Connection;
 use Shopware\Bundle\AttributeBundle\Service\CrudService;
 use Shopware\Components\Model\ModelManager;
 use SwagPaymentPayPalUnified\Components\PaymentMethodProvider;
@@ -24,22 +25,45 @@ class Uninstaller
      */
     private $modelManager;
 
+    /**
+     * @var Connection
+     */
+    private $connection;
+
     /**
      * @param CrudService  $attributeCrudService
      * @param ModelManager $modelManager
+     * @param Connection   $connection
      */
-    public function __construct(CrudService $attributeCrudService, ModelManager $modelManager)
+    public function __construct(CrudService $attributeCrudService, ModelManager $modelManager, Connection $connection)
     {
         $this->attributeCrudService = $attributeCrudService;
         $this->modelManager = $modelManager;
+        $this->connection = $connection;
+    }
+
+    /**
+     * @param bool $safeMode
+     */
+    public function uninstall($safeMode)
+    {
+        $this->deactivatePayments();
+        $this->removeAttributes();
+
+        if (!$safeMode) {
+            $this->removeSettingsTables();
+        }
     }
 
-    public function uninstall()
+    private function deactivatePayments()
     {
         $paymentMethodProvider = new PaymentMethodProvider($this->modelManager);
         $paymentMethodProvider->setPaymentMethodActiveFlag(false);
         $paymentMethodProvider->setPaymentMethodActiveFlag(false, PaymentMethodProvider::PAYPAL_INSTALLMENTS_PAYMENT_METHOD_NAME);
+    }
 
+    private function removeAttributes()
+    {
         if ($this->attributeCrudService->get('s_core_paymentmeans_attributes', 'swag_paypal_unified_display_in_plus_iframe') !== null) {
             $this->attributeCrudService->delete(
                 's_core_paymentmeans_attributes',
@@ -54,4 +78,14 @@ public function uninstall()
         }
         $this->modelManager->generateAttributeModels(['s_core_paymentmeans_attributes']);
     }
+
+    private function removeSettingsTables()
+    {
+        $sql = 'DROP TABLE IF EXISTS `swag_payment_paypal_unified_settings_express`;
+                DROP TABLE IF EXISTS `swag_payment_paypal_unified_settings_general`;
+                DROP TABLE IF EXISTS `swag_payment_paypal_unified_settings_installments`;
+                DROP TABLE IF EXISTS `swag_payment_paypal_unified_settings_plus`;';
+
+        $this->connection->exec($sql);
+    }
 }

SwagPaymentPayPalUnified.php

@@ -53,9 +53,10 @@ public function uninstall(UninstallContext $context)
     {
         $uninstaller = new Uninstaller(
             $this->container->get('shopware_attribute.crud_service'),
-            $this->container->get('models')
+            $this->container->get('models'),
+            $this->container->get('dbal_connection')
         );
-        $uninstaller->uninstall();
+        $uninstaller->uninstall($context->keepUserData());
 
         $context->scheduleClearCache(UninstallContext::CACHE_LIST_ALL);
     }