Merge pull request #73 from adrianwaler/fix-72-remove-code-duplications

#72 BillingAddressTrait and ShippingAddressTrait

Author: Kryniol

.scrutinizer.yml

@@ -1,2 +1,15 @@
+build:
+    nodes:
+        analysis:
+            project_setup:
+                override: true
+            tests:
+                override:
+                    - php-scrutinizer-run --enable-security-analysis
+filter:
+    excluded_paths:
+        - "tests/"
+    dependency_paths:
+        - "vendor/"
 tools:
     external_code_coverage: true

src/Client/SalesforceClient.php

@@ -49,7 +49,7 @@ public function doRequest(RequestInterface $request): array
             $response = $this->sendRequest($token, $request);
         } catch (HttpException $ex) {
             // Token is expired or invalid - get new and retry
-            if ($ex->getCode() !== self::UNAUTHORIZED) {
+            if (self::UNAUTHORIZED !== $ex->getCode()) {
                 throw $ex;
             }
 

src/Enum/AbstractOwnership.php

@@ -4,6 +4,12 @@
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
+/**
+ * @method static $this OWNERSHIP_PUBLIC()
+ * @method static $this OWNERSHIP_PRIVATE()
+ * @method static $this OWNERSHIP_SUBSIDIARY()
+ * @method static $this OWNERSHIP_OTHER()
+ */
 abstract class AbstractOwnership extends AbstractEnumeration
 {
     const OWNERSHIP_PUBLIC = 'Public';

src/Enum/AbstractRating.php

@@ -4,6 +4,11 @@
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
+/**
+ * @method static $this HOT()
+ * @method static $this WARM()
+ * @method static $this COLD()
+ */
 abstract class AbstractRating extends AbstractEnumeration
 {
     const HOT = 'Hot';

src/Enum/AbstractSObjectType.php

@@ -4,6 +4,19 @@
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
+/**
+ * @method static $this LEAD()
+ * @method static $this ACCOUNT()
+ * @method static $this PRODUCT()
+ * @method static $this CONTRACT()
+ * @method static $this ORDER()
+ * @method static $this PRICEBOOK()
+ * @method static $this PRICEBOOK_ENTRY()
+ * @method static $this OPPORTUNITY()
+ * @method static $this CONTACT()
+ * @method static $this CASE_SO()
+ * @method static $this SOLUTION()
+ */
 abstract class AbstractSObjectType extends AbstractEnumeration
 {
     const LEAD = 'Lead';

src/Enum/AbstractStatus.php

@@ -4,6 +4,15 @@
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
+/**
+ * @method static $this DIFFERENT()
+ * @method static $this ACKNOWLEDGED()
+ * @method static $this NOT_FOUND()
+ * @method static $this INACTIVE()
+ * @method static $this PENDING()
+ * @method static $this SELECT_MATCH()
+ * @method static $this SKIPPED()
+ */
 abstract class AbstractStatus extends AbstractEnumeration
 {
     const DIFFERENT = 'Different';

src/Enum/AbstractType.php

@@ -4,6 +4,15 @@
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
+/**
+ * @method static $this PROSPECT()
+ * @method static $this CUSTOMER_DIRECT()
+ * @method static $this CUSTOMER_CHANNEL()
+ * @method static $this CHANNEL_PARTNER_OR_RESELLER()
+ * @method static $this INSTALLATION_PARTNER()
+ * @method static $this TECHNOLOGY_PARTNER()
+ * @method static $this OTHER()
+ */
 abstract class AbstractType extends AbstractEnumeration
 {
     const PROSPECT = 'Prospect';

src/Enum/ContentType.php

@@ -4,6 +4,10 @@
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
+/**
+ * @method static $this JSON()
+ * @method static $this FORM()
+ */
 class ContentType extends AbstractEnumeration
 {
     const JSON = 'application/json';

src/Enum/RequestMethod.php

@@ -4,6 +4,12 @@
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
+/**
+ * @method static $this GET()
+ * @method static $this POST()
+ * @method static $this PATCH()
+ * @method static $this DELETE()
+ */
 class RequestMethod extends AbstractEnumeration
 {
     const GET = 'GET';

src/Model/AbstractSObject.php

@@ -93,7 +93,7 @@ public function getSystemModstamp()
         return $this->systemModstamp;
     }
 
-    public function setId(string $id): AbstractSObject
+    public function setId(string $id): self
     {
         $this->id = $id;