Merge pull request #18 from ScientaNL/remove-flowchart-definition

Remove obsolete FlowchartDefinition and fix some typings
ScientaNL · Aug 12, 2021 · cea0679 · cea0679
2 parents 52d2b9a + 1786931
commit cea0679
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 69 deletions.
diff --git a/DocumentExportDefinition/Section/AbstractDataDefinition.php b/DocumentExportDefinition/Section/AbstractDataDefinition.php
@@ -10,7 +10,6 @@
  *    "File": "DocumentExportDefinition\Section\Data\FileDefinition",
  *    "Form": "DocumentExportDefinition\Section\Data\FormDefinition",
  *    "Docx": "DocumentExportDefinition\Section\Encoded\DocxDefinition",
- *    "Flowchart": "DocumentExportDefinition\Section\Encoded\FlowchartDefinition",
  *    "Image": "DocumentExportDefinition\Section\Encoded\ImageDefinition",
  *    "Html": "DocumentExportDefinition\Section\Html\HtmlDefinition",
  *    "HtmlImage": "DocumentExportDefinition\Section\Html\HtmlImageDefinition",

diff --git a/DocumentExportDefinition/Section/Encoded/AbstractEncodedDataDefinition.php b/DocumentExportDefinition/Section/Encoded/AbstractEncodedDataDefinition.php
@@ -69,7 +69,7 @@ public function getEncodedValue()
 	}
 
 	/**
-	 * @param int $mimeType
+	 * @param string $mimeType
 	 * @return $this
 	 */
 	public function setMimeType($mimeType)
@@ -79,7 +79,7 @@ public function setMimeType($mimeType)
 	}
 
 	/**
-	 * @param int $extension
+	 * @param string $extension
 	 * @return $this
 	 */
 	public function setExtension($extension)
@@ -88,13 +88,16 @@ public function setExtension($extension)
 		return $this;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getExtension()
 	{
 		return $this->extension;
 	}
 
 	/**
-	 * @return int
+	 * @return string
 	 */
 	public function getMimeType()
 	{

diff --git a/DocumentExportDefinition/Section/Encoded/FlowchartDefinition.php b/DocumentExportDefinition/Section/Encoded/FlowchartDefinition.php
diff --git a/DocumentExportDefinition/Section/Encoded/ImageDefinition.php b/DocumentExportDefinition/Section/Encoded/ImageDefinition.php
@@ -5,6 +5,19 @@
 
 class ImageDefinition extends AbstractEncodedDataDefinition
 {
+	/**
+	 * @Serializer\Type("int")
+	 * @var int|null
+	 */
+	protected $width = null;
+
+	/**
+	 * @Serializer\Type("int")
+	 * @var int|null
+	 * @nu
+	 */
+	protected $height = null;
+
     /**
      * @Serializer\VirtualProperty
      * @Serializer\SerializedName("objectType")
@@ -15,4 +28,40 @@ public function getType()
 	{
 		return 'ImageDefinition';
 	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getWidth(): ?int
+	{
+		return $this->width;
+	}
+
+	/**
+	 * @param int|null $width
+	 * @return self
+	 */
+	public function setWidth(?int $width): self
+	{
+		$this->width = $width;
+		return $this;
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getHeight(): ?int
+	{
+		return $this->height;
+	}
+
+	/**
+	 * @param int|null $height
+	 * @return self
+	 */
+	public function setHeight(?int $height): self
+	{
+		$this->height = $height;
+		return $this;
+	}
 }