Merge pull request #21 from FATCHIP-GmbH/0057197_fatal_error_fixes

0057197: Fixed fatal errors occured
FATCHIP-GmbH · Jan 5, 2020 · aa79882 · aa79882
2 parents a407938 + 1703bb0
commit aa79882
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Services/Helper/AbstractHelper.php b/Services/Helper/AbstractHelper.php
@@ -398,7 +398,9 @@ public function createMediaImage($url, $albumName = 'Artikel')
         try {
             $this->entityManager->persist($media);
             $this->entityManager->flush($media);
-        } catch (OptimisticLockException | ORMException $e) {
+        } catch (OptimisticLockException $e) {
+            $this->logger->error($e->getMessage());
+        } catch (ORMException $e) {
             $this->logger->error($e->getMessage());
         }
 

diff --git a/Services/Helper/ShopwareArticleHelper.php b/Services/Helper/ShopwareArticleHelper.php
@@ -427,7 +427,9 @@ public function getAssignableConfiguratorOptions(array $variants)
                 try {
                     $this->entityManager->persist($option);
                     $this->entityManager->flush($option);
-                } catch (OptimisticLockException | ORMException $e) {
+                } catch (OptimisticLockException $e) {
+                    $this->logger->error('Error assigning configurator options', array(json_encode($option)));
+                } catch (ORMException $e) {
                     $this->logger->error('Error assigning configurator options', array(json_encode($option)));
                 }
 

diff --git a/Services/Helper/ShopwareOrderHelper.php b/Services/Helper/ShopwareOrderHelper.php
@@ -856,7 +856,9 @@ public function createCustomer(ValueOrder $order, ValueAddress $billingAddress,
         try {
             $this->entityManager->persist($customer);
             $this->entityManager->flush();
-        } catch (OptimisticLockException | ORMException $e) {
+        } catch (OptimisticLockException $e) {
+            $this->logger->error('Error writing customer data.');
+        } catch (ORMException $e) {
             $this->logger->error('Error writing customer data.');
         }