PT-13155 - Fix cs

Author: DennisGarding

Components/TransactionReport/TransactionReport.php

@@ -47,6 +47,7 @@ public function reportOrder($orderId)
 
     /**
      * @param string $shopwareVersion
+     * @param string $instanceId
      *
      * @return void
      */

Setup/Assets/tables.sql

@@ -153,7 +153,7 @@ CREATE TABLE IF NOT EXISTS `swag_payment_paypal_unified_transaction_report`
 
 CREATE TABLE IF NOT EXISTS `swag_payment_paypal_unified_instance`
 (
-    `instance_id` VARCHAR(255) NOT NULL
+    `instance_id` VARCHAR(36) NOT NULL
 ) ENGINE = InnoDB
     DEFAULT CHARSET = utf8
     COLLATE = utf8_unicode_ci;

Setup/Installer.php

@@ -9,6 +9,7 @@
 namespace SwagPaymentPayPalUnified\Setup;
 
 use Doctrine\DBAL\Connection;
+use Exception;
 use Shopware\Bundle\AttributeBundle\Service\CrudService;
 use Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface;
 use Shopware\Bundle\AttributeBundle\Service\TypeMapping;
@@ -87,9 +88,9 @@ public function __construct(
     }
 
     /**
-     * @return bool
      * @throws InstallationException
      *
+     * @return bool
      */
     public function install()
     {
@@ -111,8 +112,8 @@ public function install()
         try {
             // call the instance id service to create the instance id
             (new InstanceIdService($this->connection))->getInstanceId();
-        } catch (\Exception $e) {
-            throw new InstallationException($e->getMessage());
+        } catch (Exception $exception) {
+            // no need to handle this exception
         }
 
         return true;

Setup/InstanceIdService.php

@@ -9,6 +9,7 @@
 namespace SwagPaymentPayPalUnified\Setup;
 
 use Doctrine\DBAL\Connection;
+use RuntimeException;
 use SwagPaymentPayPalUnified\Components\Uuid;
 
 final class InstanceIdService
@@ -69,7 +70,7 @@ private function create()
             ->execute();
 
         if ($instanceId !== $this->get()) {
-            throw new \RuntimeException('Could not create instance id');
+            throw new RuntimeException('Could not create instance id');
         }
 
         return $instanceId;

Setup/Versions/UpdateTo618.php

@@ -9,10 +9,16 @@
 namespace SwagPaymentPayPalUnified\Setup\Versions;
 
 use Doctrine\DBAL\Connection;
+use Exception;
 use SwagPaymentPayPalUnified\Setup\InstanceIdService;
 
 class UpdateTo618
 {
+    /**
+     * @var Connection
+     */
+    private $connection;
+
     public function __construct(Connection $connection)
     {
         $this->connection = $connection;
@@ -25,7 +31,11 @@ public function update()
     {
         $this->createInstanceTable();
 
-        (new InstanceIdService($this->connection))->getInstanceId();
+        try {
+            (new InstanceIdService($this->connection))->getInstanceId();
+        } catch (Exception $e) {
+            // no need to handle this exception
+        }
     }
 
     /**
@@ -37,7 +47,7 @@ private function createInstanceTable()
             '
             CREATE TABLE IF NOT EXISTS `swag_payment_paypal_unified_instance`
             (
-                `instance_id` VARCHAR(255) NOT NULL
+                `instance_id` VARCHAR(36) NOT NULL
             ) ENGINE = InnoDB
                 DEFAULT CHARSET = utf8
                 COLLATE = utf8_unicode_ci;'

Subscriber/TransactionReportSubscriber.php

@@ -10,6 +10,7 @@
 
 use Doctrine\DBAL\Connection;
 use Enlight\Event\SubscriberInterface;
+use Exception;
 use GuzzleHttp\Client;
 use Shopware;
 use SwagPaymentPayPalUnified\Components\TransactionReport\TransactionReport;
@@ -53,9 +54,15 @@ public function onTransactionReport()
             $shopwareVersion = $this->container->getParameter('shopware.release.version');
         }
 
+        try {
+            $instanceId = (new InstanceIdService($this->connection))->getInstanceId();
+        } catch (Exception $exception) {
+            $instanceId = '';
+        }
+
         (new TransactionReport($this->connection))->report(
             $shopwareVersion,
-            (new InstanceIdService($this->connection))->getInstanceId(),
+            $instanceId,
             new Client(['base_uri' => TransactionReport::POST_URL])
         );
     }

SwagPaymentPayPalUnified.php

@@ -102,8 +102,7 @@ public function update(UpdateContext $context)
             $this->getPaymentMethodProvider(),
             new PaymentModelFactory($context->getPlugin()),
             $this->getTranslation(),
-            new TranslationTransformer($this->container->get('models')),
-            $this->getPath()
+            new TranslationTransformer($this->container->get('models'))
         );
         $updater->update($context->getCurrentVersion());