createAutoShape : Add method to create geometric shapes

Author: mhasanshahid

docs/changes/1.2.0.md

@@ -8,6 +8,7 @@
 - Group Shape: moving the shape now moves all contained shapes. Offsets and size are calculated based on the contained shapes by [@DennisBirkholz](https://github.com/DennisBirkholz) in [#690](https://github.com/PHPOffice/PHPPresentation/pull/690)
 - Added support for PHP 8.4 by [@Progi1984](https://github.com/Progi1984) in [#839](https://github.com/PHPOffice/PHPPresentation/pull/839)
 - `phpoffice/phpspreadsheet`: Allow version 3.0 by [@Progi1984](https://github.com/Progi1984) fixing [#836](https://github.com/PHPOffice/PHPPresentation/pull/836) in [#839](https://github.com/PHPOffice/PHPPresentation/pull/839)
+- `createAutoShape` : Add method to create geometric shapes by [@mhasanshahid](https://github.com/mhasanshahid) & [@Progi1984](https://github.com/Progi1984) in [#848](https://github.com/PHPOffice/PHPPresentation/pull/848)
 
 ## Bug fixes
 

docs/usage/shapes/autoshape.md

@@ -14,6 +14,14 @@ $shape = new AutoShape();
 $slide->addShape($shape)
 ```
 
+Or we can use `createAutoShape` method of slide.
+
+Example:
+
+```php
+$slide->createAutoShape();
+```
+
 ## Text
 
 You can define text of the geometric form with `setText` method.

src/PhpPresentation/Shape/Group.php

@@ -194,6 +194,17 @@ public function createLineShape(int $fromX, int $fromY, int $toX, int $toY): Lin
         return $shape;
     }
 
+    /**
+     * Create geometric shape.
+     */
+    public function createAutoShape(): AutoShape
+    {
+        $shape = new AutoShape();
+        $this->addShape($shape);
+
+        return $shape;
+    }
+
     /**
      * Create chart shape.
      */

src/PhpPresentation/Slide/AbstractSlide.php

@@ -23,6 +23,7 @@
 use PhpOffice\PhpPresentation\ComparableInterface;
 use PhpOffice\PhpPresentation\GeometryCalculator;
 use PhpOffice\PhpPresentation\PhpPresentation;
+use PhpOffice\PhpPresentation\Shape\AutoShape;
 use PhpOffice\PhpPresentation\Shape\Chart;
 use PhpOffice\PhpPresentation\Shape\Drawing\File;
 use PhpOffice\PhpPresentation\Shape\Group;
@@ -225,6 +226,17 @@ public function createLineShape(int $fromX, int $fromY, int $toX, int $toY): Lin
         return $shape;
     }
 
+    /**
+     * Create geometric shape.
+     */
+    public function createAutoShape(): AutoShape
+    {
+        $shape = new AutoShape();
+        $this->addShape($shape);
+
+        return $shape;
+    }
+
     /**
      * Create chart shape.
      */

tests/PhpPresentation/Tests/Shape/GroupTest.php

@@ -48,12 +48,13 @@ public function testAdd(): void
     {
         $object = new Group();
 
+        self::assertInstanceOf('PhpOffice\\PhpPresentation\\Shape\\AutoShape', $object->createAutoShape());
         self::assertInstanceOf('PhpOffice\\PhpPresentation\\Shape\\Chart', $object->createChartShape());
         self::assertInstanceOf('PhpOffice\\PhpPresentation\\Shape\\Drawing\\File', $object->createDrawingShape());
         self::assertInstanceOf('PhpOffice\\PhpPresentation\\Shape\\Line', $object->createLineShape(10, 10, 10, 10));
         self::assertInstanceOf('PhpOffice\\PhpPresentation\\Shape\\RichText', $object->createRichTextShape());
         self::assertInstanceOf('PhpOffice\\PhpPresentation\\Shape\\Table', $object->createTableShape());
-        self::assertCount(5, $object->getShapeCollection());
+        self::assertCount(6, $object->getShapeCollection());
     }
 
     public function testExtentX(): void

tests/PhpPresentation/Tests/Slide/AbstractSlideTest.php

@@ -20,7 +20,10 @@
 
 namespace PhpOffice\PhpPresentation\Tests\Slide;
 
+use PhpOffice\PhpPresentation\Shape\AutoShape;
 use PhpOffice\PhpPresentation\Shape\Chart;
+use PhpOffice\PhpPresentation\Shape\Drawing;
+use PhpOffice\PhpPresentation\Shape\Line;
 use PhpOffice\PhpPresentation\Shape\RichText;
 use PhpOffice\PhpPresentation\Shape\Table;
 use PhpOffice\PhpPresentation\Slide\AbstractSlide;
@@ -35,51 +38,65 @@ class AbstractSlideTest extends TestCase
 {
     public function testCollection(): void
     {
-        /** @var AbstractSlide $stub */
-        $stub = $this->getMockForAbstractClass(AbstractSlide::class);
+        /** @var AbstractSlide $object */
+        $object = $this->getMockForAbstractClass(AbstractSlide::class);
 
         $array = [];
-        self::assertInstanceOf(AbstractSlide::class, $stub->setShapeCollection($array));
-        self::assertIsArray($stub->getShapeCollection());
-        self::assertCount(count($array), $stub->getShapeCollection());
+        self::assertInstanceOf(AbstractSlide::class, $object->setShapeCollection($array));
+        self::assertIsArray($object->getShapeCollection());
+        self::assertCount(count($array), $object->getShapeCollection());
 
         $array = [
             new RichText(),
             new RichText(),
             new RichText(),
         ];
-        self::assertInstanceOf(AbstractSlide::class, $stub->setShapeCollection($array));
-        self::assertIsArray($stub->getShapeCollection());
-        self::assertCount(count($array), $stub->getShapeCollection());
+        self::assertInstanceOf(AbstractSlide::class, $object->setShapeCollection($array));
+        self::assertIsArray($object->getShapeCollection());
+        self::assertCount(count($array), $object->getShapeCollection());
+    }
+
+    public function testAdd(): void
+    {
+        /** @var AbstractSlide $object */
+        $object = $this->getMockForAbstractClass(AbstractSlide::class);
+
+        self::assertInstanceOf(AutoShape::class, $object->createAutoShape());
+        self::assertInstanceOf(Chart::class, $object->createChartShape());
+        self::assertInstanceOf(Drawing\File::class, $object->createDrawingShape());
+        self::assertInstanceOf(Line::class, $object->createLineShape(10, 10, 10, 10));
+        self::assertInstanceOf(RichText::class, $object->createRichTextShape());
+        self::assertInstanceOf(Table::class, $object->createTableShape());
+        self::assertCount(6, $object->getShapeCollection());
     }
 
     public function testSearchShapes(): void
     {
-        /** @var AbstractSlide $stub */
-        $stub = $this->getMockForAbstractClass(AbstractSlide::class);
+        /** @var AbstractSlide $object */
+        $object = $this->getMockForAbstractClass(AbstractSlide::class);
 
         $array = [
             (new RichText())->setName('AAA'),
             (new Table())->setName('BBB'),
             (new Chart())->setName('AAA'),
         ];
-        self::assertInstanceOf(AbstractSlide::class, $stub->setShapeCollection($array));
+        self::assertInstanceOf(AbstractSlide::class, $object->setShapeCollection($array));
 
         // Search by Name
-        $result = $stub->searchShapes('AAA', null);
+        $result = $object->searchShapes('AAA', null);
         self::assertIsArray($result);
         self::assertCount(2, $result);
         self::assertInstanceOf(RichText::class, $result[0]);
         self::assertInstanceOf(Chart::class, $result[1]);
 
         // Search by Name && Type
-        $result = $stub->searchShapes('AAA', Chart::class);
+        $result = $object->searchShapes('AAA', Chart::class);
         self::assertIsArray($result);
         self::assertCount(1, $result);
         self::assertInstanceOf(Chart::class, $result[0]);
 
         // Search by Type
-        $result = $stub->searchShapes(null, Table::class);
+        $result = $object->searchShapes(null, Table::class);
         self::assertIsArray($result);
         self::assertCount(1, $result);
         self::assertInstanceOf(Table::class, $result[0]);