Improvements to get public properties, and remove bad properties on h…

…ydrate

inc/GlobalFunctions.php

@@ -546,13 +546,15 @@ function idp($object, $property, $default = null)
    * will return protected and private properties,
    * this function fixes this instance
    *
-   * @param object $object Source object
+   * @param object $object     Source object
+   * @param bool   $returnKeys Return Property keys
    *
    * @return mixed
    */
-  function get_public_properties($object)
+  function get_public_properties($object, $returnKeys = false)
   {
-    return get_object_vars($object);
+    $properties = get_object_vars($object);
+    return $returnKeys ? array_keys($properties) : $properties;
   }
 }
 
@@ -708,6 +710,7 @@ function hydrate($destination, $source, array $properties, $copyNull = true)
       throw new Exception("hydrate() must be given objects");
     }
 
+    $properties = array_filter($properties);
     foreach($properties as $property)
     {
       $newVal = idp($source, $property);

tests/GlobalFunctionsTest.php

@@ -300,6 +300,7 @@ public function testProperties()
     $this->assertEquals($expect, $class->publicVars());
     $this->assertEquals($expect, get_object_vars($class));
     $this->assertEquals($expect, get_public_properties($class));
+    $this->assertEquals(['name', 'age'], get_public_properties($class, true));
   }
 
   public function testStringFrom()
@@ -380,6 +381,9 @@ public function testHydrate()
     $source->age = 19;
     $source->nullify = null;
 
+    hydrate($dest, $source, [null]);
+    $this->assertEquals('Please', $dest->nullify);
+
     hydrate($dest, $source, ['nullify'], false);
     $this->assertEquals('Please', $dest->nullify);