0.1.9.4 30/12/2015 Merged in changes from @minioak - fixed up tests. [1.5]

Note to self added to make sure that getting a NULL in Structure:54 is OK and not downstream problem.
Fixed up the remaining usage of Yaml::parse to work with v3.0 where file names no longer work.

Author: Buntix

VERSION

@@ -1,4 +1,5 @@
 
+0.1.9.4       30/12/2015 Merged in changes from @minioak - fixed up tests. [1.5]
 0.1.9.0       16/10/2015 Added request1DRanges action. [0.6]
 0.1.8.0       16/10/2015 Added an exception catcher to provide debug info in the response object. [1.89]
 0.1.7.0       16/10/2015 Added printDocument action. [0.2]

src/Helper/Structure.php

@@ -54,8 +54,8 @@ static function processMultipleProperty($schema, $val, $defaults, $helper = NULL
     $multi_schema  = $schema['_multiple'];
 
     if (isset($multi_schema['nest_key'])) $single_schema['_key'] = '~/' . $multi_schema['nest_key'];
-    
-    $val = isset($val) ? $val : array();
+
+    if (is_null($val)) $val = []; // CHECK: required param so always set, but if this is null may not want to be here in the first place.
 
     $multi_values = [];
 

src/Request/schema/createShipment.yml

@@ -208,12 +208,12 @@ properties:
         multi_key: item
 
       numberOfItems:
-          _help: "Number of items for the associated weight"
-          _required: true
-          _validate:
-            Range:
-              min: 0
-              max: 99
+        _help: "Number of items for the associated weight"
+        _required: true
+        _validate:
+          Range:
+            min: 0
+            max: 99
 
       weight:
         grams:

tests/resources/requests/createShipment.yml

@@ -2,7 +2,7 @@ valid:
   request:
     requestedShipment:
       shipmentType: 'Delivery'
-      serviceOccurence: 1
+      serviceOccurrence: 1
       serviceType: T
       serviceOffering: TRM
       serviceFormat: P.int
@@ -30,6 +30,7 @@ valid:
         country: GB
       items:
         - 
+          numberOfItems: "2"
           weight:
             grams: 100
 
@@ -38,7 +39,7 @@ valid:
       shipmentType:
         code: 'Delivery'
 
-      serviceOccurence: 1
+      serviceOccurrence: 1
 
       serviceType: 
         code: T
@@ -87,10 +88,10 @@ valid:
             code: GB
 
       items:
-        numberOfItems: 1
 
         item:
            -    
+            numberOfItems: "2"
             weight:
               value: 100
               unitOfMeasure:

tests/unit/Connector/soapConnectorTest.php

@@ -43,6 +43,6 @@ function testWSSecurity() {
       ->string($this->testedInstance->getAPIFormattedRequest())
       ->contains('Username>blah<')
       ->contains('Created>' . date_create()->format('Y-m-d')) // Do not run this test at midnight! (Or get it wet).
-      ->matches('/:Password>\w+==</');
+      ->matches('/:Password>\w+=</');
   }
 }

tests/unit/Request/BuilderTest.php

@@ -65,8 +65,6 @@ function testMultiplePropertyCreation() {
 
 
   static function getTestConfigs($key) {
-    return Yaml::parse(RESOURCES_DIR . '/' . $key . '.yml');
+    return Yaml::parse(file_get_contents(RESOURCES_DIR . '/' . $key . '.yml'));
   }
-
-
 }