Merge pull request #7 from Falseclock/master

Raplaced child doesn't have parent

Author: adapik

src/ASN1/ASN1Object.php

@@ -272,7 +272,7 @@ public function getChildren(): array
     /**
      * @return null|ASN1Object
      */
-    public function getParent()
+    public function getParent(): ASN1ObjectInterface
     {
         return $this->parent;
     }
@@ -412,6 +412,8 @@ public function replaceChild(ASN1ObjectInterface $childToReplace, ASN1ObjectInte
         foreach ($this->getChildren() as $index => $child) {
             if ($child === $childToReplace) {
                 $this->children[$index] = $replacement;
+                // New replacement must have old child's parent.
+                $replacement->parent = $this;
                 $this->rebuildTree();
 
                 return $this;

src/ASN1/ExplicitlyTaggedObject.php

@@ -31,7 +31,7 @@ protected function getEncodedValue()
         return $this->getBinaryContent();
     }
 
-    public static function create(int $tagNumber, ASN1Object $object, $class = Identifier::CLASS_CONTEXT_SPECIFIC)
+    public static function create(int $tagNumber, ASN1ObjectInterface $object, $class = Identifier::CLASS_CONTEXT_SPECIFIC)
     {
         $hasIndefiniteLength = $object->getContentLength()->getLengthForm() === ContentLength::INDEFINITE_FORM;
 

tests/ASN1/Universal/ChildrenTest.php

@@ -50,11 +50,45 @@ public function testRemoveChild()
             $i++;
         }
 
-        $this->expectException(Exception::class);
+        // Check all children have correct parent
+        foreach ($object->getChildren() as $child) {
+            self::assertEquals($child->getParent(), $object);
+        }
 
+        $this->expectException(Exception::class);
         $object->removeChild($unknownChild);
     }
 
+    public function testReplacedChildParent() {
+
+        $childToReplace = Integer::create(1);
+        $replacement = Integer::create(0);
+
+        $object = Sequence::create([
+            NullObject::create(),
+            $childToReplace,
+            NullObject::create(),
+        ]);
+
+        $expectedObject = Sequence::create([
+            NullObject::create(),
+            $replacement,
+            NullObject::create(),
+        ]);
+
+        $expectedBinary = $expectedObject->getBinary();
+
+        $object->replaceChild($childToReplace, $replacement);
+
+        // Check binary data as expected after tree rebuild
+        self::assertEquals($expectedObject->getBinary(), $expectedBinary);
+
+        // Check all children have correct parent
+        foreach ($object->getChildren() as $child) {
+            self::assertEquals($child->getParent(), $object);
+        }
+    }
+
     public function testReplaceChild()
     {
         $unknownChild = Integer::create(0);
@@ -72,7 +106,9 @@ public function testReplaceChild()
         $object->replaceChild($childToReplace, $replacement);
 
         // New child now NullObject instead of Sequence
-        self::assertInstanceOf(NullObject::class, $object->getChildren()[0]);
+        foreach ($object->getChildren() as $child) {
+            self::assertInstanceOf(NullObject::class, $child);
+        }
 
         // We still have 1 child
         self::assertCount(3, $object->getChildren());
@@ -85,6 +121,11 @@ public function testReplaceChild()
             $i++;
         }
 
+        // Check all children have correct parent
+        foreach ($object->getChildren() as $child) {
+            self::assertEquals($child->getParent(), $object);
+        }
+
         // Exception if we trying replace unknown child
         $this->expectException(Exception::class);
         $object->replaceChild($unknownChild, $replacement);
@@ -128,5 +169,10 @@ public function testAppendChild()
             self::assertEquals($i, $index);
             $i++;
         }
+
+        // Check all children have correct parent
+        foreach ($object->getChildren() as $child) {
+            self::assertEquals($child->getParent(), $object);
+        }
     }
 }