Merge pull request 'iterate in $data until fields for empty relation are over' (#22) from bugfix/fix-model-loading-when-left-join-is-empty into master

Reviewed-on: #22

src/PersistentData/PersistentDataManager.php

@@ -115,7 +115,7 @@ class PersistentDataManager implements IPersistentDataManager
 
             if (count($modified) > 0) {
                 if ($model instanceof ModelWithSlug && isset($modified['slug'])) {
-                    $modified['slug'] = $this->generateUniqueSlug($model, $modified['slug']);
+                    $diff['slug']['new'] = $modified['slug'] = $this->generateUniqueSlug($model, $modified['slug']);
                 }
 
                 $modify->setId($id);
@@ -278,7 +278,10 @@ class PersistentDataManager implements IPersistentDataManager
                     $method = 'set' . str_replace('_', '', ucwords($relation, '_'));
                     $model->$method($relationModel);
                 } else {
-                    next($data);
+                    while (substr($key, 0, strlen($relation . '__')) === $relation . '__') {
+                        next($data);
+                        $key = key($data);
+                    }
                 }
 
                 next($relations);
@@ -302,6 +305,8 @@ class PersistentDataManager implements IPersistentDataManager
 
             if ($relationModel !== null) {
                 $model->$methodSet($relationModel->getId());
+            } else {
+                $model->$methodSet(null);
             }
         }
     }

src/View/Linker.php

@@ -97,7 +97,12 @@ class Linker
 
         fwrite($outputFileHandle, $extra[0]);
         while (($line = fgets($inputFileHandle)) !== false) {
-            fwrite($outputFileHandle, $line);
+            if (preg_match('/^\s*@include\((.*)\)\s*$/', $line, $matches) === 1) {
+                $include = file_get_contents(ROOT . '/views/' . $matches[1] . '.php');
+                fwrite($outputFileHandle, $include);
+            } else {
+                fwrite($outputFileHandle, $line);
+            }
         }
         fwrite($outputFileHandle, $extra[1]);