Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop

Author: Bas-Jan 't Jong

CHANGELOG.md

@@ -36,6 +36,7 @@ This release marked the change of PHPWord license from LGPL 2.1 to LGPL 3; new r
 - Header: All images added to the second header were assigned to the first header - @basjan GH-222
 - Conversion: Fix conversion from cm to pixel, pixel to cm, and pixel to point - @basjan GH-233 GH-234
 - PageBreak: Page break adds new line in the beginning of the new page - @ivanlanin GH-150
+- Image: `marginLeft` and `marginTop` cannot accept float value - @ivanlanin GH-248
 
 ### Deprecated
 

src/PhpWord/Style/AbstractStyle.php

@@ -245,7 +245,7 @@ protected function setFloatVal($value, $default = null)
         if (is_string($value) && (preg_match('/[^\d\.\,]/', $value) == 0)) {
             $value = floatval($value);
         }
-        if (!is_float($value)) {
+        if (!is_numeric($value)) {
             $value = $default;
         }
 

src/PhpWord/Style/Image.php

@@ -102,14 +102,14 @@ class Image extends AbstractStyle
     /**
      * Margin Top
      *
-     * @var int
+     * @var int|float
      */
     private $marginTop = 0;
 
     /**
      * Margin Left
      *
-     * @var int
+     * @var int|float
      */
     private $marginLeft = 0;
 
@@ -235,7 +235,7 @@ public function setAlign($value = null)
     /**
      * Get margin top
      *
-     * @return int
+     * @return int|float
      */
     public function getMarginTop()
     {
@@ -245,20 +245,20 @@ public function getMarginTop()
     /**
      * Set margin top
      *
-     * @param int $value
+     * @param int|float $value
      * @return self
      */
     public function setMarginTop($value = 0)
     {
-        $this->marginTop = $this->setIntVal($value, 0);
+        $this->marginTop = $this->setNumericVal($value, 0);
 
         return $this;
     }
 
     /**
      * Get margin left
      *
-     * @return int
+     * @return int|float
      */
     public function getMarginLeft()
     {
@@ -268,12 +268,12 @@ public function getMarginLeft()
     /**
      * Set margin left
      *
-     * @param int $value
+     * @param int|float $value
      * @return self
      */
     public function setMarginLeft($value = 0)
     {
-        $this->marginLeft = $this->setIntVal($value, 0);
+        $this->marginLeft = $this->setNumericVal($value, 0);
 
         return $this;
     }