createDrawingShape has no container defined

Author: Progi1984

docs/changes/1.2.0.md

@@ -16,7 +16,8 @@
 - Word2007 Reader: Fixed cast of color by [@Progi1984](https://github.com/Progi1984) fixing [#826](https://github.com/PHPOffice/PHPPresentation/pull/826) in [#840](https://github.com/PHPOffice/PHPPresentation/pull/840)
 - Word2007 Reader: Fixed panose with 20 characters by [@Progi1984](https://github.com/Progi1984) fixing [#798](https://github.com/PHPOffice/PHPPresentation/pull/798) in [#842](https://github.com/PHPOffice/PHPPresentation/pull/842)
 - `Gd::setImageResource()` : Fixed when imagecreatetruecolor returns false  by [@jaapdh](https://github.com/jaapdh) in [#843](https://github.com/PHPOffice/PHPPresentation/pull/843)
-- Word2007 Writer: LineChart supports LabelPosition for Series by [@pal-software](https://github.com/jaapdh) fixing [#606](https://github.com/PHPOffice/PHPPresentation/pull/606) in [#8434](https://github.com/PHPOffice/PHPPresentation/pull/844)
+- Word2007 Writer: LineChart supports LabelPosition for Series by [@pal-software](https://github.com/pal-software) fixing [#606](https://github.com/PHPOffice/PHPPresentation/pull/606) in [#8434](https://github.com/PHPOffice/PHPPresentation/pull/844)
+- `createDrawingShape` has no container defined by [@Progi1984](https://github.com/Progi1984) fixing [#820](https://github.com/PHPOffice/PHPPresentation/pull/820) in [#845](https://github.com/PHPOffice/PHPPresentation/pull/845)
 
 ## Miscellaneous
 

src/PhpPresentation/Traits/ShapeCollection.php

@@ -21,6 +21,7 @@
 namespace PhpOffice\PhpPresentation\Traits;
 
 use PhpOffice\PhpPresentation\AbstractShape;
+use PhpOffice\PhpPresentation\ShapeContainerInterface;
 
 trait ShapeCollection
 {
@@ -80,7 +81,11 @@ public function setShapeCollection(array $shapeCollection = []): self
      */
     public function addShape(AbstractShape $shape)
     {
-        $this->shapeCollection[] = $shape;
+        if (!$shape->getContainer() && $this instanceof ShapeContainerInterface) {
+            $shape->setContainer($this);
+        } else {
+            $this->shapeCollection[] = $shape;
+        }
 
         return $this;
     }

tests/PhpPresentation/Tests/Slide/AbstractSlideTest.php

@@ -36,10 +36,10 @@ class AbstractSlideTest extends TestCase
     public function testCollection(): void
     {
         /** @var AbstractSlide $stub */
-        $stub = $this->getMockForAbstractClass('PhpOffice\\PhpPresentation\\Slide\\AbstractSlide');
+        $stub = $this->getMockForAbstractClass(AbstractSlide::class);
 
         $array = [];
-        self::assertInstanceOf('PhpOffice\\PhpPresentation\\Slide\\AbstractSlide', $stub->setShapeCollection($array));
+        self::assertInstanceOf(AbstractSlide::class, $stub->setShapeCollection($array));
         self::assertIsArray($stub->getShapeCollection());
         self::assertCount(count($array), $stub->getShapeCollection());
 
@@ -48,22 +48,22 @@ public function testCollection(): void
             new RichText(),
             new RichText(),
         ];
-        self::assertInstanceOf('PhpOffice\\PhpPresentation\\Slide\\AbstractSlide', $stub->setShapeCollection($array));
+        self::assertInstanceOf(AbstractSlide::class, $stub->setShapeCollection($array));
         self::assertIsArray($stub->getShapeCollection());
         self::assertCount(count($array), $stub->getShapeCollection());
     }
 
-    public function testsearchShapes(): void
+    public function testSearchShapes(): void
     {
         /** @var AbstractSlide $stub */
-        $stub = $this->getMockForAbstractClass('PhpOffice\\PhpPresentation\\Slide\\AbstractSlide');
+        $stub = $this->getMockForAbstractClass(AbstractSlide::class);
 
         $array = [
             (new RichText())->setName('AAA'),
             (new Table())->setName('BBB'),
             (new Chart())->setName('AAA'),
         ];
-        self::assertInstanceOf('PhpOffice\\PhpPresentation\\Slide\\AbstractSlide', $stub->setShapeCollection($array));
+        self::assertInstanceOf(AbstractSlide::class, $stub->setShapeCollection($array));
 
         // Search by Name
         $result = $stub->searchShapes('AAA', null);

tests/PhpPresentation/Tests/SlideTest.php

@@ -21,6 +21,8 @@
 namespace PhpOffice\PhpPresentation\Tests;
 
 use PhpOffice\PhpPresentation\PhpPresentation;
+use PhpOffice\PhpPresentation\ShapeContainerInterface;
+use PhpOffice\PhpPresentation\Shape\Drawing\File;
 use PhpOffice\PhpPresentation\Slide;
 use PhpOffice\PhpPresentation\Slide\AbstractBackground;
 use PhpOffice\PhpPresentation\Slide\Animation;
@@ -143,4 +145,40 @@ public function testVisible(): void
         self::assertInstanceOf(Slide::class, $object->setIsVisible());
         self::assertTrue($object->isVisible());
     }
+
+    public function testAddShape(): void
+    {
+        $slide = new Slide();
+        self::assertInstanceOf(ShapeContainerInterface::class, $slide);
+        $shape = new File();
+
+        self::assertIsArray($slide->getShapeCollection());
+        self::assertCount(0, $slide->getShapeCollection());
+
+        $slide->addShape($shape);
+        self::assertInstanceOf(File::class, $shape);
+        self::assertEquals($slide, $shape->getContainer());
+        self::assertInstanceOf(Slide::class, $shape->getContainer());
+
+        self::assertIsArray($slide->getShapeCollection());
+        self::assertCount(1, $slide->getShapeCollection());
+        self::assertEquals([$shape], $slide->getShapeCollection());
+    }
+
+    public function testCreateDrawingShape(): void
+    {
+        $slide = new Slide();
+
+        self::assertIsArray($slide->getShapeCollection());
+        self::assertCount(0, $slide->getShapeCollection());
+
+        $shape = $slide->createDrawingShape();
+        self::assertInstanceOf(File::class, $shape);
+        self::assertEquals($slide, $shape->getContainer());
+        self::assertInstanceOf(Slide::class, $shape->getContainer());
+
+        self::assertIsArray($slide->getShapeCollection());
+        self::assertCount(1, $slide->getShapeCollection());
+        self::assertEquals([$shape], $slide->getShapeCollection());
+    }
 }