Merge pull request #62 from myparcelnl/Fix-EU_COUNTRIES

change isCdCountry to public function
myparcelnl · Aug 1, 2018 · 20ba514 · 20ba514
2 parents 11cfad9 + 4707d05
commit 20ba514
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "myparcelnl/sdk",
-    "version": "v1.3.14",
+    "version": "v1.3.15",
     "description": "This package is designed to send and receive data from MyParcel by means of an API.",
     "homepage": "https://www.myparcel.nl",
     "tags": ["MyParcel", "My Parcel", "Post NL", "PostNL"],

diff --git a/src/Model/Repository/MyParcelConsignmentRepository.php b/src/Model/Repository/MyParcelConsignmentRepository.php
@@ -325,6 +325,47 @@ public function isCorrectAddress($fullStreet)
         return (bool) $result;
     }
 
+    /**
+     * Check if the address is outside the EU
+     *
+     * @return bool
+     */
+    public function isCdCountry()
+    {
+        return !in_array(
+            $this->getCountry(),
+            array (
+                'NL',
+                'BE',
+                'AT',
+                'BG',
+                'CZ',
+                'CY',
+                'DK',
+                'EE',
+                'FI',
+                'FR',
+                'DE',
+                'GB',
+                'GR',
+                'HU',
+                'IE',
+                'IT',
+                'LV',
+                'LT',
+                'LU',
+                'PL',
+                'PT',
+                'RO',
+                'SK',
+                'SI',
+                'ES',
+                'SE',
+                'XK',
+            )
+        );
+    }
+
     /**
      * Splits street data into separate parts for street name, house number and extension.
      * Only for Dutch addresses
@@ -374,47 +415,6 @@ private function splitStreet($fullStreet)
         return $streetData;
     }
 
-    /**
-     * Check if the address is outside the EU
-     *
-     * @return bool
-     */
-    protected function isCdCountry()
-    {
-        return !in_array(
-            $this->getCountry(),
-            array (
-                'NL',
-                'BE',
-                'AT',
-                'BG',
-                'CZ',
-                'CY',
-                'DK',
-                'EE',
-                'FI',
-                'FR',
-                'DE',
-                'GB',
-                'GR',
-                'HU',
-                'IE',
-                'IT',
-                'LV',
-                'LT',
-                'LU',
-                'PL',
-                'PT',
-                'RO',
-                'SK',
-                'SI',
-                'ES',
-                'SE',
-                'XK',
-            )
-        );
-    }
-
     /**
      * @return $this
      */