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

0057197: Fixed fatal errors occured
FATCHIP-GmbH · Jan 5, 2020 · a407938 · a407938
2 parents 9fbbb5f + 2870f9f
commit a407938
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/Services/Helper/AbstractHelper.php b/Services/Helper/AbstractHelper.php
@@ -182,7 +182,9 @@ public function createTax(float $rate)
         try {
             $this->entityManager->persist($tax);
             $this->entityManager->flush();
-        } catch (OptimisticLockException | ORMException $e) {
+        } catch (OptimisticLockException $e) {
+            $this->logger->error('Error saving tax rule', array($rate));
+        } catch (ORMException $e) {
             $this->logger->error('Error saving tax rule', array($rate));
         }
     }

diff --git a/Services/Helper/ShopwareArticleHelper.php b/Services/Helper/ShopwareArticleHelper.php
@@ -73,7 +73,9 @@ public function fixMissingAttribute(ArticleDetail $detail)
         try {
             $this->entityManager->persist($detail);
             $this->entityManager->flush();
-        } catch (OptimisticLockException | ORMException $e) {
+        } catch (OptimisticLockException $e) {
+            $this->logger->error('Error saving attribute');
+        } catch (ORMException $e) {
             $this->logger->error('Error saving attribute');
         }
     }

diff --git a/Services/Helper/ShopwareOrderHelper.php b/Services/Helper/ShopwareOrderHelper.php
@@ -357,7 +357,9 @@ public function setAfterBuyIds(array $values)
 
         try {
             $this->entityManager->flush();
-        } catch (OptimisticLockException | ORMException $e) {
+        } catch (OptimisticLockException $e) {
+            $this->logger->error('Error storing afterbuy ids');
+        } catch (ORMException $e) {
             $this->logger->error('Error storing afterbuy ids');
         }
     }

diff --git a/Services/WriteData/Internal/WriteProductsService.php b/Services/WriteData/Internal/WriteProductsService.php
@@ -68,7 +68,10 @@ public function send($targetData)
     {
         try {
             $this->entityManager->flush();
-        } catch (OptimisticLockException | ORMException $e) {
+        } catch (OptimisticLockException $e) {
+            $this->logger->error('Error storing products', $targetData);
+            exit('Error storing products');
+        } catch (ORMException $e) {
             $this->logger->error('Error storing products', $targetData);
             exit('Error storing products');
         }

diff --git a/viaebShopwareAfterbuy.php b/viaebShopwareAfterbuy.php
@@ -145,7 +145,8 @@ public function fixDefaultValueTypes()
                     ]);
                 }
             }
-        } catch (Zend_Db_Adapter_Exception | Zend_Db_Statement_Exception $e) {
+        } catch (Zend_Db_Adapter_Exception $e) {
+        } catch (Zend_Db_Statement_Exception $e) {
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,7 +145,8 @@ public function fixDefaultValueTypes() @@
                         ]);
                     }
                 }
-            } catch (Zend_Db_Adapter_Exception | Zend_Db_Statement_Exception $e) {
+            } catch (Zend_Db_Adapter_Exception $e) {
+            } catch (Zend_Db_Statement_Exception $e) {
             }
         }
@@ Expand Down @@