Skip to content

Commit

Permalink
Merge pull request PHPOffice#1818 from caugner/patch-1
Browse files Browse the repository at this point in the history
Fixes PHPDoc @param and @return types for several Converter methods
  • Loading branch information
troosan authored Aug 30, 2020
2 parents 21f4bb3 + 1dee5f3 commit ec1b3d3
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions src/PhpWord/Shared/Converter.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public static function inchToPoint($inch = 1)
* Convert inch to EMU
*
* @param float $inch
* @return float
* @return int
*/
public static function inchToEmu($inch = 1)
{
Expand All @@ -143,7 +143,7 @@ public static function inchToEmu($inch = 1)
/**
* Convert pixel to twip
*
* @param int $pixel
* @param float $pixel
* @return float
*/
public static function pixelToTwip($pixel = 1)
Expand All @@ -154,7 +154,7 @@ public static function pixelToTwip($pixel = 1)
/**
* Convert pixel to centimeter
*
* @param int $pixel
* @param float $pixel
* @return float
*/
public static function pixelToCm($pixel = 1)
Expand All @@ -165,7 +165,7 @@ public static function pixelToCm($pixel = 1)
/**
* Convert pixel to point
*
* @param int $pixel
* @param float $pixel
* @return float
*/
public static function pixelToPoint($pixel = 1)
Expand All @@ -176,7 +176,7 @@ public static function pixelToPoint($pixel = 1)
/**
* Convert pixel to EMU
*
* @param int $pixel
* @param float $pixel
* @return int
*/
public static function pixelToEmu($pixel = 1)
Expand All @@ -187,7 +187,7 @@ public static function pixelToEmu($pixel = 1)
/**
* Convert point to twip unit
*
* @param int $point
* @param float $point
* @return float
*/
public static function pointToTwip($point = 1)
Expand All @@ -209,7 +209,7 @@ public static function pointToPixel($point = 1)
/**
* Convert point to EMU
*
* @param int $point
* @param float $point
* @return float
*/
public static function pointToEmu($point = 1)
Expand All @@ -231,7 +231,7 @@ public static function pointToCm($point = 1)
/**
* Convert EMU to pixel
*
* @param int $emu
* @param float $emu
* @return float
*/
public static function emuToPixel($emu = 1)
Expand All @@ -242,7 +242,7 @@ public static function emuToPixel($emu = 1)
/**
* Convert pica to point
*
* @param int $pica
* @param float $pica
* @return float
*/
public static function picaToPoint($pica = 1)
Expand All @@ -253,7 +253,7 @@ public static function picaToPoint($pica = 1)
/**
* Convert degree to angle
*
* @param int $degree
* @param float $degree
* @return int
*/
public static function degreeToAngle($degree = 1)
Expand All @@ -264,7 +264,7 @@ public static function degreeToAngle($degree = 1)
/**
* Convert angle to degrees
*
* @param int $angle
* @param float $angle
* @return int
*/
public static function angleToDegree($angle = 1)
Expand Down

0 comments on commit ec1b3d3

Please sign in to comment.