Support for padding in a table cell. fix code style

OlisaevAG · OlisaevAG · commit ab9e012974e5 · 2024-11-19T17:23:41.000+03:00
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -805,24 +805,24 @@ protected static function parseStyleDeclarations(array $selectors, array $styles
                     break;
 
                 case 'padding':
-                    $valueTop   = $valueRight = $valueBottom = $valueLeft = null;
-                    $cValue      = preg_replace('# +#', ' ', trim($value));
-                    $paddingArr  = explode(' ', $cValue);
+                    $valueTop = $valueRight = $valueBottom = $valueLeft = null;
+                    $cValue = preg_replace('# +#', ' ', trim($value));
+                    $paddingArr = explode(' ', $cValue);
                     $countParams = count($paddingArr);
                     if ($countParams == 1) {
                         $valueTop = $valueRight = $valueBottom = $valueLeft = $paddingArr[0];
                     } elseif ($countParams == 2) {
-                        $valueTop   = $valueBottom = $paddingArr[0];
+                        $valueTop = $valueBottom = $paddingArr[0];
                         $valueRight = $valueLeft = $paddingArr[1];
                     } elseif ($countParams == 3) {
-                        $valueTop    = $paddingArr[0];
-                        $valueRight  = $valueLeft = $paddingArr[1];
+                        $valueTop = $paddingArr[0];
+                        $valueRight = $valueLeft = $paddingArr[1];
                         $valueBottom = $paddingArr[2];
                     } elseif ($countParams == 4) {
-                        $valueTop    = $paddingArr[0];
-                        $valueRight  = $paddingArr[1];
+                        $valueTop = $paddingArr[0];
+                        $valueRight = $paddingArr[1];
                         $valueBottom = $paddingArr[2];
-                        $valueLeft   = $paddingArr[3];
+                        $valueLeft = $paddingArr[3];
                     }
                     if ($valueTop !== null) {
                         $styles['paddingTop'] = Converter::cssToTwip($valueTop);
@@ -836,18 +836,23 @@ protected static function parseStyleDeclarations(array $selectors, array $styles
                     if ($valueLeft !== null) {
                         $styles['paddingLeft'] = Converter::cssToTwip($valueLeft);
                     }
+
                     break;
                 case 'padding-top':
                     $styles['paddingTop'] = Converter::cssToTwip($value);
+
                     break;
                 case 'padding-right':
                     $styles['paddingRight'] = Converter::cssToTwip($value);
+
                     break;
                 case 'padding-bottom':
                     $styles['paddingBottom'] = Converter::cssToTwip($value);
+
                     break;
                 case 'padding-left':
                     $styles['paddingLeft'] = Converter::cssToTwip($value);
+
                     break;
 
                 case 'border-color':
diff --git a/src/PhpWord/Style/Cell.php b/src/PhpWord/Style/Cell.php
@@ -377,60 +377,66 @@ public function getNoWrap(): bool
         return $this->noWrap;
     }
 
-
     /**
      * Get style padding-top.
+     *
      * @return mixed
      */
     public function getPaddingTop()
     {
         return $this->paddingTop;
     }
+
     /**
      * Set style padding-top.
-     * @param  int $value
      *
      * @return $this
      */
-    public function setPaddingTop(int $value): Cell
+    public function setPaddingTop(int $value): self
     {
         $this->paddingTop = $value;
+
         return $this;
     }
+
     /**
      * Get style padding-bottom.
+     *
      * @return mixed
      */
     public function getPaddingBottom()
     {
         return $this->paddingBottom;
     }
+
     /**
      * Set style padding-bottom.
-     * @param int $value
      *
      * @return $this
      */
-    public function setPaddingBottom(int $value): Cell
+    public function setPaddingBottom(int $value): self
     {
         $this->paddingBottom = $value;
+
         return $this;
     }
+
     /**
      * Get style padding-left.
+     *
      * @return mixed
      */
     public function getPaddingLeft()
     {
         return $this->paddingLeft;
     }
+
     /**
      * Set style padding-left.
-     * @param int $value
      *
      * @return $this
      */
-    public function setPaddingLeft(int $value): Cell
+    public function setPaddingLeft(int $value): self
     {
         $this->paddingLeft = $value;
 
@@ -439,6 +445,7 @@ public function setPaddingLeft(int $value): Cell
 
     /**
      * Get style padding-right.
+     *
      * @return mixed
      */
     public function getPaddingRight()
@@ -448,11 +455,10 @@ public function getPaddingRight()
 
     /**
      * Set style padding-right.
-     * @param int $value
      *
      * @return $this
      */
-    public function setPaddingRight(int $value): Cell
+    public function setPaddingRight(int $value): self
     {
         $this->paddingRight = $value;
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Cell.php b/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -59,27 +59,27 @@ public function write(): void
         $paddingBottom = $style->getPaddingBottom();
         $paddingRight = $style->getPaddingRight();
 
-        if($paddingTop !== null || $paddingLeft !== null || $paddingBottom !== null || $paddingRight !== null){
+        if ($paddingTop !== null || $paddingLeft !== null || $paddingBottom !== null || $paddingRight !== null) {
             $xmlWriter->startElement('w:tcMar');
-            if($paddingTop !== null) {
+            if ($paddingTop !== null) {
                 $xmlWriter->startElement('w:top');
                 $xmlWriter->writeAttribute('w:w', $paddingTop);
                 $xmlWriter->writeAttribute('w:type', \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP);
                 $xmlWriter->endElement(); // w:top
             }
-            if($paddingLeft !== null) {
+            if ($paddingLeft !== null) {
                 $xmlWriter->startElement('w:start');
                 $xmlWriter->writeAttribute('w:w', $paddingLeft);
                 $xmlWriter->writeAttribute('w:type', \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP);
                 $xmlWriter->endElement(); // w:start
             }
-            if($paddingBottom !== null) {
+            if ($paddingBottom !== null) {
                 $xmlWriter->startElement('w:bottom');
                 $xmlWriter->writeAttribute('w:w', $paddingBottom);
                 $xmlWriter->writeAttribute('w:type', \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP);
                 $xmlWriter->endElement(); // w:bottom
             }
-            if($paddingRight !== null){
+            if ($paddingRight !== null) {
                 $xmlWriter->startElement('w:end');
                 $xmlWriter->writeAttribute('w:w', $paddingRight);
                 $xmlWriter->writeAttribute('w:type', \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP);

Original file line number	Diff line number	Diff line change
`@@ -377,60 +377,66 @@ public function getNoWrap(): bool`
`377`	`377`	`return $this->noWrap;`
`378`	`378`	`}`
`379`	`379`
`380`		`-`
`381`	`380`	`/**`
`382`	`381`	`* Get style padding-top.`
	`382`	`+ *`
`383`	`383`	`* @return mixed`
`384`	`384`	`*/`
`385`	`385`	`public function getPaddingTop()`
`386`	`386`	`{`
`387`	`387`	`return $this->paddingTop;`
`388`	`388`	`}`
	`389`	`+`
`389`	`390`	`/**`
`390`	`391`	`* Set style padding-top.`
`391`		`- * @param int $value`
`392`	`392`	`*`
`393`	`393`	`* @return $this`
`394`	`394`	`*/`
`395`		`- public function setPaddingTop(int $value): Cell`
	`395`	`+ public function setPaddingTop(int $value): self`
`396`	`396`	`{`
`397`	`397`	`$this->paddingTop = $value;`
	`398`	`+`
`398`	`399`	`return $this;`
`399`	`400`	`}`
	`401`	`+`
`400`	`402`	`/**`
`401`	`403`	`* Get style padding-bottom.`
	`404`	`+ *`
`402`	`405`	`* @return mixed`
`403`	`406`	`*/`
`404`	`407`	`public function getPaddingBottom()`
`405`	`408`	`{`
`406`	`409`	`return $this->paddingBottom;`
`407`	`410`	`}`
	`411`	`+`
`408`	`412`	`/**`
`409`	`413`	`* Set style padding-bottom.`
`410`		`- * @param int $value`
`411`	`414`	`*`
`412`	`415`	`* @return $this`
`413`	`416`	`*/`
`414`		`- public function setPaddingBottom(int $value): Cell`
	`417`	`+ public function setPaddingBottom(int $value): self`
`415`	`418`	`{`
`416`	`419`	`$this->paddingBottom = $value;`
	`420`	`+`
`417`	`421`	`return $this;`
`418`	`422`	`}`
	`423`	`+`
`419`	`424`	`/**`
`420`	`425`	`* Get style padding-left.`
	`426`	`+ *`
`421`	`427`	`* @return mixed`
`422`	`428`	`*/`
`423`	`429`	`public function getPaddingLeft()`
`424`	`430`	`{`
`425`	`431`	`return $this->paddingLeft;`
`426`	`432`	`}`
	`433`	`+`
`427`	`434`	`/**`
`428`	`435`	`* Set style padding-left.`
`429`		`- * @param int $value`
`430`	`436`	`*`
`431`	`437`	`* @return $this`
`432`	`438`	`*/`
`433`		`- public function setPaddingLeft(int $value): Cell`
	`439`	`+ public function setPaddingLeft(int $value): self`
`434`	`440`	`{`
`435`	`441`	`$this->paddingLeft = $value;`
`436`	`442`
`@@ -439,6 +445,7 @@ public function setPaddingLeft(int $value): Cell`
`439`	`445`
`440`	`446`	`/**`
`441`	`447`	`* Get style padding-right.`
	`448`	`+ *`
`442`	`449`	`* @return mixed`
`443`	`450`	`*/`
`444`	`451`	`public function getPaddingRight()`
`@@ -448,11 +455,10 @@ public function getPaddingRight()`
`448`	`455`
`449`	`456`	`/**`
`450`	`457`	`* Set style padding-right.`
`451`		`- * @param int $value`
`452`	`458`	`*`
`453`	`459`	`* @return $this`
`454`	`460`	`*/`
`455`		`- public function setPaddingRight(int $value): Cell`
	`461`	`+ public function setPaddingRight(int $value): self`
`456`	`462`	`{`
`457`	`463`	`$this->paddingRight = $value;`
`458`	`464`