Merge pull request #43 from Progi1984/fixTyping

Fixed typing & Added conversion from points to EMU

Author: Progi1984

src/Common/Drawing.php

@@ -24,11 +24,11 @@ class Drawing
     /**
      * Convert pixels to EMU
      *
-     * @param int $pValue Value in pixels
+     * @param float $pValue Value in pixels
      *
      * @return float
      */
-    public static function pixelsToEmu(int $pValue = 0): float
+    public static function pixelsToEmu(float $pValue = 0): float
     {
         return round($pValue * 9525);
     }
@@ -38,15 +38,15 @@ public static function pixelsToEmu(int $pValue = 0): float
      *
      * @param int $pValue Value in EMU
      *
-     * @return float
+     * @return int
      */
-    public static function emuToPixels(int $pValue = 0): float
+    public static function emuToPixels(int $pValue = 0): int
     {
         if ($pValue == 0) {
             return 0;
         }
 
-        return round($pValue / 9525);
+        return (int) round($pValue / 9525);
     }
 
     /**
@@ -96,11 +96,11 @@ public static function centimetersToPoints(float $pValue = 0): float
     /**
      * Convert points width to pixels
      *
-     * @param int $pValue Value in points
+     * @param float $pValue Value in points
      *
      * @return float
      */
-    public static function pointsToPixels(int $pValue = 0): float
+    public static function pointsToPixels(float $pValue = 0): float
     {
         if ($pValue == 0) {
             return 0;
@@ -125,17 +125,17 @@ public static function pixelsToCentimeters(int $pValue = 0): float
     /**
      * Convert centimeters width to pixels
      *
-     * @param int $pValue Value in centimeters
+     * @param float $pValue Value in centimeters
      *
-     * @return float
+     * @return int
      */
-    public static function centimetersToPixels(int $pValue = 0): float
+    public static function centimetersToPixels(float $pValue = 0): int
     {
         if ($pValue == 0) {
             return 0;
         }
 
-        return ($pValue / 2.54) * self::DPI_96;
+        return (int) round((($pValue / 2.54) * self::DPI_96));
     }
 
     /**
@@ -246,6 +246,22 @@ public static function twipsToPixels(int $pValue = 0): float
         return round($pValue / 15);
     }
 
+    /**
+     * Convert points to emu
+     *
+     * @param float $pValue
+     *
+     * @return int
+     */
+    public static function pointsToEmu(float $pValue = 0): int
+    {
+        if ($pValue == 0) {
+            return 0;
+        }
+
+        return (int) round(($pValue / 0.75) / 9525);
+    }
+
     /**
      * Convert HTML hexadecimal to RGB
      *

tests/Common/Tests/DrawingTest.php

@@ -43,7 +43,7 @@ public function testPixelsCentimeters(): void
         $this->assertEquals(0, Drawing::pixelsToCentimeters());
         $this->assertEquals($value / Drawing::DPI_96 * 2.54, Drawing::pixelsToCentimeters($value));
         $this->assertEquals(0, Drawing::centimetersToPixels());
-        $this->assertEquals($value / 2.54 * Drawing::DPI_96, Drawing::centimetersToPixels($value));
+        $this->assertEquals(round($value / 2.54 * Drawing::DPI_96), Drawing::centimetersToPixels($value));
     }
 
     public function testPixelsEMU(): void
@@ -74,6 +74,14 @@ public function testPointsCentimeters(): void
         $this->assertEquals($value / 0.75 / Drawing::DPI_96 * 2.54, Drawing::pointsToCentimeters($value));
     }
 
+    public function testPointsEmu(): void
+    {
+        $value = rand(1, 100);
+
+        $this->assertEquals(0, Drawing::pointsToEmu());
+        $this->assertEquals(round($value / 0.75 / 9525), Drawing::pointsToEmu($value));
+    }
+
     public function testCentimetersPoints(): void
     {
         $this->assertEquals(0, Drawing::centimetersToPoints());