gabrielbull / php-ups-api

src/Entity/InternationalForms.php

Switch Indentation +1 added lines, -4 removed lines

@@ -616,7 +616,4 @@
     {
         $this->declarationStatement = $statement;
 
-        return $this;
-    }
->>>>>>> develop
-}
+        return $this
\ No newline at end of file

Braces +1 added lines, -4 removed lines

@@ -616,7 +616,4 @@
     {
         $this->declarationStatement = $statement;
 
-        return $this;
-    }
->>>>>>> develop
-}
+        return $this
\ No newline at end of file

src/Tracking.php

Braces +5 added lines, -4 removed lines

@@ -178,10 +178,11 @@
                 (int)$response->Response->Error->ErrorCode
             );
         }
-        if($response)
-          return $this->formatResponse($response);
-        else
-          return $response;
+        if($response) {
+                  return $this->formatResponse($response);
+        } else {
+                  return $response;
+        }
 
     }