- added modifiedToArray() method

- ListModifiedProperties() result will be sorted
- fromArray() will only mark data keys as modified

src/Popo/Plugin/ClassPlugin/FromArrayClassPlugin.php

@@ -39,7 +39,9 @@ public function run(BuilderPluginInterface $builder): void
     }
 
     \$this->\$name = \$value;
-    \$this->updateMap[\$name] = true;
+    if (\array_key_exists(\$name, \$data)) {
+        \$this->updateMap[\$name] = true;
+    }
 }
 
 return \$this;

src/Popo/Plugin/ClassPlugin/ListModifiedPropertiesClassPlugin.php

@@ -12,7 +12,9 @@ class ListModifiedPropertiesClassPlugin implements ClassPluginInterface
     public function run(BuilderPluginInterface $builder): void
     {
         $body = <<<EOF
-return array_keys(\$this->updateMap);
+\$sorted = \array_keys(\$this->updateMap);
+sort(\$sorted, \SORT_STRING);
+return \$sorted;
 EOF;
 
         $builder->getClass()

src/Popo/Plugin/ClassPlugin/ModifiedToArrayClassPlugin.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Popo\Plugin\ClassPlugin;
+
+use Popo\Plugin\BuilderPluginInterface;
+use Popo\Plugin\ClassPluginInterface;
+
+class ModifiedToArrayClassPlugin implements ClassPluginInterface
+{
+    public function run(BuilderPluginInterface $builder): void
+    {
+        $body = <<<EOF
+\$data = \$this->toArray();
+\$modifiedProperties = \$this->listModifiedProperties();
+
+return \array_filter(\$data, function (\$key) use (\$modifiedProperties) {
+    return \in_array(\$key, \$modifiedProperties);
+}, \ARRAY_FILTER_USE_KEY);
+EOF;
+
+        $builder->getClass()
+            ->addMethod('modifiedToArray')
+            ->setPublic()
+            ->setReturnType('array')
+            ->setBody($body);
+    }
+}

src/Popo/PopoConfigurator.php

@@ -11,6 +11,7 @@
 use Popo\Plugin\ClassPlugin\IsNewClassPlugin;
 use Popo\Plugin\ClassPlugin\ListModifiedPropertiesClassPlugin;
 use Popo\Plugin\ClassPlugin\MetadataClassPlugin;
+use Popo\Plugin\ClassPlugin\ModifiedToArrayClassPlugin;
 use Popo\Plugin\ClassPlugin\PopoMethodClassPlugin;
 use Popo\Plugin\ClassPlugin\RequireAllClassPlugin;
 use Popo\Plugin\ClassPlugin\ToArrayClassPlugin;
@@ -37,6 +38,7 @@ class PopoConfigurator
      */
     protected array $classPluginCollection = [
         ToArrayClassPlugin::class,
+        ModifiedToArrayClassPlugin::class,
         FromArrayClassPlugin::class,
         IsNewClassPlugin::class,
         ListModifiedPropertiesClassPlugin::class,

tests/suite/App/PopoTest.php

@@ -61,6 +61,24 @@ public function test_toArray(): void
         );
     }
 
+    public function test_modifiedArray(): void
+    {
+        $foo = (new Foo)->fromArray([
+            'title' => 'Aaaa bbb ccccc',
+            'isTest' => false,
+            'idFromExampleSchema' => 111,
+        ]);
+
+        $this->assertEquals(
+            [
+                'title' => 'Aaaa bbb ccccc',
+                'isTest' => false,
+                'idFromExampleSchema' => 111,
+            ],
+            $foo->modifiedToArray()
+        );
+    }
+
     public function test_fromArray(): void
     {
         $foo = (new Foo);
@@ -214,6 +232,19 @@ public function test_modified_properties(): void
         $this->assertEquals(['title'], $foo->listModifiedProperties());
     }
 
+    public function test_modified_properties_from_array(): void
+    {
+        $foo = (new Foo)->fromArray(
+            [
+                'title' => 'Aaaa bbb ccccc',
+                'isTest' => false,
+                'idFromExampleSchema' => 111,
+            ],
+        );
+
+        $this->assertEquals(['idFromExampleSchema', 'isTest', 'title'], $foo->listModifiedProperties());
+    }
+
     public function test_default_bool_value(): void
     {
         $foo = (new Foo);