fixed tests

Author: dracony

src/PHPixie/ORM/Values/Preload.php

@@ -37,7 +37,7 @@ public function addPath($path, $options = array())
         return $this->addExplodedPath($path, $options);
     }
 
-    public function addExplodedPath($explodedPath, $options)
+    public function addExplodedPath($explodedPath, $options = array())
     {
         $propertyName = array_shift($explodedPath);
         $property = $this->getProperty($propertyName);

src/PHPixie/ORM/Values/Preload/Property.php

@@ -7,7 +7,7 @@ class Property
     protected $options;
     protected $parameters;
 
-    public function __construct($propertyName, $options)
+    public function __construct($propertyName, $options = array())
     {
         $this->propertyName = $propertyName;
         $this->options = $options;

src/PHPixie/ORM/Values/Preload/Property/Cascading.php

@@ -6,7 +6,7 @@ class Cascading extends \PHPixie\ORM\Values\Preload\Property
 {
     protected $preload;
 
-    public function __construct($propertyName, $preload, $options)
+    public function __construct($propertyName, $preload, $options = array())
     {
         parent::__construct($propertyName, $options);
         $this->preload = $preload;

tests/PHPixie/Tests/ORM/Relationships/Type/ManyToMany/PreloaderTest.php

@@ -39,8 +39,10 @@ protected function prepareMap($type = 'left')
         $itemKey = $this->configData[$type.'PivotKey'];
 
         $fields = array();
+        $allIds = [];
         foreach($this->map as $ownerId => $ids) {
             foreach($ids as $id) {
+                $allIds[$id] = true;
                 $fields[] = array(
                                 $ownerKey => $ownerId,
                                 $itemKey  => $id,
@@ -49,7 +51,8 @@ protected function prepareMap($type = 'left')
         }
 
         $this->method($this->pivotResult, 'getFields', $fields, array(array($ownerKey, $itemKey)), 0);
-        $this->prepareMapIdOffsets();
+        $this->method($this->result, 'getField', array_keys($allIds), array('id'), 0);
+        $this->prepareMapIdOffsets(1);
 
     }
 

tests/PHPixie/Tests/ORM/Values/PreloadTest.php

@@ -93,11 +93,11 @@ protected function prepareAddTest($path, $property = null)
 
         if($property === null) {
             $property = $this->getCascadingProperty($name);
-            $this->method($this->values, 'cascadingPreloadProperty', $property, array($name), 0);
+            $this->method($this->values, 'cascadingPreloadProperty', $property, array($name, array()), 0);
         }
 
         if(!empty($path)) {
-            $this->method($property->preload(), 'addExplodedPath', null, array($path), 0);
+            $this->method($property->preload(), 'addExplodedPath', null, array($path, array()), 0);
         }
 
         return $property;