diff --git a/Classes/PHPExcel/Shared/CodePage.php b/Classes/PHPExcel/Shared/CodePage.php index 2389296e..74e4b37d 100644 --- a/Classes/PHPExcel/Shared/CodePage.php +++ b/Classes/PHPExcel/Shared/CodePage.php @@ -39,11 +39,11 @@ class PHPExcel_Shared_CodePage * Convert Microsoft Code Page Identifier to Code Page Name which iconv * and mbstring understands * - * @param int $number Microsoft Code Page Indentifier + * @param integer $codePage Microsoft Code Page Indentifier * @return string Code Page Name * @throws Exception */ - public static function NumberToName($codePage = '1252') + public static function NumberToName($codePage = 1252) { switch ($codePage) { case 367: return 'ASCII'; break; // ASCII diff --git a/Classes/PHPExcel/Shared/Excel5.php b/Classes/PHPExcel/Shared/Excel5.php index 67611896..99040760 100644 --- a/Classes/PHPExcel/Shared/Excel5.php +++ b/Classes/PHPExcel/Shared/Excel5.php @@ -40,7 +40,7 @@ class PHPExcel_Shared_Excel5 * This holds for Arial 10 * * @param PHPExcel_Worksheet $sheet The sheet - * @param integer $col The column + * @param string $col The column * @return integer The width in pixels */ public static function sizeCol($sheet, $col = 'A') @@ -136,9 +136,9 @@ class PHPExcel_Shared_Excel5 * * @param PHPExcel_Worksheet $sheet * @param string $startColumn - * @param integer $startOffset Offset within start cell measured in 1/1024 of the cell width + * @param integer $startOffsetX Offset within start cell measured in 1/1024 of the cell width * @param string $endColumn - * @param integer $endOffset Offset within end cell measured in 1/1024 of the cell width + * @param integer $endOffsetX Offset within end cell measured in 1/1024 of the cell width * @return integer Horizontal measured in pixels */ public static function getDistanceX(PHPExcel_Worksheet $sheet, $startColumn = 'A', $startOffsetX = 0, $endColumn = 'A', $endOffsetX = 0) @@ -166,10 +166,10 @@ class PHPExcel_Shared_Excel5 * The distanceY is found as sum of all the spanning rows minus two offsets * * @param PHPExcel_Worksheet $sheet - * @param string $startRow (1-based) - * @param integer $startOffset Offset within start cell measured in 1/256 of the cell height - * @param string $endRow (1-based) - * @param integer $endOffset Offset within end cell measured in 1/256 of the cell height + * @param integer $startRow (1-based) + * @param integer $startOffsetY Offset within start cell measured in 1/256 of the cell height + * @param integer $endRow (1-based) + * @param integer $endOffsetY Offset within end cell measured in 1/256 of the cell height * @return integer Vertical distance measured in pixels */ public static function getDistanceY(PHPExcel_Worksheet $sheet, $startRow = 1, $startOffsetY = 0, $endRow = 1, $endOffsetY = 0) diff --git a/Classes/PHPExcel/Shared/String.php b/Classes/PHPExcel/Shared/String.php index 3b88ec93..49e963c9 100644 --- a/Classes/PHPExcel/Shared/String.php +++ b/Classes/PHPExcel/Shared/String.php @@ -621,7 +621,7 @@ class PHPExcel_Shared_String public static function StrToTitle($pValue = '') { if (function_exists('mb_convert_case')) { - return mb_convert_case($pValue, MB_CASE_LOWER, "UTF-8"); + return mb_convert_case($pValue, MB_CASE_TITLE, "UTF-8"); } return ucwords($pValue); } diff --git a/Classes/PHPExcel/Shared/TimeZone.php b/Classes/PHPExcel/Shared/TimeZone.php index 02a01584..be18f633 100644 --- a/Classes/PHPExcel/Shared/TimeZone.php +++ b/Classes/PHPExcel/Shared/TimeZone.php @@ -85,7 +85,7 @@ class PHPExcel_Shared_TimeZone /** * Return the Timezone transition for the specified timezone and timestamp * - * @param string $timezone The timezone for finding the transitions + * @param DateTimeZone $objTimezone The timezone for finding the transitions * @param integer $timestamp PHP date/time value for finding the current transition * @return array The current transition details */