Merge pull request #105 from myparcelnl/add-insurance-100-euro

add insurance 100 euros
myparcelnl · Jan 3, 2019 · 246ea7d · 246ea7d
2 parents 61c5629 + 2c5b79c
commit 246ea7d
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 21 deletions.
diff --git a/Tests/ReturnLabelTest/SendReturnLabelMailTest.php b/Tests/ReturnLabelTest/SendReturnLabelMailTest.php
@@ -21,7 +21,7 @@
 use MyParcelNL\Sdk\src\Helper\MyParcelCollection;
 use MyParcelNL\Sdk\src\Model\Repository\MyParcelConsignmentRepository;
 
-class SendReturnLabelMailTest extends \PHPUnit_Framework_TestCase
+class SendReturnLabelMailTest extends \PHPUnit\Framework\TestCase
 {
     public function testSendReturnLabelMail()
     {

diff --git a/Tests/SendConsignments/SendDigitalStampTest.php b/Tests/SendConsignments/SendDigitalStampTest.php
@@ -9,7 +9,7 @@
  * Class SendDigitalStampTest
  * @package MyParcelNL\Sdk\tests\SendDigitalStampTest
  */
-class SendDigitalStampTest extends \PHPUnit_Framework_TestCase
+class SendDigitalStampTest extends \PHPUnit\Framework\TestCase
 {
     use HasCustomItems;
 

diff --git a/Tests/SendConsignments/SendLargeFormatTest.php b/Tests/SendConsignments/SendLargeFormatTest.php
@@ -24,7 +24,7 @@
  * Class SendOneInternationalConsignmentTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentTest
  */
-class SendLargeFormatTest extends \PHPUnit_Framework_TestCase
+class SendLargeFormatTest extends \PHPUnit\Framework\TestCase
 {
     use HasCustomItems;
 

diff --git a/Tests/SendConsignments/SendMailboxConsignmentTest.php b/Tests/SendConsignments/SendMailboxConsignmentTest.php
@@ -23,7 +23,7 @@
  * Class SendMailboxConsignmentTest
  * @package MyParcelNL\Sdk\tests\SendMailboxConsignmentTest
  */
-class SendMailboxConsignmentTest extends \PHPUnit_Framework_TestCase
+class SendMailboxConsignmentTest extends \PHPUnit\Framework\TestCase
 {
 
     /**

diff --git a/Tests/SendConsignments/SendMorningShipmentTest.php b/Tests/SendConsignments/SendMorningShipmentTest.php
@@ -23,7 +23,7 @@
  * Class SendMorningShipmentTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentTest
  */
-class SendMorningShipmentTest extends \PHPUnit_Framework_TestCase
+class SendMorningShipmentTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test one shipment with createConcepts()

diff --git a/Tests/SendConsignments/SendMultiReferenceIdentifierConsignmentTest.php b/Tests/SendConsignments/SendMultiReferenceIdentifierConsignmentTest.php
@@ -23,7 +23,7 @@
  * Class SendOneReferenceIdentifierConsignmentTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentTest
  */
-class SendMultiReferenceIdentifierConsignmentTest extends \PHPUnit_Framework_TestCase
+class SendMultiReferenceIdentifierConsignmentTest extends \PHPUnit\Framework\TestCase
 {
 
     /**

diff --git a/Tests/SendConsignments/SendMultipleConsignmentsTest.php b/Tests/SendConsignments/SendMultipleConsignmentsTest.php
@@ -24,7 +24,7 @@
  * Class SendMultipleConsignmentsTest
  * @package MyParcelNL\Sdk\tests\SendConsignmentsTest
  */
-class SendMultipleConsignmentsTest extends \PHPUnit_Framework_TestCase
+class SendMultipleConsignmentsTest extends \PHPUnit\Framework\TestCase
 {
 
     /**

diff --git a/Tests/SendConsignments/SendNightShipmentTest.php b/Tests/SendConsignments/SendNightShipmentTest.php
@@ -23,7 +23,7 @@
  * Class SendNightShipmentTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentTest
  */
-class SendNightShipmentTest extends \PHPUnit_Framework_TestCase
+class SendNightShipmentTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test one shipment with createConcepts()

diff --git a/Tests/SendConsignments/SendOneConsignmentTest.php b/Tests/SendConsignments/SendOneConsignmentTest.php
@@ -23,7 +23,7 @@
  * Class SendOneConsignmentTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentTest
  */
-class SendOneConsignmentTest extends \PHPUnit_Framework_TestCase
+class SendOneConsignmentTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -126,7 +126,14 @@ public function testSendOneConsignment()
             }
 
             if (key_exists('insurance', $consignmentTest)) {
-                $this->assertEquals($consignmentTest['insurance'], $consignment->getInsurance(), 'getInsurance()');
+                // Since 1-1-2019 it is not possible to get an insurance with 50 euros from MyParcel, instead the insurance 100 euros has been added.
+                $insurance = $consignmentTest['insurance'];
+
+                if ($insurance == 50) {
+                    $insurance = 100;
+                }
+
+                $this->assertEquals($insurance, $consignment->getInsurance(), 'getInsurance()');
             }
 
             /**

diff --git a/Tests/SendConsignments/SendOneConsignmentWithoutEmailTest.php b/Tests/SendConsignments/SendOneConsignmentWithoutEmailTest.php
@@ -22,7 +22,7 @@
  * Class SendOneConsignmentWithoutEmailTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentWithoutEmailTest
  */
-class SendOneConsignmentWithoutEmailTest extends \PHPUnit_Framework_TestCase
+class SendOneConsignmentWithoutEmailTest extends \PHPUnit\Framework\TestCase
 {
 
     /**

diff --git a/Tests/SendConsignments/SendOneInternationalConsignmentTest.php b/Tests/SendConsignments/SendOneInternationalConsignmentTest.php
@@ -25,7 +25,7 @@
  * Class SendOneInternationalConsignmentTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentTest
  */
-class SendOneInternationalConsignmentTest extends \PHPUnit_Framework_TestCase
+class SendOneInternationalConsignmentTest extends \PHPUnit\Framework\TestCase
 {
     use HasCustomItems;
 

diff --git a/Tests/SendConsignments/SendPickupFromCheckoutDataTest.php b/Tests/SendConsignments/SendPickupFromCheckoutDataTest.php
@@ -23,7 +23,7 @@
  * Class SendPickupFromCheckoutDataTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentTest
  */
-class SendPickupFromCheckoutDataTest extends \PHPUnit_Framework_TestCase
+class SendPickupFromCheckoutDataTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test one shipment with createConcepts()

diff --git a/Tests/SendConsignments/SendReferenceIdentifierConsignmentTest.php b/Tests/SendConsignments/SendReferenceIdentifierConsignmentTest.php
@@ -23,7 +23,7 @@
  * Class SendReferenceIdentifierConsignmentTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentTest
  */
-class SendReferenceIdentifierConsignmentTest extends \PHPUnit_Framework_TestCase
+class SendReferenceIdentifierConsignmentTest extends \PHPUnit\Framework\TestCase
 {
 
     /**

diff --git a/Tests/SendConsignments/SendUserAgentTest.php b/Tests/SendConsignments/SendUserAgentTest.php
@@ -23,7 +23,7 @@
  * Class SendPickupFromCheckoutDataTest
  * @package MyParcelNL\Sdk\tests\SendOneConsignmentTest
  */
-class SendUserAgentTest extends \PHPUnit_Framework_TestCase
+class SendUserAgentTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test one shipment with createConcepts()

diff --git a/Tests/SplitStreet/InternationalFullStreetTest.php b/Tests/SplitStreet/InternationalFullStreetTest.php
@@ -24,7 +24,7 @@
  *
  * @package MyParcelNL\Sdk\tests\InternationalFullStreetTest
  */
-class InternationalFullStreetTest extends \PHPUnit_Framework_TestCase
+class InternationalFullStreetTest extends \PHPUnit\Framework\TestCase
 {
 
     /**

diff --git a/Tests/SplitStreet/SplitLongStreetTest.php b/Tests/SplitStreet/SplitLongStreetTest.php
@@ -22,7 +22,7 @@
  * Class SplitStreetTest
  * @package MyParcelNL\Sdk\tests\SplitStreetTest
  */
-class SplitLongStreetTest extends \PHPUnit_Framework_TestCase
+class SplitLongStreetTest extends \PHPUnit\Framework\TestCase
 {
 
     /**

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "myparcelnl/sdk",
-    "version": "v1.5.0",
+    "version": "v1.5.1",
     "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/MyParcelConsignment.php b/src/Model/MyParcelConsignment.php
@@ -37,7 +37,7 @@ class MyParcelConsignment
     const CC_NL = 'NL';
     const CC_BE = 'BE';
 
-    private $insurance_possibilities = [0, 50, 250, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000];
+    private $insurance_possibilities = [0, 50, 100, 250, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000];
 
     /**
      * @var string
@@ -989,7 +989,7 @@ public function getInsurance()
      *
      * Composite type containing integer and currency. The amount is without decimal
      * separators.
-     * Pattern: [0, 50, 250, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000]
+     * Pattern: [0, 50, 100, 250, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000]
      * Required: No
      *
      * @param int $insurance
@@ -1000,7 +1000,7 @@ public function getInsurance()
     public function setInsurance($insurance)
     {
         if (!in_array($insurance, $this->insurance_possibilities) && $this->getCountry() == self::CC_NL) {
-            throw new \Exception('Insurance must be one of [0, 50, 250, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000]');
+            throw new \Exception('Insurance must be one of [0, 50, 100, 250, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000]');
         }
 
         if (!$this->canHaveOption()) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ @@
      *
      * @package MyParcelNL\Sdk\tests\InternationalFullStreetTest
      */
-    class InternationalFullStreetTest extends \PHPUnit_Framework_TestCase
+    class InternationalFullStreetTest extends \PHPUnit\Framework\TestCase
     {
         /**
@@ Expand Down @@