Don't extract static properties, as they won't get serialized

EdeMeijer · Sep 7, 2014 · 081f515 · 081f515
1 parent ecf2301
commit 081f515
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 35 deletions.
diff --git a/src/EdeMeijer/SerializeDebugger/ObjectPropertyExtractor.php b/src/EdeMeijer/SerializeDebugger/ObjectPropertyExtractor.php
@@ -112,11 +112,7 @@ private function initializeParentPrivateProperties(ReflectionClass $reflector)
      */
     private function getAccessibleReflectionProperties(ReflectionClass $reflector)
     {
-        return $reflector->getProperties(
-            ReflectionProperty::IS_PRIVATE |
-            ReflectionProperty::IS_PROTECTED |
-            ReflectionProperty::IS_PUBLIC
-        );
+        return $this->getWithoutStatic($reflector->getProperties());
     }
 
     /**
@@ -125,6 +121,21 @@ private function getAccessibleReflectionProperties(ReflectionClass $reflector)
      */
     private function getPrivateReflectionProperties(ReflectionClass $reflector)
     {
-        return $reflector->getProperties(ReflectionProperty::IS_PRIVATE);
+        return $this->getWithoutStatic($reflector->getProperties(ReflectionProperty::IS_PRIVATE));
+    }
+
+    /**
+     * @param ReflectionProperty[] $properties
+     * @return ReflectionProperty[]
+     */
+    private function getWithoutStatic(array $properties)
+    {
+        $filtered = [];
+        foreach ($properties as $property) {
+            if (!$property->isStatic()) {
+                $filtered[] = $property;
+            }
+        }
+        return $filtered;
     }
 }
diff --git a/test/EdeMeijer/SerializeDebugger/Test/Mocks/TestSubClass.php b/test/EdeMeijer/SerializeDebugger/Test/Mocks/TestSubClass.php
@@ -12,4 +12,11 @@ class TestSubClass extends TestBaseClass
     public $publicSubVar = 789;
     /** @var string */
     public $overriddenBaseVar = 'def';
+
+    /** @var string */
+    public static $publicStaticSubVar = 'ghi';
+    /** @var string */
+    protected static $protectedStaticSubVar = 'jkl';
+    /** @var string */
+    private static $privateStaticSubVar = 'jkl';
 } 
diff --git a/test/EdeMeijer/SerializeDebugger/Test/ObjectPropertyExtractorTest.php b/test/EdeMeijer/SerializeDebugger/Test/ObjectPropertyExtractorTest.php
@@ -0,0 +1,38 @@
+<?php
+
+
+namespace EdeMeijer\SerializeDebugger\Test;
+
+
+use EdeMeijer\SerializeDebugger\ObjectPropertyExtractor;
+use EdeMeijer\SerializeDebugger\Test\Mocks\TestSubClass;
+
+class ObjectPropertyExtractorTest extends \PHPUnit_Framework_TestCase
+{
+    public function testExtraction()
+    {
+        require_once __DIR__ . '/Mocks/TestBaseClass.php';
+        require_once __DIR__ . '/Mocks/TestSubClass.php';
+
+        $objWithInheritance = new TestSubClass();
+
+        $SUT = new ObjectPropertyExtractor($objWithInheritance);
+
+        $extractedProperties = $SUT->getProperties();
+
+        // We expect 7 properties, no static properties
+        $this->assertCount(7, $extractedProperties);
+        // Check if all expected properties are indexed
+        $this->assertContains('privateSubVar', $extractedProperties);
+        $this->assertContains('protectedSubVar', $extractedProperties);
+        $this->assertContains('publicSubVar', $extractedProperties);
+        $this->assertContains('overriddenBaseVar', $extractedProperties);
+        $this->assertContains('protectedBaseVar', $extractedProperties);
+        $this->assertContains('publicBaseVar', $extractedProperties);
+        $this->assertContains('privateBaseVar', $extractedProperties);
+        // Check if value of overridden property is the one of the sub class
+        $overriddenBaseVar = $SUT->getValue('overriddenBaseVar');
+        $this->assertEquals('def', $overriddenBaseVar);
+    }
+}
+
diff --git a/...r/SerializeDebugger/Test/DebuggerTest.php → ...ializeDebugger/Test/Unit/DebuggerTest.php b/...r/SerializeDebugger/Test/DebuggerTest.php → ...ializeDebugger/Test/Unit/DebuggerTest.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace EdeMeijer\SerializeDebugger\Test;
+namespace EdeMeijer\SerializeDebugger\Test\Unit;
 
 use EdeMeijer\SerializeDebugger\Debugger;
-use EdeMeijer\SerializeDebugger\Test\Mocks\TestSubClass;
 use stdClass;
 
 class DebuggerTest extends \PHPUnit_Framework_TestCase
@@ -63,29 +62,6 @@ public function testItHandlesCircularReferencesCorrectly()
         $this->assertSame($nodes[0], $nodes[1]->getChildNodes()['aRef']);
     }
 
-    public function testItReadsAllKindsOfObjectPropertiesCorrectly()
-    {
-        require_once __DIR__ . '/Mocks/TestBaseClass.php';
-        require_once __DIR__ . '/Mocks/TestSubClass.php';
-
-        $objWithInheritance = new TestSubClass();
-        $nodes = $this->SUT->debug($objWithInheritance)->getRawNodes();
-        $childNodes = $nodes[0]->getChildNodes();
-
-        // We expect 8 nodes; the base object and 7 properties
-        $this->assertCount(8, $nodes);
-        // Check if all expected properties are indexed
-        $this->assertArrayHasKey('privateSubVar', $childNodes);
-        $this->assertArrayHasKey('protectedSubVar', $childNodes);
-        $this->assertArrayHasKey('publicSubVar', $childNodes);
-        $this->assertArrayHasKey('overriddenBaseVar', $childNodes);
-        $this->assertArrayHasKey('protectedBaseVar', $childNodes);
-        $this->assertArrayHasKey('publicBaseVar', $childNodes);
-        $this->assertArrayHasKey('privateBaseVar', $childNodes);
-        // Check if value of overridden property is the one of the sub class
-        $this->assertEquals('def', $childNodes['overriddenBaseVar']->getData());
-    }
-
     /**
      * @return array
      */
@@ -98,7 +74,11 @@ public function basicClassificationProvider()
             [null, $base . 'PrimitiveType'],
             [true, $base . 'PrimitiveType'],
             [[], $base . 'ArrayType'],
-            [function () {}, $base . 'ClosureType'],
+            [
+                function () {
+                },
+                $base . 'ClosureType'
+            ],
             [new stdClass(), $base . 'ObjectType'],
             [new Debugger(), $base . 'ObjectType'],
             [fopen(__FILE__, 'r'), $base . 'ResourceType'],

diff --git a/...eDebugger/Test/PlainTextFormatterTest.php → ...gger/Test/Unit/PlainTextFormatterTest.php b/...eDebugger/Test/PlainTextFormatterTest.php → ...gger/Test/Unit/PlainTextFormatterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace EdeMeijer\SerializeDebugger\Test;
+namespace EdeMeijer\SerializeDebugger\Test\Unit;
 
 use EdeMeijer\SerializeDebugger\Result\PlainTextFormatter;
 use EdeMeijer\SerializeDebugger\Result\ResultItem;

diff --git a/...erializeDebugger/Test/DebugResultTest.php → ...erializeDebugger/Test/Unit/ResultTest.php b/...erializeDebugger/Test/DebugResultTest.php → ...erializeDebugger/Test/Unit/ResultTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace EdeMeijer\SerializeDebugger\Test;
+namespace EdeMeijer\SerializeDebugger\Test\Unit;
 
 use EdeMeijer\SerializeDebugger\Debugger;
 use EdeMeijer\SerializeDebugger\Result\ResultItem;
@@ -10,7 +10,7 @@
 use EdeMeijer\SerializeDebugger\Type\PrimitiveType;
 use EdeMeijer\SerializeDebugger\Type\ResourceType;
 
-class DebugResultTest extends \PHPUnit_Framework_TestCase
+class ResultTest extends \PHPUnit_Framework_TestCase
 {
     /** @var Debugger */
     private $debugger;