Merge remote-tracking branch 'origin/master' into fix/190-alwaysinclude-fk-columns

# Conflicts:
#	tests/ModelControllerProjectionTest.php

Author: kennethphough

src/Mvc/Controller/ModelController.php

@@ -405,10 +405,36 @@ protected function eagerLoadPlan($projection)
         return $plan;
     }
 
+    /**
+     * Strip eager-load helper keys (`<fk>_object`) from a response row (KYTE-#190).
+     * Model::eagerLoadRelations attaches the fetched relation as a dynamic
+     * `<fk>_object` property for getObject() to consume — it is an internal
+     * expansion helper, not a response field. getAllParams() surfaces it, so
+     * left in the payload it duplicates the related row and, for relations whose
+     * columns carry binary data (e.g. bzip2-compressed section templates),
+     * produces invalid UTF-8 that makes json_encode fail. Only non-struct keys
+     * ending in `_object` are removed. Pure/static for unit testing.
+     *
+     * @param array<string,mixed> $response Row from getAllParams()
+     * @param array<string,mixed> $struct   Model struct
+     * @return array<string,mixed>
+     */
+    public static function stripEagerHelpers(array $response, $struct)
+    {
+        foreach (array_keys($response) as $rk) {
+            if (is_string($rk) && substr($rk, -7) === '_object' && !isset($struct[$rk])) {
+                unset($response[$rk]);
+            }
+        }
+        return $response;
+    }
+
     protected function getObject($obj) {
         try {
-            $response = $obj->getAllParams();
-    
+            // Strip eager-load `<fk>_object` helpers; the object property itself
+            // is kept so FK expansion below still uses the eager-loaded object.
+            $response = self::stripEagerHelpers($obj->getAllParams(), $obj->kyte_model['struct']);
+
             foreach ($response as $key => &$value) {
                 if (!isset($obj->kyte_model['struct'][$key])) {
                     continue; // Skip if key not found in struct

tests/ModelControllerProjectionTest.php

@@ -117,4 +117,27 @@ public function testProjectionKeepsForeignKeysSoExpansionStillRuns(): void
         $this->assertContains('client', $p);   // FK preserved even though unrequested
         $this->assertNotContains('body', $p);  // large column still trimmed
     }
+
+    public function testStripEagerHelpersRemovesObjectKeysButKeepsRealFields(): void
+    {
+        // Eager-load attaches `<fk>_object` helper props that getAllParams
+        // surfaces; they must not reach the response (KYTE-#190 — a bzip2
+        // section-template `<fk>_object` carries binary that breaks json_encode).
+        $struct = ['id' => [], 'parent' => ['fk' => []], 'name' => []];
+        $row = [
+            'id'            => 1,
+            'parent'        => 5,
+            'name'          => 'x',
+            'parent_object' => (object) ['name' => 'P'],   // eager helper (object)
+            'header_object' => "\xff\xfebinary",           // eager helper (binary)
+        ];
+        $out = ModelController::stripEagerHelpers($row, $struct);
+        $this->assertArrayHasKey('id', $out);
+        $this->assertArrayHasKey('parent', $out);          // real FK field kept
+        $this->assertArrayHasKey('name', $out);
+        $this->assertArrayNotHasKey('parent_object', $out); // helper stripped
+        $this->assertArrayNotHasKey('header_object', $out); // helper stripped
+        // the survivors must be JSON-encodable (the whole point)
+        $this->assertNotFalse(json_encode($out));
+    }
 }