'; + // echo 'Summary Information
'; $this->summaryInformation = count($this->props) - 1; } // Additional Document Summary information if ($name == chr(5) . 'DocumentSummaryInformation') { -// echo 'Document Summary Information
'; + // echo 'Document Summary Information
'; $this->documentSummaryInformation = count($this->props) - 1; } @@ -315,6 +313,7 @@ class OLERead } else { $_ord_24 = ($_or_24 & 127) << 24; } + return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24; } } diff --git a/src/PhpSpreadsheet/Shared/PCLZip/PclZip.php b/src/PhpSpreadsheet/Shared/PCLZip/PclZip.php index 7e1b7699..9c6ab98b 100644 --- a/src/PhpSpreadsheet/Shared/PCLZip/PclZip.php +++ b/src/PhpSpreadsheet/Shared/PCLZip/PclZip.php @@ -86,7 +86,7 @@ if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) { // -------------------------------------------------------------------------------- // ----- Global variables -$g_pclzip_version = "2.8.2"; +$g_pclzip_version = '2.8.2'; // ----- Error codes // -1 : Unable to open file in binary write mode @@ -220,7 +220,7 @@ class PclZip // ----- Tests the zlib if (!function_exists('gzopen')) { - die('Abort '.basename(__FILE__).' : Missing zlib extensions'); + die('Abort ' . basename(__FILE__) . ' : Missing zlib extensions'); } // ----- Set the attributes @@ -272,13 +272,13 @@ class PclZip // -------------------------------------------------------------------------------- public function create($p_filelist) { - $v_result=1; + $v_result = 1; // ----- Reset the error handler $this->privErrorReset(); // ----- Set default values - $v_options = array(); + $v_options = []; $v_options[PCLZIP_OPT_NO_COMPRESSION] = false; // ----- Look for variable options arguments @@ -291,12 +291,12 @@ class PclZip // ----- Remove from the options list the first argument array_shift($v_arg_list); - $v_size--; + --$v_size; // ----- Look for first arg if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) { // ----- Parse the options - $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array ( + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, [ PCLZIP_OPT_REMOVE_PATH => 'optional', PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', PCLZIP_OPT_ADD_PATH => 'optional', @@ -306,9 +306,9 @@ class PclZip PCLZIP_OPT_COMMENT => 'optional', PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional', PCLZIP_OPT_TEMP_FILE_ON => 'optional', - PCLZIP_OPT_TEMP_FILE_OFF => 'optional' + PCLZIP_OPT_TEMP_FILE_OFF => 'optional', //, PCLZIP_OPT_CRYPT => 'optional' - )); + ]); if ($v_result != 1) { return 0; } @@ -323,7 +323,8 @@ class PclZip if ($v_size == 2) { $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1]; } elseif ($v_size > 2) { - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments"); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Invalid number / type of arguments'); + return 0; } } @@ -333,10 +334,10 @@ class PclZip $this->privOptionDefaultThreshold($v_options); // ----- Init - $v_string_list = array(); - $v_att_list = array(); - $v_filedescr_list = array(); - $p_result_list = array(); + $v_string_list = []; + $v_att_list = []; + $v_filedescr_list = []; + $p_result_list = []; // ----- Look if the $p_filelist is really an array if (is_array($p_filelist)) { @@ -354,7 +355,8 @@ class PclZip $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist); } else { // ----- Invalid variable type for $p_filelist - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist"); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Invalid variable type p_filelist'); + return 0; } @@ -369,14 +371,14 @@ class PclZip } // ----- For each file in the list check the attributes - $v_supported_attributes = array( + $v_supported_attributes = [ PCLZIP_ATT_FILE_NAME => 'mandatory', PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional', PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional', PCLZIP_ATT_FILE_MTIME => 'optional', PCLZIP_ATT_FILE_CONTENT => 'optional', - PCLZIP_ATT_FILE_COMMENT => 'optional' - ); + PCLZIP_ATT_FILE_COMMENT => 'optional', + ]; foreach ($v_att_list as $v_entry) { $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes); if ($v_result != 1) { @@ -438,13 +440,13 @@ class PclZip // -------------------------------------------------------------------------------- public function add($p_filelist) { - $v_result=1; + $v_result = 1; // ----- Reset the error handler $this->privErrorReset(); // ----- Set default values - $v_options = array(); + $v_options = []; $v_options[PCLZIP_OPT_NO_COMPRESSION] = false; // ----- Look for variable options arguments @@ -457,12 +459,12 @@ class PclZip // ----- Remove form the options list the first argument array_shift($v_arg_list); - $v_size--; + --$v_size; // ----- Look for first arg if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) { // ----- Parse the options - $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array ( + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, [ PCLZIP_OPT_REMOVE_PATH => 'optional', PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', PCLZIP_OPT_ADD_PATH => 'optional', @@ -474,9 +476,9 @@ class PclZip PCLZIP_OPT_PREPEND_COMMENT => 'optional', PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional', PCLZIP_OPT_TEMP_FILE_ON => 'optional', - PCLZIP_OPT_TEMP_FILE_OFF => 'optional' + PCLZIP_OPT_TEMP_FILE_OFF => 'optional', //, PCLZIP_OPT_CRYPT => 'optional' - )); + ]); if ($v_result != 1) { return 0; } @@ -492,7 +494,7 @@ class PclZip $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1]; } elseif ($v_size > 2) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments"); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Invalid number / type of arguments'); // ----- Return return 0; @@ -504,10 +506,10 @@ class PclZip $this->privOptionDefaultThreshold($v_options); // ----- Init - $v_string_list = array(); - $v_att_list = array(); - $v_filedescr_list = array(); - $p_result_list = array(); + $v_string_list = []; + $v_att_list = []; + $v_filedescr_list = []; + $p_result_list = []; // ----- Look if the $p_filelist is really an array if (is_array($p_filelist)) { @@ -525,7 +527,8 @@ class PclZip $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist); } else { // ----- Invalid variable type for $p_filelist - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist"); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist"); + return 0; } @@ -537,14 +540,14 @@ class PclZip } // ----- For each file in the list check the attributes - $v_supported_attributes = array( + $v_supported_attributes = [ PCLZIP_ATT_FILE_NAME => 'mandatory', PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional', PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional', PCLZIP_ATT_FILE_MTIME => 'optional', PCLZIP_ATT_FILE_CONTENT => 'optional', PCLZIP_ATT_FILE_COMMENT => 'optional', - ); + ]; foreach ($v_att_list as $v_entry) { $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes); if ($v_result != 1) { @@ -612,21 +615,22 @@ class PclZip // -------------------------------------------------------------------------------- public function listContent() { - $v_result=1; + $v_result = 1; // ----- Reset the error handler $this->privErrorReset(); // ----- Check archive if (!$this->privCheckFormat()) { - return(0); + return 0; } // ----- Call the extracting fct - $p_list = array(); + $p_list = []; if (($v_result = $this->privList($p_list)) != 1) { unset($p_list); - return(0); + + return 0; } // ----- Return @@ -668,21 +672,21 @@ class PclZip // -------------------------------------------------------------------------------- public function extract() { - $v_result=1; + $v_result = 1; // ----- Reset the error handler $this->privErrorReset(); // ----- Check archive if (!$this->privCheckFormat()) { - return(0); + return 0; } // ----- Set default values - $v_options = array(); + $v_options = []; // $v_path = "./"; $v_path = ''; - $v_remove_path = ""; + $v_remove_path = ''; $v_remove_all_path = false; // ----- Look for variable options arguments @@ -699,7 +703,7 @@ class PclZip // ----- Look for first arg if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) { // ----- Parse the options - $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array ( + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, [ PCLZIP_OPT_PATH => 'optional', PCLZIP_OPT_REMOVE_PATH => 'optional', PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', @@ -718,8 +722,8 @@ class PclZip PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional', PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional', PCLZIP_OPT_TEMP_FILE_ON => 'optional', - PCLZIP_OPT_TEMP_FILE_OFF => 'optional' - )); + PCLZIP_OPT_TEMP_FILE_OFF => 'optional', + ]); if ($v_result != 1) { return 0; } @@ -753,7 +757,7 @@ class PclZip $v_remove_path = $v_arg_list[1]; } elseif ($v_size > 2) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments"); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Invalid number / type of arguments'); // ----- Return return 0; @@ -767,11 +771,12 @@ class PclZip // ----- Trace // ----- Call the extracting fct - $p_list = array(); + $p_list = []; $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options); if ($v_result < 1) { unset($p_list); - return(0); + + return 0; } // ----- Return @@ -779,7 +784,6 @@ class PclZip } // -------------------------------------------------------------------------------- - // -------------------------------------------------------------------------------- // Function : // extractByIndex($p_index, $p_path="./", $p_remove_path="") @@ -819,21 +823,21 @@ class PclZip //function extractByIndex($p_index, options...) public function extractByIndex($p_index) { - $v_result=1; + $v_result = 1; // ----- Reset the error handler $this->privErrorReset(); // ----- Check archive if (!$this->privCheckFormat()) { - return(0); + return 0; } // ----- Set default values - $v_options = array(); + $v_options = []; // $v_path = "./"; $v_path = ''; - $v_remove_path = ""; + $v_remove_path = ''; $v_remove_all_path = false; // ----- Look for variable options arguments @@ -849,12 +853,12 @@ class PclZip // ----- Remove form the options list the first argument array_shift($v_arg_list); - $v_size--; + --$v_size; // ----- Look for first arg if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) { // ----- Parse the options - $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array( + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, [ PCLZIP_OPT_PATH => 'optional', PCLZIP_OPT_REMOVE_PATH => 'optional', PCLZIP_OPT_REMOVE_ALL_PATH => 'optional', @@ -868,8 +872,8 @@ class PclZip PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional', PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional', PCLZIP_OPT_TEMP_FILE_ON => 'optional', - PCLZIP_OPT_TEMP_FILE_OFF => 'optional' - )); + PCLZIP_OPT_TEMP_FILE_OFF => 'optional', + ]); if ($v_result != 1) { return 0; } @@ -908,7 +912,7 @@ class PclZip $v_remove_path = $v_arg_list[1]; } elseif ($v_size > 2) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments"); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Invalid number / type of arguments'); // ----- Return return 0; @@ -921,9 +925,9 @@ class PclZip // ----- Trick // Here I want to reuse extractByRule(), so I need to parse the $p_index // with privParseOptions() - $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index); - $v_options_trick = array(); - $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array (PCLZIP_OPT_BY_INDEX => 'optional')); + $v_arg_trick = [PCLZIP_OPT_BY_INDEX, $p_index]; + $v_options_trick = []; + $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, [PCLZIP_OPT_BY_INDEX => 'optional']); if ($v_result != 1) { return 0; } @@ -934,7 +938,7 @@ class PclZip // ----- Call the extracting fct if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) { - return(0); + return 0; } // ----- Return @@ -962,18 +966,18 @@ class PclZip // -------------------------------------------------------------------------------- public function delete() { - $v_result=1; + $v_result = 1; // ----- Reset the error handler $this->privErrorReset(); // ----- Check archive if (!$this->privCheckFormat()) { - return(0); + return 0; } // ----- Set default values - $v_options = array(); + $v_options = []; // ----- Look for variable options arguments $v_size = func_num_args(); @@ -984,14 +988,14 @@ class PclZip $v_arg_list = func_get_args(); // ----- Parse the options - $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array ( + $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, [ PCLZIP_OPT_BY_NAME => 'optional', PCLZIP_OPT_BY_EREG => 'optional', PCLZIP_OPT_BY_PREG => 'optional', - PCLZIP_OPT_BY_INDEX => 'optional' - )); + PCLZIP_OPT_BY_INDEX => 'optional', + ]); if ($v_result != 1) { - return 0; + return 0; } } @@ -999,11 +1003,12 @@ class PclZip $this->privDisableMagicQuotes(); // ----- Call the delete fct - $v_list = array(); + $v_list = []; if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) { $this->privSwapBackMagicQuotes(); unset($v_list); - return(0); + + return 0; } // ----- Magic quotes trick @@ -1022,7 +1027,6 @@ class PclZip // -------------------------------------------------------------------------------- public function deleteByIndex($p_index) { - $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index); // ----- Return @@ -1056,11 +1060,12 @@ class PclZip // ----- Check archive if (!$this->privCheckFormat()) { $this->privSwapBackMagicQuotes(); - return(0); + + return 0; } // ----- Default properties - $v_prop = array(); + $v_prop = []; $v_prop['comment'] = ''; $v_prop['nb'] = 0; $v_prop['status'] = 'not_exist'; @@ -1072,16 +1077,17 @@ class PclZip $this->privSwapBackMagicQuotes(); // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode'); + self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode'); // ----- Return return 0; } // ----- Read the central directory informations - $v_central_dir = array(); + $v_central_dir = []; if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) { $this->privSwapBackMagicQuotes(); + return 0; } @@ -1131,7 +1137,7 @@ class PclZip // TBC : Should also check the archive format if (!is_file($p_archive)) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'"); + self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'"); $v_result = PCLZIP_ERR_MISSING_FILE; } else { // ----- Duplicate the archive @@ -1140,7 +1146,7 @@ class PclZip } else { // ----- Invalid variable // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add"); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Invalid variable type p_archive_to_add'); $v_result = PCLZIP_ERR_INVALID_PARAMETER; } @@ -1172,7 +1178,7 @@ class PclZip // ----- Check archive if (!$this->privCheckFormat()) { - return(0); + return 0; } // ----- Look if the $p_archive_to_add is a PclZip object @@ -1182,14 +1188,14 @@ class PclZip } elseif (is_string($p_archive_to_add)) { // ----- Look if the $p_archive_to_add is a string (so a filename) // ----- Create a temporary archive - $v_object_archive = new PclZip($p_archive_to_add); + $v_object_archive = new self($p_archive_to_add); // ----- Merge the archive $v_result = $this->privMerge($v_object_archive); } else { // ----- Invalid variable // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add"); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, 'Invalid variable type p_archive_to_add'); $v_result = PCLZIP_ERR_INVALID_PARAMETER; } @@ -1198,8 +1204,6 @@ class PclZip } // -------------------------------------------------------------------------------- - - // -------------------------------------------------------------------------------- // Function : errorCode() // Description : @@ -1208,9 +1212,9 @@ class PclZip public function errorCode() { if (PCLZIP_ERROR_EXTERNAL == 1) { - return(PclErrorCode()); + return PclErrorCode(); } else { - return($this->error_code); + return $this->error_code; } } // -------------------------------------------------------------------------------- @@ -1222,7 +1226,7 @@ class PclZip // -------------------------------------------------------------------------------- public function errorName($p_with_code = false) { - $v_name = array( + $v_name = [ PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR', PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL', PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL', @@ -1244,7 +1248,7 @@ class PclZip PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION', - ); + ]; if (isset($v_name[$this->error_code])) { $v_value = $v_name[$this->error_code]; @@ -1253,9 +1257,9 @@ class PclZip } if ($p_with_code) { - return($v_value.' ('.$this->error_code.')'); + return $v_value . ' (' . $this->error_code . ')'; } else { - return($v_value); + return $v_value; } } // -------------------------------------------------------------------------------- @@ -1268,26 +1272,23 @@ class PclZip public function errorInfo($p_full = false) { if (PCLZIP_ERROR_EXTERNAL == 1) { - return(PclErrorString()); + return PclErrorString(); } else { if ($p_full) { - return($this->errorName(true)." : ".$this->error_string); + return $this->errorName(true) . ' : ' . $this->error_string; } else { - return($this->error_string." [code ".$this->error_code."]"); + return $this->error_string . ' [code ' . $this->error_code . ']'; } } } // -------------------------------------------------------------------------------- - // -------------------------------------------------------------------------------- // ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS ***** // ***** ***** // ***** THESES FUNCTIONS MUST NOT BE USED DIRECTLY ***** // -------------------------------------------------------------------------------- - - // -------------------------------------------------------------------------------- // Function : privCheckFormat() // Description : @@ -1315,15 +1316,17 @@ class PclZip // ----- Look if the file exits if (!is_file($this->zipname)) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'"); - return(false); + self::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'"); + + return false; } // ----- Check that the file is readeable if (!is_readable($this->zipname)) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'"); - return(false); + self::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'"); + + return false; } // ----- Check the magic code @@ -1357,18 +1360,18 @@ class PclZip // -------------------------------------------------------------------------------- public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false) { - $v_result=1; + $v_result = 1; // ----- Read the options - $i=0; - while ($i<$p_size) { + $i = 0; + while ($i < $p_size) { // ----- Check if the option is supported if (!isset($v_requested_options[$p_options_list[$i]])) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method"); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } // ----- Look for next option @@ -1378,49 +1381,53 @@ class PclZip case PCLZIP_OPT_REMOVE_PATH: case PCLZIP_OPT_ADD_PATH: // ----- Check the number of parameters - if (($i+1) >= $p_size) { + if (($i + 1) >= $p_size) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } // ----- Get the value - $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false); - $i++; + $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false); + ++$i; break; case PCLZIP_OPT_TEMP_FILE_THRESHOLD: // ----- Check the number of parameters - if (($i+1) >= $p_size) { - PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); - return PclZip::errorCode(); + if (($i + 1) >= $p_size) { + self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); + + return self::errorCode(); } // ----- Check for incompatible options if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) { - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'"); - return PclZip::errorCode(); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'"); + + return self::errorCode(); } // ----- Check the value - $v_value = $p_options_list[$i+1]; - if ((!is_integer($v_value)) || ($v_value<0)) { - PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'"); - return PclZip::errorCode(); + $v_value = $p_options_list[$i + 1]; + if ((!is_integer($v_value)) || ($v_value < 0)) { + self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); + + return self::errorCode(); } // ----- Get the value (and convert it in bytes) - $v_result_list[$p_options_list[$i]] = $v_value*1048576; - $i++; + $v_result_list[$p_options_list[$i]] = $v_value * 1048576; + ++$i; break; case PCLZIP_OPT_TEMP_FILE_ON: // ----- Check for incompatible options if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) { - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'"); - return PclZip::errorCode(); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'"); + + return self::errorCode(); } $v_result_list[$p_options_list[$i]] = true; @@ -1429,55 +1436,57 @@ class PclZip case PCLZIP_OPT_TEMP_FILE_OFF: // ----- Check for incompatible options if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) { - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'"); - return PclZip::errorCode(); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'"); + + return self::errorCode(); } // ----- Check for incompatible options if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) { - PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'"); - return PclZip::errorCode(); + self::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'"); + + return self::errorCode(); } $v_result_list[$p_options_list[$i]] = true; break; case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION: // ----- Check the number of parameters - if (($i+1) >= $p_size) { + if (($i + 1) >= $p_size) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } // ----- Get the value - if (is_string($p_options_list[$i+1]) && ($p_options_list[$i+1] != '')) { - $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], false); - $i++; + if (is_string($p_options_list[$i + 1]) && ($p_options_list[$i + 1] != '')) { + $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false); + ++$i; } else { } break; // ----- Look for options that request an array of string for value case PCLZIP_OPT_BY_NAME: // ----- Check the number of parameters - if (($i+1) >= $p_size) { + if (($i + 1) >= $p_size) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } // ----- Get the value - if (is_string($p_options_list[$i+1])) { - $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1]; - } elseif (is_array($p_options_list[$i+1])) { - $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1]; + if (is_string($p_options_list[$i + 1])) { + $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1]; + } elseif (is_array($p_options_list[$i + 1])) { + $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1]; } else { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } - $i++; + ++$i; break; // ----- Look for options that request an EREG or PREG expression case PCLZIP_OPT_BY_EREG: @@ -1488,23 +1497,23 @@ class PclZip case PCLZIP_OPT_BY_PREG: //case PCLZIP_OPT_CRYPT : // ----- Check the number of parameters - if (($i+1) >= $p_size) { + if (($i + 1) >= $p_size) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } // ----- Get the value - if (is_string($p_options_list[$i+1])) { - $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1]; + if (is_string($p_options_list[$i + 1])) { + $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1]; } else { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } - $i++; + ++$i; break; // ----- Look for options that takes a string @@ -1512,67 +1521,67 @@ class PclZip case PCLZIP_OPT_ADD_COMMENT: case PCLZIP_OPT_PREPEND_COMMENT: // ----- Check the number of parameters - if (($i+1) >= $p_size) { + if (($i + 1) >= $p_size) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } // ----- Get the value - if (is_string($p_options_list[$i+1])) { - $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1]; + if (is_string($p_options_list[$i + 1])) { + $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1]; } else { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" .PclZipUtilOptionText($p_options_list[$i]) ."'"); + self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } - $i++; + ++$i; break; // ----- Look for options that request an array of index case PCLZIP_OPT_BY_INDEX: // ----- Check the number of parameters - if (($i+1) >= $p_size) { + if (($i + 1) >= $p_size) { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + self::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } // ----- Get the value - $v_work_list = array(); - if (is_string($p_options_list[$i+1])) { + $v_work_list = []; + if (is_string($p_options_list[$i + 1])) { // ----- Remove spaces - $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', ''); + $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', ''); // ----- Parse items - $v_work_list = explode(",", $p_options_list[$i+1]); - } elseif (is_integer($p_options_list[$i+1])) { - $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1]; - } elseif (is_array($p_options_list[$i+1])) { - $v_work_list = $p_options_list[$i+1]; + $v_work_list = explode(',', $p_options_list[$i + 1]); + } elseif (is_integer($p_options_list[$i + 1])) { + $v_work_list[0] = $p_options_list[$i + 1] . '-' . $p_options_list[$i + 1]; + } elseif (is_array($p_options_list[$i + 1])) { + $v_work_list = $p_options_list[$i + 1]; } else { // ----- Error log - PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'"); + self::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'"); // ----- Return - return PclZip::errorCode(); + return self::errorCode(); } // ----- Reduce the index list // each index item in the list must be a couple with a start and // an end value : [0,3], [5-5], [8-10], ... // ----- Check the format of each item - $v_sort_flag=false; - $v_sort_value=0; - for ($j=0; $j
'; - if ($value != (int)$value) { + if ($value != (int) $value) { self::formatAsFraction($value, $format); } } else { @@ -720,7 +726,7 @@ class NumberFormat extends Supervisor implements \PhpSpreadsheet\IComparable } elseif (preg_match('/0([^\d\.]+)0/', $format)) { $value = self::complexNumberFormatMask($value, $format); } else { - $sprintf_pattern = "%0$minWidth." . strlen($right) . "f"; + $sprintf_pattern = "%0$minWidth." . strlen($right) . 'f'; $value = sprintf($sprintf_pattern, $value); $value = preg_replace($number_regex, $value, $format); } @@ -741,7 +747,7 @@ class NumberFormat extends Supervisor implements \PhpSpreadsheet\IComparable } // Escape any escaped slashes to a single slash - $format = preg_replace("/\\\\/u", '\\', $format); + $format = preg_replace('/\\\\/u', '\\', $format); // Additional formatting provided by callback function if ($callBack !== null) { diff --git a/src/PhpSpreadsheet/Style/Protection.php b/src/PhpSpreadsheet/Style/Protection.php index f30ad6d7..44a9f51c 100644 --- a/src/PhpSpreadsheet/Style/Protection.php +++ b/src/PhpSpreadsheet/Style/Protection.php @@ -27,9 +27,9 @@ namespace PhpSpreadsheet\Style; class Protection extends Supervisor implements \PhpSpreadsheet\IComparable { /** Protection styles */ - const PROTECTION_INHERIT = 'inherit'; - const PROTECTION_PROTECTED = 'protected'; - const PROTECTION_UNPROTECTED = 'unprotected'; + const PROTECTION_INHERIT = 'inherit'; + const PROTECTION_PROTECTED = 'protected'; + const PROTECTION_UNPROTECTED = 'unprotected'; /** * Locked @@ -48,10 +48,10 @@ class Protection extends Supervisor implements \PhpSpreadsheet\IComparable /** * Create a new Protection * - * @param boolean $isSupervisor Flag indicating if this is a supervisor or not + * @param bool $isSupervisor Flag indicating if this is a supervisor or not * Leave this value at default unless you understand exactly what * its ramifications are - * @param boolean $isConditional Flag indicating if this is a conditional style or not + * @param bool $isConditional Flag indicating if this is a conditional style or not * Leave this value at default unless you understand exactly what * its ramifications are */ @@ -86,7 +86,7 @@ class Protection extends Supervisor implements \PhpSpreadsheet\IComparable */ public function getStyleArray($array) { - return array('protection' => $array); + return ['protection' => $array]; } /** @@ -119,8 +119,9 @@ class Protection extends Supervisor implements \PhpSpreadsheet\IComparable } } } else { - throw new \PhpSpreadsheet\Exception("Invalid style array passed."); + throw new \PhpSpreadsheet\Exception('Invalid style array passed.'); } + return $this; } @@ -134,6 +135,7 @@ class Protection extends Supervisor implements \PhpSpreadsheet\IComparable if ($this->isSupervisor) { return $this->getSharedComponent()->getLocked(); } + return $this->locked; } @@ -146,11 +148,12 @@ class Protection extends Supervisor implements \PhpSpreadsheet\IComparable public function setLocked($pValue = self::PROTECTION_INHERIT) { if ($this->isSupervisor) { - $styleArray = $this->getStyleArray(array('locked' => $pValue)); + $styleArray = $this->getStyleArray(['locked' => $pValue]); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); } else { $this->locked = $pValue; } + return $this; } @@ -164,6 +167,7 @@ class Protection extends Supervisor implements \PhpSpreadsheet\IComparable if ($this->isSupervisor) { return $this->getSharedComponent()->getHidden(); } + return $this->hidden; } @@ -176,11 +180,12 @@ class Protection extends Supervisor implements \PhpSpreadsheet\IComparable public function setHidden($pValue = self::PROTECTION_INHERIT) { if ($this->isSupervisor) { - $styleArray = $this->getStyleArray(array('hidden' => $pValue)); + $styleArray = $this->getStyleArray(['hidden' => $pValue]); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); } else { $this->hidden = $pValue; } + return $this; } @@ -194,6 +199,7 @@ class Protection extends Supervisor implements \PhpSpreadsheet\IComparable if ($this->isSupervisor) { return $this->getSharedComponent()->getHashCode(); } + return md5( $this->locked . $this->hidden . diff --git a/src/PhpSpreadsheet/Style/Supervisor.php b/src/PhpSpreadsheet/Style/Supervisor.php index 15a4e5b4..c924b5b9 100644 --- a/src/PhpSpreadsheet/Style/Supervisor.php +++ b/src/PhpSpreadsheet/Style/Supervisor.php @@ -29,7 +29,7 @@ abstract class Supervisor /** * Supervisor? * - * @var boolean + * @var bool */ protected $isSupervisor; @@ -43,7 +43,7 @@ abstract class Supervisor /** * Create a new Supervisor * - * @param boolean $isSupervisor Flag indicating if this is a supervisor or not + * @param bool $isSupervisor Flag indicating if this is a supervisor or not * Leave this value at default unless you understand exactly what * its ramifications are */ @@ -62,13 +62,14 @@ abstract class Supervisor public function bindParent($parent, $parentPropertyName = null) { $this->parent = $parent; + return $this; } /** * Is this a supervisor or a cell style component? * - * @return boolean + * @return bool */ public function getIsSupervisor() { diff --git a/src/PhpSpreadsheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet.php index 7dc45d31..c2aff429 100644 --- a/src/PhpSpreadsheet/Worksheet.php +++ b/src/PhpSpreadsheet/Worksheet.php @@ -29,13 +29,13 @@ namespace PhpSpreadsheet; class Worksheet implements IComparable { /* Break types */ - const BREAK_NONE = 0; - const BREAK_ROW = 1; + const BREAK_NONE = 0; + const BREAK_ROW = 1; const BREAK_COLUMN = 2; /* Sheet state */ - const SHEETSTATE_VISIBLE = 'visible'; - const SHEETSTATE_HIDDEN = 'hidden'; + const SHEETSTATE_VISIBLE = 'visible'; + const SHEETSTATE_HIDDEN = 'hidden'; const SHEETSTATE_VERYHIDDEN = 'veryHidden'; /** @@ -43,7 +43,7 @@ class Worksheet implements IComparable * * @var array */ - private static $invalidCharacters = array('*', ':', '/', '\\', '?', '[', ']'); + private static $invalidCharacters = ['*', ':', '/', '\\', '?', '[', ']']; /** * Parent spreadsheet @@ -64,7 +64,7 @@ class Worksheet implements IComparable * * @var Worksheet\RowDimension[] */ - private $rowDimensions = array(); + private $rowDimensions = []; /** * Default row dimension @@ -78,7 +78,7 @@ class Worksheet implements IComparable * * @var Worksheet\ColumnDimension[] */ - private $columnDimensions = array(); + private $columnDimensions = []; /** * Default column dimension @@ -99,7 +99,7 @@ class Worksheet implements IComparable * * @var Chart[] */ - private $chartCollection = array(); + private $chartCollection = []; /** * Worksheet title @@ -155,19 +155,19 @@ class Worksheet implements IComparable * * @var Style[] */ - private $styles = array(); + private $styles = []; /** * Conditional styles. Indexed by cell coordinate, e.g. 'A1' * * @var array */ - private $conditionalStylesCollection = array(); + private $conditionalStylesCollection = []; /** * Is the current cell collection sorted already? * - * @var boolean + * @var bool */ private $cellCollectionIsSorted = false; @@ -176,21 +176,21 @@ class Worksheet implements IComparable * * @var array */ - private $breaks = array(); + private $breaks = []; /** * Collection of merged cell ranges * * @var array */ - private $mergeCells = array(); + private $mergeCells = []; /** * Collection of protected cell ranges * * @var array */ - private $protectedCells = array(); + private $protectedCells = []; /** * Autofilter Range and selection @@ -209,35 +209,35 @@ class Worksheet implements IComparable /** * Show gridlines? * - * @var boolean + * @var bool */ private $showGridlines = true; /** - * Print gridlines? - * - * @var boolean - */ + * Print gridlines? + * + * @var bool + */ private $printGridlines = false; /** - * Show row and column headers? - * - * @var boolean - */ + * Show row and column headers? + * + * @var bool + */ private $showRowColHeaders = true; /** * Show summary below? (Row/Column outline) * - * @var boolean + * @var bool */ private $showSummaryBelow = true; /** * Show summary right? (Row/Column outline) * - * @var boolean + * @var bool */ private $showSummaryRight = true; @@ -246,7 +246,7 @@ class Worksheet implements IComparable * * @var Comment[] */ - private $comments = array(); + private $comments = []; /** * Active cell. (Only one!) @@ -279,7 +279,7 @@ class Worksheet implements IComparable /** * Right-to-left? * - * @var boolean + * @var bool */ private $rightToLeft = false; @@ -288,14 +288,14 @@ class Worksheet implements IComparable * * @var array */ - private $hyperlinkCollection = array(); + private $hyperlinkCollection = []; /** * Data validation objects. Indexed by cell coordinate, e.g. 'A1' * * @var array */ - private $dataValidationCollection = array(); + private $dataValidationCollection = []; /** * Tab color @@ -307,7 +307,7 @@ class Worksheet implements IComparable /** * Dirty flag * - * @var boolean + * @var bool */ private $dirty = true; @@ -319,10 +319,10 @@ class Worksheet implements IComparable private $hash; /** - * CodeName - * - * @var string - */ + * CodeName + * + * @var string + */ private $codeName = null; /** @@ -338,35 +338,33 @@ class Worksheet implements IComparable $this->setTitle($pTitle, false); // setTitle can change $pTitle $this->setCodeName($this->getTitle()); - $this->setSheetState(Worksheet::SHEETSTATE_VISIBLE); + $this->setSheetState(self::SHEETSTATE_VISIBLE); - $this->cellCollection = CachedObjectStorageFactory::getInstance($this); + $this->cellCollection = CachedObjectStorageFactory::getInstance($this); // Set page setup - $this->pageSetup = new Worksheet\PageSetup(); + $this->pageSetup = new Worksheet\PageSetup(); // Set page margins - $this->pageMargins = new Worksheet\PageMargins(); + $this->pageMargins = new Worksheet\PageMargins(); // Set page header/footer - $this->headerFooter = new Worksheet\HeaderFooter(); + $this->headerFooter = new Worksheet\HeaderFooter(); // Set sheet view - $this->sheetView = new Worksheet\SheetView(); + $this->sheetView = new Worksheet\SheetView(); // Drawing collection - $this->drawingCollection = new \ArrayObject(); + $this->drawingCollection = new \ArrayObject(); // Chart collection - $this->chartCollection = new \ArrayObject(); + $this->chartCollection = new \ArrayObject(); // Protection - $this->protection = new Worksheet\Protection(); + $this->protection = new Worksheet\Protection(); // Default row dimension - $this->defaultRowDimension = new Worksheet\RowDimension(null); + $this->defaultRowDimension = new Worksheet\RowDimension(null); // Default column dimension $this->defaultColumnDimension = new Worksheet\ColumnDimension(null); - $this->autoFilter = new Worksheet\AutoFilter(null, $this); + $this->autoFilter = new Worksheet\AutoFilter(null, $this); } - /** * Disconnect all cells from this Worksheet object, * typically so that the worksheet object can be unset - * */ public function disconnectCells() { @@ -380,7 +378,6 @@ class Worksheet implements IComparable /** * Code to execute when this worksheet is unset() - * */ public function __destruct() { @@ -389,7 +386,7 @@ class Worksheet implements IComparable $this->disconnectCells(); } - /** + /** * Return the cache controller for the cell collection * * @return CachedObjectStorage_xxx @@ -399,7 +396,6 @@ class Worksheet implements IComparable return $this->cellCollection; } - /** * Get array of invalid characters for sheet title * @@ -414,8 +410,8 @@ class Worksheet implements IComparable * Check sheet code name for valid Excel syntax * * @param string $pValue The string to check - * @return string The valid string * @throws Exception + * @return string The valid string */ private static function checkSheetCodeName($pValue) { @@ -425,8 +421,8 @@ class Worksheet implements IComparable } // Some of the printable ASCII characters are invalid: * : / \ ? [ ] and first and last characters cannot be a "'" if ((str_replace(self::$invalidCharacters, '', $pValue) !== $pValue) || - (Shared\StringHelper::substring($pValue, -1, 1)=='\'') || - (Shared\StringHelper::substring($pValue, 0, 1)=='\'')) { + (Shared\StringHelper::substring($pValue, -1, 1) == '\'') || + (Shared\StringHelper::substring($pValue, 0, 1) == '\'')) { throw new Exception('Invalid character found in sheet code name'); } @@ -438,12 +434,12 @@ class Worksheet implements IComparable return $pValue; } - /** + /** * Check sheet title for valid Excel syntax * * @param string $pValue The string to check - * @return string The valid string * @throws Exception + * @return string The valid string */ private static function checkSheetTitle($pValue) { @@ -463,7 +459,7 @@ class Worksheet implements IComparable /** * Get collection of cells * - * @param boolean $pSorted Also sort the cell collection? + * @param bool $pSorted Also sort the cell collection? * @return Cell[] */ public function getCellCollection($pSorted = true) @@ -475,7 +471,8 @@ class Worksheet implements IComparable if ($this->cellCollection !== null) { return $this->cellCollection->getCellList(); } - return array(); + + return []; } /** @@ -488,7 +485,8 @@ class Worksheet implements IComparable if ($this->cellCollection !== null) { return $this->cellCollection->getSortedCellList(); } - return array(); + + return []; } /** @@ -565,7 +563,7 @@ class Worksheet implements IComparable $this->chartCollection[] = $pChart; } else { // Insert the chart at the requested index - array_splice($this->chartCollection, $iChartIndex, 0, array($pChart)); + array_splice($this->chartCollection, $iChartIndex, 0, [$pChart]); } return $pChart; @@ -585,8 +583,8 @@ class Worksheet implements IComparable * Get a chart by its index position * * @param string $index Chart index position - * @return false|Chart * @throws Exception + * @return false|Chart */ public function getChartByIndex($index = null) { @@ -607,15 +605,16 @@ class Worksheet implements IComparable /** * Return an array of the names of charts on this worksheet * - * @return string[] The names of charts * @throws Exception + * @return string[] The names of charts */ public function getChartNames() { - $chartNames = array(); + $chartNames = []; foreach ($this->chartCollection as $chart) { $chartNames[] = $chart->getName(); } + return $chartNames; } @@ -623,8 +622,8 @@ class Worksheet implements IComparable * Get a chart by name * * @param string $chartName Chart name - * @return false|Chart * @throws Exception + * @return false|Chart */ public function getChartByName($chartName = '') { @@ -637,6 +636,7 @@ class Worksheet implements IComparable return $this->chartCollection[$index]; } } + return false; } @@ -648,7 +648,7 @@ class Worksheet implements IComparable public function refreshColumnDimensions() { $currentColumnDimensions = $this->getColumnDimensions(); - $newColumnDimensions = array(); + $newColumnDimensions = []; foreach ($currentColumnDimensions as $objColumnDimension) { $newColumnDimensions[$objColumnDimension->getColumnIndex()] = $objColumnDimension; @@ -667,7 +667,7 @@ class Worksheet implements IComparable public function refreshRowDimensions() { $currentRowDimensions = $this->getRowDimensions(); - $newRowDimensions = array(); + $newRowDimensions = []; foreach ($currentRowDimensions as $objRowDimension) { $newRowDimensions[$objRowDimension->getRowIndex()] = $objRowDimension; @@ -686,7 +686,7 @@ class Worksheet implements IComparable public function calculateWorksheetDimension() { // Return - return 'A1' . ':' . $this->getHighestColumn() . $this->getHighestRow(); + return 'A1' . ':' . $this->getHighestColumn() . $this->getHighestRow(); } /** @@ -697,19 +697,19 @@ class Worksheet implements IComparable public function calculateWorksheetDataDimension() { // Return - return 'A1' . ':' . $this->getHighestDataColumn() . $this->getHighestDataRow(); + return 'A1' . ':' . $this->getHighestDataColumn() . $this->getHighestDataRow(); } /** * Calculate widths for auto-size columns * - * @param boolean $calculateMergeCells Calculate merge cell width + * @param bool $calculateMergeCells Calculate merge cell width * @return Worksheet; */ public function calculateColumnWidths($calculateMergeCells = false) { // initialize $autoSizes array - $autoSizes = array(); + $autoSizes = []; foreach ($this->getColumnDimensions() as $colDimension) { if ($colDimension->getAutoSize()) { $autoSizes[$colDimension->getColumnIndex()] = -1; @@ -719,7 +719,7 @@ class Worksheet implements IComparable // There is only something to do if there are some auto-size columns if (!empty($autoSizes)) { // build list of cells references that participate in a merge - $isMergeCell = array(); + $isMergeCell = []; foreach ($this->getMergeCells() as $cells) { foreach (Cell::extractAllCellReferencesInRange($cells) as $cellReference) { $isMergeCell[$cellReference] = true; @@ -854,6 +854,7 @@ class Worksheet implements IComparable } $altTitle = $pValue . ' ' . $i; + return $this->setTitle($altTitle, $updateFormulaCellReferences); } } @@ -891,9 +892,10 @@ class Worksheet implements IComparable * @param string $value Sheet state (visible, hidden, veryHidden) * @return Worksheet */ - public function setSheetState($value = Worksheet::SHEETSTATE_VISIBLE) + public function setSheetState($value = self::SHEETSTATE_VISIBLE) { $this->sheetState = $value; + return $this; } @@ -916,6 +918,7 @@ class Worksheet implements IComparable public function setPageSetup(Worksheet\PageSetup $pValue) { $this->pageSetup = $pValue; + return $this; } @@ -938,6 +941,7 @@ class Worksheet implements IComparable public function setPageMargins(Worksheet\PageMargins $pValue) { $this->pageMargins = $pValue; + return $this; } @@ -960,6 +964,7 @@ class Worksheet implements IComparable public function setHeaderFooter(Worksheet\HeaderFooter $pValue) { $this->headerFooter = $pValue; + return $this; } @@ -982,6 +987,7 @@ class Worksheet implements IComparable public function setSheetView(Worksheet\SheetView $pValue) { $this->sheetView = $pValue; + return $this; } @@ -1021,6 +1027,7 @@ class Worksheet implements IComparable if ($row == null) { return $this->cachedHighestColumn; } + return $this->getHighestDataColumn($row); } @@ -1048,6 +1055,7 @@ class Worksheet implements IComparable if ($column == null) { return $this->cachedHighestRow; } + return $this->getHighestDataRow($column); } @@ -1084,6 +1092,7 @@ class Worksheet implements IComparable public function setCellValue($pCoordinate = 'A1', $pValue = null, $returnCell = false) { $cell = $this->getCell(strtoupper($pCoordinate))->setValue($pValue); + return ($returnCell) ? $cell : $this; } @@ -1099,6 +1108,7 @@ class Worksheet implements IComparable public function setCellValueByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $returnCell = false) { $cell = $this->getCellByColumnAndRow($pColumn, $pRow)->setValue($pValue); + return ($returnCell) ? $cell : $this; } @@ -1115,6 +1125,7 @@ class Worksheet implements IComparable { // Set value $cell = $this->getCell(strtoupper($pCoordinate))->setValueExplicit($pValue, $pDataType); + return ($returnCell) ? $cell : $this; } @@ -1131,6 +1142,7 @@ class Worksheet implements IComparable public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = Cell\DataType::TYPE_STRING, $returnCell = false) { $cell = $this->getCellByColumnAndRow($pColumn, $pRow)->setValueExplicit($pValue, $pDataType); + return ($returnCell) ? $cell : $this; } @@ -1138,7 +1150,7 @@ class Worksheet implements IComparable * Get cell at a specific coordinate * * @param string $pCoordinate Coordinate of the cell - * @param boolean $createIfNotExists Flag indicating whether a new cell should be created if it doesn't + * @param bool $createIfNotExists Flag indicating whether a new cell should be created if it doesn't * already exist, or a null should be returned instead * @throws Exception * @return null|Cell Cell that was found/created or null @@ -1152,16 +1164,18 @@ class Worksheet implements IComparable // Worksheet reference? if (strpos($pCoordinate, '!') !== false) { - $worksheetReference = Worksheet::extractSheetTitle($pCoordinate, true); + $worksheetReference = self::extractSheetTitle($pCoordinate, true); + return $this->parent->getSheetByName($worksheetReference[0])->getCell(strtoupper($worksheetReference[1]), $createIfNotExists); } // Named range? - if ((!preg_match('/^'.Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) && - (preg_match('/^'.Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) { + if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) && + (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))) { $namedRange = NamedRange::resolveRange($pCoordinate, $this); if ($namedRange !== null) { $pCoordinate = $namedRange->getRange(); + return $namedRange->getWorksheet()->getCell($pCoordinate, $createIfNotExists); } } @@ -1184,7 +1198,7 @@ class Worksheet implements IComparable * * @param string $pColumn Numeric column coordinate of the cell * @param string $pRow Numeric row coordinate of the cell - * @param boolean $createIfNotExists Flag indicating whether a new cell should be created if it doesn't + * @param bool $createIfNotExists Flag indicating whether a new cell should be created if it doesn't * already exist, or a null should be returned instead * @return null|Cell Cell that was found/created or null */ @@ -1224,7 +1238,7 @@ class Worksheet implements IComparable // Cell needs appropriate xfIndex from dimensions records // but don't create dimension records if they don't already exist - $rowDimension = $this->getRowDimension($aCoordinates[1], false); + $rowDimension = $this->getRowDimension($aCoordinates[1], false); $columnDimension = $this->getColumnDimension($aCoordinates[0], false); if ($rowDimension !== null && $rowDimension->getXfIndex() > 0) { @@ -1243,19 +1257,20 @@ class Worksheet implements IComparable * * @param string $pCoordinate Coordinate of the cell * @throws Exception - * @return boolean + * @return bool */ public function cellExists($pCoordinate = 'A1') { - // Worksheet reference? + // Worksheet reference? if (strpos($pCoordinate, '!') !== false) { - $worksheetReference = Worksheet::extractSheetTitle($pCoordinate, true); + $worksheetReference = self::extractSheetTitle($pCoordinate, true); + return $this->parent->getSheetByName($worksheetReference[0])->cellExists(strtoupper($worksheetReference[1])); } // Named range? - if ((!preg_match('/^'.Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) && - (preg_match('/^'.Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) { + if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) && + (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))) { $namedRange = NamedRange::resolveRange($pCoordinate, $this); if ($namedRange !== null) { $pCoordinate = $namedRange->getRange(); @@ -1292,7 +1307,7 @@ class Worksheet implements IComparable * * @param string $pColumn Numeric column coordinate of the cell * @param string $pRow Numeric row coordinate of the cell - * @return boolean + * @return bool */ public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1) { @@ -1319,6 +1334,7 @@ class Worksheet implements IComparable $this->cachedHighestRow = max($this->cachedHighestRow, $pRow); } + return $this->rowDimensions[$pRow]; } @@ -1344,6 +1360,7 @@ class Worksheet implements IComparable $this->cachedHighestColumn = $pColumn; } } + return $this->columnDimensions[$pColumn]; } @@ -1372,8 +1389,8 @@ class Worksheet implements IComparable * Get default style of workbook. * * @deprecated - * @return Style * @throws Exception + * @return Style */ public function getDefaultStyle() { @@ -1390,12 +1407,13 @@ class Worksheet implements IComparable */ public function setDefaultStyle(Style $pValue) { - $this->parent->getDefaultStyle()->applyFromArray(array( - 'font' => array( + $this->parent->getDefaultStyle()->applyFromArray([ + 'font' => [ 'name' => $pValue->getFont()->getName(), 'size' => $pValue->getFont()->getSize(), - ), - )); + ], + ]); + return $this; } @@ -1403,8 +1421,8 @@ class Worksheet implements IComparable * Get style for cell * * @param string $pCellCoordinate Cell coordinate (or range) to get style for - * @return Style * @throws Exception + * @return Style */ public function getStyle($pCellCoordinate = 'A1') { @@ -1427,8 +1445,9 @@ class Worksheet implements IComparable { $pCoordinate = strtoupper($pCoordinate); if (!isset($this->conditionalStylesCollection[$pCoordinate])) { - $this->conditionalStylesCollection[$pCoordinate] = array(); + $this->conditionalStylesCollection[$pCoordinate] = []; } + return $this->conditionalStylesCollection[$pCoordinate]; } @@ -1436,13 +1455,14 @@ class Worksheet implements IComparable * Do conditional styles exist for this cell? * * @param string $pCoordinate - * @return boolean + * @return bool */ public function conditionalStylesExists($pCoordinate = 'A1') { if (isset($this->conditionalStylesCollection[strtoupper($pCoordinate)])) { return true; } + return false; } @@ -1455,6 +1475,7 @@ class Worksheet implements IComparable public function removeConditionalStyles($pCoordinate = 'A1') { unset($this->conditionalStylesCollection[strtoupper($pCoordinate)]); + return $this; } @@ -1478,6 +1499,7 @@ class Worksheet implements IComparable public function setConditionalStyles($pCoordinate, $pValue) { $this->conditionalStylesCollection[strtoupper($pCoordinate)] = $pValue; + return $this; } @@ -1494,6 +1516,7 @@ class Worksheet implements IComparable { if (!is_null($pColumn2) && !is_null($pRow2)) { $cellRange = Cell::stringFromColumnIndex($pColumn) . $pRow . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2; + return $this->getStyle($cellRange); } @@ -1514,6 +1537,7 @@ class Worksheet implements IComparable public function setSharedStyle(Style $pSharedCellStyle = null, $pRange = '') { $this->duplicateStyle($pSharedCellStyle, $pRange); + return $this; } @@ -1611,13 +1635,14 @@ class Worksheet implements IComparable * @deprecated * @param array $pStyles Array containing style information * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1") - * @param boolean $pAdvanced Advanced mode for setting borders. + * @param bool $pAdvanced Advanced mode for setting borders. * @throws Exception * @return Worksheet */ public function duplicateStyleArray($pStyles = null, $pRange = '', $pAdvanced = true) { $this->getStyle($pRange)->applyFromArray($pStyles, $pAdvanced); + return $this; } @@ -1629,13 +1654,13 @@ class Worksheet implements IComparable * @throws Exception * @return Worksheet */ - public function setBreak($pCell = 'A1', $pBreak = Worksheet::BREAK_NONE) + public function setBreak($pCell = 'A1', $pBreak = self::BREAK_NONE) { // Uppercase coordinate $pCell = strtoupper($pCell); if ($pCell != '') { - if ($pBreak == Worksheet::BREAK_NONE) { + if ($pBreak == self::BREAK_NONE) { if (isset($this->breaks[$pCell])) { unset($this->breaks[$pCell]); } @@ -1652,12 +1677,12 @@ class Worksheet implements IComparable /** * Set break on a cell by using numeric cell coordinates * - * @param integer $pColumn Numeric column coordinate of the cell - * @param integer $pRow Numeric row coordinate of the cell - * @param integer $pBreak Break type (type of \PhpSpreadsheet\Worksheet::BREAK_*) + * @param int $pColumn Numeric column coordinate of the cell + * @param int $pRow Numeric row coordinate of the cell + * @param int $pBreak Break type (type of \PhpSpreadsheet\Worksheet::BREAK_*) * @return Worksheet */ - public function setBreakByColumnAndRow($pColumn = 0, $pRow = 1, $pBreak = Worksheet::BREAK_NONE) + public function setBreakByColumnAndRow($pColumn = 0, $pRow = 1, $pBreak = self::BREAK_NONE) { return $this->setBreak(Cell::stringFromColumnIndex($pColumn) . $pRow, $pBreak); } @@ -1700,7 +1725,7 @@ class Worksheet implements IComparable // Blank out the rest of the cells in the range (if they exist) $count = count($aReferences); - for ($i = 1; $i < $count; $i++) { + for ($i = 1; $i < $count; ++$i) { if ($this->cellExists($aReferences[$i])) { $this->getCell($aReferences[$i])->setValueExplicit(null, Cell\DataType::TYPE_NULL); } @@ -1725,6 +1750,7 @@ class Worksheet implements IComparable public function mergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1) { $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2; + return $this->mergeCells($cellRange); } @@ -1766,6 +1792,7 @@ class Worksheet implements IComparable public function unmergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1) { $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2; + return $this->unmergeCells($cellRange); } @@ -1785,9 +1812,10 @@ class Worksheet implements IComparable * * @param array */ - public function setMergeCells($pValue = array()) + public function setMergeCells($pValue = []) { $this->mergeCells = $pValue; + return $this; } @@ -1796,7 +1824,7 @@ class Worksheet implements IComparable * * @param string $pRange Cell (e.g. A1) or cell range (e.g. A1:E1) * @param string $pPassword Password to unlock the protection - * @param boolean $pAlreadyHashed If the password has already been hashed, set this to true + * @param bool $pAlreadyHashed If the password has already been hashed, set this to true * @throws Exception * @return Worksheet */ @@ -1821,13 +1849,14 @@ class Worksheet implements IComparable * @param int $pColumn2 Numeric column coordinate of the last cell * @param int $pRow2 Numeric row coordinate of the last cell * @param string $pPassword Password to unlock the protection - * @param boolean $pAlreadyHashed If the password has already been hashed, set this to true + * @param bool $pAlreadyHashed If the password has already been hashed, set this to true * @throws Exception * @return Worksheet */ public function protectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false) { $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2; + return $this->protectCells($cellRange, $pPassword, $pAlreadyHashed); } @@ -1848,6 +1877,7 @@ class Worksheet implements IComparable } else { throw new Exception('Cell range ' . $pRange . ' not known as protected.'); } + return $this; } @@ -1859,13 +1889,14 @@ class Worksheet implements IComparable * @param int $pColumn2 Numeric column coordinate of the last cell * @param int $pRow2 Numeric row coordinate of the last cell * @param string $pPassword Password to unlock the protection - * @param boolean $pAlreadyHashed If the password has already been hashed, set this to true + * @param bool $pAlreadyHashed If the password has already been hashed, set this to true * @throws Exception * @return Worksheet */ public function unprotectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false) { $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2; + return $this->unprotectCells($cellRange, $pPassword, $pAlreadyHashed); } @@ -1905,16 +1936,17 @@ class Worksheet implements IComparable } elseif (is_object($pValue) && ($pValue instanceof Worksheet\AutoFilter)) { $this->autoFilter = $pValue; } + return $this; } /** * Set Autofilter Range by using numeric cell coordinates * - * @param integer $pColumn1 Numeric column coordinate of the first cell - * @param integer $pRow1 Numeric row coordinate of the first cell - * @param integer $pColumn2 Numeric column coordinate of the second cell - * @param integer $pRow2 Numeric row coordinate of the second cell + * @param int $pColumn1 Numeric column coordinate of the first cell + * @param int $pRow1 Numeric row coordinate of the first cell + * @param int $pColumn2 Numeric column coordinate of the second cell + * @param int $pRow2 Numeric row coordinate of the second cell * @throws Exception * @return Worksheet */ @@ -1935,6 +1967,7 @@ class Worksheet implements IComparable public function removeAutoFilter() { $this->autoFilter->setRange(null); + return $this; } @@ -1969,6 +2002,7 @@ class Worksheet implements IComparable } else { throw new Exception('Freeze pane can not be set on a range of cells.'); } + return $this; } @@ -2009,8 +2043,9 @@ class Worksheet implements IComparable $objReferenceHelper = ReferenceHelper::getInstance(); $objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this); } else { - throw new Exception("Rows can only be inserted before at least row 1."); + throw new Exception('Rows can only be inserted before at least row 1.'); } + return $this; } @@ -2028,8 +2063,9 @@ class Worksheet implements IComparable $objReferenceHelper = ReferenceHelper::getInstance(); $objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this); } else { - throw new Exception("Column references should not be numeric."); + throw new Exception('Column references should not be numeric.'); } + return $this; } @@ -2046,7 +2082,7 @@ class Worksheet implements IComparable if ($pBefore >= 0) { return $this->insertNewColumnBefore(Cell::stringFromColumnIndex($pBefore), $pNumCols); } else { - throw new Exception("Columns can only be inserted before at least column A (0)."); + throw new Exception('Columns can only be inserted before at least column A (0).'); } } @@ -2069,8 +2105,9 @@ class Worksheet implements IComparable --$highestRow; } } else { - throw new Exception("Rows to be deleted should at least start from row 1."); + throw new Exception('Rows to be deleted should at least start from row 1.'); } + return $this; } @@ -2094,8 +2131,9 @@ class Worksheet implements IComparable $highestColumn = Cell::stringFromColumnIndex(Cell::columnIndexFromString($highestColumn) - 2); } } else { - throw new Exception("Column references should not be numeric."); + throw new Exception('Column references should not be numeric.'); } + return $this; } @@ -2112,14 +2150,14 @@ class Worksheet implements IComparable if ($pColumn >= 0) { return $this->removeColumn(Cell::stringFromColumnIndex($pColumn), $pNumCols); } else { - throw new Exception("Columns to be deleted should at least start from column 0"); + throw new Exception('Columns to be deleted should at least start from column 0'); } } /** * Show gridlines? * - * @return boolean + * @return bool */ public function getShowGridlines() { @@ -2129,63 +2167,66 @@ class Worksheet implements IComparable /** * Set show gridlines * - * @param boolean $pValue Show gridlines (true/false) + * @param bool $pValue Show gridlines (true/false) * @return Worksheet */ public function setShowGridlines($pValue = false) { $this->showGridlines = $pValue; + return $this; } /** - * Print gridlines? - * - * @return boolean - */ + * Print gridlines? + * + * @return bool + */ public function getPrintGridlines() { return $this->printGridlines; } /** - * Set print gridlines - * - * @param boolean $pValue Print gridlines (true/false) - * @return Worksheet - */ + * Set print gridlines + * + * @param bool $pValue Print gridlines (true/false) + * @return Worksheet + */ public function setPrintGridlines($pValue = false) { $this->printGridlines = $pValue; + return $this; } /** - * Show row and column headers? - * - * @return boolean - */ + * Show row and column headers? + * + * @return bool + */ public function getShowRowColHeaders() { return $this->showRowColHeaders; } /** - * Set show row and column headers - * - * @param boolean $pValue Show row and column headers (true/false) - * @return Worksheet - */ + * Set show row and column headers + * + * @param bool $pValue Show row and column headers (true/false) + * @return Worksheet + */ public function setShowRowColHeaders($pValue = false) { $this->showRowColHeaders = $pValue; + return $this; } /** * Show summary below? (Row/Column outlining) * - * @return boolean + * @return bool */ public function getShowSummaryBelow() { @@ -2195,19 +2236,20 @@ class Worksheet implements IComparable /** * Set show summary below * - * @param boolean $pValue Show summary below (true/false) + * @param bool $pValue Show summary below (true/false) * @return Worksheet */ public function setShowSummaryBelow($pValue = true) { $this->showSummaryBelow = $pValue; + return $this; } /** * Show summary right? (Row/Column outlining) * - * @return boolean + * @return bool */ public function getShowSummaryRight() { @@ -2217,12 +2259,13 @@ class Worksheet implements IComparable /** * Set show summary right * - * @param boolean $pValue Show summary right (true/false) + * @param bool $pValue Show summary right (true/false) * @return Worksheet */ public function setShowSummaryRight($pValue = true) { $this->showSummaryRight = $pValue; + return $this; } @@ -2242,7 +2285,7 @@ class Worksheet implements IComparable * @param array of Comment * @return Worksheet */ - public function setComments($pValue = array()) + public function setComments($pValue = []) { $this->comments = $pValue; @@ -2253,8 +2296,8 @@ class Worksheet implements IComparable * Get comment for cell * * @param string $pCellCoordinate Cell coordinate to get comment for - * @return Comment * @throws Exception + * @return Comment */ public function getComment($pCellCoordinate = 'A1') { @@ -2275,6 +2318,7 @@ class Worksheet implements IComparable } else { $newComment = new Comment(); $this->comments[$pCellCoordinate] = $newComment; + return $newComment; } } @@ -2359,12 +2403,13 @@ class Worksheet implements IComparable $pCoordinate = preg_replace('/^([0-9]+):([0-9]+)$/', 'A${1}:XFD${2}', $pCoordinate); if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) { - list($first, ) = Cell::splitRange($pCoordinate); + list($first) = Cell::splitRange($pCoordinate); $this->activeCell = $first[0]; } else { $this->activeCell = $pCoordinate; } $this->selectedCells = $pCoordinate; + return $this; } @@ -2384,7 +2429,7 @@ class Worksheet implements IComparable /** * Get right-to-left * - * @return boolean + * @return bool */ public function getRightToLeft() { @@ -2394,12 +2439,13 @@ class Worksheet implements IComparable /** * Set right-to-left * - * @param boolean $value Right-to-left true/false + * @param bool $value Right-to-left true/false * @return Worksheet */ public function setRightToLeft($value = false) { $this->rightToLeft = $value; + return $this; } @@ -2409,7 +2455,7 @@ class Worksheet implements IComparable * @param array $source Source array * @param mixed $nullValue Value in source array that stands for blank cell * @param string $startCell Insert array starting from this cell address as the top left coordinate - * @param boolean $strictNullComparison Apply strict comparison when testing for null values in the array + * @param bool $strictNullComparison Apply strict comparison when testing for null values in the array * @throws Exception * @return Worksheet */ @@ -2418,11 +2464,11 @@ class Worksheet implements IComparable if (is_array($source)) { // Convert a 1-D array to 2-D (for ease of looping) if (!is_array(end($source))) { - $source = array($source); + $source = [$source]; } // start coordinate - list ($startColumn, $startRow) = Cell::coordinateFromString($startCell); + list($startColumn, $startRow) = Cell::coordinateFromString($startCell); // Loop through $source foreach ($source as $rowData) { @@ -2444,8 +2490,9 @@ class Worksheet implements IComparable ++$startRow; } } else { - throw new Exception("Parameter \$source should be an array."); + throw new Exception('Parameter $source should be an array.'); } + return $this; } @@ -2454,24 +2501,24 @@ class Worksheet implements IComparable * * @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1") * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist - * @param boolean $calculateFormulas Should formulas be calculated? - * @param boolean $formatData Should formatting be applied to cell values? - * @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero + * @param bool $calculateFormulas Should formulas be calculated? + * @param bool $formatData Should formatting be applied to cell values? + * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero * True - Return rows and columns indexed by their actual row and column IDs * @return array */ public function rangeToArray($pRange = 'A1', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) { // Returnvalue - $returnValue = array(); + $returnValue = []; // Identify the range that we need to extract from the worksheet list($rangeStart, $rangeEnd) = Cell::rangeBoundaries($pRange); - $minCol = Cell::stringFromColumnIndex($rangeStart[0] -1); + $minCol = Cell::stringFromColumnIndex($rangeStart[0] - 1); $minRow = $rangeStart[1]; - $maxCol = Cell::stringFromColumnIndex($rangeEnd[0] -1); + $maxCol = Cell::stringFromColumnIndex($rangeEnd[0] - 1); $maxRow = $rangeEnd[1]; - $maxCol++; + ++$maxCol; // Loop through rows $r = -1; for ($row = $minRow; $row <= $maxRow; ++$row) { @@ -2482,9 +2529,9 @@ class Worksheet implements IComparable $cRef = ($returnCellRef) ? $col : ++$c; // Using getCell() will create a new cell if it doesn't already exist. We don't want that to happen // so we test and retrieve directly against cellCollection - if ($this->cellCollection->isDataSet($col.$row)) { + if ($this->cellCollection->isDataSet($col . $row)) { // Cell exists - $cell = $this->cellCollection->getCacheData($col.$row); + $cell = $this->cellCollection->getCacheData($col . $row); if ($cell->getValue() !== null) { if ($cell->getValue() instanceof RichText) { $returnValue[$rRef][$cRef] = $cell->getValue()->getPlainText(); @@ -2518,18 +2565,17 @@ class Worksheet implements IComparable return $returnValue; } - /** * Create array from a range of cells * * @param string $pNamedRange Name of the Named Range * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist - * @param boolean $calculateFormulas Should formulas be calculated? - * @param boolean $formatData Should formatting be applied to cell values? - * @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero + * @param bool $calculateFormulas Should formulas be calculated? + * @param bool $formatData Should formatting be applied to cell values? + * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero * True - Return rows and columns indexed by their actual row and column IDs - * @return array * @throws Exception + * @return array */ public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) { @@ -2541,17 +2587,16 @@ class Worksheet implements IComparable return $pWorkSheet->rangeToArray($pCellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef); } - throw new Exception('Named Range '.$pNamedRange.' does not exist.'); + throw new Exception('Named Range ' . $pNamedRange . ' does not exist.'); } - /** * Create array from worksheet * * @param mixed $nullValue Value returned in the array entry if a cell doesn't exist - * @param boolean $calculateFormulas Should formulas be calculated? - * @param boolean $formatData Should formatting be applied to cell values? - * @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero + * @param bool $calculateFormulas Should formulas be calculated? + * @param bool $formatData Should formatting be applied to cell values? + * @param bool $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero * True - Return rows and columns indexed by their actual row and column IDs * @return array */ @@ -2564,14 +2609,14 @@ class Worksheet implements IComparable $maxCol = $this->getHighestColumn(); $maxRow = $this->getHighestRow(); // Return - return $this->rangeToArray('A1:'.$maxCol.$maxRow, $nullValue, $calculateFormulas, $formatData, $returnCellRef); + return $this->rangeToArray('A1:' . $maxCol . $maxRow, $nullValue, $calculateFormulas, $formatData, $returnCellRef); } /** * Get row iterator * - * @param integer $startRow The row number at which to start iterating - * @param integer $endRow The row number at which to stop iterating + * @param int $startRow The row number at which to start iterating + * @param int $endRow The row number at which to stop iterating * * @return Worksheet\RowIterator */ @@ -2649,6 +2694,7 @@ class Worksheet implements IComparable $this->hash = md5($this->title . $this->autoFilter . ($this->protection->isProtectionEnabled() ? 't' : 'f') . __CLASS__); $this->dirty = false; } + return $this->hash; } @@ -2670,7 +2716,7 @@ class Worksheet implements IComparable } if ($returnRange) { - return array(trim(substr($pRange, 0, $sep), "'"), substr($pRange, $sep + 1)); + return [trim(substr($pRange, 0, $sep), "'"), substr($pRange, $sep + 1)]; } return substr($pRange, $sep + 1); @@ -2690,6 +2736,7 @@ class Worksheet implements IComparable // else create hyperlink $this->hyperlinkCollection[$pCellCoordinate] = new Cell\Hyperlink(); + return $this->hyperlinkCollection[$pCellCoordinate]; } @@ -2707,6 +2754,7 @@ class Worksheet implements IComparable } else { $this->hyperlinkCollection[$pCellCoordinate] = $pHyperlink; } + return $this; } @@ -2714,7 +2762,7 @@ class Worksheet implements IComparable * Hyperlink at a specific coordinate exists? * * @param string $pCoordinate - * @return boolean + * @return bool */ public function hyperlinkExists($pCoordinate = 'A1') { @@ -2745,6 +2793,7 @@ class Worksheet implements IComparable // else create data validation $this->dataValidationCollection[$pCellCoordinate] = new Cell\DataValidation(); + return $this->dataValidationCollection[$pCellCoordinate]; } @@ -2762,6 +2811,7 @@ class Worksheet implements IComparable } else { $this->dataValidationCollection[$pCellCoordinate] = $pDataValidation; } + return $this; } @@ -2769,7 +2819,7 @@ class Worksheet implements IComparable * Data validation at a specific coordinate exists? * * @param string $pCoordinate - * @return boolean + * @return bool */ public function dataValidationExists($pCoordinate = 'A1') { @@ -2814,7 +2864,7 @@ class Worksheet implements IComparable if ($rangeBoundaries[1][1] > $maxRow) { $rangeBoundaries[1][1] = $maxRow; } - $rangeSet = $rangeBoundaries[0][0].$rangeBoundaries[0][1].':'.$rangeBoundaries[1][0].$rangeBoundaries[1][1]; + $rangeSet = $rangeBoundaries[0][0] . $rangeBoundaries[0][1] . ':' . $rangeBoundaries[1][0] . $rangeBoundaries[1][1]; } unset($rangeSet); $stRange = implode(' ', $rangeBlocks); @@ -2832,6 +2882,7 @@ class Worksheet implements IComparable if ($this->tabColor === null) { $this->tabColor = new Style\Color(); } + return $this->tabColor; } @@ -2851,11 +2902,11 @@ class Worksheet implements IComparable /** * Tab color set? * - * @return boolean + * @return bool */ public function isTabColorSet() { - return ($this->tabColor !== null); + return $this->tabColor !== null; } /** @@ -2898,13 +2949,13 @@ class Worksheet implements IComparable } } } -/** + /** * Define the code name of the sheet * * @param null|string Same rule as Title minus space not allowed (but, like Excel, change silently space to underscore) - * @return objWorksheet * @throws Exception - */ + * @return objWorksheet + */ public function setCodeName($pValue = null) { // Is this a 'rename' or not? @@ -2946,22 +2997,23 @@ class Worksheet implements IComparable } } - $this->codeName=$pValue; + $this->codeName = $pValue; + return $this; } /** * Return the code name of the sheet * * @return null|string - */ + */ public function getCodeName() { return $this->codeName; } /** * Sheet has a code name ? - * @return boolean - */ + * @return bool + */ public function hasCodeName() { return !(is_null($this->codeName)); diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php index 57e05ebf..01886612 100644 --- a/src/PhpSpreadsheet/Worksheet/AutoFilter.php +++ b/src/PhpSpreadsheet/Worksheet/AutoFilter.php @@ -35,7 +35,6 @@ class AutoFilter */ private $workSheet; - /** * Autofilter Range * @@ -43,14 +42,12 @@ class AutoFilter */ private $range = ''; - /** * Autofilter Column Ruleset * * @var AutoFilter\Column[] */ - private $columns = array(); - + private $columns = []; /** * Create a new AutoFilter @@ -122,7 +119,7 @@ class AutoFilter if (empty($pRange)) { // Discard all column rules - $this->columns = array(); + $this->columns = []; } else { // Discard any column rules that are no longer valid within this range list($rangeStart, $rangeEnd) = \PhpSpreadsheet\Cell::rangeBoundaries($this->range); @@ -153,18 +150,18 @@ class AutoFilter * * @param string $column Column name (e.g. A) * @throws \PhpSpreadsheet\Exception - * @return integer The column offset within the autofilter range + * @return int The column offset within the autofilter range */ public function testColumnInRange($column) { if (empty($this->range)) { - throw new \PhpSpreadsheet\Exception("No autofilter range is defined."); + throw new \PhpSpreadsheet\Exception('No autofilter range is defined.'); } $columnIndex = \PhpSpreadsheet\Cell::columnIndexFromString($column); list($rangeStart, $rangeEnd) = \PhpSpreadsheet\Cell::rangeBoundaries($this->range); if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) { - throw new \PhpSpreadsheet\Exception("Column is outside of current autofilter range."); + throw new \PhpSpreadsheet\Exception('Column is outside of current autofilter range.'); } return $columnIndex - $rangeStart[0]; @@ -175,7 +172,7 @@ class AutoFilter * * @param string $pColumn Column name (e.g. A) * @throws \PhpSpreadsheet\Exception - * @return integer The offset of the specified column within the autofilter range + * @return int The offset of the specified column within the autofilter range */ public function getColumnOffset($pColumn) { @@ -203,7 +200,7 @@ class AutoFilter /** * Get a specified AutoFilter Column by it's offset * - * @param integer $pColumnOffset Column offset within range (starting from 0) + * @param int $pColumnOffset Column offset within range (starting from 0) * @throws \PhpSpreadsheet\Exception * @return AutoFilter\Column */ @@ -230,7 +227,7 @@ class AutoFilter } elseif (is_object($pColumn) && ($pColumn instanceof AutoFilter\Column)) { $column = $pColumn->getColumnIndex(); } else { - throw new \PhpSpreadsheet\Exception("Column is not within the autofilter range."); + throw new \PhpSpreadsheet\Exception('Column is not within the autofilter range.'); } $this->testColumnInRange($column); @@ -292,13 +289,12 @@ class AutoFilter return $this; } - /** * Test if cell value is in the defined set of values * * @param mixed $cellValue * @param mixed[] $dataSet - * @return boolean + * @return bool */ private static function filterTestInSimpleDataSet($cellValue, $dataSet) { @@ -307,6 +303,7 @@ class AutoFilter if (($cellValue == '') || ($cellValue === null)) { return $blanks; } + return in_array($cellValue, $dataSetValues); } @@ -315,7 +312,7 @@ class AutoFilter * * @param mixed $cellValue * @param mixed[] $dataSet - * @return boolean + * @return bool */ private static function filterTestInDateGroupSet($cellValue, $dataSet) { @@ -347,6 +344,7 @@ class AutoFilter } } } + return false; } @@ -355,7 +353,7 @@ class AutoFilter * * @param mixed $cellValue * @param mixed[] $ruleSet - * @return boolean + * @return bool */ private static function filterTestInCustomDataSet($cellValue, $ruleSet) { @@ -375,39 +373,39 @@ class AutoFilter // Numeric values are tested using the appropriate operator switch ($rule['operator']) { case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL: - $retVal = ($cellValue == $rule['value']); + $retVal = ($cellValue == $rule['value']); break; case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL: - $retVal = ($cellValue != $rule['value']); + $retVal = ($cellValue != $rule['value']); break; case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN: - $retVal = ($cellValue > $rule['value']); + $retVal = ($cellValue > $rule['value']); break; case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL: - $retVal = ($cellValue >= $rule['value']); + $retVal = ($cellValue >= $rule['value']); break; case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN: - $retVal = ($cellValue < $rule['value']); + $retVal = ($cellValue < $rule['value']); break; case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL: - $retVal = ($cellValue <= $rule['value']); + $retVal = ($cellValue <= $rule['value']); break; } } elseif ($rule['value'] == '') { switch ($rule['operator']) { case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL: - $retVal = (($cellValue == '') || ($cellValue === null)); + $retVal = (($cellValue == '') || ($cellValue === null)); break; case AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL: - $retVal = (($cellValue != '') && ($cellValue !== null)); + $retVal = (($cellValue != '') && ($cellValue !== null)); break; default: - $retVal = true; + $retVal = true; break; } } else { // String values are always tested for equality, factoring in for wildcards (hence a regexp test) - $retVal = preg_match('/^'.$rule['value'].'$/i', $cellValue); + $retVal = preg_match('/^' . $rule['value'] . '$/i', $cellValue); } // If there are multiple conditions, then we need to test both using the appropriate join operator switch ($join) { @@ -433,7 +431,7 @@ class AutoFilter * * @param mixed $cellValue * @param mixed[] $monthSet - * @return boolean + * @return bool */ private static function filterTestInPeriodDateSet($cellValue, $monthSet) { @@ -457,9 +455,8 @@ class AutoFilter * * @var array */ - private static $fromReplace = array('\*', '\?', '~~', '~.*', '~.?'); - private static $toReplace = array('.*', '.', '~', '\*', '\?'); - + private static $fromReplace = ['\*', '\?', '~~', '~.*', '~.?']; + private static $toReplace = ['.*', '.', '~', '\*', '\?']; /** * Convert a dynamic rule daterange to a custom filter range expression for ease of calculation @@ -474,7 +471,7 @@ class AutoFilter \PhpSpreadsheet\Calculation\Functions::setReturnDateType(\PhpSpreadsheet\Calculation\Functions::RETURNDATE_PHP_NUMERIC); $val = $maxVal = null; - $ruleValues = array(); + $ruleValues = []; $baseDate = \PhpSpreadsheet\Calculation\DateTime::DATENOW(); // Calculate start/end dates for the required date range based on current date switch ($dynamicRuleType) { @@ -527,9 +524,9 @@ class AutoFilter case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER: $thisMonth = date('m', $baseDate); $thisQuarter = floor(--$thisMonth / 3); - $maxVal = (int) \PhpSpreadsheet\Shared\Date::PHPtoExcel(gmmktime(0, 0, 0, date('t', $baseDate), (1+$thisQuarter)*3, date('Y', $baseDate))); + $maxVal = (int) \PhpSpreadsheet\Shared\Date::PHPtoExcel(gmmktime(0, 0, 0, date('t', $baseDate), (1 + $thisQuarter) * 3, date('Y', $baseDate))); ++$maxVal; - $val = (int) \PhpSpreadsheet\Shared\Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1+$thisQuarter*3, date('Y', $baseDate))); + $val = (int) \PhpSpreadsheet\Shared\Date::PHPToExcel(gmmktime(0, 0, 0, 1, 1 + $thisQuarter * 3, date('Y', $baseDate))); break; case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH: case AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH: @@ -560,19 +557,19 @@ class AutoFilter } // Set the filter column rule attributes ready for writing - $filterColumn->setAttributes(array('val' => $val, 'maxVal' => $maxVal)); + $filterColumn->setAttributes(['val' => $val, 'maxVal' => $maxVal]); // Set the rules for identifying rows for hide/show - $ruleValues[] = array('operator' => AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL, 'value' => $val); - $ruleValues[] = array('operator' => AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN, 'value' => $maxVal); + $ruleValues[] = ['operator' => AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL, 'value' => $val]; + $ruleValues[] = ['operator' => AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN, 'value' => $maxVal]; \PhpSpreadsheet\Calculation\Functions::setReturnDateType($rDateType); - return array('method' => 'filterTestInCustomDataSet', 'arguments' => array('filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND)); + return ['method' => 'filterTestInCustomDataSet', 'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND]]; } private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue) { - $range = $columnID.$startRow.':'.$columnID.$endRow; + $range = $columnID . $startRow . ':' . $columnID . $endRow; $dataValues = \PhpSpreadsheet\Calculation\Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false)); $dataValues = array_filter($dataValues); @@ -599,12 +596,12 @@ class AutoFilter // echo 'AutoFilter Heading Row ', $rangeStart[1],' is always SHOWN',PHP_EOL; $this->workSheet->getRowDimension($rangeStart[1])->setVisible(true); - $columnFilterTests = array(); + $columnFilterTests = []; foreach ($this->columns as $columnID => $filterColumn) { $rules = $filterColumn->getRules(); switch ($filterColumn->getFilterType()) { case AutoFilter\Column::AUTOFILTER_FILTERTYPE_FILTER: - $ruleValues = array(); + $ruleValues = []; // Build a list of the filter value selections foreach ($rules as $rule) { $ruleType = $rule->getRuleType(); @@ -618,17 +615,17 @@ class AutoFilter } if ($ruleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_FILTER) { // Filter on absolute values - $columnFilterTests[$columnID] = array( + $columnFilterTests[$columnID] = [ 'method' => 'filterTestInSimpleDataSet', - 'arguments' => array('filterValues' => $ruleDataSet, 'blanks' => $blanks) - ); + 'arguments' => ['filterValues' => $ruleDataSet, 'blanks' => $blanks], + ]; } else { // Filter on date group values - $arguments = array( - 'date' => array(), - 'time' => array(), - 'dateTime' => array(), - ); + $arguments = [ + 'date' => [], + 'time' => [], + 'dateTime' => [], + ]; foreach ($ruleDataSet as $ruleValue) { $date = $time = ''; if ((isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) && @@ -664,15 +661,15 @@ class AutoFilter $arguments['date'] = array_filter($arguments['date']); $arguments['time'] = array_filter($arguments['time']); $arguments['dateTime'] = array_filter($arguments['dateTime']); - $columnFilterTests[$columnID] = array( + $columnFilterTests[$columnID] = [ 'method' => 'filterTestInDateGroupSet', - 'arguments' => array('filterValues' => $arguments, 'blanks' => $blanks) - ); + 'arguments' => ['filterValues' => $arguments, 'blanks' => $blanks], + ]; } break; case AutoFilter\Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER: $customRuleForBlanks = false; - $ruleValues = array(); + $ruleValues = []; // Build a list of the filter value selections foreach ($rules as $rule) { $ruleType = $rule->getRuleType(); @@ -686,16 +683,16 @@ class AutoFilter $ruleValue = trim($ruleValue); } } - $ruleValues[] = array('operator' => $rule->getOperator(), 'value' => $ruleValue); + $ruleValues[] = ['operator' => $rule->getOperator(), 'value' => $ruleValue]; } $join = $filterColumn->getJoin(); - $columnFilterTests[$columnID] = array( + $columnFilterTests[$columnID] = [ 'method' => 'filterTestInCustomDataSet', - 'arguments' => array('filterRules' => $ruleValues, 'join' => $join, 'customRuleForBlanks' => $customRuleForBlanks) - ); + 'arguments' => ['filterRules' => $ruleValues, 'join' => $join, 'customRuleForBlanks' => $customRuleForBlanks], + ]; break; case AutoFilter\Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER: - $ruleValues = array(); + $ruleValues = []; foreach ($rules as $rule) { // We should only ever have one Dynamic Filter Rule anyway $dynamicRuleType = $rule->getGrouping(); @@ -703,37 +700,37 @@ class AutoFilter ($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) { // Number (Average) based // Calculate the average - $averageFormula = '=AVERAGE('.$columnID.($rangeStart[1]+1).':'.$columnID.$rangeEnd[1].')'; + $averageFormula = '=AVERAGE(' . $columnID . ($rangeStart[1] + 1) . ':' . $columnID . $rangeEnd[1] . ')'; $average = \PhpSpreadsheet\Calculation::getInstance()->calculateFormula($averageFormula, null, $this->workSheet->getCell('A1')); // Set above/below rule based on greaterThan or LessTan $operator = ($dynamicRuleType === AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ? AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN : AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN; - $ruleValues[] = array('operator' => $operator, - 'value' => $average - ); - $columnFilterTests[$columnID] = array( + $ruleValues[] = ['operator' => $operator, + 'value' => $average, + ]; + $columnFilterTests[$columnID] = [ 'method' => 'filterTestInCustomDataSet', - 'arguments' => array('filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR) - ); + 'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR], + ]; } else { // Date based if ($dynamicRuleType{0} == 'M' || $dynamicRuleType{0} == 'Q') { // Month or Quarter sscanf($dynamicRuleType, '%[A-Z]%d', $periodType, $period); if ($periodType == 'M') { - $ruleValues = array($period); + $ruleValues = [$period]; } else { --$period; - $periodEnd = (1+$period)*3; - $periodStart = 1+$period*3; + $periodEnd = (1 + $period) * 3; + $periodStart = 1 + $period * 3; $ruleValues = range($periodStart, $periodEnd); } - $columnFilterTests[$columnID] = array( + $columnFilterTests[$columnID] = [ 'method' => 'filterTestInPeriodDateSet', - 'arguments' => $ruleValues - ); - $filterColumn->setAttributes(array()); + 'arguments' => $ruleValues, + ]; + $filterColumn->setAttributes([]); } else { // Date Range $columnFilterTests[$columnID] = $this->dynamicFilterDateRange($dynamicRuleType, $filterColumn); @@ -743,7 +740,7 @@ class AutoFilter } break; case AutoFilter\Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER: - $ruleValues = array(); + $ruleValues = []; $dataRowCount = $rangeEnd[1] - $rangeStart[1]; foreach ($rules as $rule) { // We should only ever have one Dynamic Filter Rule anyway @@ -761,17 +758,17 @@ class AutoFilter $ruleValue = 500; } - $maxVal = $this->calculateTopTenValue($columnID, $rangeStart[1]+1, $rangeEnd[1], $toptenRuleType, $ruleValue); + $maxVal = $this->calculateTopTenValue($columnID, $rangeStart[1] + 1, $rangeEnd[1], $toptenRuleType, $ruleValue); $operator = ($toptenRuleType == AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL : AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL; - $ruleValues[] = array('operator' => $operator, 'value' => $maxVal); - $columnFilterTests[$columnID] = array( + $ruleValues[] = ['operator' => $operator, 'value' => $maxVal]; + $columnFilterTests[$columnID] = [ 'method' => 'filterTestInCustomDataSet', - 'arguments' => array('filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR) - ); - $filterColumn->setAttributes(array('maxVal' => $maxVal)); + 'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR], + ]; + $filterColumn->setAttributes(['maxVal' => $maxVal]); break; } } @@ -780,18 +777,18 @@ class AutoFilter // var_dump($columnFilterTests); // // Execute the column tests for each row in the autoFilter range to determine show/hide, - for ($row = $rangeStart[1]+1; $row <= $rangeEnd[1]; ++$row) { -// echo 'Testing Row = ', $row,PHP_EOL; + for ($row = $rangeStart[1] + 1; $row <= $rangeEnd[1]; ++$row) { + // echo 'Testing Row = ', $row,PHP_EOL; $result = true; foreach ($columnFilterTests as $columnID => $columnFilterTest) { -// echo 'Testing cell ', $columnID.$row,PHP_EOL; - $cellValue = $this->workSheet->getCell($columnID.$row)->getCalculatedValue(); + // echo 'Testing cell ', $columnID.$row,PHP_EOL; + $cellValue = $this->workSheet->getCell($columnID . $row)->getCalculatedValue(); // echo 'Value is ', $cellValue,PHP_EOL; // Execute the filter test $result = $result && call_user_func_array( - array('\\PhpSpreadsheet\\Worksheet\\AutoFilter', $columnFilterTest['method']), - array($cellValue, $columnFilterTest['arguments']) + ['\\PhpSpreadsheet\\Worksheet\\AutoFilter', $columnFilterTest['method']], + [$cellValue, $columnFilterTest['arguments']] ); // echo (($result) ? 'VALID' : 'INVALID'),PHP_EOL; // If filter test has resulted in FALSE, exit the loop straightaway rather than running any more tests @@ -807,7 +804,6 @@ class AutoFilter return $this; } - /** * Implement PHP __clone to create a deep clone, not just a shallow copy. */ @@ -824,7 +820,7 @@ class AutoFilter } } elseif ((is_array($value)) && ($key == 'columns')) { // The columns array of \PhpSpreadsheet\Worksheet\AutoFilter objects - $this->{$key} = array(); + $this->{$key} = []; foreach ($value as $k => $v) { $this->{$key}[$k] = clone $v; // attach the new cloned Column to this new cloned Autofilter object diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php b/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php index 33589163..ec205e62 100644 --- a/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php +++ b/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php @@ -28,21 +28,21 @@ namespace PhpSpreadsheet\Worksheet\AutoFilter; */ class Column { - const AUTOFILTER_FILTERTYPE_FILTER = 'filters'; - const AUTOFILTER_FILTERTYPE_CUSTOMFILTER = 'customFilters'; + const AUTOFILTER_FILTERTYPE_FILTER = 'filters'; + const AUTOFILTER_FILTERTYPE_CUSTOMFILTER = 'customFilters'; // Supports no more than 2 rules, with an And/Or join criteria // if more than 1 rule is defined - const AUTOFILTER_FILTERTYPE_DYNAMICFILTER = 'dynamicFilter'; + const AUTOFILTER_FILTERTYPE_DYNAMICFILTER = 'dynamicFilter'; // Even though the filter rule is constant, the filtered data can vary // e.g. filtered by date = TODAY - const AUTOFILTER_FILTERTYPE_TOPTENFILTER = 'top10'; + const AUTOFILTER_FILTERTYPE_TOPTENFILTER = 'top10'; /** * Types of autofilter rules * * @var string[] */ - private static $filterTypes = array( + private static $filterTypes = [ // Currently we're not handling // colorFilter // extLst @@ -51,21 +51,21 @@ class Column self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER, self::AUTOFILTER_FILTERTYPE_DYNAMICFILTER, self::AUTOFILTER_FILTERTYPE_TOPTENFILTER, - ); + ]; /* Multiple Rule Connections */ const AUTOFILTER_COLUMN_JOIN_AND = 'and'; - const AUTOFILTER_COLUMN_JOIN_OR = 'or'; + const AUTOFILTER_COLUMN_JOIN_OR = 'or'; /** * Join options for autofilter rules * * @var string[] */ - private static $ruleJoins = array( + private static $ruleJoins = [ self::AUTOFILTER_COLUMN_JOIN_AND, self::AUTOFILTER_COLUMN_JOIN_OR, - ); + ]; /** * Autofilter @@ -74,7 +74,6 @@ class Column */ private $parent; - /** * Autofilter Column Index * @@ -82,7 +81,6 @@ class Column */ private $columnIndex = ''; - /** * Autofilter Column Filter Type * @@ -90,7 +88,6 @@ class Column */ private $filterType = self::AUTOFILTER_FILTERTYPE_FILTER; - /** * Autofilter Multiple Rules And/Or * @@ -98,22 +95,19 @@ class Column */ private $join = self::AUTOFILTER_COLUMN_JOIN_OR; - /** * Autofilter Column Rules * * @var array of Column\Rule */ - private $ruleset = array(); - + private $ruleset = []; /** * Autofilter Column Dynamic Attributes * * @var array of mixed */ - private $attributes = array(); - + private $attributes = []; /** * Create a new Column @@ -245,7 +239,7 @@ class Column * @throws \PhpSpreadsheet\Exception * @return Column */ - public function setAttributes($pAttributes = array()) + public function setAttributes($pAttributes = []) { $this->attributes = $pAttributes; @@ -288,6 +282,7 @@ class Column if (isset($this->attributes[$pName])) { return $this->attributes[$pName]; } + return null; } @@ -305,7 +300,7 @@ class Column /** * Get a specified AutoFilter Column Rule * - * @param integer $pIndex Rule index in the ruleset array + * @param int $pIndex Rule index in the ruleset array * @return Column\Rule */ public function getRule($pIndex) @@ -313,6 +308,7 @@ class Column if (!isset($this->ruleset[$pIndex])) { $this->ruleset[$pIndex] = new Column\Rule($this); } + return $this->ruleset[$pIndex]; } @@ -332,7 +328,7 @@ class Column * Add a new AutoFilter Column Rule to the ruleset * * @param Column\Rule $pRule - * @param boolean $returnRule Flag indicating whether the rule object or the column object should be returned + * @param bool $returnRule Flag indicating whether the rule object or the column object should be returned * @return Column|Column\Rule */ public function addRule(Column\Rule $pRule, $returnRule = true) @@ -347,7 +343,7 @@ class Column * Delete a specified AutoFilter Column Rule * If the number of rules is reduced to 1, then we reset And/Or logic to Or * - * @param integer $pIndex Rule index in the ruleset array + * @param int $pIndex Rule index in the ruleset array * @return Column */ public function deleteRule($pIndex) @@ -370,7 +366,7 @@ class Column */ public function clearRules() { - $this->ruleset = array(); + $this->ruleset = []; $this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR); return $this; @@ -392,7 +388,7 @@ class Column } } elseif ((is_array($value)) && ($key == 'ruleset')) { // The columns array of \PhpSpreadsheet\Worksheet\AutoFilter objects - $this->$key = array(); + $this->$key = []; foreach ($value as $k => $v) { $this->$key[$k] = clone $v; // attach the new cloned Rule to this new cloned Autofilter Cloned object diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php b/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php index faba6316..b0c8c49f 100644 --- a/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php +++ b/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php @@ -28,13 +28,13 @@ namespace PhpSpreadsheet\Worksheet\AutoFilter\Column; */ class Rule { - const AUTOFILTER_RULETYPE_FILTER = 'filter'; - const AUTOFILTER_RULETYPE_DATEGROUP = 'dateGroupItem'; - const AUTOFILTER_RULETYPE_CUSTOMFILTER = 'customFilter'; + const AUTOFILTER_RULETYPE_FILTER = 'filter'; + const AUTOFILTER_RULETYPE_DATEGROUP = 'dateGroupItem'; + const AUTOFILTER_RULETYPE_CUSTOMFILTER = 'customFilter'; const AUTOFILTER_RULETYPE_DYNAMICFILTER = 'dynamicFilter'; - const AUTOFILTER_RULETYPE_TOPTENFILTER = 'top10Filter'; + const AUTOFILTER_RULETYPE_TOPTENFILTER = 'top10Filter'; - private static $ruleTypes = array( + private static $ruleTypes = [ // Currently we're not handling // colorFilter // extLst @@ -44,72 +44,72 @@ class Rule self::AUTOFILTER_RULETYPE_CUSTOMFILTER, self::AUTOFILTER_RULETYPE_DYNAMICFILTER, self::AUTOFILTER_RULETYPE_TOPTENFILTER, - ); + ]; - const AUTOFILTER_RULETYPE_DATEGROUP_YEAR = 'year'; - const AUTOFILTER_RULETYPE_DATEGROUP_MONTH = 'month'; - const AUTOFILTER_RULETYPE_DATEGROUP_DAY = 'day'; - const AUTOFILTER_RULETYPE_DATEGROUP_HOUR = 'hour'; + const AUTOFILTER_RULETYPE_DATEGROUP_YEAR = 'year'; + const AUTOFILTER_RULETYPE_DATEGROUP_MONTH = 'month'; + const AUTOFILTER_RULETYPE_DATEGROUP_DAY = 'day'; + const AUTOFILTER_RULETYPE_DATEGROUP_HOUR = 'hour'; const AUTOFILTER_RULETYPE_DATEGROUP_MINUTE = 'minute'; const AUTOFILTER_RULETYPE_DATEGROUP_SECOND = 'second'; - private static $dateTimeGroups = array( + private static $dateTimeGroups = [ self::AUTOFILTER_RULETYPE_DATEGROUP_YEAR, self::AUTOFILTER_RULETYPE_DATEGROUP_MONTH, self::AUTOFILTER_RULETYPE_DATEGROUP_DAY, self::AUTOFILTER_RULETYPE_DATEGROUP_HOUR, self::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE, self::AUTOFILTER_RULETYPE_DATEGROUP_SECOND, - ); + ]; - const AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY = 'yesterday'; - const AUTOFILTER_RULETYPE_DYNAMIC_TODAY = 'today'; - const AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW = 'tomorrow'; - const AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE = 'yearToDate'; - const AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR = 'thisYear'; - const AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER = 'thisQuarter'; - const AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH = 'thisMonth'; - const AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK = 'thisWeek'; - const AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR = 'lastYear'; - const AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER = 'lastQuarter'; - const AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH = 'lastMonth'; - const AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK = 'lastWeek'; - const AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR = 'nextYear'; - const AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER = 'nextQuarter'; - const AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH = 'nextMonth'; - const AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK = 'nextWeek'; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1 = 'M1'; - const AUTOFILTER_RULETYPE_DYNAMIC_JANUARY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2 = 'M2'; - const AUTOFILTER_RULETYPE_DYNAMIC_FEBRUARY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3 = 'M3'; - const AUTOFILTER_RULETYPE_DYNAMIC_MARCH = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4 = 'M4'; - const AUTOFILTER_RULETYPE_DYNAMIC_APRIL = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5 = 'M5'; - const AUTOFILTER_RULETYPE_DYNAMIC_MAY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6 = 'M6'; - const AUTOFILTER_RULETYPE_DYNAMIC_JUNE = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7 = 'M7'; - const AUTOFILTER_RULETYPE_DYNAMIC_JULY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8 = 'M8'; - const AUTOFILTER_RULETYPE_DYNAMIC_AUGUST = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9 = 'M9'; - const AUTOFILTER_RULETYPE_DYNAMIC_SEPTEMBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10 = 'M10'; - const AUTOFILTER_RULETYPE_DYNAMIC_OCTOBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11 = 'M11'; - const AUTOFILTER_RULETYPE_DYNAMIC_NOVEMBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11; - const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12 = 'M12'; - const AUTOFILTER_RULETYPE_DYNAMIC_DECEMBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12; - const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1 = 'Q1'; - const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2 = 'Q2'; - const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3 = 'Q3'; - const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4 = 'Q4'; + const AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY = 'yesterday'; + const AUTOFILTER_RULETYPE_DYNAMIC_TODAY = 'today'; + const AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW = 'tomorrow'; + const AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE = 'yearToDate'; + const AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR = 'thisYear'; + const AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER = 'thisQuarter'; + const AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH = 'thisMonth'; + const AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK = 'thisWeek'; + const AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR = 'lastYear'; + const AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER = 'lastQuarter'; + const AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH = 'lastMonth'; + const AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK = 'lastWeek'; + const AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR = 'nextYear'; + const AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER = 'nextQuarter'; + const AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH = 'nextMonth'; + const AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK = 'nextWeek'; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1 = 'M1'; + const AUTOFILTER_RULETYPE_DYNAMIC_JANUARY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2 = 'M2'; + const AUTOFILTER_RULETYPE_DYNAMIC_FEBRUARY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3 = 'M3'; + const AUTOFILTER_RULETYPE_DYNAMIC_MARCH = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4 = 'M4'; + const AUTOFILTER_RULETYPE_DYNAMIC_APRIL = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5 = 'M5'; + const AUTOFILTER_RULETYPE_DYNAMIC_MAY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6 = 'M6'; + const AUTOFILTER_RULETYPE_DYNAMIC_JUNE = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7 = 'M7'; + const AUTOFILTER_RULETYPE_DYNAMIC_JULY = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8 = 'M8'; + const AUTOFILTER_RULETYPE_DYNAMIC_AUGUST = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9 = 'M9'; + const AUTOFILTER_RULETYPE_DYNAMIC_SEPTEMBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10 = 'M10'; + const AUTOFILTER_RULETYPE_DYNAMIC_OCTOBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11 = 'M11'; + const AUTOFILTER_RULETYPE_DYNAMIC_NOVEMBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11; + const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12 = 'M12'; + const AUTOFILTER_RULETYPE_DYNAMIC_DECEMBER = self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12; + const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1 = 'Q1'; + const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2 = 'Q2'; + const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3 = 'Q3'; + const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4 = 'Q4'; const AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE = 'aboveAverage'; const AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE = 'belowAverage'; - private static $dynamicTypes = array( + private static $dynamicTypes = [ self::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY, self::AUTOFILTER_RULETYPE_DYNAMIC_TODAY, self::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW, @@ -144,7 +144,7 @@ class Rule self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4, self::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE, self::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE, - ); + ]; /* * The only valid filter rule operators for filter and customFilter types are: @@ -155,38 +155,37 @@ class Rule *
';
$html .= '
' . PHP_EOL;
@@ -733,9 +736,9 @@ class HTML extends BaseWriter implements IWriter
/**
* Generate CSS styles
*
- * @param boolean $generateSurroundingHTML Generate surrounding HTML tags? (<style> and </style>)
- * @return string
+ * @param bool $generateSurroundingHTML Generate surrounding HTML tags? (<style> and </style>)
* @throws \Spreadsheet\Writer\Exception
+ * @return string
*/
public function generateStyles($generateSurroundingHTML = true)
{
@@ -775,9 +778,9 @@ class HTML extends BaseWriter implements IWriter
/**
* Build CSS styles
*
- * @param boolean $generateSurroundingHTML Generate surrounding HTML style? (html { })
- * @return array
+ * @param bool $generateSurroundingHTML Generate surrounding HTML style? (html { })
* @throws \Spreadsheet\Writer\Exception
+ * @return array
*/
public function buildCSS($generateSurroundingHTML = true)
{
@@ -797,19 +800,18 @@ class HTML extends BaseWriter implements IWriter
}
// Construct CSS
- $css = array();
+ $css = [];
// Start styles
if ($generateSurroundingHTML) {
// html { }
- $css['html']['font-family'] = 'Calibri, Arial, Helvetica, sans-serif';
- $css['html']['font-size'] = '11pt';
+ $css['html']['font-family'] = 'Calibri, Arial, Helvetica, sans-serif';
+ $css['html']['font-size'] = '11pt';
$css['html']['background-color'] = 'white';
}
-
// table { }
- $css['table']['border-collapse'] = 'collapse';
+ $css['table']['border-collapse'] = 'collapse';
if (!$this->isPdf) {
$css['table']['page-break-after'] = 'always';
}
@@ -843,7 +845,7 @@ class HTML extends BaseWriter implements IWriter
}
// Fetch sheets
- $sheets = array();
+ $sheets = [];
if (is_null($this->sheetIndex)) {
$sheets = $this->spreadsheet->getAllSheets();
} else {
@@ -886,7 +888,7 @@ class HTML extends BaseWriter implements IWriter
$rowDimension = $sheet->getDefaultRowDimension();
// table.sheetN tr { }
- $css['table.sheet' . $sheetIndex . ' tr'] = array();
+ $css['table.sheet' . $sheetIndex . ' tr'] = [];
if ($rowDimension->getRowHeight() == -1) {
$pt_height = Font::getDefaultRowHeightByFont($this->spreadsheet->getDefaultStyle()->getFont());
@@ -895,7 +897,7 @@ class HTML extends BaseWriter implements IWriter
}
$css['table.sheet' . $sheetIndex . ' tr']['height'] = $pt_height . 'pt';
if ($rowDimension->getVisible() === false) {
- $css['table.sheet' . $sheetIndex . ' tr']['display'] = 'none';
+ $css['table.sheet' . $sheetIndex . ' tr']['display'] = 'none';
$css['table.sheet' . $sheetIndex . ' tr']['visibility'] = 'hidden';
}
@@ -904,7 +906,7 @@ class HTML extends BaseWriter implements IWriter
$row = $rowDimension->getRowIndex() - 1;
// table.sheetN tr.rowYYYYYY { }
- $css['table.sheet' . $sheetIndex . ' tr.row' . $row] = array();
+ $css['table.sheet' . $sheetIndex . ' tr.row' . $row] = [];
if ($rowDimension->getRowHeight() == -1) {
$pt_height = Font::getDefaultRowHeightByFont($this->spreadsheet->getDefaultStyle()->getFont());
@@ -960,14 +962,14 @@ class HTML extends BaseWriter implements IWriter
private function createCSSStyleAlignment(\Spreadsheet\Style\Alignment $pStyle)
{
// Construct CSS
- $css = array();
+ $css = [];
// Create CSS
$css['vertical-align'] = $this->mapVAlign($pStyle->getVertical());
if ($textAlign = $this->mapHAlign($pStyle->getHorizontal())) {
$css['text-align'] = $textAlign;
- if (in_array($textAlign, array('left', 'right'))) {
- $css['padding-'.$textAlign] = (string)((int)$pStyle->getIndent() * 9).'px';
+ if (in_array($textAlign, ['left', 'right'])) {
+ $css['padding-' . $textAlign] = (string) ((int) $pStyle->getIndent() * 9) . 'px';
}
}
@@ -983,7 +985,7 @@ class HTML extends BaseWriter implements IWriter
private function createCSSStyleFont(\Spreadsheet\Style\Font $pStyle)
{
// Construct CSS
- $css = array();
+ $css = [];
// Create CSS
if ($pStyle->getBold()) {
@@ -1000,9 +1002,9 @@ class HTML extends BaseWriter implements IWriter
$css['font-style'] = 'italic';
}
- $css['color'] = '#' . $pStyle->getColor()->getRGB();
+ $css['color'] = '#' . $pStyle->getColor()->getRGB();
$css['font-family'] = '\'' . $pStyle->getName() . '\'';
- $css['font-size'] = $pStyle->getSize() . 'pt';
+ $css['font-size'] = $pStyle->getSize() . 'pt';
return $css;
}
@@ -1016,13 +1018,13 @@ class HTML extends BaseWriter implements IWriter
private function createCSSStyleBorders(\Spreadsheet\Style\Borders $pStyle)
{
// Construct CSS
- $css = array();
+ $css = [];
// Create CSS
$css['border-bottom'] = $this->createCSSStyleBorder($pStyle->getBottom());
- $css['border-top'] = $this->createCSSStyleBorder($pStyle->getTop());
- $css['border-left'] = $this->createCSSStyleBorder($pStyle->getLeft());
- $css['border-right'] = $this->createCSSStyleBorder($pStyle->getRight());
+ $css['border-top'] = $this->createCSSStyleBorder($pStyle->getTop());
+ $css['border-left'] = $this->createCSSStyleBorder($pStyle->getLeft());
+ $css['border-right'] = $this->createCSSStyleBorder($pStyle->getRight());
return $css;
}
@@ -1053,7 +1055,7 @@ class HTML extends BaseWriter implements IWriter
private function createCSSStyleFill(\Spreadsheet\Style\Fill $pStyle)
{
// Construct HTML
- $css = array();
+ $css = [];
// Create CSS
$value = $pStyle->getFillType() == \Spreadsheet\Style\Fill::FILL_NONE ?
@@ -1080,8 +1082,8 @@ class HTML extends BaseWriter implements IWriter
* Generate table header
*
* @param \Spreadsheet\Worksheet $pSheet The worksheet for the table we are writing
- * @return string
* @throws \Spreadsheet\Writer\Exception
+ * @return string
*/
private function generateTableHeader($pSheet)
{
@@ -1141,8 +1143,8 @@ class HTML extends BaseWriter implements IWriter
* @param \Spreadsheet\Worksheet $pSheet \Spreadsheet\Worksheet
* @param array $pValues Array containing cells in a row
* @param int $pRow Row number (0-based)
- * @return string
* @throws \Spreadsheet\Writer\Exception
+ * @return string
*/
private function generateRow(\Spreadsheet\Worksheet $pSheet, $pValues = null, $pRow = 0, $cellType = 'td')
{
@@ -1189,7 +1191,7 @@ class HTML extends BaseWriter implements IWriter
$cssClass = '';
$cssClass = 'column' . $colNum;
} else {
- $cssClass = array();
+ $cssClass = [];
if ($cellType == 'th') {
if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum])) {
$this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum];
@@ -1247,26 +1249,26 @@ class HTML extends BaseWriter implements IWriter
$cellData = \Spreadsheet\Style\NumberFormat::toFormattedString(
$cell->getCalculatedValue(),
$pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode(),
- array($this, 'formatColor')
+ [$this, 'formatColor']
);
} else {
$cellData = \Spreadsheet\Style\NumberFormat::toFormattedString(
$cell->getValue(),
$pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode(),
- array($this, 'formatColor')
+ [$this, 'formatColor']
);
}
$cellData = htmlspecialchars($cellData);
if ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperScript()) {
- $cellData = ''.$cellData.'';
+ $cellData = '' . $cellData . '';
} elseif ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubScript()) {
- $cellData = ''.$cellData.'';
+ $cellData = '' . $cellData . '';
}
}
// Converts the cell content so that spaces occuring at beginning of each new line are replaced by
// Example: " Hello\n to the world" is converted to " Hello\n to the world"
- $cellData = preg_replace("/(?m)(?:^|\\G) /", ' ', $cellData);
+ $cellData = preg_replace('/(?m)(?:^|\\G) /', ' ', $cellData);
// convert newline "\n" to '
' $cellData = nl2br($cellData); @@ -1370,7 +1372,7 @@ class HTML extends BaseWriter implements IWriter $html .= $cellData; // Column end - $html .= '' . PHP_EOL; + $html .= '' . PHP_EOL; } // Next column @@ -1383,7 +1385,7 @@ class HTML extends BaseWriter implements IWriter // Return return $html; } else { - throw new \Spreadsheet\Writer\Exception("Invalid parameters passed."); + throw new \Spreadsheet\Writer\Exception('Invalid parameters passed.'); } } @@ -1393,9 +1395,9 @@ class HTML extends BaseWriter implements IWriter * @param array * @return string */ - private function assembleCSS($pValue = array()) + private function assembleCSS($pValue = []) { - $pairs = array(); + $pairs = []; foreach ($pValue as $property => $value) { $pairs[] = $property . ':' . $value; } @@ -1423,13 +1425,14 @@ class HTML extends BaseWriter implements IWriter public function setImagesRoot($pValue = '.') { $this->imagesRoot = $pValue; + return $this; } /** * Get embed images * - * @return boolean + * @return bool */ public function getEmbedImages() { @@ -1439,19 +1442,20 @@ class HTML extends BaseWriter implements IWriter /** * Set embed images * - * @param boolean $pValue + * @param bool $pValue * @return Spreadsheet_Writer_HTML */ public function setEmbedImages($pValue = '.') { $this->embedImages = $pValue; + return $this; } /** * Get use inline CSS? * - * @return boolean + * @return bool */ public function getUseInlineCss() { @@ -1461,12 +1465,13 @@ class HTML extends BaseWriter implements IWriter /** * Set use inline CSS? * - * @param boolean $pValue + * @param bool $pValue * @return Spreadsheet_Writer_HTML */ public function setUseInlineCss($pValue = false) { $this->useInlineCss = $pValue; + return $this; } @@ -1481,7 +1486,7 @@ class HTML extends BaseWriter implements IWriter { // Color information, e.g. [Red] is always at the beginning $color = null; // initialize - $matches = array(); + $matches = []; $color_regex = '/^\\[[a-zA-Z]+\\]/'; if (preg_match($color_regex, $pFormat, $matches)) { @@ -1510,18 +1515,18 @@ class HTML extends BaseWriter implements IWriter // In HTML only the upper-left cell should be written and it should have // appropriate rowspan / colspan attribute $sheetIndexes = $this->sheetIndex !== null ? - array($this->sheetIndex) : range(0, $this->spreadsheet->getSheetCount() - 1); + [$this->sheetIndex] : range(0, $this->spreadsheet->getSheetCount() - 1); foreach ($sheetIndexes as $sheetIndex) { $sheet = $this->spreadsheet->getSheet($sheetIndex); - $candidateSpannedRow = array(); + $candidateSpannedRow = []; // loop through all Excel merged cells foreach ($sheet->getMergeCells() as $cells) { - list($cells,) = \Spreadsheet\Cell::splitRange($cells); + list($cells) = \Spreadsheet\Cell::splitRange($cells); $first = $cells[0]; - $last = $cells[1]; + $last = $cells[1]; list($fc, $fr) = \Spreadsheet\Cell::coordinateFromString($first); $fc = \Spreadsheet\Cell::columnIndexFromString($fc) - 1; @@ -1539,17 +1544,17 @@ class HTML extends BaseWriter implements IWriter while ($c++ < $lc) { if (!($c == $fc && $r == $fr)) { // not the upper-left cell (should not be written in HTML) - $this->isSpannedCell[$sheetIndex][$r][$c] = array( - 'baseCell' => array($fr, $fc), - ); + $this->isSpannedCell[$sheetIndex][$r][$c] = [ + 'baseCell' => [$fr, $fc], + ]; } else { // upper-left is the base cell that should hold the colspan/rowspan attribute - $this->isBaseCell[$sheetIndex][$r][$c] = array( + $this->isBaseCell[$sheetIndex][$r][$c] = [ 'xlrowspan' => $lr - $fr + 1, // Excel rowspan - 'rowspan' => $lr - $fr + 1, // HTML rowspan, value may change + 'rowspan' => $lr - $fr + 1, // HTML rowspan, value may change 'xlcolspan' => $lc - $fc + 1, // Excel colspan - 'colspan' => $lc - $fc + 1, // HTML colspan, value may change - ); + 'colspan' => $lc - $fc + 1, // HTML colspan, value may change + ]; } } } @@ -1569,7 +1574,7 @@ class HTML extends BaseWriter implements IWriter // For each of the omitted rows we found above, the affected rowspans should be subtracted by 1 if (isset($this->isSpannedRow[$sheetIndex])) { foreach ($this->isSpannedRow[$sheetIndex] as $rowIndex) { - $adjustedBaseCells = array(); + $adjustedBaseCells = []; $c = -1; $e = $countColumns - 1; while ($c++ < $e) { diff --git a/src/PhpSpreadsheet/Writer/OpenDocument.php b/src/PhpSpreadsheet/Writer/OpenDocument.php index 3aa2824f..c052466c 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument.php @@ -31,7 +31,7 @@ class OpenDocument extends BaseWriter implements IWriter * * @var OpenDocument\WriterPart[] */ - private $writerParts = array(); + private $writerParts = []; /** * Private PhpSpreadsheet @@ -49,15 +49,15 @@ class OpenDocument extends BaseWriter implements IWriter { $this->setPhpSpreadsheet($spreadsheet); - $writerPartsArray = array( - 'content' => \PhpSpreadsheet\Writer\OpenDocument\Content::class, - 'meta' => \PhpSpreadsheet\Writer\OpenDocument\Meta::class, - 'meta_inf' => \PhpSpreadsheet\Writer\OpenDocument\MetaInf::class, - 'mimetype' => \PhpSpreadsheet\Writer\OpenDocument\Mimetype::class, - 'settings' => \PhpSpreadsheet\Writer\OpenDocument\Settings::class, - 'styles' => \PhpSpreadsheet\Writer\OpenDocument\Styles::class, + $writerPartsArray = [ + 'content' => \PhpSpreadsheet\Writer\OpenDocument\Content::class, + 'meta' => \PhpSpreadsheet\Writer\OpenDocument\Meta::class, + 'meta_inf' => \PhpSpreadsheet\Writer\OpenDocument\MetaInf::class, + 'mimetype' => \PhpSpreadsheet\Writer\OpenDocument\Mimetype::class, + 'settings' => \PhpSpreadsheet\Writer\OpenDocument\Settings::class, + 'styles' => \PhpSpreadsheet\Writer\OpenDocument\Styles::class, 'thumbnails' => \PhpSpreadsheet\Writer\OpenDocument\Thumbnails::class, - ); + ]; foreach ($writerPartsArray as $writer => $class) { $this->writerParts[$writer] = new $class($this); @@ -162,8 +162,8 @@ class OpenDocument extends BaseWriter implements IWriter /** * Get PhpSpreadsheet object * - * @return PhpSpreadsheet * @throws \PhpSpreadsheet\Writer\Exception + * @return PhpSpreadsheet */ public function getPhpSpreadsheet() { @@ -184,6 +184,7 @@ class OpenDocument extends BaseWriter implements IWriter public function setPhpSpreadsheet(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { $this->spreadSheet = $spreadsheet; + return $this; } } diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php b/src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php index 1901b7b5..8841fa9a 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php @@ -27,7 +27,6 @@ namespace PhpSpreadsheet\Writer\OpenDocument\Cell; * @version ##VERSION##, ##DATE## */ - /** * @category PhpSpreadsheet * @copyright Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet) @@ -47,9 +46,9 @@ class Comment //$objWriter->writeAttribute('draw:style-name', 'gr1'); //$objWriter->writeAttribute('draw:text-style-name', 'P1'); $objWriter->writeAttribute('svg:width', $comment->getWidth()); - $objWriter->writeAttribute('svg:height', $comment->getHeight()); - $objWriter->writeAttribute('svg:x', $comment->getMarginLeft()); - $objWriter->writeAttribute('svg:y', $comment->getMarginTop()); + $objWriter->writeAttribute('svg:height', $comment->getHeight()); + $objWriter->writeAttribute('svg:x', $comment->getMarginLeft()); + $objWriter->writeAttribute('svg:y', $comment->getMarginTop()); //$objWriter->writeAttribute('draw:caption-point-x', $comment->getMarginLeft()); //$objWriter->writeAttribute('draw:caption-point-y', $comment->getMarginTop()); $objWriter->writeElement('dc:creator', $comment->getAuthor()); diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Content.php b/src/PhpSpreadsheet/Writer/OpenDocument/Content.php index f2312409..8ab14baf 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Content.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Content.php @@ -27,7 +27,6 @@ namespace PhpSpreadsheet\Writer\OpenDocument; * @version ##VERSION##, ##DATE## */ - /** * @category PhpSpreadsheet * @copyright Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet) @@ -42,8 +41,8 @@ class Content extends WriterPart * Write content.xml to XML format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { @@ -63,51 +62,51 @@ class Content extends WriterPart // Content $objWriter->startElement('office:document-content'); - $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); - $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); - $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); - $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); - $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); - $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); - $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); - $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); - $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); - $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); - $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); - $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); - $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); - $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); - $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); - $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); - $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); - $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); - $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); - $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); - $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); - $objWriter->writeAttribute('xmlns:xforms', 'http://www.w3.org/2002/xforms'); - $objWriter->writeAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema'); - $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance'); - $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); - $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); - $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); - $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); - $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); - $objWriter->writeAttribute('xmlns:field', 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0'); - $objWriter->writeAttribute('xmlns:formx', 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0'); - $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); - $objWriter->writeAttribute('office:version', '1.2'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); + $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); + $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); + $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); + $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); + $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); + $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); + $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); + $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); + $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); + $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); + $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); + $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); + $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); + $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); + $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); + $objWriter->writeAttribute('xmlns:xforms', 'http://www.w3.org/2002/xforms'); + $objWriter->writeAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema'); + $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance'); + $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); + $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); + $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); + $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); + $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); + $objWriter->writeAttribute('xmlns:field', 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0'); + $objWriter->writeAttribute('xmlns:formx', 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0'); + $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); + $objWriter->writeAttribute('office:version', '1.2'); - $objWriter->writeElement('office:scripts'); - $objWriter->writeElement('office:font-face-decls'); - $objWriter->writeElement('office:automatic-styles'); + $objWriter->writeElement('office:scripts'); + $objWriter->writeElement('office:font-face-decls'); + $objWriter->writeElement('office:automatic-styles'); - $objWriter->startElement('office:body'); - $objWriter->startElement('office:spreadsheet'); - $objWriter->writeElement('table:calculation-settings'); - $this->writeSheets($objWriter); - $objWriter->writeElement('table:named-expressions'); - $objWriter->endElement(); - $objWriter->endElement(); + $objWriter->startElement('office:body'); + $objWriter->startElement('office:spreadsheet'); + $objWriter->writeElement('table:calculation-settings'); + $this->writeSheets($objWriter); + $objWriter->writeElement('table:named-expressions'); + $objWriter->endElement(); + $objWriter->endElement(); $objWriter->endElement(); return $objWriter->getData(); @@ -123,15 +122,15 @@ class Content extends WriterPart $spreadsheet = $this->getParentWriter()->getPhpSpreadsheet(); /* @var $spreadsheet PhpSpreadsheet */ $sheet_count = $spreadsheet->getSheetCount(); - for ($i = 0; $i < $sheet_count; $i++) { + for ($i = 0; $i < $sheet_count; ++$i) { //$this->getWriterPart('Worksheet')->writeWorksheet()); $objWriter->startElement('table:table'); - $objWriter->writeAttribute('table:name', $spreadsheet->getSheet($i)->getTitle()); - $objWriter->writeElement('office:forms'); - $objWriter->startElement('table:table-column'); - $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); - $objWriter->endElement(); - $this->writeRows($objWriter, $spreadsheet->getSheet($i)); + $objWriter->writeAttribute('table:name', $spreadsheet->getSheet($i)->getTitle()); + $objWriter->writeElement('office:forms'); + $objWriter->startElement('table:table-column'); + $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); + $objWriter->endElement(); + $this->writeRows($objWriter, $spreadsheet->getSheet($i)); $objWriter->endElement(); } } @@ -148,7 +147,7 @@ class Content extends WriterPart $span_row = 0; $rows = $sheet->getRowIterator(); while ($rows->valid()) { - $number_rows_repeated--; + --$number_rows_repeated; $row = $rows->current(); if ($row->getCellIterator()->valid()) { if ($span_row) { @@ -157,7 +156,7 @@ class Content extends WriterPart $objWriter->writeAttribute('table:number-rows-repeated', $span_row); } $objWriter->startElement('table:table-cell'); - $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); + $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); $objWriter->endElement(); $objWriter->endElement(); $span_row = 0; @@ -166,7 +165,7 @@ class Content extends WriterPart $this->writeCells($objWriter, $row); $objWriter->endElement(); } else { - $span_row++; + ++$span_row; } $rows->next(); } @@ -254,8 +253,8 @@ class Content extends WriterPart * Write span * * @param \PhpSpreadsheet\Shared\XMLWriter $objWriter - * @param integer $curColumn - * @param integer $prevColumn + * @param int $curColumn + * @param int $prevColumn */ private function writeCellSpan(\PhpSpreadsheet\Shared\XMLWriter $objWriter, $curColumn, $prevColumn) { @@ -264,7 +263,7 @@ class Content extends WriterPart $objWriter->writeElement('table:table-cell'); } elseif ($diff > 1) { $objWriter->startElement('table:table-cell'); - $objWriter->writeAttribute('table:number-columns-repeated', $diff); + $objWriter->writeAttribute('table:number-columns-repeated', $diff); $objWriter->endElement(); } } diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Meta.php b/src/PhpSpreadsheet/Writer/OpenDocument/Meta.php index 1edd0032..bd5082c7 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Meta.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Meta.php @@ -30,8 +30,8 @@ class Meta extends WriterPart * Write meta.xml to XML format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php b/src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php index 791dfcee..94374cad 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php @@ -30,8 +30,8 @@ class MetaInf extends WriterPart * Write META-INF/manifest.xml to XML format * * @param \PhpSpreadsheet\SpreadSheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function writeManifest(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { @@ -51,34 +51,34 @@ class MetaInf extends WriterPart // Manifest $objWriter->startElement('manifest:manifest'); - $objWriter->writeAttribute('xmlns:manifest', 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0'); - $objWriter->writeAttribute('manifest:version', '1.2'); + $objWriter->writeAttribute('xmlns:manifest', 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0'); + $objWriter->writeAttribute('manifest:version', '1.2'); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', '/'); - $objWriter->writeAttribute('manifest:version', '1.2'); - $objWriter->writeAttribute('manifest:media-type', 'application/vnd.oasis.opendocument.spreadsheet'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'meta.xml'); - $objWriter->writeAttribute('manifest:media-type', 'text/xml'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'settings.xml'); - $objWriter->writeAttribute('manifest:media-type', 'text/xml'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'content.xml'); - $objWriter->writeAttribute('manifest:media-type', 'text/xml'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'Thumbnails/thumbnail.png'); - $objWriter->writeAttribute('manifest:media-type', 'image/png'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'styles.xml'); - $objWriter->writeAttribute('manifest:media-type', 'text/xml'); - $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', '/'); + $objWriter->writeAttribute('manifest:version', '1.2'); + $objWriter->writeAttribute('manifest:media-type', 'application/vnd.oasis.opendocument.spreadsheet'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'meta.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'settings.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'content.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'Thumbnails/thumbnail.png'); + $objWriter->writeAttribute('manifest:media-type', 'image/png'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'styles.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); $objWriter->endElement(); return $objWriter->getData(); diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php b/src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php index 7e6a713b..1eddda63 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php @@ -28,8 +28,8 @@ class Mimetype extends WriterPart * Write mimetype to plain text format * * @param \PhpSpreadsheet\SpreadSheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Settings.php b/src/PhpSpreadsheet/Writer/OpenDocument/Settings.php index e7cb9a7c..10ae515c 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Settings.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Settings.php @@ -30,8 +30,8 @@ class Settings extends WriterPart * Write settings.xml to XML format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { @@ -51,23 +51,23 @@ class Settings extends WriterPart // Settings $objWriter->startElement('office:document-settings'); - $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); - $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); - $objWriter->writeAttribute('xmlns:config', 'urn:oasis:names:tc:opendocument:xmlns:config:1.0'); - $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); - $objWriter->writeAttribute('office:version', '1.2'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:config', 'urn:oasis:names:tc:opendocument:xmlns:config:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('office:version', '1.2'); - $objWriter->startElement('office:settings'); - $objWriter->startElement('config:config-item-set'); - $objWriter->writeAttribute('config:name', 'ooo:view-settings'); - $objWriter->startElement('config:config-item-map-indexed'); - $objWriter->writeAttribute('config:name', 'Views'); - $objWriter->endElement(); - $objWriter->endElement(); - $objWriter->startElement('config:config-item-set'); - $objWriter->writeAttribute('config:name', 'ooo:configuration-settings'); - $objWriter->endElement(); - $objWriter->endElement(); + $objWriter->startElement('office:settings'); + $objWriter->startElement('config:config-item-set'); + $objWriter->writeAttribute('config:name', 'ooo:view-settings'); + $objWriter->startElement('config:config-item-map-indexed'); + $objWriter->writeAttribute('config:name', 'Views'); + $objWriter->endElement(); + $objWriter->endElement(); + $objWriter->startElement('config:config-item-set'); + $objWriter->writeAttribute('config:name', 'ooo:configuration-settings'); + $objWriter->endElement(); + $objWriter->endElement(); $objWriter->endElement(); return $objWriter->getData(); diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Styles.php b/src/PhpSpreadsheet/Writer/OpenDocument/Styles.php index 345ff3da..6c5bcdf1 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Styles.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Styles.php @@ -30,8 +30,8 @@ class Styles extends WriterPart * Write styles.xml to XML format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { @@ -51,39 +51,39 @@ class Styles extends WriterPart // Content $objWriter->startElement('office:document-styles'); - $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); - $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); - $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); - $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); - $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); - $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); - $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); - $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); - $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); - $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); - $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); - $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); - $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); - $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); - $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); - $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); - $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); - $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); - $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); - $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); - $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); - $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); - $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); - $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); - $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); - $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); - $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); - $objWriter->writeAttribute('office:version', '1.2'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); + $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); + $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); + $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); + $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); + $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); + $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); + $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); + $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); + $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); + $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); + $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); + $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); + $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); + $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); + $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); + $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); + $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); + $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); + $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); + $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); + $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); + $objWriter->writeAttribute('office:version', '1.2'); - $objWriter->writeElement('office:font-face-decls'); - $objWriter->writeElement('office:styles'); - $objWriter->writeElement('office:automatic-styles'); - $objWriter->writeElement('office:master-styles'); + $objWriter->writeElement('office:font-face-decls'); + $objWriter->writeElement('office:styles'); + $objWriter->writeElement('office:automatic-styles'); + $objWriter->writeElement('office:master-styles'); $objWriter->endElement(); return $objWriter->getData(); diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php b/src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php index bc423afd..f92b2808 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php @@ -30,8 +30,8 @@ class Thumbnails extends WriterPart * Write Thumbnails/thumbnail.png to PNG format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function writeThumbnail(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { diff --git a/src/PhpSpreadsheet/Writer/PDF.php b/src/PhpSpreadsheet/Writer/PDF.php index 842f1b8f..c716d25e 100644 --- a/src/PhpSpreadsheet/Writer/PDF.php +++ b/src/PhpSpreadsheet/Writer/PDF.php @@ -26,7 +26,6 @@ namespace PhpSpreadsheet\Writer; */ class PDF implements IWriter { - /** * The wrapper for the requested PDF rendering engine * @@ -44,12 +43,12 @@ class PDF implements IWriter { $pdfLibraryName = \PhpSpreadsheet\Settings::getPdfRendererName(); if (is_null($pdfLibraryName)) { - throw new Exception("PDF Rendering library has not been defined."); + throw new Exception('PDF Rendering library has not been defined.'); } $pdfLibraryPath = \PhpSpreadsheet\Settings::getPdfRendererPath(); if (is_null($pdfLibraryName)) { - throw new Exception("PDF Rendering library path has not been defined."); + throw new Exception('PDF Rendering library path has not been defined.'); } $includePath = str_replace('\\', '/', get_include_path()); $rendererPath = str_replace('\\', '/', $pdfLibraryPath); @@ -61,7 +60,6 @@ class PDF implements IWriter $this->renderer = new $rendererName($spreadsheet); } - /** * Magic method to handle direct calls to the configured PDF renderer wrapper class. * @@ -72,10 +70,10 @@ class PDF implements IWriter public function __call($name, $arguments) { if ($this->renderer === null) { - throw new Exception("PDF Rendering library has not been defined."); + throw new Exception('PDF Rendering library has not been defined.'); } - return call_user_func_array(array($this->renderer, $name), $arguments); + return call_user_func_array([$this->renderer, $name], $arguments); } /** diff --git a/src/PhpSpreadsheet/Writer/PDF/Core.php b/src/PhpSpreadsheet/Writer/PDF/Core.php index 32f47672..98c34a07 100644 --- a/src/PhpSpreadsheet/Writer/PDF/Core.php +++ b/src/PhpSpreadsheet/Writer/PDF/Core.php @@ -54,7 +54,6 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML */ protected $paperSize; - /** * Temporary storage for Save Array Return type * @@ -67,140 +66,74 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML * * @var array */ - protected static $paperSizes = array( - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER - => 'LETTER', // (8.5 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_SMALL - => 'LETTER', // (8.5 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID - => array(792.00, 1224.00), // (11 in. by 17 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEDGER - => array(1224.00, 792.00), // (17 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL - => 'LEGAL', // (8.5 in. by 14 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STATEMENT - => array(396.00, 612.00), // (5.5 in. by 8.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_EXECUTIVE - => 'EXECUTIVE', // (7.25 in. by 10.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3 - => 'A3', // (297 mm by 420 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4 - => 'A4', // (210 mm by 297 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_SMALL - => 'A4', // (210 mm by 297 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5 - => 'A5', // (148 mm by 210 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4 - => 'B4', // (250 mm by 353 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5 - => 'B5', // (176 mm by 250 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_FOLIO - => 'FOLIO', // (8.5 in. by 13 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_QUARTO - => array(609.45, 779.53), // (215 mm by 275 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_1 - => array(720.00, 1008.00), // (10 in. by 14 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_2 - => array(792.00, 1224.00), // (11 in. by 17 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NOTE - => 'LETTER', // (8.5 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO9_ENVELOPE - => array(279.00, 639.00), // (3.875 in. by 8.875 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO10_ENVELOPE - => array(297.00, 684.00), // (4.125 in. by 9.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO11_ENVELOPE - => array(324.00, 747.00), // (4.5 in. by 10.375 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO12_ENVELOPE - => array(342.00, 792.00), // (4.75 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO14_ENVELOPE - => array(360.00, 828.00), // (5 in. by 11.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C - => array(1224.00, 1584.00), // (17 in. by 22 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_D - => array(1584.00, 2448.00), // (22 in. by 34 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_E - => array(2448.00, 3168.00), // (34 in. by 44 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_DL_ENVELOPE - => array(311.81, 623.62), // (110 mm by 220 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C5_ENVELOPE - => 'C5', // (162 mm by 229 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C3_ENVELOPE - => 'C3', // (324 mm by 458 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C4_ENVELOPE - => 'C4', // (229 mm by 324 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C6_ENVELOPE - => 'C6', // (114 mm by 162 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C65_ENVELOPE - => array(323.15, 649.13), // (114 mm by 229 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4_ENVELOPE - => 'B4', // (250 mm by 353 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5_ENVELOPE - => 'B5', // (176 mm by 250 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B6_ENVELOPE - => array(498.90, 354.33), // (176 mm by 125 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ITALY_ENVELOPE - => array(311.81, 651.97), // (110 mm by 230 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_MONARCH_ENVELOPE - => array(279.00, 540.00), // (3.875 in. by 7.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_6_3_4_ENVELOPE - => array(261.00, 468.00), // (3.625 in. by 6.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_US_STANDARD_FANFOLD - => array(1071.00, 792.00), // (14.875 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD - => array(612.00, 864.00), // (8.5 in. by 12 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD - => 'FOLIO', // (8.5 in. by 13 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B4 - => 'B4', // (250 mm by 353 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD - => array(566.93, 419.53), // (200 mm by 148 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_1 - => array(648.00, 792.00), // (9 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_2 - => array(720.00, 792.00), // (10 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_3 - => array(1080.00, 792.00), // (15 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_INVITE_ENVELOPE - => array(623.62, 623.62), // (220 mm by 220 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER - => array(667.80, 864.00), // (9.275 in. by 12 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER - => array(667.80, 1080.00), // (9.275 in. by 15 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER - => array(841.68, 1296.00), // (11.69 in. by 18 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_EXTRA_PAPER - => array(668.98, 912.76), // (236 mm by 322 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER - => array(595.80, 792.00), // (8.275 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER - => 'A4', // (210 mm by 297 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER - => array(667.80, 864.00), // (9.275 in. by 12 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER - => array(643.46, 1009.13), // (227 mm by 356 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER - => array(864.57, 1380.47), // (305 mm by 487 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_PLUS_PAPER - => array(612.00, 913.68), // (8.5 in. by 12.69 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_PLUS_PAPER - => array(595.28, 935.43), // (210 mm by 330 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER - => 'A5', // (148 mm by 210 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER - => array(515.91, 728.50), // (182 mm by 257 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_PAPER - => array(912.76, 1261.42), // (322 mm by 445 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_EXTRA_PAPER - => array(493.23, 666.14), // (174 mm by 235 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER - => array(569.76, 782.36), // (201 mm by 276 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A2_PAPER - => 'A2', // (420 mm by 594 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER - => 'A3', // (297 mm by 420 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER - => array(912.76, 1261.42) // (322 mm by 445 mm) - ); + protected static $paperSizes = [ + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER => 'LETTER', // (8.5 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_SMALL => 'LETTER', // (8.5 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID => [792.00, 1224.00], // (11 in. by 17 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEDGER => [1224.00, 792.00], // (17 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL => 'LEGAL', // (8.5 in. by 14 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STATEMENT => [396.00, 612.00], // (5.5 in. by 8.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_EXECUTIVE => 'EXECUTIVE', // (7.25 in. by 10.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3 => 'A3', // (297 mm by 420 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4 => 'A4', // (210 mm by 297 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_SMALL => 'A4', // (210 mm by 297 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5 => 'A5', // (148 mm by 210 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4 => 'B4', // (250 mm by 353 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5 => 'B5', // (176 mm by 250 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_FOLIO => 'FOLIO', // (8.5 in. by 13 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_QUARTO => [609.45, 779.53], // (215 mm by 275 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_1 => [720.00, 1008.00], // (10 in. by 14 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_2 => [792.00, 1224.00], // (11 in. by 17 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NOTE => 'LETTER', // (8.5 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO9_ENVELOPE => [279.00, 639.00], // (3.875 in. by 8.875 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO10_ENVELOPE => [297.00, 684.00], // (4.125 in. by 9.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO11_ENVELOPE => [324.00, 747.00], // (4.5 in. by 10.375 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO12_ENVELOPE => [342.00, 792.00], // (4.75 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO14_ENVELOPE => [360.00, 828.00], // (5 in. by 11.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C => [1224.00, 1584.00], // (17 in. by 22 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_D => [1584.00, 2448.00], // (22 in. by 34 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_E => [2448.00, 3168.00], // (34 in. by 44 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_DL_ENVELOPE => [311.81, 623.62], // (110 mm by 220 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C5_ENVELOPE => 'C5', // (162 mm by 229 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C3_ENVELOPE => 'C3', // (324 mm by 458 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C4_ENVELOPE => 'C4', // (229 mm by 324 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C6_ENVELOPE => 'C6', // (114 mm by 162 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C65_ENVELOPE => [323.15, 649.13], // (114 mm by 229 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4_ENVELOPE => 'B4', // (250 mm by 353 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5_ENVELOPE => 'B5', // (176 mm by 250 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B6_ENVELOPE => [498.90, 354.33], // (176 mm by 125 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ITALY_ENVELOPE => [311.81, 651.97], // (110 mm by 230 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_MONARCH_ENVELOPE => [279.00, 540.00], // (3.875 in. by 7.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_6_3_4_ENVELOPE => [261.00, 468.00], // (3.625 in. by 6.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_US_STANDARD_FANFOLD => [1071.00, 792.00], // (14.875 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD => [612.00, 864.00], // (8.5 in. by 12 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD => 'FOLIO', // (8.5 in. by 13 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B4 => 'B4', // (250 mm by 353 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD => [566.93, 419.53], // (200 mm by 148 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_1 => [648.00, 792.00], // (9 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_2 => [720.00, 792.00], // (10 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_3 => [1080.00, 792.00], // (15 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_INVITE_ENVELOPE => [623.62, 623.62], // (220 mm by 220 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER => [667.80, 864.00], // (9.275 in. by 12 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER => [667.80, 1080.00], // (9.275 in. by 15 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER => [841.68, 1296.00], // (11.69 in. by 18 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_EXTRA_PAPER => [668.98, 912.76], // (236 mm by 322 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER => [595.80, 792.00], // (8.275 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER => 'A4', // (210 mm by 297 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER => [667.80, 864.00], // (9.275 in. by 12 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER => [643.46, 1009.13], // (227 mm by 356 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER => [864.57, 1380.47], // (305 mm by 487 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_PLUS_PAPER => [612.00, 913.68], // (8.5 in. by 12.69 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_PLUS_PAPER => [595.28, 935.43], // (210 mm by 330 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER => 'A5', // (148 mm by 210 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER => [515.91, 728.50], // (182 mm by 257 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_PAPER => [912.76, 1261.42], // (322 mm by 445 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_EXTRA_PAPER => [493.23, 666.14], // (174 mm by 235 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER => [569.76, 782.36], // (201 mm by 276 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A2_PAPER => 'A2', // (420 mm by 594 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER => 'A3', // (297 mm by 420 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER => [912.76, 1261.42], // (322 mm by 445 mm) + ]; /** * Create a new PDF Writer instance @@ -236,6 +169,7 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML public function setFont($fontName) { $this->font = $fontName; + return $this; } @@ -258,6 +192,7 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML public function setPaperSize($pValue = \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER) { $this->paperSize = $pValue; + return $this; } @@ -280,6 +215,7 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML public function setOrientation($pValue = \PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_DEFAULT) { $this->orientation = $pValue; + return $this; } @@ -307,6 +243,7 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML } else { throw new \PhpSpreadsheet\Writer\Exception("Directory does not exist: $pValue"); } + return $this; } diff --git a/src/PhpSpreadsheet/Writer/PDF/DomPDF.php b/src/PhpSpreadsheet/Writer/PDF/DomPDF.php index 2b651cc3..f525c4f3 100644 --- a/src/PhpSpreadsheet/Writer/PDF/DomPDF.php +++ b/src/PhpSpreadsheet/Writer/PDF/DomPDF.php @@ -2,7 +2,7 @@ namespace PhpSpreadsheet\Writer\PDF; -/** Require DomPDF library */ +/* Require DomPDF library */ $pdfRendererClassFile = \PhpSpreadsheet\Settings::getPdfRendererPath() . '/dompdf_config.inc.php'; if (file_exists($pdfRendererClassFile)) { require_once $pdfRendererClassFile; @@ -87,9 +87,8 @@ class DomPDF extends Core implements \PhpSpreadsheet\Writer\IWriter $paperSize = self::$paperSizes[$printPaperSize]; } - // Create PDF - $pdf = new DOMPDF(); + $pdf = new self(); $pdf->set_paper(strtolower($paperSize), $orientation); $pdf->load_html( diff --git a/src/PhpSpreadsheet/Writer/PDF/MPDF.php b/src/PhpSpreadsheet/Writer/PDF/MPDF.php index 6bd976f4..fa377a95 100644 --- a/src/PhpSpreadsheet/Writer/PDF/MPDF.php +++ b/src/PhpSpreadsheet/Writer/PDF/MPDF.php @@ -2,7 +2,7 @@ namespace PhpSpreadsheet\Writer\PDF; -/** Require mPDF library */ +/* Require mPDF library */ $pdfRendererClassFile = \PhpSpreadsheet\Settings::getPdfRendererPath() . '/mpdf.php'; if (file_exists($pdfRendererClassFile)) { require_once $pdfRendererClassFile; @@ -88,9 +88,8 @@ class MPDF extends Core implements \PhpSpreadsheet\Writer\IWriter $paperSize = self::$paperSizes[$printPaperSize]; } - // Create PDF - $pdf = new mpdf(); + $pdf = new self(); $ortmp = $orientation; $pdf->_setPageSize(strtoupper($paperSize), $ortmp); $pdf->DefOrientation = $orientation; diff --git a/src/PhpSpreadsheet/Writer/PDF/TcPDF.php b/src/PhpSpreadsheet/Writer/PDF/TcPDF.php index 5aead92e..b8a3855f 100644 --- a/src/PhpSpreadsheet/Writer/PDF/TcPDF.php +++ b/src/PhpSpreadsheet/Writer/PDF/TcPDF.php @@ -2,7 +2,7 @@ namespace PhpSpreadsheet\Writer\PDF; -/** Require tcPDF library */ +/* Require tcPDF library */ $pdfRendererClassFile = \PhpSpreadsheet\Settings::getPdfRendererPath() . '/tcpdf.php'; if (file_exists($pdfRendererClassFile)) { $k_path_url = \PhpSpreadsheet\Settings::getPdfRendererPath(); @@ -86,9 +86,8 @@ class TcPDF extends Core implements \PhpSpreadsheet\Writer\IWriter $paperSize = self::$paperSizes[$printPaperSize]; } - // Create PDF - $pdf = new TCPDF($orientation, 'pt', $paperSize); + $pdf = new self($orientation, 'pt', $paperSize); $pdf->setFontSubsetting(false); // Set margins, converting inches to points (using 72 dpi) $pdf->SetMargins($printMargins->getLeft() * 72, $printMargins->getTop() * 72, $printMargins->getRight() * 72); diff --git a/tests/PhpSpreadsheet/Calculation/DateTimeTest.php b/tests/PhpSpreadsheet/Calculation/DateTimeTest.php index 0372c7ad..9a46cbda 100644 --- a/tests/PhpSpreadsheet/Calculation/DateTimeTest.php +++ b/tests/PhpSpreadsheet/Calculation/DateTimeTest.php @@ -2,16 +2,15 @@ namespace PhpSpreadsheet\Tests\Calculation; -use PhpSpreadsheet\Shared\Date; -use PhpSpreadsheet\Calculation\Functions; use PhpSpreadsheet\Calculation\DateTime; +use PhpSpreadsheet\Calculation\Functions; +use PhpSpreadsheet\Shared\Date; /** * Class DateTimeTest */ class DateTimeTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -24,7 +23,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DATE'), $args); + $result = call_user_func_array([DateTime::class, 'DATE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -77,7 +76,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DATEVALUE'), $args); + $result = call_user_func_array([DateTime::class, 'DATEVALUE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -114,7 +113,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'YEAR'), $args); + $result = call_user_func_array([DateTime::class, 'YEAR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -130,7 +129,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'MONTHOFYEAR'), $args); + $result = call_user_func_array([DateTime::class, 'MONTHOFYEAR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -149,7 +148,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'WEEKOFYEAR'), $args); + $result = call_user_func_array([DateTime::class, 'WEEKOFYEAR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -168,7 +167,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DAYOFWEEK'), $args); + $result = call_user_func_array([DateTime::class, 'DAYOFWEEK'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -184,7 +183,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DAYOFMONTH'), $args); + $result = call_user_func_array([DateTime::class, 'DAYOFMONTH'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -200,7 +199,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'TIME'), $args); + $result = call_user_func_array([DateTime::class, 'TIME'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -239,7 +238,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'TIMEVALUE'), $args); + $result = call_user_func_array([DateTime::class, 'TIMEVALUE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -278,7 +277,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'HOUROFDAY'), $args); + $result = call_user_func_array([DateTime::class, 'HOUROFDAY'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -296,7 +295,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'MINUTEOFHOUR'), $args); + $result = call_user_func_array([DateTime::class, 'MINUTEOFHOUR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -314,7 +313,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'SECONDOFMINUTE'), $args); + $result = call_user_func_array([DateTime::class, 'SECONDOFMINUTE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -330,7 +329,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'NETWORKDAYS'), $args); + $result = call_user_func_array([DateTime::class, 'NETWORKDAYS'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -346,7 +345,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'WORKDAY'), $args); + $result = call_user_func_array([DateTime::class, 'WORKDAY'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -362,7 +361,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'EDATE'), $args); + $result = call_user_func_array([DateTime::class, 'EDATE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -399,7 +398,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'EOMONTH'), $args); + $result = call_user_func_array([DateTime::class, 'EOMONTH'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -439,7 +438,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DATEDIF'), $args); + $result = call_user_func_array([DateTime::class, 'DATEDIF'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -455,7 +454,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DAYS360'), $args); + $result = call_user_func_array([DateTime::class, 'DAYS360'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -474,7 +473,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'YEARFRAC'), $args); + $result = call_user_func_array([DateTime::class, 'YEARFRAC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } diff --git a/tests/PhpSpreadsheet/Calculation/EngineeringTest.php b/tests/PhpSpreadsheet/Calculation/EngineeringTest.php index 1bbce265..acf75dfd 100644 --- a/tests/PhpSpreadsheet/Calculation/EngineeringTest.php +++ b/tests/PhpSpreadsheet/Calculation/EngineeringTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Calculation\Functions; class EngineeringTest extends \PHPUnit_Framework_TestCase { - /** * @var \PhpSpreadsheet\Tests\Custom\ComplexAssert */ @@ -31,7 +30,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BESSELI'), $args); + $result = call_user_func_array([Engineering::class, 'BESSELI'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -47,7 +46,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BESSELJ'), $args); + $result = call_user_func_array([Engineering::class, 'BESSELJ'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -63,7 +62,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BESSELK'), $args); + $result = call_user_func_array([Engineering::class, 'BESSELK'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -79,7 +78,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BESSELY'), $args); + $result = call_user_func_array([Engineering::class, 'BESSELY'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -95,7 +94,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'COMPLEX'), $args); + $result = call_user_func_array([Engineering::class, 'COMPLEX'], $args); $this->assertEquals($expectedResult, $result); } @@ -111,7 +110,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMAGINARY'), $args); + $result = call_user_func_array([Engineering::class, 'IMAGINARY'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -127,7 +126,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMREAL'), $args); + $result = call_user_func_array([Engineering::class, 'IMREAL'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -143,7 +142,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMABS'), $args); + $result = call_user_func_array([Engineering::class, 'IMABS'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -160,7 +159,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMARGUMENT'), $args); + $result = call_user_func_array([Engineering::class, 'IMARGUMENT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -176,7 +175,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMCONJUGATE'), $args); + $result = call_user_func_array([Engineering::class, 'IMCONJUGATE'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -192,7 +191,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMCOS'), $args); + $result = call_user_func_array([Engineering::class, 'IMCOS'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -211,7 +210,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMDIV'), $args); + $result = call_user_func_array([Engineering::class, 'IMDIV'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -227,7 +226,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMEXP'), $args); + $result = call_user_func_array([Engineering::class, 'IMEXP'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -243,7 +242,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMLN'), $args); + $result = call_user_func_array([Engineering::class, 'IMLN'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -259,7 +258,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMLOG2'), $args); + $result = call_user_func_array([Engineering::class, 'IMLOG2'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -275,7 +274,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMLOG10'), $args); + $result = call_user_func_array([Engineering::class, 'IMLOG10'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -294,7 +293,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMPOWER'), $args); + $result = call_user_func_array([Engineering::class, 'IMPOWER'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -310,7 +309,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMPRODUCT'), $args); + $result = call_user_func_array([Engineering::class, 'IMPRODUCT'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -326,7 +325,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMSIN'), $args); + $result = call_user_func_array([Engineering::class, 'IMSIN'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -342,7 +341,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMSQRT'), $args); + $result = call_user_func_array([Engineering::class, 'IMSQRT'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -361,7 +360,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMSUB'), $args); + $result = call_user_func_array([Engineering::class, 'IMSUB'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -378,7 +377,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMSUM'), $args); + $result = call_user_func_array([Engineering::class, 'IMSUM'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -394,7 +393,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'ERF'), $args); + $result = call_user_func_array([Engineering::class, 'ERF'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -410,7 +409,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'ERFC'), $args); + $result = call_user_func_array([Engineering::class, 'ERFC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -426,7 +425,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BINTODEC'), $args); + $result = call_user_func_array([Engineering::class, 'BINTODEC'], $args); $this->assertEquals($expectedResult, $result); } @@ -442,7 +441,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BINTOHEX'), $args); + $result = call_user_func_array([Engineering::class, 'BINTOHEX'], $args); $this->assertEquals($expectedResult, $result); } @@ -458,7 +457,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BINTOOCT'), $args); + $result = call_user_func_array([Engineering::class, 'BINTOOCT'], $args); $this->assertEquals($expectedResult, $result); } @@ -474,7 +473,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'DECTOBIN'), $args); + $result = call_user_func_array([Engineering::class, 'DECTOBIN'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -490,7 +489,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'DECTOHEX'), $args); + $result = call_user_func_array([Engineering::class, 'DECTOHEX'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -506,7 +505,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'DECTOOCT'), $args); + $result = call_user_func_array([Engineering::class, 'DECTOOCT'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -522,7 +521,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'HEXTOBIN'), $args); + $result = call_user_func_array([Engineering::class, 'HEXTOBIN'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -538,7 +537,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'HEXTODEC'), $args); + $result = call_user_func_array([Engineering::class, 'HEXTODEC'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -554,7 +553,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'HEXTOOCT'), $args); + $result = call_user_func_array([Engineering::class, 'HEXTOOCT'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -570,7 +569,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'OCTTOBIN'), $args); + $result = call_user_func_array([Engineering::class, 'OCTTOBIN'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -586,7 +585,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'OCTTODEC'), $args); + $result = call_user_func_array([Engineering::class, 'OCTTODEC'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -602,7 +601,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'OCTTOHEX'), $args); + $result = call_user_func_array([Engineering::class, 'OCTTOHEX'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -618,7 +617,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'DELTA'), $args); + $result = call_user_func_array([Engineering::class, 'DELTA'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -634,7 +633,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'GESTEP'), $args); + $result = call_user_func_array([Engineering::class, 'GESTEP'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -674,7 +673,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'CONVERTUOM'), $args); + $result = call_user_func_array([Engineering::class, 'CONVERTUOM'], $args); $this->assertEquals($expectedResult, $result, null); } diff --git a/tests/PhpSpreadsheet/Calculation/FinancialTest.php b/tests/PhpSpreadsheet/Calculation/FinancialTest.php index 28006a54..61b3752c 100644 --- a/tests/PhpSpreadsheet/Calculation/FinancialTest.php +++ b/tests/PhpSpreadsheet/Calculation/FinancialTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Calculation\Functions; class FinancialTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -21,7 +20,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'ACCRINT'), $args); + $result = call_user_func_array([Financial::class, 'ACCRINT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -37,7 +36,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'ACCRINTM'), $args); + $result = call_user_func_array([Financial::class, 'ACCRINTM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -53,7 +52,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'AMORDEGRC'), $args); + $result = call_user_func_array([Financial::class, 'AMORDEGRC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -69,7 +68,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'AMORLINC'), $args); + $result = call_user_func_array([Financial::class, 'AMORLINC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -85,7 +84,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPDAYBS'), $args); + $result = call_user_func_array([Financial::class, 'COUPDAYBS'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -101,7 +100,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPDAYS'), $args); + $result = call_user_func_array([Financial::class, 'COUPDAYS'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -117,7 +116,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPDAYSNC'), $args); + $result = call_user_func_array([Financial::class, 'COUPDAYSNC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -133,7 +132,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPNCD'), $args); + $result = call_user_func_array([Financial::class, 'COUPNCD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -149,7 +148,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPNUM'), $args); + $result = call_user_func_array([Financial::class, 'COUPNUM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -165,7 +164,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPPCD'), $args); + $result = call_user_func_array([Financial::class, 'COUPPCD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -181,7 +180,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'CUMIPMT'), $args); + $result = call_user_func_array([Financial::class, 'CUMIPMT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -197,7 +196,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'CUMPRINC'), $args); + $result = call_user_func_array([Financial::class, 'CUMPRINC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -213,7 +212,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DB'), $args); + $result = call_user_func_array([Financial::class, 'DB'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -229,7 +228,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DDB'), $args); + $result = call_user_func_array([Financial::class, 'DDB'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -245,7 +244,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DISC'), $args); + $result = call_user_func_array([Financial::class, 'DISC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -261,7 +260,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DOLLARDE'), $args); + $result = call_user_func_array([Financial::class, 'DOLLARDE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -277,7 +276,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DOLLARFR'), $args); + $result = call_user_func_array([Financial::class, 'DOLLARFR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -293,7 +292,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'EFFECT'), $args); + $result = call_user_func_array([Financial::class, 'EFFECT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -309,7 +308,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'FV'), $args); + $result = call_user_func_array([Financial::class, 'FV'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -325,7 +324,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'FVSCHEDULE'), $args); + $result = call_user_func_array([Financial::class, 'FVSCHEDULE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -341,7 +340,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'INTRATE'), $args); + $result = call_user_func_array([Financial::class, 'INTRATE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -357,7 +356,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'IPMT'), $args); + $result = call_user_func_array([Financial::class, 'IPMT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -373,7 +372,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'IRR'), $args); + $result = call_user_func_array([Financial::class, 'IRR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -389,7 +388,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'ISPMT'), $args); + $result = call_user_func_array([Financial::class, 'ISPMT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -405,7 +404,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'MIRR'), $args); + $result = call_user_func_array([Financial::class, 'MIRR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -421,7 +420,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'NOMINAL'), $args); + $result = call_user_func_array([Financial::class, 'NOMINAL'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -437,7 +436,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'NPER'), $args); + $result = call_user_func_array([Financial::class, 'NPER'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -453,7 +452,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'NPV'), $args); + $result = call_user_func_array([Financial::class, 'NPV'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -472,7 +471,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'PRICE'), $args); + $result = call_user_func_array([Financial::class, 'PRICE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -491,7 +490,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'RATE'), $args); + $result = call_user_func_array([Financial::class, 'RATE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -510,7 +509,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'XIRR'), $args); + $result = call_user_func_array([Financial::class, 'XIRR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } diff --git a/tests/PhpSpreadsheet/Calculation/FunctionsTest.php b/tests/PhpSpreadsheet/Calculation/FunctionsTest.php index 3303c183..e21b236b 100644 --- a/tests/PhpSpreadsheet/Calculation/FunctionsTest.php +++ b/tests/PhpSpreadsheet/Calculation/FunctionsTest.php @@ -6,7 +6,6 @@ use PhpSpreadsheet\Calculation\Functions; class FunctionsTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -67,7 +66,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isBlank'), $args); + $result = call_user_func_array([Functions::class, 'isBlank'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -83,7 +82,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isErr'), $args); + $result = call_user_func_array([Functions::class, 'isErr'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -99,7 +98,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isError'), $args); + $result = call_user_func_array([Functions::class, 'isError'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -115,7 +114,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'errorType'), $args); + $result = call_user_func_array([Functions::class, 'errorType'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -131,7 +130,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isLogical'), $args); + $result = call_user_func_array([Functions::class, 'isLogical'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -147,7 +146,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isNa'), $args); + $result = call_user_func_array([Functions::class, 'isNa'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -163,7 +162,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isNumber'), $args); + $result = call_user_func_array([Functions::class, 'isNumber'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -179,7 +178,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isText'), $args); + $result = call_user_func_array([Functions::class, 'isText'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -195,7 +194,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isNonText'), $args); + $result = call_user_func_array([Functions::class, 'isNonText'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -211,7 +210,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isEven'), $args); + $result = call_user_func_array([Functions::class, 'isEven'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -227,7 +226,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isOdd'), $args); + $result = call_user_func_array([Functions::class, 'isOdd'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -243,7 +242,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'TYPE'), $args); + $result = call_user_func_array([Functions::class, 'TYPE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -259,7 +258,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'n'), $args); + $result = call_user_func_array([Functions::class, 'n'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } diff --git a/tests/PhpSpreadsheet/Calculation/LogicalTest.php b/tests/PhpSpreadsheet/Calculation/LogicalTest.php index 5cad07ac..7ad5256c 100644 --- a/tests/PhpSpreadsheet/Calculation/LogicalTest.php +++ b/tests/PhpSpreadsheet/Calculation/LogicalTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Calculation\Logical; class LogicalTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -16,13 +15,13 @@ class LogicalTest extends \PHPUnit_Framework_TestCase public function testTRUE() { $result = Logical::TRUE(); - $this->assertEquals(true, $result); + $this->assertTrue($result); } public function testFALSE() { $result = Logical::FALSE(); - $this->assertEquals(false, $result); + $this->assertFalse($result); } /** @@ -32,7 +31,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'logicalAnd'), $args); + $result = call_user_func_array([Logical::class, 'logicalAnd'], $args); $this->assertEquals($expectedResult, $result); } @@ -48,7 +47,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'logicalOr'), $args); + $result = call_user_func_array([Logical::class, 'logicalOr'], $args); $this->assertEquals($expectedResult, $result); } @@ -64,7 +63,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'NOT'), $args); + $result = call_user_func_array([Logical::class, 'NOT'], $args); $this->assertEquals($expectedResult, $result); } @@ -80,7 +79,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'statementIf'), $args); + $result = call_user_func_array([Logical::class, 'statementIf'], $args); $this->assertEquals($expectedResult, $result); } @@ -96,7 +95,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'IFERROR'), $args); + $result = call_user_func_array([Logical::class, 'IFERROR'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Calculation/LookupRefTest.php b/tests/PhpSpreadsheet/Calculation/LookupRefTest.php index 29fbaea4..20574732 100644 --- a/tests/PhpSpreadsheet/Calculation/LookupRefTest.php +++ b/tests/PhpSpreadsheet/Calculation/LookupRefTest.php @@ -10,7 +10,6 @@ use PhpSpreadsheet\Calculation\LookupRef; */ class LookupRefTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -24,7 +23,7 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(LookupRef::class,'HLOOKUP'), $args); + $result = call_user_func_array([LookupRef::class, 'HLOOKUP'], $args); $this->assertEquals($expectedResult, $result); } @@ -41,7 +40,7 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(LookupRef::class,'VLOOKUP'), $args); + $result = call_user_func_array([LookupRef::class, 'VLOOKUP'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Calculation/MathTrigTest.php b/tests/PhpSpreadsheet/Calculation/MathTrigTest.php index 0cfb1f4d..ed017e81 100644 --- a/tests/PhpSpreadsheet/Calculation/MathTrigTest.php +++ b/tests/PhpSpreadsheet/Calculation/MathTrigTest.php @@ -8,7 +8,6 @@ use PhpSpreadsheet\Calculation\MathTrig; class MathTrigTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -21,7 +20,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ATAN2'), $args); + $result = call_user_func_array([MathTrig::class, 'ATAN2'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -37,7 +36,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'CEILING'), $args); + $result = call_user_func_array([MathTrig::class, 'CEILING'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -53,7 +52,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'COMBIN'), $args); + $result = call_user_func_array([MathTrig::class, 'COMBIN'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -69,7 +68,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'EVEN'), $args); + $result = call_user_func_array([MathTrig::class, 'EVEN'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -85,7 +84,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ODD'), $args); + $result = call_user_func_array([MathTrig::class, 'ODD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -101,7 +100,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'FACT'), $args); + $result = call_user_func_array([MathTrig::class, 'FACT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -117,7 +116,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'FACTDOUBLE'), $args); + $result = call_user_func_array([MathTrig::class, 'FACTDOUBLE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -133,7 +132,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'FLOOR'), $args); + $result = call_user_func_array([MathTrig::class, 'FLOOR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -149,7 +148,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'GCD'), $args); + $result = call_user_func_array([MathTrig::class, 'GCD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -165,7 +164,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'LCM'), $args); + $result = call_user_func_array([MathTrig::class, 'LCM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -181,7 +180,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'INT'), $args); + $result = call_user_func_array([MathTrig::class, 'INT'], $args); $this->assertEquals($expectedResult, $result); } @@ -197,7 +196,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'SIGN'), $args); + $result = call_user_func_array([MathTrig::class, 'SIGN'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -213,7 +212,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'POWER'), $args); + $result = call_user_func_array([MathTrig::class, 'POWER'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -229,7 +228,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'logBase'), $args); + $result = call_user_func_array([MathTrig::class, 'logBase'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -245,7 +244,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MOD'), $args); + $result = call_user_func_array([MathTrig::class, 'MOD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -264,7 +263,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MDETERM'), $args); + $result = call_user_func_array([MathTrig::class, 'MDETERM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -283,7 +282,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MINVERSE'), $args); + $result = call_user_func_array([MathTrig::class, 'MINVERSE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -302,7 +301,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MMULT'), $args); + $result = call_user_func_array([MathTrig::class, 'MMULT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -318,7 +317,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MULTINOMIAL'), $args); + $result = call_user_func_array([MathTrig::class, 'MULTINOMIAL'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -335,7 +334,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE); - $result = call_user_func_array(array(MathTrig::class,'MROUND'), $args); + $result = call_user_func_array([MathTrig::class, 'MROUND'], $args); Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_ARRAY); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -352,7 +351,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'PRODUCT'), $args); + $result = call_user_func_array([MathTrig::class, 'PRODUCT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -368,7 +367,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'QUOTIENT'), $args); + $result = call_user_func_array([MathTrig::class, 'QUOTIENT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -384,7 +383,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ROUNDUP'), $args); + $result = call_user_func_array([MathTrig::class, 'ROUNDUP'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -400,7 +399,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ROUNDDOWN'), $args); + $result = call_user_func_array([MathTrig::class, 'ROUNDDOWN'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -416,7 +415,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'SERIESSUM'), $args); + $result = call_user_func_array([MathTrig::class, 'SERIESSUM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -432,7 +431,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'SUMSQ'), $args); + $result = call_user_func_array([MathTrig::class, 'SUMSQ'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -448,7 +447,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'TRUNC'), $args); + $result = call_user_func_array([MathTrig::class, 'TRUNC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -464,7 +463,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ROMAN'), $args); + $result = call_user_func_array([MathTrig::class, 'ROMAN'], $args); $this->assertEquals($expectedResult, $result); } @@ -480,7 +479,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'SQRTPI'), $args); + $result = call_user_func_array([MathTrig::class, 'SQRTPI'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -496,70 +495,70 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class, 'SUMIF'), $args); + $result = call_user_func_array([MathTrig::class, 'SUMIF'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } public function providerSUMIF() { - return array( - array( - array( - array(1), - array(5), - array(10), - ), + return [ + [ + [ + [1], + [5], + [10], + ], '>=5', 15, - ), - array( - array( - array('text'), - array(2), - ), + ], + [ + [ + ['text'], + [2], + ], '=text', - array( - array(10), - array(100), - ), + [ + [10], + [100], + ], 10, - ), - array( - array( - array('"text with quotes"'), - array(2), - ), + ], + [ + [ + ['"text with quotes"'], + [2], + ], '="text with quotes"', - array( - array(10), - array(100), - ), + [ + [10], + [100], + ], 10, - ), - array( - array( - array('"text with quotes"'), - array(''), - ), + ], + [ + [ + ['"text with quotes"'], + [''], + ], '>"', // Compare to the single characater " (double quote) - array( - array(10), - array(100), - ), - 10 - ), - array( - array( - array(''), - array('anything'), - ), + [ + [10], + [100], + ], + 10, + ], + [ + [ + [''], + ['anything'], + ], '>"', // Compare to the single characater " (double quote) - array( - array(10), - array(100), - ), - 100 - ), - ); + [ + [10], + [100], + ], + 100, + ], + ]; } } diff --git a/tests/PhpSpreadsheet/Calculation/TextDataTest.php b/tests/PhpSpreadsheet/Calculation/TextDataTest.php index 98251999..51de92b4 100644 --- a/tests/PhpSpreadsheet/Calculation/TextDataTest.php +++ b/tests/PhpSpreadsheet/Calculation/TextDataTest.php @@ -2,13 +2,12 @@ namespace PhpSpreadsheet\Tests\Calculation; -use PhpSpreadsheet\Shared\StringHelper; use PhpSpreadsheet\Calculation\Functions; use PhpSpreadsheet\Calculation\TextData; +use PhpSpreadsheet\Shared\StringHelper; class TextDataTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -21,7 +20,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'CHARACTER'), $args); + $result = call_user_func_array([TextData::class, 'CHARACTER'], $args); $this->assertEquals($expectedResult, $result); } @@ -37,7 +36,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'ASCIICODE'), $args); + $result = call_user_func_array([TextData::class, 'ASCIICODE'], $args); $this->assertEquals($expectedResult, $result); } @@ -53,7 +52,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'CONCATENATE'), $args); + $result = call_user_func_array([TextData::class, 'CONCATENATE'], $args); $this->assertEquals($expectedResult, $result); } @@ -69,7 +68,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'LEFT'), $args); + $result = call_user_func_array([TextData::class, 'LEFT'], $args); $this->assertEquals($expectedResult, $result); } @@ -85,7 +84,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'MID'), $args); + $result = call_user_func_array([TextData::class, 'MID'], $args); $this->assertEquals($expectedResult, $result); } @@ -101,7 +100,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'RIGHT'), $args); + $result = call_user_func_array([TextData::class, 'RIGHT'], $args); $this->assertEquals($expectedResult, $result); } @@ -117,7 +116,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'LOWERCASE'), $args); + $result = call_user_func_array([TextData::class, 'LOWERCASE'], $args); $this->assertEquals($expectedResult, $result); } @@ -133,7 +132,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'UPPERCASE'), $args); + $result = call_user_func_array([TextData::class, 'UPPERCASE'], $args); $this->assertEquals($expectedResult, $result); } @@ -149,7 +148,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'PROPERCASE'), $args); + $result = call_user_func_array([TextData::class, 'PROPERCASE'], $args); $this->assertEquals($expectedResult, $result); } @@ -165,7 +164,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'STRINGLENGTH'), $args); + $result = call_user_func_array([TextData::class, 'STRINGLENGTH'], $args); $this->assertEquals($expectedResult, $result); } @@ -181,7 +180,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'SEARCHINSENSITIVE'), $args); + $result = call_user_func_array([TextData::class, 'SEARCHINSENSITIVE'], $args); $this->assertEquals($expectedResult, $result); } @@ -197,7 +196,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'SEARCHSENSITIVE'), $args); + $result = call_user_func_array([TextData::class, 'SEARCHSENSITIVE'], $args); $this->assertEquals($expectedResult, $result); } @@ -213,7 +212,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'REPLACE'), $args); + $result = call_user_func_array([TextData::class, 'REPLACE'], $args); $this->assertEquals($expectedResult, $result); } @@ -229,7 +228,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'SUBSTITUTE'), $args); + $result = call_user_func_array([TextData::class, 'SUBSTITUTE'], $args); $this->assertEquals($expectedResult, $result); } @@ -245,7 +244,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'TRIMSPACES'), $args); + $result = call_user_func_array([TextData::class, 'TRIMSPACES'], $args); $this->assertEquals($expectedResult, $result); } @@ -261,7 +260,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'TRIMNONPRINTABLE'), $args); + $result = call_user_func_array([TextData::class, 'TRIMNONPRINTABLE'], $args); $this->assertEquals($expectedResult, $result); } @@ -277,7 +276,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'DOLLAR'), $args); + $result = call_user_func_array([TextData::class, 'DOLLAR'], $args); $this->assertEquals($expectedResult, $result); } @@ -293,7 +292,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'FIXEDFORMAT'), $args); + $result = call_user_func_array([TextData::class, 'FIXEDFORMAT'], $args); $this->assertEquals($expectedResult, $result); } @@ -309,7 +308,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'RETURNSTRING'), $args); + $result = call_user_func_array([TextData::class, 'RETURNSTRING'], $args); $this->assertEquals($expectedResult, $result); } @@ -324,13 +323,13 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function testTEXT() { // Enforce decimal and thousands separator values to UK/US, and currency code to USD - call_user_func(array(StringHelper::class, 'setDecimalSeparator'), '.'); - call_user_func(array(StringHelper::class, 'setThousandsSeparator'), ','); - call_user_func(array(StringHelper::class, 'setCurrencyCode'), '$'); + call_user_func([StringHelper::class, 'setDecimalSeparator'], '.'); + call_user_func([StringHelper::class, 'setThousandsSeparator'], ','); + call_user_func([StringHelper::class, 'setCurrencyCode'], '$'); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class, 'TEXTFORMAT'), $args); + $result = call_user_func_array([TextData::class, 'TEXTFORMAT'], $args); $this->assertEquals($expectedResult, $result); } @@ -344,13 +343,13 @@ class TextDataTest extends \PHPUnit_Framework_TestCase */ public function testVALUE() { - call_user_func(array(StringHelper::class, 'setDecimalSeparator'), '.'); - call_user_func(array(StringHelper::class, 'setThousandsSeparator'), ' '); - call_user_func(array(StringHelper::class, 'setCurrencyCode'), '$'); + call_user_func([StringHelper::class, 'setDecimalSeparator'], '.'); + call_user_func([StringHelper::class, 'setThousandsSeparator'], ' '); + call_user_func([StringHelper::class, 'setCurrencyCode'], '$'); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class, 'VALUE'), $args); + $result = call_user_func_array([TextData::class, 'VALUE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } diff --git a/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php b/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php index 86e4e8f3..eec39ba4 100644 --- a/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php +++ b/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php @@ -2,13 +2,13 @@ namespace PhpSpreadsheet\Tests\Cell; -use PhpSpreadsheet\Worksheet; -use PhpSpreadsheet\Style\NumberFormat; -use PhpSpreadsheet\Shared\StringHelper; +use PhpSpreadsheet\CachedObjectStorage\Memory; use PhpSpreadsheet\Cell; use PhpSpreadsheet\Cell\AdvancedValueBinder; use PhpSpreadsheet\Cell\DataType; -use PhpSpreadsheet\CachedObjectStorage\Memory; +use PhpSpreadsheet\Shared\StringHelper; +use PhpSpreadsheet\Style\NumberFormat; +use PhpSpreadsheet\Worksheet; class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase { @@ -17,7 +17,7 @@ class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase if (!defined('PHPSPREADSHEET_ROOT')) { define('PHPSPREADSHEET_ROOT', APPLICATION_PATH . '/'); } - require_once(PHPSPREADSHEET_ROOT . '/Bootstrap.php'); + require_once PHPSPREADSHEET_ROOT . '/Bootstrap.php'; } public function provider() @@ -28,16 +28,16 @@ class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase $currencyUSD = NumberFormat::FORMAT_CURRENCY_USD_SIMPLE; $currencyEURO = str_replace('$', '€', NumberFormat::FORMAT_CURRENCY_USD_SIMPLE); - return array( - array('10%', 0.1, NumberFormat::FORMAT_PERCENTAGE_00, ',', '.', '$'), - array('$10.11', 10.11, $currencyUSD, ',', '.', '$'), - array('$1,010.12', 1010.12, $currencyUSD, ',', '.', '$'), - array('$20,20', 20.2, $currencyUSD, '.', ',', '$'), - array('$2.020,20', 2020.2, $currencyUSD, '.', ',', '$'), - array('€2.020,20', 2020.2, $currencyEURO, '.', ',', '€'), - array('€ 2.020,20', 2020.2, $currencyEURO, '.', ',', '€'), - array('€2,020.22', 2020.22, $currencyEURO, ',', '.', '€'), - ); + return [ + ['10%', 0.1, NumberFormat::FORMAT_PERCENTAGE_00, ',', '.', '$'], + ['$10.11', 10.11, $currencyUSD, ',', '.', '$'], + ['$1,010.12', 1010.12, $currencyUSD, ',', '.', '$'], + ['$20,20', 20.2, $currencyUSD, '.', ',', '$'], + ['$2.020,20', 2020.2, $currencyUSD, '.', ',', '$'], + ['€2.020,20', 2020.2, $currencyEURO, '.', ',', '€'], + ['€ 2.020,20', 2020.2, $currencyEURO, '.', ',', '€'], + ['€2,020.22', 2020.22, $currencyEURO, ',', '.', '€'], + ]; } /** @@ -47,7 +47,7 @@ class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase { $sheet = $this->getMock( Worksheet::class, - array('getStyle', 'getNumberFormat', 'setFormatCode','getCellCacheController') + ['getStyle', 'getNumberFormat', 'setFormatCode', 'getCellCacheController'] ); $cache = $this->getMockBuilder(Memory::class) ->disableOriginalConstructor() diff --git a/tests/PhpSpreadsheet/Cell/DataTypeTest.php b/tests/PhpSpreadsheet/Cell/DataTypeTest.php index 98c342b5..932ba859 100644 --- a/tests/PhpSpreadsheet/Cell/DataTypeTest.php +++ b/tests/PhpSpreadsheet/Cell/DataTypeTest.php @@ -6,18 +6,17 @@ use PhpSpreadsheet\Cell\DataType; class DataTypeTest extends \PHPUnit_Framework_TestCase { - public function setUp() { if (!defined('PHPSPREADSHEET_ROOT')) { define('PHPSPREADSHEET_ROOT', APPLICATION_PATH . '/'); } - require_once(PHPSPREADSHEET_ROOT . '/Bootstrap.php'); + require_once PHPSPREADSHEET_ROOT . '/Bootstrap.php'; } public function testGetErrorCodes() { - $result = call_user_func(array(DataType::class,'getErrorCodes')); + $result = call_user_func([DataType::class, 'getErrorCodes']); $this->assertInternalType('array', $result); $this->assertGreaterThan(0, count($result)); $this->assertArrayHasKey('#NULL!', $result); diff --git a/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php b/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php index 54595e96..d5db5d62 100644 --- a/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php +++ b/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php @@ -2,10 +2,10 @@ namespace PhpSpreadsheet\Tests\Cell; -use PhpSpreadsheet\Cell\DefaultValueBinder; use PhpSpreadsheet\Cell; -use PhpSpreadsheet\RichText; use PhpSpreadsheet\Cell\DataType; +use PhpSpreadsheet\Cell\DefaultValueBinder; +use PhpSpreadsheet\RichText; class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase { @@ -16,7 +16,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase if (!defined('PHPSPREADSHEET_ROOT')) { define('PHPSPREADSHEET_ROOT', APPLICATION_PATH . '/'); } - require_once(PHPSPREADSHEET_ROOT . '/Bootstrap.php'); + require_once PHPSPREADSHEET_ROOT . '/Bootstrap.php'; } protected function createCellStub() @@ -44,20 +44,20 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase public function binderProvider() { - return array( - array(null), - array(''), - array('ABC'), - array('=SUM(A1:B2)'), - array(true), - array(false), - array(123), - array(-123.456), - array('123'), - array('-123.456'), - array('#REF!'), - array(new \DateTime()), - ); + return [ + [null], + [''], + ['ABC'], + ['=SUM(A1:B2)'], + [true], + [false], + [123], + [-123.456], + ['123'], + ['-123.456'], + ['#REF!'], + [new \DateTime()], + ]; } /** @@ -66,7 +66,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase public function testDataTypeForValue() { list($args, $expectedResult) = func_get_args(); - $result = call_user_func_array(array(DefaultValueBinder::class,'dataTypeForValue'), $args); + $result = call_user_func_array([DefaultValueBinder::class, 'dataTypeForValue'], $args); $this->assertEquals($expectedResult, $result); } @@ -81,7 +81,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase $objRichText->createText('Hello World'); $expectedResult = DataType::TYPE_INLINE; - $result = call_user_func(array(DefaultValueBinder::class,'dataTypeForValue'), $objRichText); + $result = call_user_func([DefaultValueBinder::class, 'dataTypeForValue'], $objRichText); $this->assertEquals($expectedResult, $result); } } diff --git a/tests/PhpSpreadsheet/Cell/HyperlinkTest.php b/tests/PhpSpreadsheet/Cell/HyperlinkTest.php index 9c812a57..d3b51271 100644 --- a/tests/PhpSpreadsheet/Cell/HyperlinkTest.php +++ b/tests/PhpSpreadsheet/Cell/HyperlinkTest.php @@ -6,13 +6,12 @@ use PhpSpreadsheet\Cell\Hyperlink; class HyperlinkTest extends \PHPUnit_Framework_TestCase { - public function setUp() { if (!defined('PHPSPREADSHEET_ROOT')) { define('PHPSPREADSHEET_ROOT', APPLICATION_PATH . '/'); } - require_once(PHPSPREADSHEET_ROOT . '/Bootstrap.php'); + require_once PHPSPREADSHEET_ROOT . '/Bootstrap.php'; } public function testGetUrl() diff --git a/tests/PhpSpreadsheet/CellTest.php b/tests/PhpSpreadsheet/CellTest.php index a8083715..5f8d1749 100644 --- a/tests/PhpSpreadsheet/CellTest.php +++ b/tests/PhpSpreadsheet/CellTest.php @@ -14,7 +14,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'columnIndexFromString'), $args); + $result = call_user_func_array([Cell::class, 'columnIndexFromString'], $args); $this->assertEquals($expectedResult, $result); } @@ -27,10 +27,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'ABCD'; try { - $result = call_user_func(array(Cell::class,'columnIndexFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'columnIndexFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Column string index can not be longer than 3 characters'); + return; } $this->fail('An expected exception has not been raised.'); @@ -40,10 +41,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = ''; try { - $result = call_user_func(array(Cell::class,'columnIndexFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'columnIndexFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Column string index can not be empty'); + return; } $this->fail('An expected exception has not been raised.'); @@ -56,7 +58,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'stringFromColumnIndex'), $args); + $result = call_user_func_array([Cell::class, 'stringFromColumnIndex'], $args); $this->assertEquals($expectedResult, $result); } @@ -72,7 +74,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'coordinateFromString'), $args); + $result = call_user_func_array([Cell::class, 'coordinateFromString'], $args); $this->assertEquals($expectedResult, $result); } @@ -85,10 +87,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'A1:AI2012'; try { - $result = call_user_func(array(Cell::class,'coordinateFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'coordinateFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Cell coordinate string can not be a range of cells'); + return; } $this->fail('An expected exception has not been raised.'); @@ -98,10 +101,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = ''; try { - $result = call_user_func(array(Cell::class,'coordinateFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'coordinateFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Cell coordinate can not be zero-length string'); + return; } $this->fail('An expected exception has not been raised.'); @@ -111,10 +115,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'AI'; try { - $result = call_user_func(array(Cell::class,'coordinateFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'coordinateFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); - $this->assertEquals($e->getMessage(), 'Invalid cell coordinate '.$cellAddress); + $this->assertEquals($e->getMessage(), 'Invalid cell coordinate ' . $cellAddress); + return; } $this->fail('An expected exception has not been raised.'); @@ -127,7 +132,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'absoluteCoordinate'), $args); + $result = call_user_func_array([Cell::class, 'absoluteCoordinate'], $args); $this->assertEquals($expectedResult, $result); } @@ -140,10 +145,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'A1:AI2012'; try { - $result = call_user_func(array(Cell::class,'absoluteCoordinate'), $cellAddress); + $result = call_user_func([Cell::class, 'absoluteCoordinate'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Cell coordinate string can not be a range of cells'); + return; } $this->fail('An expected exception has not been raised.'); @@ -156,7 +162,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'absoluteReference'), $args); + $result = call_user_func_array([Cell::class, 'absoluteReference'], $args); $this->assertEquals($expectedResult, $result); } @@ -169,10 +175,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'A1:AI2012'; try { - $result = call_user_func(array(Cell::class,'absoluteReference'), $cellAddress); + $result = call_user_func([Cell::class, 'absoluteReference'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Cell coordinate string can not be a range of cells'); + return; } $this->fail('An expected exception has not been raised.'); @@ -185,7 +192,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'splitRange'), $args); + $result = call_user_func_array([Cell::class, 'splitRange'], $args); foreach ($result as $key => $split) { if (!is_array($expectedResult[$key])) { $this->assertEquals($expectedResult[$key], $split[0]); @@ -207,7 +214,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'buildRange'), $args); + $result = call_user_func_array([Cell::class, 'buildRange'], $args); $this->assertEquals($expectedResult, $result); } @@ -220,10 +227,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellRange = ''; try { - $result = call_user_func(array(Cell::class,'buildRange'), $cellRange); + $result = call_user_func([Cell::class, 'buildRange'], $cellRange); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Range does not contain any information'); + return; } $this->fail('An expected exception has not been raised.'); @@ -236,7 +244,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'rangeBoundaries'), $args); + $result = call_user_func_array([Cell::class, 'rangeBoundaries'], $args); $this->assertEquals($expectedResult, $result); } @@ -252,7 +260,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'rangeDimension'), $args); + $result = call_user_func_array([Cell::class, 'rangeDimension'], $args); $this->assertEquals($expectedResult, $result); } @@ -268,7 +276,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'getRangeBoundaries'), $args); + $result = call_user_func_array([Cell::class, 'getRangeBoundaries'], $args); $this->assertEquals($expectedResult, $result); } @@ -284,7 +292,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'extractAllCellReferencesInRange'), $args); + $result = call_user_func_array([Cell::class, 'extractAllCellReferencesInRange'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php b/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php index b0fbdde1..7765cc86 100644 --- a/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php +++ b/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php @@ -9,12 +9,12 @@ class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase { public function testSetDataType() { - $dataTypeValues = array( + $dataTypeValues = [ 'Number', - 'String' - ); + 'String', + ]; - $testInstance = new DataSeriesValues; + $testInstance = new DataSeriesValues(); foreach ($dataTypeValues as $dataTypeValue) { $result = $testInstance->setDataType($dataTypeValue); @@ -24,12 +24,13 @@ class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase public function testSetInvalidDataTypeThrowsException() { - $testInstance = new DataSeriesValues; + $testInstance = new DataSeriesValues(); try { $result = $testInstance->setDataType('BOOLEAN'); } catch (Exception $e) { $this->assertEquals($e->getMessage(), 'Invalid datatype for chart data series values'); + return; } $this->fail('An expected exception has not been raised.'); @@ -39,7 +40,7 @@ class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase { $dataTypeValue = 'String'; - $testInstance = new DataSeriesValues; + $testInstance = new DataSeriesValues(); $setValue = $testInstance->setDataType($dataTypeValue); $result = $testInstance->getDataType(); diff --git a/tests/PhpSpreadsheet/Chart/LayoutTest.php b/tests/PhpSpreadsheet/Chart/LayoutTest.php index 1659021f..03432592 100644 --- a/tests/PhpSpreadsheet/Chart/LayoutTest.php +++ b/tests/PhpSpreadsheet/Chart/LayoutTest.php @@ -10,7 +10,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase { $LayoutTargetValue = 'String'; - $testInstance = new Layout; + $testInstance = new Layout(); $result = $testInstance->setLayoutTarget($LayoutTargetValue); $this->assertTrue($result instanceof Layout); @@ -20,7 +20,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase { $LayoutTargetValue = 'String'; - $testInstance = new Layout; + $testInstance = new Layout(); $setValue = $testInstance->setLayoutTarget($LayoutTargetValue); $result = $testInstance->getLayoutTarget(); diff --git a/tests/PhpSpreadsheet/Chart/LegendTest.php b/tests/PhpSpreadsheet/Chart/LegendTest.php index d4f64c05..901d8441 100644 --- a/tests/PhpSpreadsheet/Chart/LegendTest.php +++ b/tests/PhpSpreadsheet/Chart/LegendTest.php @@ -8,15 +8,15 @@ class LegendTest extends \PHPUnit_Framework_TestCase { public function testSetPosition() { - $positionValues = array( + $positionValues = [ Legend::POSITION_RIGHT, Legend::POSITION_LEFT, Legend::POSITION_TOP, Legend::POSITION_BOTTOM, Legend::POSITION_TOPRIGHT, - ); + ]; - $testInstance = new Legend; + $testInstance = new Legend(); foreach ($positionValues as $positionValue) { $result = $testInstance->setPosition($positionValue); @@ -26,7 +26,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetInvalidPositionReturnsFalse() { - $testInstance = new Legend; + $testInstance = new Legend(); $result = $testInstance->setPosition('BottomLeft'); $this->assertFalse($result); @@ -39,7 +39,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase { $PositionValue = Legend::POSITION_BOTTOM; - $testInstance = new Legend; + $testInstance = new Legend(); $setValue = $testInstance->setPosition($PositionValue); $result = $testInstance->getPosition(); @@ -48,16 +48,16 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetPositionXL() { - $positionValues = array( + $positionValues = [ Legend::XL_LEGEND_POSITION_BOTTOM, Legend::XL_LEGEND_POSITION_CORNER, Legend::XL_LEGEND_POSITION_CUSTOM, Legend::XL_LEGEND_POSITION_LEFT, Legend::XL_LEGEND_POSITION_RIGHT, Legend::XL_LEGEND_POSITION_TOP, - ); + ]; - $testInstance = new Legend; + $testInstance = new Legend(); foreach ($positionValues as $positionValue) { $result = $testInstance->setPositionXL($positionValue); @@ -67,7 +67,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetInvalidXLPositionReturnsFalse() { - $testInstance = new Legend; + $testInstance = new Legend(); $result = $testInstance->setPositionXL(999); $this->assertFalse($result); @@ -80,7 +80,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase { $PositionValue = Legend::XL_LEGEND_POSITION_CORNER; - $testInstance = new Legend; + $testInstance = new Legend(); $setValue = $testInstance->setPositionXL($PositionValue); $result = $testInstance->getPositionXL(); @@ -89,12 +89,12 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetOverlay() { - $overlayValues = array( + $overlayValues = [ true, false, - ); + ]; - $testInstance = new Legend; + $testInstance = new Legend(); foreach ($overlayValues as $overlayValue) { $result = $testInstance->setOverlay($overlayValue); @@ -104,7 +104,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetInvalidOverlayReturnsFalse() { - $testInstance = new Legend; + $testInstance = new Legend(); $result = $testInstance->setOverlay('INVALID'); $this->assertFalse($result); @@ -117,7 +117,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase { $OverlayValue = true; - $testInstance = new Legend; + $testInstance = new Legend(); $setValue = $testInstance->setOverlay($OverlayValue); $result = $testInstance->getOverlay(); diff --git a/tests/PhpSpreadsheet/Custom/Complex.php b/tests/PhpSpreadsheet/Custom/Complex.php index 63f9f391..52654a79 100644 --- a/tests/PhpSpreadsheet/Custom/Complex.php +++ b/tests/PhpSpreadsheet/Custom/Complex.php @@ -14,7 +14,7 @@ class Complex { // Test for real number, with no imaginary part if (is_numeric($complexNumber)) { - return array($complexNumber, 0, null); + return [$complexNumber, 0, null]; } // Fix silly human errors @@ -42,7 +42,8 @@ class Complex if ($complexParts[1] === '-') { $imaginary = 0 - $imaginary; } - return array(0, $imaginary, $complexParts[2]); + + return [0, $imaginary, $complexParts[2]]; } // If we don't have an imaginary part, identify whether it should be +1 or -1... @@ -60,19 +61,18 @@ class Complex } // Return real and imaginary parts and suffix as an array, and set a default suffix if user input lazily - return array($complexParts[1], $complexParts[4], !empty($complexParts[9]) ? $complexParts[9] : 'i'); + return [$complexParts[1], $complexParts[4], !empty($complexParts[9]) ? $complexParts[9] : 'i']; } // function _parseComplex() - public function __construct($realPart, $imaginaryPart = null, $suffix = 'i') { if ($imaginaryPart === null) { if (is_array($realPart)) { // We have an array of (potentially) real and imaginary parts, and any suffix - list ($realPart, $imaginaryPart, $suffix) = array_values($realPart) + array(0.0, 0.0, 'i'); + list($realPart, $imaginaryPart, $suffix) = array_values($realPart) + [0.0, 0.0, 'i']; } elseif ((is_string($realPart)) || (is_numeric($realPart))) { // We've been given a string to parse to extract the real and imaginary parts, and any suffix - list ($realPart, $imaginaryPart, $suffix) = self::_parseComplex($realPart); + list($realPart, $imaginaryPart, $suffix) = self::_parseComplex($realPart); } } @@ -99,23 +99,24 @@ class Complex public function __toString() { - $str = ""; + $str = ''; if ($this->imaginaryPart != 0.0) { if (abs($this->imaginaryPart) != 1.0) { $str .= $this->imaginaryPart . $this->suffix; } else { - $str .= (($this->imaginaryPart < 0.0) ? '-' : ''). $this->suffix; + $str .= (($this->imaginaryPart < 0.0) ? '-' : '') . $this->suffix; } } if ($this->realPart != 0.0) { if (($str) && ($this->imaginaryPart > 0.0)) { - $str = "+" . $str; + $str = '+' . $str; } $str = $this->realPart . $str; } if (!$str) { - $str = "0.0"; + $str = '0.0'; } + return $str; } } diff --git a/tests/PhpSpreadsheet/Custom/ComplexAssert.php b/tests/PhpSpreadsheet/Custom/ComplexAssert.php index 290838c8..c6ec3ef4 100644 --- a/tests/PhpSpreadsheet/Custom/ComplexAssert.php +++ b/tests/PhpSpreadsheet/Custom/ComplexAssert.php @@ -4,7 +4,7 @@ namespace PhpSpreadsheet\Tests\Custom; class ComplexAssert { - private $_errorMessage = ''; + private $_errorMessage = ''; public function assertComplexEquals($expected, $actual, $delta = 0) { @@ -14,6 +14,7 @@ class ComplexAssert return true; } $this->_errorMessage = 'Expected Error: ' . $actual . ' !== ' . $expected; + return false; } @@ -23,25 +24,30 @@ class ComplexAssert if (!is_numeric($actualComplex->getReal()) || !is_numeric($expectedComplex->getReal())) { if ($actualComplex->getReal() !== $expectedComplex->getReal()) { $this->_errorMessage = 'Mismatched String: ' . $actualComplex->getReal() . ' !== ' . $expectedComplex->getReal(); + return false; } + return true; } if ($actualComplex->getReal() < ($expectedComplex->getReal() - $delta) || $actualComplex->getReal() > ($expectedComplex->getReal() + $delta)) { $this->_errorMessage = 'Mismatched Real part: ' . $actualComplex->getReal() . ' != ' . $expectedComplex->getReal(); + return false; } if ($actualComplex->getImaginary() < ($expectedComplex->getImaginary() - $delta) || $actualComplex->getImaginary() > ($expectedComplex->getImaginary() + $delta)) { $this->_errorMessage = 'Mismatched Imaginary part: ' . $actualComplex->getImaginary() . ' != ' . $expectedComplex->getImaginary(); + return false; } if ($actualComplex->getSuffix() !== $actualComplex->getSuffix()) { $this->_errorMessage = 'Mismatched Suffix: ' . $actualComplex->getSuffix() . ' != ' . $expectedComplex->getSuffix(); + return false; } diff --git a/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php b/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php index 6965d0cc..689c4be7 100644 --- a/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php +++ b/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php @@ -24,6 +24,7 @@ class XEEValidatorTest extends \PHPUnit_Framework_TestCase foreach (glob('data/Reader/XEETestInvalid*.xml') as $file) { $tests[] = [realpath($file), true]; } + return $tests; } @@ -39,10 +40,11 @@ class XEEValidatorTest extends \PHPUnit_Framework_TestCase public function providerValidXML() { - $tests = array(); + $tests = []; foreach (glob('data/Reader/XEETestValid*.xml') as $file) { $tests[] = [realpath($file), file_get_contents($file)]; } + return $tests; } } diff --git a/tests/PhpSpreadsheet/ReferenceHelperTest.php b/tests/PhpSpreadsheet/ReferenceHelperTest.php index d3586d10..1d188301 100644 --- a/tests/PhpSpreadsheet/ReferenceHelperTest.php +++ b/tests/PhpSpreadsheet/ReferenceHelperTest.php @@ -6,7 +6,6 @@ use PhpSpreadsheet\ReferenceHelper; class ReferenceHelperTest extends \PHPUnit_Framework_TestCase { - public function setUp() { } @@ -14,19 +13,19 @@ class ReferenceHelperTest extends \PHPUnit_Framework_TestCase public function testColumnSort() { $columnBase = $columnExpectedResult = [ - 'A','B','Z', - 'AA','AB','AZ', - 'BA','BB','BZ', - 'ZA','ZB','ZZ', - 'AAA','AAB','AAZ', - 'ABA','ABB','ABZ', - 'AZA','AZB','AZZ', - 'BAA','BAB','BAZ', - 'BBA','BBB','BBZ', - 'BZA','BZB','BZZ' + 'A', 'B', 'Z', + 'AA', 'AB', 'AZ', + 'BA', 'BB', 'BZ', + 'ZA', 'ZB', 'ZZ', + 'AAA', 'AAB', 'AAZ', + 'ABA', 'ABB', 'ABZ', + 'AZA', 'AZB', 'AZZ', + 'BAA', 'BAB', 'BAZ', + 'BBA', 'BBB', 'BBZ', + 'BZA', 'BZB', 'BZZ', ]; shuffle($columnBase); - usort($columnBase, array(ReferenceHelper::class,'columnSort')); + usort($columnBase, [ReferenceHelper::class, 'columnSort']); foreach ($columnBase as $key => $value) { $this->assertEquals($columnExpectedResult[$key], $value); } @@ -35,20 +34,20 @@ class ReferenceHelperTest extends \PHPUnit_Framework_TestCase public function testColumnReverseSort() { $columnBase = $columnExpectedResult = [ - 'A','B','Z', - 'AA','AB','AZ', - 'BA','BB','BZ', - 'ZA','ZB','ZZ', - 'AAA','AAB','AAZ', - 'ABA','ABB','ABZ', - 'AZA','AZB','AZZ', - 'BAA','BAB','BAZ', - 'BBA','BBB','BBZ', - 'BZA','BZB','BZZ' + 'A', 'B', 'Z', + 'AA', 'AB', 'AZ', + 'BA', 'BB', 'BZ', + 'ZA', 'ZB', 'ZZ', + 'AAA', 'AAB', 'AAZ', + 'ABA', 'ABB', 'ABZ', + 'AZA', 'AZB', 'AZZ', + 'BAA', 'BAB', 'BAZ', + 'BBA', 'BBB', 'BBZ', + 'BZA', 'BZB', 'BZZ', ]; shuffle($columnBase); $columnExpectedResult = array_reverse($columnExpectedResult); - usort($columnBase, array(ReferenceHelper::class,'columnReverseSort')); + usort($columnBase, [ReferenceHelper::class, 'columnReverseSort']); foreach ($columnBase as $key => $value) { $this->assertEquals($columnExpectedResult[$key], $value); } diff --git a/tests/PhpSpreadsheet/SettingsTest.php b/tests/PhpSpreadsheet/SettingsTest.php index 552ad7dd..1148a59d 100644 --- a/tests/PhpSpreadsheet/SettingsTest.php +++ b/tests/PhpSpreadsheet/SettingsTest.php @@ -4,7 +4,6 @@ namespace PhpSpreadsheet\Tests; class SettingsTest extends \PHPUnit_Framework_TestCase { - public function setUp() { } @@ -13,7 +12,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase */ public function testGetXMLSettings() { - $result = call_user_func(array(\PhpSpreadsheet\Settings::class,'getLibXmlLoaderOptions')); + $result = call_user_func([\PhpSpreadsheet\Settings::class, 'getLibXmlLoaderOptions']); $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR) & $result)); } @@ -21,8 +20,8 @@ class SettingsTest extends \PHPUnit_Framework_TestCase */ public function testSetXMLSettings() { - call_user_func_array(array(\PhpSpreadsheet\Settings::class,'setLibXmlLoaderOptions'), [LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID]); - $result = call_user_func(array(\PhpSpreadsheet\Settings::class,'getLibXmlLoaderOptions')); + call_user_func_array([\PhpSpreadsheet\Settings::class, 'setLibXmlLoaderOptions'], [LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID]); + $result = call_user_func([\PhpSpreadsheet\Settings::class, 'getLibXmlLoaderOptions']); $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID) & $result)); } } diff --git a/tests/PhpSpreadsheet/Shared/CodePageTest.php b/tests/PhpSpreadsheet/Shared/CodePageTest.php index 4e26c33a..6afea3df 100644 --- a/tests/PhpSpreadsheet/Shared/CodePageTest.php +++ b/tests/PhpSpreadsheet/Shared/CodePageTest.php @@ -2,8 +2,8 @@ namespace PhpSpreadsheet\Tests\Shared; -use PhpSpreadsheet\Shared\CodePage; use PhpSpreadsheet\Exception; +use PhpSpreadsheet\Shared\CodePage; class CodePageTest extends \PHPUnit_Framework_TestCase { @@ -14,7 +14,7 @@ class CodePageTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(CodePage::class,'numberToName'), $args); + $result = call_user_func_array([CodePage::class, 'numberToName'], $args); $this->assertEquals($expectedResult, $result); } @@ -27,9 +27,10 @@ class CodePageTest extends \PHPUnit_Framework_TestCase { $invalidCodePage = 12345; try { - $result = call_user_func(array(CodePage::class,'numberToName'), $invalidCodePage); + $result = call_user_func([CodePage::class, 'numberToName'], $invalidCodePage); } catch (Exception $e) { $this->assertEquals($e->getMessage(), 'Unknown codepage: 12345'); + return; } $this->fail('An expected exception has not been raised.'); @@ -39,9 +40,10 @@ class CodePageTest extends \PHPUnit_Framework_TestCase { $unsupportedCodePage = 720; try { - $result = call_user_func(array(CodePage::class,'numberToName'), $unsupportedCodePage); + $result = call_user_func([CodePage::class, 'numberToName'], $unsupportedCodePage); } catch (Exception $e) { $this->assertEquals($e->getMessage(), 'Code page 720 not supported.'); + return; } $this->fail('An expected exception has not been raised.'); diff --git a/tests/PhpSpreadsheet/Shared/DateTest.php b/tests/PhpSpreadsheet/Shared/DateTest.php index b903c0b5..c7c9cb12 100644 --- a/tests/PhpSpreadsheet/Shared/DateTest.php +++ b/tests/PhpSpreadsheet/Shared/DateTest.php @@ -8,13 +8,13 @@ class DateTest extends \PHPUnit_Framework_TestCase { public function testSetExcelCalendar() { - $calendarValues = array( + $calendarValues = [ Date::CALENDAR_MAC_1904, Date::CALENDAR_WINDOWS_1900, - ); + ]; foreach ($calendarValues as $calendarValue) { - $result = call_user_func(array(Date::class,'setExcelCalendar'), $calendarValue); + $result = call_user_func([Date::class, 'setExcelCalendar'], $calendarValue); $this->assertTrue($result); } } @@ -22,7 +22,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testSetExcelCalendarWithInvalidValue() { $unsupportedCalendar = '2012'; - $result = call_user_func(array(Date::class,'setExcelCalendar'), $unsupportedCalendar); + $result = call_user_func([Date::class, 'setExcelCalendar'], $unsupportedCalendar); $this->assertFalse($result); } @@ -32,13 +32,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeExcelToTimestamp1900() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class, 'excelToTimestamp'), $args); + $result = call_user_func_array([Date::class, 'excelToTimestamp'], $args); $this->assertEquals($expectedResult, $result); } @@ -53,13 +53,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeTimestampToExcel1900() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'timestampToExcel'), $args); + $result = call_user_func_array([Date::class, 'timestampToExcel'], $args); $this->assertEquals($expectedResult, $result, null, 1E-5); } @@ -74,13 +74,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeDateTimeToExcel() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'dateTimeToExcel'), $args); + $result = call_user_func_array([Date::class, 'dateTimeToExcel'], $args); $this->assertEquals($expectedResult, $result, null, 1E-5); } @@ -95,13 +95,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeFormattedPHPToExcel1900() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'formattedPHPToExcel'), $args); + $result = call_user_func_array([Date::class, 'formattedPHPToExcel'], $args); $this->assertEquals($expectedResult, $result, null, 1E-5); } @@ -116,13 +116,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeExcelToTimestamp1904() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_MAC_1904 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'excelToTimestamp'), $args); + $result = call_user_func_array([Date::class, 'excelToTimestamp'], $args); $this->assertEquals($expectedResult, $result); } @@ -137,13 +137,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeTimestampToExcel1904() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_MAC_1904 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'timestampToExcel'), $args); + $result = call_user_func_array([Date::class, 'timestampToExcel'], $args); $this->assertEquals($expectedResult, $result, null, 1E-5); } @@ -159,7 +159,7 @@ class DateTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'isDateTimeFormatCode'), $args); + $result = call_user_func_array([Date::class, 'isDateTimeFormatCode'], $args); $this->assertEquals($expectedResult, $result); } @@ -174,13 +174,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeExcelToTimestamp1900Timezone() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'excelToTimestamp'), $args); + $result = call_user_func_array([Date::class, 'excelToTimestamp'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Shared/FileTest.php b/tests/PhpSpreadsheet/Shared/FileTest.php index 7d6b86c2..b7272abb 100644 --- a/tests/PhpSpreadsheet/Shared/FileTest.php +++ b/tests/PhpSpreadsheet/Shared/FileTest.php @@ -10,21 +10,21 @@ class FileTest extends \PHPUnit_Framework_TestCase { $expectedResult = false; - $result = call_user_func(array(File::class,'getUseUploadTempDirectory')); + $result = call_user_func([File::class, 'getUseUploadTempDirectory']); $this->assertEquals($expectedResult, $result); } public function testSetUseUploadTempDirectory() { - $useUploadTempDirectoryValues = array( + $useUploadTempDirectoryValues = [ true, false, - ); + ]; foreach ($useUploadTempDirectoryValues as $useUploadTempDirectoryValue) { - call_user_func(array(File::class,'setUseUploadTempDirectory'), $useUploadTempDirectoryValue); + call_user_func([File::class, 'setUseUploadTempDirectory'], $useUploadTempDirectoryValue); - $result = call_user_func(array(File::class,'getUseUploadTempDirectory')); + $result = call_user_func([File::class, 'getUseUploadTempDirectory']); $this->assertEquals($useUploadTempDirectoryValue, $result); } } diff --git a/tests/PhpSpreadsheet/Shared/FontTest.php b/tests/PhpSpreadsheet/Shared/FontTest.php index c9c711c6..18fbd106 100644 --- a/tests/PhpSpreadsheet/Shared/FontTest.php +++ b/tests/PhpSpreadsheet/Shared/FontTest.php @@ -10,19 +10,19 @@ class FontTest extends \PHPUnit_Framework_TestCase { $expectedResult = Font::AUTOSIZE_METHOD_APPROX; - $result = call_user_func(array(Font::class,'getAutoSizeMethod')); + $result = call_user_func([Font::class, 'getAutoSizeMethod']); $this->assertEquals($expectedResult, $result); } public function testSetAutoSizeMethod() { - $autosizeMethodValues = array( + $autosizeMethodValues = [ Font::AUTOSIZE_METHOD_EXACT, Font::AUTOSIZE_METHOD_APPROX, - ); + ]; foreach ($autosizeMethodValues as $autosizeMethodValue) { - $result = call_user_func(array(Font::class,'setAutoSizeMethod'), $autosizeMethodValue); + $result = call_user_func([Font::class, 'setAutoSizeMethod'], $autosizeMethodValue); $this->assertTrue($result); } } @@ -31,7 +31,7 @@ class FontTest extends \PHPUnit_Framework_TestCase { $unsupportedAutosizeMethod = 'guess'; - $result = call_user_func(array(Font::class,'setAutoSizeMethod'), $unsupportedAutosizeMethod); + $result = call_user_func([Font::class, 'setAutoSizeMethod'], $unsupportedAutosizeMethod); $this->assertFalse($result); } @@ -42,7 +42,7 @@ class FontTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Font::class,'fontSizeToPixels'), $args); + $result = call_user_func_array([Font::class, 'fontSizeToPixels'], $args); $this->assertEquals($expectedResult, $result); } @@ -58,7 +58,7 @@ class FontTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Font::class,'inchSizeToPixels'), $args); + $result = call_user_func_array([Font::class, 'inchSizeToPixels'], $args); $this->assertEquals($expectedResult, $result); } @@ -74,7 +74,7 @@ class FontTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Font::class,'centimeterSizeToPixels'), $args); + $result = call_user_func_array([Font::class, 'centimeterSizeToPixels'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php b/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php index 41addd76..41ebaa30 100644 --- a/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php +++ b/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php @@ -14,7 +14,7 @@ class PasswordHasherTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(PasswordHasher::class,'hashPassword'), $args); + $result = call_user_func_array([PasswordHasher::class, 'hashPassword'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Shared/StringTest.php b/tests/PhpSpreadsheet/Shared/StringTest.php index 957c078d..21934437 100644 --- a/tests/PhpSpreadsheet/Shared/StringTest.php +++ b/tests/PhpSpreadsheet/Shared/StringTest.php @@ -11,18 +11,18 @@ class StringTest extends \PHPUnit_Framework_TestCase parent::setUp(); // Reset Currency Code - call_user_func(array(StringHelper::class,'setCurrencyCode'), null); + call_user_func([StringHelper::class, 'setCurrencyCode'], null); } public function testGetIsMbStringEnabled() { - $result = call_user_func(array(StringHelper::class,'getIsMbstringEnabled')); + $result = call_user_func([StringHelper::class, 'getIsMbstringEnabled']); $this->assertTrue($result); } public function testGetIsIconvEnabled() { - $result = call_user_func(array(StringHelper::class,'getIsIconvEnabled')); + $result = call_user_func([StringHelper::class, 'getIsIconvEnabled']); $this->assertTrue($result); } @@ -31,16 +31,16 @@ class StringTest extends \PHPUnit_Framework_TestCase $localeconv = localeconv(); $expectedResult = (!empty($localeconv['decimal_point'])) ? $localeconv['decimal_point'] : ','; - $result = call_user_func(array(StringHelper::class,'getDecimalSeparator')); + $result = call_user_func([StringHelper::class, 'getDecimalSeparator']); $this->assertEquals($expectedResult, $result); } public function testSetDecimalSeparator() { $expectedResult = ','; - call_user_func(array(StringHelper::class,'setDecimalSeparator'), $expectedResult); + call_user_func([StringHelper::class, 'setDecimalSeparator'], $expectedResult); - $result = call_user_func(array(StringHelper::class,'getDecimalSeparator')); + $result = call_user_func([StringHelper::class, 'getDecimalSeparator']); $this->assertEquals($expectedResult, $result); } @@ -49,16 +49,16 @@ class StringTest extends \PHPUnit_Framework_TestCase $localeconv = localeconv(); $expectedResult = (!empty($localeconv['thousands_sep'])) ? $localeconv['thousands_sep'] : ','; - $result = call_user_func(array(StringHelper::class,'getThousandsSeparator')); + $result = call_user_func([StringHelper::class, 'getThousandsSeparator']); $this->assertEquals($expectedResult, $result); } public function testSetThousandsSeparator() { $expectedResult = ' '; - call_user_func(array(StringHelper::class,'setThousandsSeparator'), $expectedResult); + call_user_func([StringHelper::class, 'setThousandsSeparator'], $expectedResult); - $result = call_user_func(array(StringHelper::class,'getThousandsSeparator')); + $result = call_user_func([StringHelper::class, 'getThousandsSeparator']); $this->assertEquals($expectedResult, $result); } @@ -66,16 +66,16 @@ class StringTest extends \PHPUnit_Framework_TestCase { $localeconv = localeconv(); $expectedResult = (!empty($localeconv['currency_symbol']) ? $localeconv['currency_symbol'] : (!empty($localeconv['int_curr_symbol']) ? $localeconv['int_curr_symbol']: '$')); - $result = call_user_func(array(StringHelper::class,'getCurrencyCode')); + $result = call_user_func([StringHelper::class, 'getCurrencyCode']); $this->assertEquals($expectedResult, $result); } public function testSetCurrencyCode() { $expectedResult = '£'; - call_user_func(array(StringHelper::class,'setCurrencyCode'), $expectedResult); + call_user_func([StringHelper::class, 'setCurrencyCode'], $expectedResult); - $result = call_user_func(array(StringHelper::class,'getCurrencyCode')); + $result = call_user_func([StringHelper::class, 'getCurrencyCode']); $this->assertEquals($expectedResult, $result); } } diff --git a/tests/PhpSpreadsheet/Shared/TimeZoneTest.php b/tests/PhpSpreadsheet/Shared/TimeZoneTest.php index 5c7a99e1..410ea32e 100644 --- a/tests/PhpSpreadsheet/Shared/TimeZoneTest.php +++ b/tests/PhpSpreadsheet/Shared/TimeZoneTest.php @@ -8,16 +8,16 @@ class TimeZoneTest extends \PHPUnit_Framework_TestCase { public function testSetTimezone() { - $timezoneValues = array( + $timezoneValues = [ 'Europe/Prague', 'Asia/Tokyo', 'America/Indiana/Indianapolis', 'Pacific/Honolulu', 'Atlantic/St_Helena', - ); + ]; foreach ($timezoneValues as $timezoneValue) { - $result = call_user_func(array(TimeZone::class,'setTimezone'), $timezoneValue); + $result = call_user_func([TimeZone::class, 'setTimezone'], $timezoneValue); $this->assertTrue($result); } } @@ -25,7 +25,7 @@ class TimeZoneTest extends \PHPUnit_Framework_TestCase public function testSetTimezoneWithInvalidValue() { $unsupportedTimezone = 'Etc/GMT+10'; - $result = call_user_func(array(TimeZone::class,'setTimezone'), $unsupportedTimezone); + $result = call_user_func([TimeZone::class, 'setTimezone'], $unsupportedTimezone); $this->assertFalse($result); } } diff --git a/tests/PhpSpreadsheet/Style/ColorTest.php b/tests/PhpSpreadsheet/Style/ColorTest.php index 928d5234..626ec7f0 100644 --- a/tests/PhpSpreadsheet/Style/ColorTest.php +++ b/tests/PhpSpreadsheet/Style/ColorTest.php @@ -13,7 +13,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Color::class,'getRed'), $args); + $result = call_user_func_array([Color::class, 'getRed'], $args); $this->assertEquals($expectedResult, $result); } @@ -29,7 +29,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Color::class,'getGreen'), $args); + $result = call_user_func_array([Color::class, 'getGreen'], $args); $this->assertEquals($expectedResult, $result); } @@ -45,7 +45,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Color::class,'getBlue'), $args); + $result = call_user_func_array([Color::class, 'getBlue'], $args); $this->assertEquals($expectedResult, $result); } @@ -60,7 +60,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase public function testChangeBrightness() { list($args, $expectedResult) = func_get_args(); - $result = call_user_func_array(array(Color::class,'changeBrightness'), $args); + $result = call_user_func_array([Color::class, 'changeBrightness'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php b/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php index 9833f7df..a6263997 100644 --- a/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php +++ b/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Style\NumberFormat; class NumberFormatDateTest extends \PHPUnit_Framework_TestCase { - public function setUp() { StringHelper::setDecimalSeparator('.'); @@ -23,7 +22,7 @@ class NumberFormatDateTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(NumberFormat::class,'toFormattedString'), $args); + $result = call_user_func_array([NumberFormat::class, 'toFormattedString'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Style/NumberFormatTest.php b/tests/PhpSpreadsheet/Style/NumberFormatTest.php index 1949667c..a9ec082c 100644 --- a/tests/PhpSpreadsheet/Style/NumberFormatTest.php +++ b/tests/PhpSpreadsheet/Style/NumberFormatTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Style\NumberFormat; class NumberFormatTest extends \PHPUnit_Framework_TestCase { - public function setUp() { StringHelper::setDecimalSeparator('.'); @@ -21,7 +20,7 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(NumberFormat::class,'toFormattedString'), $args); + $result = call_user_func_array([NumberFormat::class, 'toFormattedString'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php b/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php index 44ffa637..601048b7 100644 --- a/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php +++ b/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php @@ -4,7 +4,7 @@ namespace PhpSpreadsheet\Tests\Worksheet\AutoFilter; use PhpSpreadsheet\Worksheet\AutoFilter; -class AutofilterColumnTest extends \PHPUnit_Framework_TestCase +class ColumnTest extends \PHPUnit_Framework_TestCase { private $testInitialColumn = 'H'; @@ -111,9 +111,9 @@ class AutofilterColumnTest extends \PHPUnit_Framework_TestCase public function testSetAttributes() { - $attributeSet = array( 'val' => 100, - 'maxVal' => 200 - ); + $attributeSet = ['val' => 100, + 'maxVal' => 200, + ]; // Setters return the instance to implement the fluent interface $result = $this->testAutoFilterColumnObject->setAttributes($attributeSet); @@ -122,9 +122,9 @@ class AutofilterColumnTest extends \PHPUnit_Framework_TestCase public function testGetAttributes() { - $attributeSet = array( 'val' => 100, - 'maxVal' => 200 - ); + $attributeSet = ['val' => 100, + 'maxVal' => 200, + ]; $this->testAutoFilterColumnObject->setAttributes($attributeSet); @@ -135,9 +135,9 @@ class AutofilterColumnTest extends \PHPUnit_Framework_TestCase public function testSetAttribute() { - $attributeSet = array( 'val' => 100, - 'maxVal' => 200 - ); + $attributeSet = ['val' => 100, + 'maxVal' => 200, + ]; foreach ($attributeSet as $attributeName => $attributeValue) { // Setters return the instance to implement the fluent interface @@ -148,9 +148,9 @@ class AutofilterColumnTest extends \PHPUnit_Framework_TestCase public function testGetAttribute() { - $attributeSet = array( 'val' => 100, - 'maxVal' => 200 - ); + $attributeSet = ['val' => 100, + 'maxVal' => 200, + ]; $this->testAutoFilterColumnObject->setAttributes($attributeSet); diff --git a/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php b/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php index a96b3fb8..6259e0a1 100644 --- a/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php +++ b/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php @@ -2,10 +2,10 @@ namespace PhpSpreadsheet\Tests\Worksheet; +use PhpSpreadsheet\CachedObjectStorage\Memory; +use PhpSpreadsheet\Worksheet; use PhpSpreadsheet\Worksheet\AutoFilter; use PhpSpreadsheet\Worksheet\AutoFilter\Column; -use PhpSpreadsheet\Worksheet; -use PhpSpreadsheet\CachedObjectStorage\Memory; class AutoFilterTest extends \PHPUnit_Framework_TestCase { @@ -70,7 +70,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase { $ranges = [ 'G1:J512' => 'Worksheet1!G1:J512', - 'K1:N20' => 'K1:N20' + 'K1:N20' => 'K1:N20', ]; foreach ($ranges as $actualRange => $fullRange) { @@ -120,7 +120,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase $columnIndexes = [ 'H' => 0, 'K' => 3, - 'M' => 5 + 'M' => 5, ]; // If we request a specific column by its column ID, we should get an @@ -210,7 +210,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase public function testGetColumns() { - $columnIndexes = ['L','M']; + $columnIndexes = ['L', 'M']; foreach ($columnIndexes as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); @@ -229,7 +229,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase public function testGetColumn() { - $columnIndexes = array('L','M'); + $columnIndexes = ['L', 'M']; foreach ($columnIndexes as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); @@ -248,7 +248,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase $columnIndexes = [ 0 => 'H', 3 => 'K', - 5 => 'M' + 5 => 'M', ]; // If we request a specific column by its offset, we should @@ -282,7 +282,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase { $expectedResult = ''; - $columnIndexes = ['L','M','N']; + $columnIndexes = ['L', 'M', 'N']; foreach ($columnIndexes as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); } @@ -306,12 +306,12 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase $expectedResult = 'G1:J512'; // These columns should be retained - $columnIndexes1 = ['I','J']; + $columnIndexes1 = ['I', 'J']; foreach ($columnIndexes1 as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); } // These columns should be discarded - $columnIndexes2 = ['K','L','M']; + $columnIndexes2 = ['K', 'L', 'M']; foreach ($columnIndexes2 as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); } @@ -333,7 +333,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase public function testClone() { - $columnIndexes = ['L','M']; + $columnIndexes = ['L', 'M']; foreach ($columnIndexes as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); diff --git a/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php index 8484f71a..e81fd17c 100644 --- a/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php +++ b/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php @@ -2,9 +2,9 @@ namespace PhpSpreadsheet\Tests\Worksheet; -use PhpSpreadsheet\Worksheet\ColumnCellIterator; use PhpSpreadsheet\Cell; use PhpSpreadsheet\Worksheet; +use PhpSpreadsheet\Worksheet\ColumnCellIterator; class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase { @@ -29,7 +29,6 @@ class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->mockCell)); } - public function testIteratorFullRange() { $iterator = new ColumnCellIterator($this->mockWorksheet, 'A'); @@ -61,7 +60,7 @@ class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase $iterator->seek(4); $this->assertEquals($columnIndexResult, $iterator->key()); - for ($i = 1; $i < $columnIndexResult-1; $i++) { + for ($i = 1; $i < $columnIndexResult - 1; ++$i) { $iterator->prev(); $this->assertEquals($columnIndexResult - $i, $iterator->key()); } diff --git a/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php index 1fb77381..3ff0c922 100644 --- a/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php +++ b/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php @@ -3,8 +3,8 @@ namespace PhpSpreadsheet\Tests\Worksheet; use PhpSpreadsheet\Worksheet; -use PhpSpreadsheet\Worksheet\ColumnIterator; use PhpSpreadsheet\Worksheet\Column; +use PhpSpreadsheet\Worksheet\ColumnIterator; class ColumnIteratorTest extends \PHPUnit_Framework_TestCase { @@ -29,7 +29,6 @@ class ColumnIteratorTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->mockColumn)); } - public function testIteratorFullRange() { $iterator = new ColumnIterator($this->mockWorksheet); @@ -62,7 +61,7 @@ class ColumnIteratorTest extends \PHPUnit_Framework_TestCase $iterator->seek('D'); $this->assertEquals($columnIndexResult, $iterator->key()); - for ($i = 1; $i < array_search($columnIndexResult, $ranges); $i++) { + for ($i = 1; $i < array_search($columnIndexResult, $ranges); ++$i) { $iterator->prev(); $expectedResult = $ranges[array_search($columnIndexResult, $ranges) - $i]; $this->assertEquals($expectedResult, $iterator->key()); diff --git a/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php index c199fc10..450045bf 100644 --- a/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php +++ b/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php @@ -2,8 +2,8 @@ namespace PhpSpreadsheet\Tests\Worksheet; -use PhpSpreadsheet\Worksheet; use PhpSpreadsheet\Cell; +use PhpSpreadsheet\Worksheet; use PhpSpreadsheet\Worksheet\RowCellIterator; class RowCellIteratorTest extends \PHPUnit_Framework_TestCase @@ -29,7 +29,6 @@ class RowCellIteratorTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->mockCell)); } - public function testIteratorFullRange() { $iterator = new RowCellIterator($this->mockWorksheet); @@ -62,7 +61,7 @@ class RowCellIteratorTest extends \PHPUnit_Framework_TestCase $iterator->seek('D'); $this->assertEquals($RowCellIndexResult, $iterator->key()); - for ($i = 1; $i < array_search($RowCellIndexResult, $ranges); $i++) { + for ($i = 1; $i < array_search($RowCellIndexResult, $ranges); ++$i) { $iterator->prev(); $expectedResult = $ranges[array_search($RowCellIndexResult, $ranges) - $i]; $this->assertEquals($expectedResult, $iterator->key()); diff --git a/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php index ceb9a414..a19204a1 100644 --- a/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php +++ b/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php @@ -2,9 +2,9 @@ namespace PhpSpreadsheet\Tests\Worksheet; -use PhpSpreadsheet\Worksheet\RowIterator; use PhpSpreadsheet\Worksheet; use PhpSpreadsheet\Worksheet\Row; +use PhpSpreadsheet\Worksheet\RowIterator; class RowIteratorTest extends \PHPUnit_Framework_TestCase { @@ -29,7 +29,6 @@ class RowIteratorTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->mockRow)); } - public function testIteratorFullRange() { $iterator = new RowIterator($this->mockWorksheet); @@ -61,7 +60,7 @@ class RowIteratorTest extends \PHPUnit_Framework_TestCase $iterator->seek(4); $this->assertEquals($columnIndexResult, $iterator->key()); - for ($i = 1; $i < $columnIndexResult-1; $i++) { + for ($i = 1; $i < $columnIndexResult - 1; ++$i) { $iterator->prev(); $this->assertEquals($columnIndexResult - $i, $iterator->key()); } diff --git a/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php b/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php index 0da62fae..7d11fef1 100644 --- a/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php +++ b/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php @@ -21,7 +21,6 @@ class WorksheetColumnTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue(5)); } - public function testInstantiateColumnDefault() { $column = new Column($this->mockWorksheet); diff --git a/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php b/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php index 48c07d24..2ed9b921 100644 --- a/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php +++ b/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php @@ -21,7 +21,6 @@ class WorksheetRowTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue('E')); } - public function testInstantiateRowDefault() { $row = new Row($this->mockWorksheet); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 31f081cd..1b2011b9 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,10 +1,8 @@ 19-Dec-1960 05:00:00 UTC - [ 25569, 'America/New_York', 18000 ], // 01-Jan-1970 00:00:00 EST => 01-Jan-1970 05:00:00 UTC PHP Base Date - [ 30292, 'America/New_York', 408085200 ], // 07-Dec-1982 00:00:00 EST => 07-Dec-1982 05:00:00 UTC - [ 39611, 'America/New_York', 1213243200 ], // 12-Jun-2008 00:00:00 EDT => 12-Jun-2008 04:00:00 UTC - [ 50424, 'America/New_York', 2147490000 ], // 19-Jan-2038 00:00:00 EST => 19-Jan-2038 05:00:00 UTC PHP 32-bit Latest Date - [ 22345.56789, 'America/New_York', -278486534 ], // 05-Mar-1961 13:37:46 EST => 05-Mar-1961 18:37:46 UTC - [ 22345.6789, 'America/New_York', -278476943 ], // 05-Mar-1961 16:17:37 EST => 05-Mar-1961 21:17:37 UTC - [ 0.5, 'America/New_York', 61200 ], // 12:00:00 EST => 17:00:00 UTC - [ 0.75, 'America/New_York', 82800 ], // 18:00.00 EST => 23:00:00 UTC - [ 0.12345, 'America/New_York', 28666 ], // 02:57:46 EST => 07:57:46 UTC - [ 41215, 'America/New_York', 1351828800 ], // 02-Nov-2012 00:00:00 EDT => 02-Nov-2012 04:00:00 UTC - [ 22269, 'Pacific/Auckland', -285163200 ], // 19-Dec-1960 00:00:00 NZST => 18-Dec-1960 12:00:00 UTC - [ 25569, 'Pacific/Auckland', -43200 ], // 01-Jan-1970 00:00:00 NZST => 31-Dec-1969 12:00:00 UTC PHP Base Date - [ 30292, 'Pacific/Auckland', 408020400 ], // 07-Dec-1982 00:00:00 NZDT => 06-Dec-1982 11:00:00 UTC - [ 39611, 'Pacific/Auckland', 1213185600 ], // 12-Jun-2008 00:00:00 NZST => 11-Jun-2008 12:00:00 UTC - [ 50423.5, 'Pacific/Auckland', 2147382000 ], // 18-Jan-2038 12:00:00 NZDT => 17-Jan-2038 23:00:00 UTC PHP 32-bit Latest Date - [ 22345.56789, 'Pacific/Auckland', -278547734 ], // 05-Mar-1961 13:37:46 NZST => 05-Mar-1961 01:37:46 UTC - [ 22345.6789, 'Pacific/Auckland', -278538143 ], // 05-Mar-1961 16:17:37 NZST => 05-Mar-1961 04:17:37 UTC - [ 0.5, 'Pacific/Auckland', 0 ], // 12:00:00 NZST => 00:00:00 UTC - [ 0.75, 'Pacific/Auckland', 21600 ], // 18:00.00 NZST => 06:00:00 UTC - [ 0.12345, 'Pacific/Auckland', -32534 ], // 02:57:46 NZST => 14:57:46 UTC - [ 41215, 'Pacific/Auckland', 1351767600 ], // 02-Nov-2012 00:00:00 NZDT => 01-Nov-2012 11:00:00 UTC + [22269, 'America/New_York', -285102000], // 19-Dec-1960 00:00:00 EST => 19-Dec-1960 05:00:00 UTC + [25569, 'America/New_York', 18000], // 01-Jan-1970 00:00:00 EST => 01-Jan-1970 05:00:00 UTC PHP Base Date + [30292, 'America/New_York', 408085200], // 07-Dec-1982 00:00:00 EST => 07-Dec-1982 05:00:00 UTC + [39611, 'America/New_York', 1213243200], // 12-Jun-2008 00:00:00 EDT => 12-Jun-2008 04:00:00 UTC + [50424, 'America/New_York', 2147490000], // 19-Jan-2038 00:00:00 EST => 19-Jan-2038 05:00:00 UTC PHP 32-bit Latest Date + [22345.56789, 'America/New_York', -278486534], // 05-Mar-1961 13:37:46 EST => 05-Mar-1961 18:37:46 UTC + [22345.6789, 'America/New_York', -278476943], // 05-Mar-1961 16:17:37 EST => 05-Mar-1961 21:17:37 UTC + [0.5, 'America/New_York', 61200], // 12:00:00 EST => 17:00:00 UTC + [0.75, 'America/New_York', 82800], // 18:00.00 EST => 23:00:00 UTC + [0.12345, 'America/New_York', 28666], // 02:57:46 EST => 07:57:46 UTC + [41215, 'America/New_York', 1351828800], // 02-Nov-2012 00:00:00 EDT => 02-Nov-2012 04:00:00 UTC + [22269, 'Pacific/Auckland', -285163200], // 19-Dec-1960 00:00:00 NZST => 18-Dec-1960 12:00:00 UTC + [25569, 'Pacific/Auckland', -43200], // 01-Jan-1970 00:00:00 NZST => 31-Dec-1969 12:00:00 UTC PHP Base Date + [30292, 'Pacific/Auckland', 408020400], // 07-Dec-1982 00:00:00 NZDT => 06-Dec-1982 11:00:00 UTC + [39611, 'Pacific/Auckland', 1213185600], // 12-Jun-2008 00:00:00 NZST => 11-Jun-2008 12:00:00 UTC + [50423.5, 'Pacific/Auckland', 2147382000], // 18-Jan-2038 12:00:00 NZDT => 17-Jan-2038 23:00:00 UTC PHP 32-bit Latest Date + [22345.56789, 'Pacific/Auckland', -278547734], // 05-Mar-1961 13:37:46 NZST => 05-Mar-1961 01:37:46 UTC + [22345.6789, 'Pacific/Auckland', -278538143], // 05-Mar-1961 16:17:37 NZST => 05-Mar-1961 04:17:37 UTC + [0.5, 'Pacific/Auckland', 0], // 12:00:00 NZST => 00:00:00 UTC + [0.75, 'Pacific/Auckland', 21600], // 18:00.00 NZST => 06:00:00 UTC + [0.12345, 'Pacific/Auckland', -32534], // 02:57:46 NZST => 14:57:46 UTC + [41215, 'Pacific/Auckland', 1351767600], // 02-Nov-2012 00:00:00 NZDT => 01-Nov-2012 11:00:00 UTC ]; diff --git a/tests/data/Shared/Date/ExcelToTimestamp1904.php b/tests/data/Shared/Date/ExcelToTimestamp1904.php index 7716e66b..c7967ba2 100644 --- a/tests/data/Shared/Date/ExcelToTimestamp1904.php +++ b/tests/data/Shared/Date/ExcelToTimestamp1904.php @@ -2,13 +2,13 @@ // Excel DateTimeStamp Result Comments return [ - [ 1462, -1956528000 ], - [ 1463, -1956441600 ], - [ 22269, -158803200 ], - [ 25569, 126316800 ], - [ 30292, 534384000 ], - [ 39611, 1339545600 ], - [ 0.25, 21600 ], // 06:00:00 - [ 0.3333333333333333333, 28800 ], // 08:00.00 - [ 0.54321, 46933 ], // 02:57:46 + [1462, -1956528000], + [1463, -1956441600], + [22269, -158803200], + [25569, 126316800], + [30292, 534384000], + [39611, 1339545600], + [0.25, 21600], // 06:00:00 + [0.3333333333333333333, 28800], // 08:00.00 + [0.54321, 46933], // 02:57:46 ]; diff --git a/tests/data/Shared/Date/FormatCodes.php b/tests/data/Shared/Date/FormatCodes.php index c4be5210..69252ec1 100644 --- a/tests/data/Shared/Date/FormatCodes.php +++ b/tests/data/Shared/Date/FormatCodes.php @@ -2,40 +2,40 @@ // Excel Format Code Result return [ - [ 'General', false ], - [ '@', false ], - [ '0', false ], - [ '0.00', false ], - [ '#,##0.00', false ], - [ '#,##0.00_-', false ], - [ '0%', false ], - [ '0.00%', false ], - [ 'yyyy-mm-dd', true ], - [ 'yy-mm-dd', true ], - [ 'dd/mm/yy', true ], - [ 'd/m/y', true ], - [ 'd-m-y', true ], - [ 'd-m', true ], - [ 'm-y', true ], - [ 'mm-dd-yy', true ], - [ 'd-mmm-yy', true ], - [ 'd-mmm', true ], - [ 'mmm-yy', true ], - [ 'm/d/yy h:mm', true ], - [ 'd/m/y h:mm', true ], - [ 'h:mm AM/PM', true ], - [ 'h:mm:ss AM/PM', true ], - [ 'h:mm', true ], - [ 'h:mm:ss', true ], - [ 'mm:ss', true ], - [ 'h:mm:ss', true ], - [ 'i:s.S', true ], - [ 'h:mm:ss;@', true ], - [ 'yy/mm/dd;@', true ], - [ '"$" #,##0.00_-', false ], - [ '$#,##0_-', false ], - [ '[$EUR ]#,##0.00_-', false ], - [ '_[$EUR ]#,##0.00_-', false ], - [ '[Green]#,##0.00;[Red]#,##0.00_-', false ], - [ '#,##0.00 "dollars"', false ], + ['General', false], + ['@', false], + ['0', false], + ['0.00', false], + ['#,##0.00', false], + ['#,##0.00_-', false], + ['0%', false], + ['0.00%', false], + ['yyyy-mm-dd', true], + ['yy-mm-dd', true], + ['dd/mm/yy', true], + ['d/m/y', true], + ['d-m-y', true], + ['d-m', true], + ['m-y', true], + ['mm-dd-yy', true], + ['d-mmm-yy', true], + ['d-mmm', true], + ['mmm-yy', true], + ['m/d/yy h:mm', true], + ['d/m/y h:mm', true], + ['h:mm AM/PM', true], + ['h:mm:ss AM/PM', true], + ['h:mm', true], + ['h:mm:ss', true], + ['mm:ss', true], + ['h:mm:ss', true], + ['i:s.S', true], + ['h:mm:ss;@', true], + ['yy/mm/dd;@', true], + ['"$" #,##0.00_-', false], + ['$#,##0_-', false], + ['[$EUR ]#,##0.00_-', false], + ['_[$EUR ]#,##0.00_-', false], + ['[Green]#,##0.00;[Red]#,##0.00_-', false], + ['#,##0.00 "dollars"', false], ]; diff --git a/tests/data/Shared/Date/FormattedPHPToExcel1900.php b/tests/data/Shared/Date/FormattedPHPToExcel1900.php index f84c7323..6eafc3cc 100644 --- a/tests/data/Shared/Date/FormattedPHPToExcel1900.php +++ b/tests/data/Shared/Date/FormattedPHPToExcel1900.php @@ -2,15 +2,15 @@ // Year Month Day Hours Minutes Seconds Result Comments return [ - [ 1901, 12, 14, 714 ], // PHP 32-bit Earliest Date 14-Dec-1901 - [ 1903, 12, 31, 1461 ], // 31-Dec-1903 - [ 1904, 1, 1, 1462 ], // Excel 1904 Calendar Base Date 01-Jan-1904 - [ 1904, 1, 2, 1463 ], // 02-Jan-1904 - [ 1960, 12, 19, 22269 ], // 19-Dec-1960 - [ 1970, 1, 1, 25569 ], // PHP Base Date 01-Jan-1970 - [ 1982, 12, 7, 30292 ], // 07-Dec-1982 - [ 2008, 6, 12, 39611 ], // 12-Jun-2008 - [ 2038, 1, 19, 50424 ], // PHP 32-bit Latest Date 19-Jan-2038 - [ 1903, 5, 18, 13, 37, 46, 1234.56789 ], // 18-May-1903 13:37:46 - [ 1933, 10, 18, 16, 17, 37, 12345.6789 ], // 18-Oct-1933 16:17:37 + [1901, 12, 14, 714], // PHP 32-bit Earliest Date 14-Dec-1901 + [1903, 12, 31, 1461], // 31-Dec-1903 + [1904, 1, 1, 1462], // Excel 1904 Calendar Base Date 01-Jan-1904 + [1904, 1, 2, 1463], // 02-Jan-1904 + [1960, 12, 19, 22269], // 19-Dec-1960 + [1970, 1, 1, 25569], // PHP Base Date 01-Jan-1970 + [1982, 12, 7, 30292], // 07-Dec-1982 + [2008, 6, 12, 39611], // 12-Jun-2008 + [2038, 1, 19, 50424], // PHP 32-bit Latest Date 19-Jan-2038 + [1903, 5, 18, 13, 37, 46, 1234.56789], // 18-May-1903 13:37:46 + [1933, 10, 18, 16, 17, 37, 12345.6789], // 18-Oct-1933 16:17:37 ]; diff --git a/tests/data/Shared/Date/TimestampToExcel1900.php b/tests/data/Shared/Date/TimestampToExcel1900.php index 395c4c36..22acbb6f 100644 --- a/tests/data/Shared/Date/TimestampToExcel1900.php +++ b/tests/data/Shared/Date/TimestampToExcel1900.php @@ -2,15 +2,15 @@ // Unix TimeStamp Result Comments return [ - [ -2147472000, 714 ], // PHP 32-bit Earliest Date 14-Dec-1901 - [ -2082931200, 1461 ], // 31-Dec-1903 - [ -2082844800, 1462 ], // Excel 1904 Calendar Base Date 01-Jan-1904 - [ -2082758400, 1463 ], // 02-Jan-1904 - [ -285120000, 22269 ], // 19-Dec-1960 - [ 0, 25569 ], // PHP Base Date 01-Jan-1970 - [ 408067200, 30292 ], // 07-Dec-1982 - [ 1213228800, 39611 ], // 12-Jun-2008 - [ 2147472000, 50424 ], // PHP 32-bit Latest Date 19-Jan-2038 - [ -2102494934, 1234.56789 ], // 18-May-1903 13:37:46 - [ -1142494943, 12345.6789 ], // 18-Oct-1933 16:17:37 + [-2147472000, 714], // PHP 32-bit Earliest Date 14-Dec-1901 + [-2082931200, 1461], // 31-Dec-1903 + [-2082844800, 1462], // Excel 1904 Calendar Base Date 01-Jan-1904 + [-2082758400, 1463], // 02-Jan-1904 + [-285120000, 22269], // 19-Dec-1960 + [0, 25569], // PHP Base Date 01-Jan-1970 + [408067200, 30292], // 07-Dec-1982 + [1213228800, 39611], // 12-Jun-2008 + [2147472000, 50424], // PHP 32-bit Latest Date 19-Jan-2038 + [-2102494934, 1234.56789], // 18-May-1903 13:37:46 + [-1142494943, 12345.6789], // 18-Oct-1933 16:17:37 ]; diff --git a/tests/data/Shared/Date/TimestampToExcel1904.php b/tests/data/Shared/Date/TimestampToExcel1904.php index 4a08ecbf..93f5b700 100644 --- a/tests/data/Shared/Date/TimestampToExcel1904.php +++ b/tests/data/Shared/Date/TimestampToExcel1904.php @@ -2,10 +2,10 @@ // Excel DateTimeStamp Result return [ - [ -1956528000, 1462 ], - [ -1956441600, 1463 ], - [ -158803200, 22269 ], - [ 126316800, 25569 ], - [ 534384000, 30292 ], - [ 1339545600, 39611 ], + [-1956528000, 1462], + [-1956441600, 1463], + [-158803200, 22269], + [126316800, 25569], + [534384000, 30292], + [1339545600, 39611], ]; diff --git a/tests/data/Style/ColorChangeBrightness.php b/tests/data/Style/ColorChangeBrightness.php index a0a99f32..9585b06d 100644 --- a/tests/data/Style/ColorChangeBrightness.php +++ b/tests/data/Style/ColorChangeBrightness.php @@ -1,18 +1,18 @@
' $cellData = nl2br($cellData); @@ -1370,7 +1372,7 @@ class HTML extends BaseWriter implements IWriter $html .= $cellData; // Column end - $html .= '' . PHP_EOL; + $html .= '' . PHP_EOL; } // Next column @@ -1383,7 +1385,7 @@ class HTML extends BaseWriter implements IWriter // Return return $html; } else { - throw new \Spreadsheet\Writer\Exception("Invalid parameters passed."); + throw new \Spreadsheet\Writer\Exception('Invalid parameters passed.'); } } @@ -1393,9 +1395,9 @@ class HTML extends BaseWriter implements IWriter * @param array * @return string */ - private function assembleCSS($pValue = array()) + private function assembleCSS($pValue = []) { - $pairs = array(); + $pairs = []; foreach ($pValue as $property => $value) { $pairs[] = $property . ':' . $value; } @@ -1423,13 +1425,14 @@ class HTML extends BaseWriter implements IWriter public function setImagesRoot($pValue = '.') { $this->imagesRoot = $pValue; + return $this; } /** * Get embed images * - * @return boolean + * @return bool */ public function getEmbedImages() { @@ -1439,19 +1442,20 @@ class HTML extends BaseWriter implements IWriter /** * Set embed images * - * @param boolean $pValue + * @param bool $pValue * @return Spreadsheet_Writer_HTML */ public function setEmbedImages($pValue = '.') { $this->embedImages = $pValue; + return $this; } /** * Get use inline CSS? * - * @return boolean + * @return bool */ public function getUseInlineCss() { @@ -1461,12 +1465,13 @@ class HTML extends BaseWriter implements IWriter /** * Set use inline CSS? * - * @param boolean $pValue + * @param bool $pValue * @return Spreadsheet_Writer_HTML */ public function setUseInlineCss($pValue = false) { $this->useInlineCss = $pValue; + return $this; } @@ -1481,7 +1486,7 @@ class HTML extends BaseWriter implements IWriter { // Color information, e.g. [Red] is always at the beginning $color = null; // initialize - $matches = array(); + $matches = []; $color_regex = '/^\\[[a-zA-Z]+\\]/'; if (preg_match($color_regex, $pFormat, $matches)) { @@ -1510,18 +1515,18 @@ class HTML extends BaseWriter implements IWriter // In HTML only the upper-left cell should be written and it should have // appropriate rowspan / colspan attribute $sheetIndexes = $this->sheetIndex !== null ? - array($this->sheetIndex) : range(0, $this->spreadsheet->getSheetCount() - 1); + [$this->sheetIndex] : range(0, $this->spreadsheet->getSheetCount() - 1); foreach ($sheetIndexes as $sheetIndex) { $sheet = $this->spreadsheet->getSheet($sheetIndex); - $candidateSpannedRow = array(); + $candidateSpannedRow = []; // loop through all Excel merged cells foreach ($sheet->getMergeCells() as $cells) { - list($cells,) = \Spreadsheet\Cell::splitRange($cells); + list($cells) = \Spreadsheet\Cell::splitRange($cells); $first = $cells[0]; - $last = $cells[1]; + $last = $cells[1]; list($fc, $fr) = \Spreadsheet\Cell::coordinateFromString($first); $fc = \Spreadsheet\Cell::columnIndexFromString($fc) - 1; @@ -1539,17 +1544,17 @@ class HTML extends BaseWriter implements IWriter while ($c++ < $lc) { if (!($c == $fc && $r == $fr)) { // not the upper-left cell (should not be written in HTML) - $this->isSpannedCell[$sheetIndex][$r][$c] = array( - 'baseCell' => array($fr, $fc), - ); + $this->isSpannedCell[$sheetIndex][$r][$c] = [ + 'baseCell' => [$fr, $fc], + ]; } else { // upper-left is the base cell that should hold the colspan/rowspan attribute - $this->isBaseCell[$sheetIndex][$r][$c] = array( + $this->isBaseCell[$sheetIndex][$r][$c] = [ 'xlrowspan' => $lr - $fr + 1, // Excel rowspan - 'rowspan' => $lr - $fr + 1, // HTML rowspan, value may change + 'rowspan' => $lr - $fr + 1, // HTML rowspan, value may change 'xlcolspan' => $lc - $fc + 1, // Excel colspan - 'colspan' => $lc - $fc + 1, // HTML colspan, value may change - ); + 'colspan' => $lc - $fc + 1, // HTML colspan, value may change + ]; } } } @@ -1569,7 +1574,7 @@ class HTML extends BaseWriter implements IWriter // For each of the omitted rows we found above, the affected rowspans should be subtracted by 1 if (isset($this->isSpannedRow[$sheetIndex])) { foreach ($this->isSpannedRow[$sheetIndex] as $rowIndex) { - $adjustedBaseCells = array(); + $adjustedBaseCells = []; $c = -1; $e = $countColumns - 1; while ($c++ < $e) { diff --git a/src/PhpSpreadsheet/Writer/OpenDocument.php b/src/PhpSpreadsheet/Writer/OpenDocument.php index 3aa2824f..c052466c 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument.php @@ -31,7 +31,7 @@ class OpenDocument extends BaseWriter implements IWriter * * @var OpenDocument\WriterPart[] */ - private $writerParts = array(); + private $writerParts = []; /** * Private PhpSpreadsheet @@ -49,15 +49,15 @@ class OpenDocument extends BaseWriter implements IWriter { $this->setPhpSpreadsheet($spreadsheet); - $writerPartsArray = array( - 'content' => \PhpSpreadsheet\Writer\OpenDocument\Content::class, - 'meta' => \PhpSpreadsheet\Writer\OpenDocument\Meta::class, - 'meta_inf' => \PhpSpreadsheet\Writer\OpenDocument\MetaInf::class, - 'mimetype' => \PhpSpreadsheet\Writer\OpenDocument\Mimetype::class, - 'settings' => \PhpSpreadsheet\Writer\OpenDocument\Settings::class, - 'styles' => \PhpSpreadsheet\Writer\OpenDocument\Styles::class, + $writerPartsArray = [ + 'content' => \PhpSpreadsheet\Writer\OpenDocument\Content::class, + 'meta' => \PhpSpreadsheet\Writer\OpenDocument\Meta::class, + 'meta_inf' => \PhpSpreadsheet\Writer\OpenDocument\MetaInf::class, + 'mimetype' => \PhpSpreadsheet\Writer\OpenDocument\Mimetype::class, + 'settings' => \PhpSpreadsheet\Writer\OpenDocument\Settings::class, + 'styles' => \PhpSpreadsheet\Writer\OpenDocument\Styles::class, 'thumbnails' => \PhpSpreadsheet\Writer\OpenDocument\Thumbnails::class, - ); + ]; foreach ($writerPartsArray as $writer => $class) { $this->writerParts[$writer] = new $class($this); @@ -162,8 +162,8 @@ class OpenDocument extends BaseWriter implements IWriter /** * Get PhpSpreadsheet object * - * @return PhpSpreadsheet * @throws \PhpSpreadsheet\Writer\Exception + * @return PhpSpreadsheet */ public function getPhpSpreadsheet() { @@ -184,6 +184,7 @@ class OpenDocument extends BaseWriter implements IWriter public function setPhpSpreadsheet(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { $this->spreadSheet = $spreadsheet; + return $this; } } diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php b/src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php index 1901b7b5..8841fa9a 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php @@ -27,7 +27,6 @@ namespace PhpSpreadsheet\Writer\OpenDocument\Cell; * @version ##VERSION##, ##DATE## */ - /** * @category PhpSpreadsheet * @copyright Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet) @@ -47,9 +46,9 @@ class Comment //$objWriter->writeAttribute('draw:style-name', 'gr1'); //$objWriter->writeAttribute('draw:text-style-name', 'P1'); $objWriter->writeAttribute('svg:width', $comment->getWidth()); - $objWriter->writeAttribute('svg:height', $comment->getHeight()); - $objWriter->writeAttribute('svg:x', $comment->getMarginLeft()); - $objWriter->writeAttribute('svg:y', $comment->getMarginTop()); + $objWriter->writeAttribute('svg:height', $comment->getHeight()); + $objWriter->writeAttribute('svg:x', $comment->getMarginLeft()); + $objWriter->writeAttribute('svg:y', $comment->getMarginTop()); //$objWriter->writeAttribute('draw:caption-point-x', $comment->getMarginLeft()); //$objWriter->writeAttribute('draw:caption-point-y', $comment->getMarginTop()); $objWriter->writeElement('dc:creator', $comment->getAuthor()); diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Content.php b/src/PhpSpreadsheet/Writer/OpenDocument/Content.php index f2312409..8ab14baf 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Content.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Content.php @@ -27,7 +27,6 @@ namespace PhpSpreadsheet\Writer\OpenDocument; * @version ##VERSION##, ##DATE## */ - /** * @category PhpSpreadsheet * @copyright Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet) @@ -42,8 +41,8 @@ class Content extends WriterPart * Write content.xml to XML format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { @@ -63,51 +62,51 @@ class Content extends WriterPart // Content $objWriter->startElement('office:document-content'); - $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); - $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); - $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); - $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); - $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); - $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); - $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); - $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); - $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); - $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); - $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); - $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); - $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); - $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); - $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); - $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); - $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); - $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); - $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); - $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); - $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); - $objWriter->writeAttribute('xmlns:xforms', 'http://www.w3.org/2002/xforms'); - $objWriter->writeAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema'); - $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance'); - $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); - $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); - $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); - $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); - $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); - $objWriter->writeAttribute('xmlns:field', 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0'); - $objWriter->writeAttribute('xmlns:formx', 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0'); - $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); - $objWriter->writeAttribute('office:version', '1.2'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); + $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); + $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); + $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); + $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); + $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); + $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); + $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); + $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); + $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); + $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); + $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); + $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); + $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); + $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); + $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); + $objWriter->writeAttribute('xmlns:xforms', 'http://www.w3.org/2002/xforms'); + $objWriter->writeAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema'); + $objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance'); + $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); + $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); + $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); + $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); + $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); + $objWriter->writeAttribute('xmlns:field', 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0'); + $objWriter->writeAttribute('xmlns:formx', 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0'); + $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); + $objWriter->writeAttribute('office:version', '1.2'); - $objWriter->writeElement('office:scripts'); - $objWriter->writeElement('office:font-face-decls'); - $objWriter->writeElement('office:automatic-styles'); + $objWriter->writeElement('office:scripts'); + $objWriter->writeElement('office:font-face-decls'); + $objWriter->writeElement('office:automatic-styles'); - $objWriter->startElement('office:body'); - $objWriter->startElement('office:spreadsheet'); - $objWriter->writeElement('table:calculation-settings'); - $this->writeSheets($objWriter); - $objWriter->writeElement('table:named-expressions'); - $objWriter->endElement(); - $objWriter->endElement(); + $objWriter->startElement('office:body'); + $objWriter->startElement('office:spreadsheet'); + $objWriter->writeElement('table:calculation-settings'); + $this->writeSheets($objWriter); + $objWriter->writeElement('table:named-expressions'); + $objWriter->endElement(); + $objWriter->endElement(); $objWriter->endElement(); return $objWriter->getData(); @@ -123,15 +122,15 @@ class Content extends WriterPart $spreadsheet = $this->getParentWriter()->getPhpSpreadsheet(); /* @var $spreadsheet PhpSpreadsheet */ $sheet_count = $spreadsheet->getSheetCount(); - for ($i = 0; $i < $sheet_count; $i++) { + for ($i = 0; $i < $sheet_count; ++$i) { //$this->getWriterPart('Worksheet')->writeWorksheet()); $objWriter->startElement('table:table'); - $objWriter->writeAttribute('table:name', $spreadsheet->getSheet($i)->getTitle()); - $objWriter->writeElement('office:forms'); - $objWriter->startElement('table:table-column'); - $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); - $objWriter->endElement(); - $this->writeRows($objWriter, $spreadsheet->getSheet($i)); + $objWriter->writeAttribute('table:name', $spreadsheet->getSheet($i)->getTitle()); + $objWriter->writeElement('office:forms'); + $objWriter->startElement('table:table-column'); + $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); + $objWriter->endElement(); + $this->writeRows($objWriter, $spreadsheet->getSheet($i)); $objWriter->endElement(); } } @@ -148,7 +147,7 @@ class Content extends WriterPart $span_row = 0; $rows = $sheet->getRowIterator(); while ($rows->valid()) { - $number_rows_repeated--; + --$number_rows_repeated; $row = $rows->current(); if ($row->getCellIterator()->valid()) { if ($span_row) { @@ -157,7 +156,7 @@ class Content extends WriterPart $objWriter->writeAttribute('table:number-rows-repeated', $span_row); } $objWriter->startElement('table:table-cell'); - $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); + $objWriter->writeAttribute('table:number-columns-repeated', self::NUMBER_COLS_REPEATED_MAX); $objWriter->endElement(); $objWriter->endElement(); $span_row = 0; @@ -166,7 +165,7 @@ class Content extends WriterPart $this->writeCells($objWriter, $row); $objWriter->endElement(); } else { - $span_row++; + ++$span_row; } $rows->next(); } @@ -254,8 +253,8 @@ class Content extends WriterPart * Write span * * @param \PhpSpreadsheet\Shared\XMLWriter $objWriter - * @param integer $curColumn - * @param integer $prevColumn + * @param int $curColumn + * @param int $prevColumn */ private function writeCellSpan(\PhpSpreadsheet\Shared\XMLWriter $objWriter, $curColumn, $prevColumn) { @@ -264,7 +263,7 @@ class Content extends WriterPart $objWriter->writeElement('table:table-cell'); } elseif ($diff > 1) { $objWriter->startElement('table:table-cell'); - $objWriter->writeAttribute('table:number-columns-repeated', $diff); + $objWriter->writeAttribute('table:number-columns-repeated', $diff); $objWriter->endElement(); } } diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Meta.php b/src/PhpSpreadsheet/Writer/OpenDocument/Meta.php index 1edd0032..bd5082c7 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Meta.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Meta.php @@ -30,8 +30,8 @@ class Meta extends WriterPart * Write meta.xml to XML format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php b/src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php index 791dfcee..94374cad 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php @@ -30,8 +30,8 @@ class MetaInf extends WriterPart * Write META-INF/manifest.xml to XML format * * @param \PhpSpreadsheet\SpreadSheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function writeManifest(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { @@ -51,34 +51,34 @@ class MetaInf extends WriterPart // Manifest $objWriter->startElement('manifest:manifest'); - $objWriter->writeAttribute('xmlns:manifest', 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0'); - $objWriter->writeAttribute('manifest:version', '1.2'); + $objWriter->writeAttribute('xmlns:manifest', 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0'); + $objWriter->writeAttribute('manifest:version', '1.2'); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', '/'); - $objWriter->writeAttribute('manifest:version', '1.2'); - $objWriter->writeAttribute('manifest:media-type', 'application/vnd.oasis.opendocument.spreadsheet'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'meta.xml'); - $objWriter->writeAttribute('manifest:media-type', 'text/xml'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'settings.xml'); - $objWriter->writeAttribute('manifest:media-type', 'text/xml'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'content.xml'); - $objWriter->writeAttribute('manifest:media-type', 'text/xml'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'Thumbnails/thumbnail.png'); - $objWriter->writeAttribute('manifest:media-type', 'image/png'); - $objWriter->endElement(); - $objWriter->startElement('manifest:file-entry'); - $objWriter->writeAttribute('manifest:full-path', 'styles.xml'); - $objWriter->writeAttribute('manifest:media-type', 'text/xml'); - $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', '/'); + $objWriter->writeAttribute('manifest:version', '1.2'); + $objWriter->writeAttribute('manifest:media-type', 'application/vnd.oasis.opendocument.spreadsheet'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'meta.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'settings.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'content.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'Thumbnails/thumbnail.png'); + $objWriter->writeAttribute('manifest:media-type', 'image/png'); + $objWriter->endElement(); + $objWriter->startElement('manifest:file-entry'); + $objWriter->writeAttribute('manifest:full-path', 'styles.xml'); + $objWriter->writeAttribute('manifest:media-type', 'text/xml'); + $objWriter->endElement(); $objWriter->endElement(); return $objWriter->getData(); diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php b/src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php index 7e6a713b..1eddda63 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php @@ -28,8 +28,8 @@ class Mimetype extends WriterPart * Write mimetype to plain text format * * @param \PhpSpreadsheet\SpreadSheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Settings.php b/src/PhpSpreadsheet/Writer/OpenDocument/Settings.php index e7cb9a7c..10ae515c 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Settings.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Settings.php @@ -30,8 +30,8 @@ class Settings extends WriterPart * Write settings.xml to XML format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { @@ -51,23 +51,23 @@ class Settings extends WriterPart // Settings $objWriter->startElement('office:document-settings'); - $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); - $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); - $objWriter->writeAttribute('xmlns:config', 'urn:oasis:names:tc:opendocument:xmlns:config:1.0'); - $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); - $objWriter->writeAttribute('office:version', '1.2'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:config', 'urn:oasis:names:tc:opendocument:xmlns:config:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('office:version', '1.2'); - $objWriter->startElement('office:settings'); - $objWriter->startElement('config:config-item-set'); - $objWriter->writeAttribute('config:name', 'ooo:view-settings'); - $objWriter->startElement('config:config-item-map-indexed'); - $objWriter->writeAttribute('config:name', 'Views'); - $objWriter->endElement(); - $objWriter->endElement(); - $objWriter->startElement('config:config-item-set'); - $objWriter->writeAttribute('config:name', 'ooo:configuration-settings'); - $objWriter->endElement(); - $objWriter->endElement(); + $objWriter->startElement('office:settings'); + $objWriter->startElement('config:config-item-set'); + $objWriter->writeAttribute('config:name', 'ooo:view-settings'); + $objWriter->startElement('config:config-item-map-indexed'); + $objWriter->writeAttribute('config:name', 'Views'); + $objWriter->endElement(); + $objWriter->endElement(); + $objWriter->startElement('config:config-item-set'); + $objWriter->writeAttribute('config:name', 'ooo:configuration-settings'); + $objWriter->endElement(); + $objWriter->endElement(); $objWriter->endElement(); return $objWriter->getData(); diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Styles.php b/src/PhpSpreadsheet/Writer/OpenDocument/Styles.php index 345ff3da..6c5bcdf1 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Styles.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Styles.php @@ -30,8 +30,8 @@ class Styles extends WriterPart * Write styles.xml to XML format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function write(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { @@ -51,39 +51,39 @@ class Styles extends WriterPart // Content $objWriter->startElement('office:document-styles'); - $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); - $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); - $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); - $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); - $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); - $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); - $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); - $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); - $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); - $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); - $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); - $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); - $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); - $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); - $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); - $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); - $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); - $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); - $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); - $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); - $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); - $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); - $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); - $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); - $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); - $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); - $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); - $objWriter->writeAttribute('office:version', '1.2'); + $objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0'); + $objWriter->writeAttribute('xmlns:style', 'urn:oasis:names:tc:opendocument:xmlns:style:1.0'); + $objWriter->writeAttribute('xmlns:text', 'urn:oasis:names:tc:opendocument:xmlns:text:1.0'); + $objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0'); + $objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'); + $objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0'); + $objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + $objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); + $objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0'); + $objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0'); + $objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0'); + $objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0'); + $objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0'); + $objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0'); + $objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML'); + $objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0'); + $objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0'); + $objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office'); + $objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer'); + $objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc'); + $objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events'); + $objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report'); + $objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2'); + $objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml'); + $objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#'); + $objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table'); + $objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/'); + $objWriter->writeAttribute('office:version', '1.2'); - $objWriter->writeElement('office:font-face-decls'); - $objWriter->writeElement('office:styles'); - $objWriter->writeElement('office:automatic-styles'); - $objWriter->writeElement('office:master-styles'); + $objWriter->writeElement('office:font-face-decls'); + $objWriter->writeElement('office:styles'); + $objWriter->writeElement('office:automatic-styles'); + $objWriter->writeElement('office:master-styles'); $objWriter->endElement(); return $objWriter->getData(); diff --git a/src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php b/src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php index bc423afd..f92b2808 100644 --- a/src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php +++ b/src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php @@ -30,8 +30,8 @@ class Thumbnails extends WriterPart * Write Thumbnails/thumbnail.png to PNG format * * @param \PhpSpreadsheet\Spreadsheet $spreadsheet - * @return string XML Output * @throws \PhpSpreadsheet\Writer\Exception + * @return string XML Output */ public function writeThumbnail(\PhpSpreadsheet\SpreadSheet $spreadsheet = null) { diff --git a/src/PhpSpreadsheet/Writer/PDF.php b/src/PhpSpreadsheet/Writer/PDF.php index 842f1b8f..c716d25e 100644 --- a/src/PhpSpreadsheet/Writer/PDF.php +++ b/src/PhpSpreadsheet/Writer/PDF.php @@ -26,7 +26,6 @@ namespace PhpSpreadsheet\Writer; */ class PDF implements IWriter { - /** * The wrapper for the requested PDF rendering engine * @@ -44,12 +43,12 @@ class PDF implements IWriter { $pdfLibraryName = \PhpSpreadsheet\Settings::getPdfRendererName(); if (is_null($pdfLibraryName)) { - throw new Exception("PDF Rendering library has not been defined."); + throw new Exception('PDF Rendering library has not been defined.'); } $pdfLibraryPath = \PhpSpreadsheet\Settings::getPdfRendererPath(); if (is_null($pdfLibraryName)) { - throw new Exception("PDF Rendering library path has not been defined."); + throw new Exception('PDF Rendering library path has not been defined.'); } $includePath = str_replace('\\', '/', get_include_path()); $rendererPath = str_replace('\\', '/', $pdfLibraryPath); @@ -61,7 +60,6 @@ class PDF implements IWriter $this->renderer = new $rendererName($spreadsheet); } - /** * Magic method to handle direct calls to the configured PDF renderer wrapper class. * @@ -72,10 +70,10 @@ class PDF implements IWriter public function __call($name, $arguments) { if ($this->renderer === null) { - throw new Exception("PDF Rendering library has not been defined."); + throw new Exception('PDF Rendering library has not been defined.'); } - return call_user_func_array(array($this->renderer, $name), $arguments); + return call_user_func_array([$this->renderer, $name], $arguments); } /** diff --git a/src/PhpSpreadsheet/Writer/PDF/Core.php b/src/PhpSpreadsheet/Writer/PDF/Core.php index 32f47672..98c34a07 100644 --- a/src/PhpSpreadsheet/Writer/PDF/Core.php +++ b/src/PhpSpreadsheet/Writer/PDF/Core.php @@ -54,7 +54,6 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML */ protected $paperSize; - /** * Temporary storage for Save Array Return type * @@ -67,140 +66,74 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML * * @var array */ - protected static $paperSizes = array( - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER - => 'LETTER', // (8.5 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_SMALL - => 'LETTER', // (8.5 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID - => array(792.00, 1224.00), // (11 in. by 17 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEDGER - => array(1224.00, 792.00), // (17 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL - => 'LEGAL', // (8.5 in. by 14 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STATEMENT - => array(396.00, 612.00), // (5.5 in. by 8.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_EXECUTIVE - => 'EXECUTIVE', // (7.25 in. by 10.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3 - => 'A3', // (297 mm by 420 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4 - => 'A4', // (210 mm by 297 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_SMALL - => 'A4', // (210 mm by 297 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5 - => 'A5', // (148 mm by 210 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4 - => 'B4', // (250 mm by 353 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5 - => 'B5', // (176 mm by 250 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_FOLIO - => 'FOLIO', // (8.5 in. by 13 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_QUARTO - => array(609.45, 779.53), // (215 mm by 275 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_1 - => array(720.00, 1008.00), // (10 in. by 14 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_2 - => array(792.00, 1224.00), // (11 in. by 17 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NOTE - => 'LETTER', // (8.5 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO9_ENVELOPE - => array(279.00, 639.00), // (3.875 in. by 8.875 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO10_ENVELOPE - => array(297.00, 684.00), // (4.125 in. by 9.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO11_ENVELOPE - => array(324.00, 747.00), // (4.5 in. by 10.375 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO12_ENVELOPE - => array(342.00, 792.00), // (4.75 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO14_ENVELOPE - => array(360.00, 828.00), // (5 in. by 11.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C - => array(1224.00, 1584.00), // (17 in. by 22 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_D - => array(1584.00, 2448.00), // (22 in. by 34 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_E - => array(2448.00, 3168.00), // (34 in. by 44 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_DL_ENVELOPE - => array(311.81, 623.62), // (110 mm by 220 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C5_ENVELOPE - => 'C5', // (162 mm by 229 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C3_ENVELOPE - => 'C3', // (324 mm by 458 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C4_ENVELOPE - => 'C4', // (229 mm by 324 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C6_ENVELOPE - => 'C6', // (114 mm by 162 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C65_ENVELOPE - => array(323.15, 649.13), // (114 mm by 229 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4_ENVELOPE - => 'B4', // (250 mm by 353 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5_ENVELOPE - => 'B5', // (176 mm by 250 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B6_ENVELOPE - => array(498.90, 354.33), // (176 mm by 125 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ITALY_ENVELOPE - => array(311.81, 651.97), // (110 mm by 230 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_MONARCH_ENVELOPE - => array(279.00, 540.00), // (3.875 in. by 7.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_6_3_4_ENVELOPE - => array(261.00, 468.00), // (3.625 in. by 6.5 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_US_STANDARD_FANFOLD - => array(1071.00, 792.00), // (14.875 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD - => array(612.00, 864.00), // (8.5 in. by 12 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD - => 'FOLIO', // (8.5 in. by 13 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B4 - => 'B4', // (250 mm by 353 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD - => array(566.93, 419.53), // (200 mm by 148 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_1 - => array(648.00, 792.00), // (9 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_2 - => array(720.00, 792.00), // (10 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_3 - => array(1080.00, 792.00), // (15 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_INVITE_ENVELOPE - => array(623.62, 623.62), // (220 mm by 220 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER - => array(667.80, 864.00), // (9.275 in. by 12 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER - => array(667.80, 1080.00), // (9.275 in. by 15 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER - => array(841.68, 1296.00), // (11.69 in. by 18 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_EXTRA_PAPER - => array(668.98, 912.76), // (236 mm by 322 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER - => array(595.80, 792.00), // (8.275 in. by 11 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER - => 'A4', // (210 mm by 297 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER - => array(667.80, 864.00), // (9.275 in. by 12 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER - => array(643.46, 1009.13), // (227 mm by 356 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER - => array(864.57, 1380.47), // (305 mm by 487 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_PLUS_PAPER - => array(612.00, 913.68), // (8.5 in. by 12.69 in.) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_PLUS_PAPER - => array(595.28, 935.43), // (210 mm by 330 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER - => 'A5', // (148 mm by 210 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER - => array(515.91, 728.50), // (182 mm by 257 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_PAPER - => array(912.76, 1261.42), // (322 mm by 445 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_EXTRA_PAPER - => array(493.23, 666.14), // (174 mm by 235 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER - => array(569.76, 782.36), // (201 mm by 276 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A2_PAPER - => 'A2', // (420 mm by 594 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER - => 'A3', // (297 mm by 420 mm) - \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER - => array(912.76, 1261.42) // (322 mm by 445 mm) - ); + protected static $paperSizes = [ + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER => 'LETTER', // (8.5 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_SMALL => 'LETTER', // (8.5 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID => [792.00, 1224.00], // (11 in. by 17 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEDGER => [1224.00, 792.00], // (17 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL => 'LEGAL', // (8.5 in. by 14 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STATEMENT => [396.00, 612.00], // (5.5 in. by 8.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_EXECUTIVE => 'EXECUTIVE', // (7.25 in. by 10.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3 => 'A3', // (297 mm by 420 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4 => 'A4', // (210 mm by 297 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_SMALL => 'A4', // (210 mm by 297 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5 => 'A5', // (148 mm by 210 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4 => 'B4', // (250 mm by 353 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5 => 'B5', // (176 mm by 250 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_FOLIO => 'FOLIO', // (8.5 in. by 13 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_QUARTO => [609.45, 779.53], // (215 mm by 275 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_1 => [720.00, 1008.00], // (10 in. by 14 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_2 => [792.00, 1224.00], // (11 in. by 17 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NOTE => 'LETTER', // (8.5 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO9_ENVELOPE => [279.00, 639.00], // (3.875 in. by 8.875 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO10_ENVELOPE => [297.00, 684.00], // (4.125 in. by 9.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO11_ENVELOPE => [324.00, 747.00], // (4.5 in. by 10.375 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO12_ENVELOPE => [342.00, 792.00], // (4.75 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_NO14_ENVELOPE => [360.00, 828.00], // (5 in. by 11.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C => [1224.00, 1584.00], // (17 in. by 22 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_D => [1584.00, 2448.00], // (22 in. by 34 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_E => [2448.00, 3168.00], // (34 in. by 44 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_DL_ENVELOPE => [311.81, 623.62], // (110 mm by 220 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C5_ENVELOPE => 'C5', // (162 mm by 229 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C3_ENVELOPE => 'C3', // (324 mm by 458 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C4_ENVELOPE => 'C4', // (229 mm by 324 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C6_ENVELOPE => 'C6', // (114 mm by 162 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_C65_ENVELOPE => [323.15, 649.13], // (114 mm by 229 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B4_ENVELOPE => 'B4', // (250 mm by 353 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B5_ENVELOPE => 'B5', // (176 mm by 250 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_B6_ENVELOPE => [498.90, 354.33], // (176 mm by 125 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ITALY_ENVELOPE => [311.81, 651.97], // (110 mm by 230 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_MONARCH_ENVELOPE => [279.00, 540.00], // (3.875 in. by 7.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_6_3_4_ENVELOPE => [261.00, 468.00], // (3.625 in. by 6.5 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_US_STANDARD_FANFOLD => [1071.00, 792.00], // (14.875 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD => [612.00, 864.00], // (8.5 in. by 12 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD => 'FOLIO', // (8.5 in. by 13 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B4 => 'B4', // (250 mm by 353 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD => [566.93, 419.53], // (200 mm by 148 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_1 => [648.00, 792.00], // (9 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_2 => [720.00, 792.00], // (10 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_3 => [1080.00, 792.00], // (15 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_INVITE_ENVELOPE => [623.62, 623.62], // (220 mm by 220 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER => [667.80, 864.00], // (9.275 in. by 12 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER => [667.80, 1080.00], // (9.275 in. by 15 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER => [841.68, 1296.00], // (11.69 in. by 18 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_EXTRA_PAPER => [668.98, 912.76], // (236 mm by 322 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER => [595.80, 792.00], // (8.275 in. by 11 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER => 'A4', // (210 mm by 297 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER => [667.80, 864.00], // (9.275 in. by 12 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER => [643.46, 1009.13], // (227 mm by 356 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER => [864.57, 1380.47], // (305 mm by 487 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER_PLUS_PAPER => [612.00, 913.68], // (8.5 in. by 12.69 in.) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4_PLUS_PAPER => [595.28, 935.43], // (210 mm by 330 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER => 'A5', // (148 mm by 210 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER => [515.91, 728.50], // (182 mm by 257 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_PAPER => [912.76, 1261.42], // (322 mm by 445 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A5_EXTRA_PAPER => [493.23, 666.14], // (174 mm by 235 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER => [569.76, 782.36], // (201 mm by 276 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A2_PAPER => 'A2', // (420 mm by 594 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER => 'A3', // (297 mm by 420 mm) + \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER => [912.76, 1261.42], // (322 mm by 445 mm) + ]; /** * Create a new PDF Writer instance @@ -236,6 +169,7 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML public function setFont($fontName) { $this->font = $fontName; + return $this; } @@ -258,6 +192,7 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML public function setPaperSize($pValue = \PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_LETTER) { $this->paperSize = $pValue; + return $this; } @@ -280,6 +215,7 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML public function setOrientation($pValue = \PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_DEFAULT) { $this->orientation = $pValue; + return $this; } @@ -307,6 +243,7 @@ abstract class Core extends \PhpSpreadsheet\Writer\HTML } else { throw new \PhpSpreadsheet\Writer\Exception("Directory does not exist: $pValue"); } + return $this; } diff --git a/src/PhpSpreadsheet/Writer/PDF/DomPDF.php b/src/PhpSpreadsheet/Writer/PDF/DomPDF.php index 2b651cc3..f525c4f3 100644 --- a/src/PhpSpreadsheet/Writer/PDF/DomPDF.php +++ b/src/PhpSpreadsheet/Writer/PDF/DomPDF.php @@ -2,7 +2,7 @@ namespace PhpSpreadsheet\Writer\PDF; -/** Require DomPDF library */ +/* Require DomPDF library */ $pdfRendererClassFile = \PhpSpreadsheet\Settings::getPdfRendererPath() . '/dompdf_config.inc.php'; if (file_exists($pdfRendererClassFile)) { require_once $pdfRendererClassFile; @@ -87,9 +87,8 @@ class DomPDF extends Core implements \PhpSpreadsheet\Writer\IWriter $paperSize = self::$paperSizes[$printPaperSize]; } - // Create PDF - $pdf = new DOMPDF(); + $pdf = new self(); $pdf->set_paper(strtolower($paperSize), $orientation); $pdf->load_html( diff --git a/src/PhpSpreadsheet/Writer/PDF/MPDF.php b/src/PhpSpreadsheet/Writer/PDF/MPDF.php index 6bd976f4..fa377a95 100644 --- a/src/PhpSpreadsheet/Writer/PDF/MPDF.php +++ b/src/PhpSpreadsheet/Writer/PDF/MPDF.php @@ -2,7 +2,7 @@ namespace PhpSpreadsheet\Writer\PDF; -/** Require mPDF library */ +/* Require mPDF library */ $pdfRendererClassFile = \PhpSpreadsheet\Settings::getPdfRendererPath() . '/mpdf.php'; if (file_exists($pdfRendererClassFile)) { require_once $pdfRendererClassFile; @@ -88,9 +88,8 @@ class MPDF extends Core implements \PhpSpreadsheet\Writer\IWriter $paperSize = self::$paperSizes[$printPaperSize]; } - // Create PDF - $pdf = new mpdf(); + $pdf = new self(); $ortmp = $orientation; $pdf->_setPageSize(strtoupper($paperSize), $ortmp); $pdf->DefOrientation = $orientation; diff --git a/src/PhpSpreadsheet/Writer/PDF/TcPDF.php b/src/PhpSpreadsheet/Writer/PDF/TcPDF.php index 5aead92e..b8a3855f 100644 --- a/src/PhpSpreadsheet/Writer/PDF/TcPDF.php +++ b/src/PhpSpreadsheet/Writer/PDF/TcPDF.php @@ -2,7 +2,7 @@ namespace PhpSpreadsheet\Writer\PDF; -/** Require tcPDF library */ +/* Require tcPDF library */ $pdfRendererClassFile = \PhpSpreadsheet\Settings::getPdfRendererPath() . '/tcpdf.php'; if (file_exists($pdfRendererClassFile)) { $k_path_url = \PhpSpreadsheet\Settings::getPdfRendererPath(); @@ -86,9 +86,8 @@ class TcPDF extends Core implements \PhpSpreadsheet\Writer\IWriter $paperSize = self::$paperSizes[$printPaperSize]; } - // Create PDF - $pdf = new TCPDF($orientation, 'pt', $paperSize); + $pdf = new self($orientation, 'pt', $paperSize); $pdf->setFontSubsetting(false); // Set margins, converting inches to points (using 72 dpi) $pdf->SetMargins($printMargins->getLeft() * 72, $printMargins->getTop() * 72, $printMargins->getRight() * 72); diff --git a/tests/PhpSpreadsheet/Calculation/DateTimeTest.php b/tests/PhpSpreadsheet/Calculation/DateTimeTest.php index 0372c7ad..9a46cbda 100644 --- a/tests/PhpSpreadsheet/Calculation/DateTimeTest.php +++ b/tests/PhpSpreadsheet/Calculation/DateTimeTest.php @@ -2,16 +2,15 @@ namespace PhpSpreadsheet\Tests\Calculation; -use PhpSpreadsheet\Shared\Date; -use PhpSpreadsheet\Calculation\Functions; use PhpSpreadsheet\Calculation\DateTime; +use PhpSpreadsheet\Calculation\Functions; +use PhpSpreadsheet\Shared\Date; /** * Class DateTimeTest */ class DateTimeTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -24,7 +23,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DATE'), $args); + $result = call_user_func_array([DateTime::class, 'DATE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -77,7 +76,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DATEVALUE'), $args); + $result = call_user_func_array([DateTime::class, 'DATEVALUE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -114,7 +113,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'YEAR'), $args); + $result = call_user_func_array([DateTime::class, 'YEAR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -130,7 +129,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'MONTHOFYEAR'), $args); + $result = call_user_func_array([DateTime::class, 'MONTHOFYEAR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -149,7 +148,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'WEEKOFYEAR'), $args); + $result = call_user_func_array([DateTime::class, 'WEEKOFYEAR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -168,7 +167,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DAYOFWEEK'), $args); + $result = call_user_func_array([DateTime::class, 'DAYOFWEEK'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -184,7 +183,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DAYOFMONTH'), $args); + $result = call_user_func_array([DateTime::class, 'DAYOFMONTH'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -200,7 +199,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'TIME'), $args); + $result = call_user_func_array([DateTime::class, 'TIME'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -239,7 +238,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'TIMEVALUE'), $args); + $result = call_user_func_array([DateTime::class, 'TIMEVALUE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -278,7 +277,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'HOUROFDAY'), $args); + $result = call_user_func_array([DateTime::class, 'HOUROFDAY'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -296,7 +295,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'MINUTEOFHOUR'), $args); + $result = call_user_func_array([DateTime::class, 'MINUTEOFHOUR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -314,7 +313,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'SECONDOFMINUTE'), $args); + $result = call_user_func_array([DateTime::class, 'SECONDOFMINUTE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -330,7 +329,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'NETWORKDAYS'), $args); + $result = call_user_func_array([DateTime::class, 'NETWORKDAYS'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -346,7 +345,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'WORKDAY'), $args); + $result = call_user_func_array([DateTime::class, 'WORKDAY'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -362,7 +361,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'EDATE'), $args); + $result = call_user_func_array([DateTime::class, 'EDATE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -399,7 +398,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'EOMONTH'), $args); + $result = call_user_func_array([DateTime::class, 'EOMONTH'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -439,7 +438,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DATEDIF'), $args); + $result = call_user_func_array([DateTime::class, 'DATEDIF'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -455,7 +454,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'DAYS360'), $args); + $result = call_user_func_array([DateTime::class, 'DAYS360'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -474,7 +473,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(DateTime::class, 'YEARFRAC'), $args); + $result = call_user_func_array([DateTime::class, 'YEARFRAC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } diff --git a/tests/PhpSpreadsheet/Calculation/EngineeringTest.php b/tests/PhpSpreadsheet/Calculation/EngineeringTest.php index 1bbce265..acf75dfd 100644 --- a/tests/PhpSpreadsheet/Calculation/EngineeringTest.php +++ b/tests/PhpSpreadsheet/Calculation/EngineeringTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Calculation\Functions; class EngineeringTest extends \PHPUnit_Framework_TestCase { - /** * @var \PhpSpreadsheet\Tests\Custom\ComplexAssert */ @@ -31,7 +30,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BESSELI'), $args); + $result = call_user_func_array([Engineering::class, 'BESSELI'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -47,7 +46,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BESSELJ'), $args); + $result = call_user_func_array([Engineering::class, 'BESSELJ'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -63,7 +62,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BESSELK'), $args); + $result = call_user_func_array([Engineering::class, 'BESSELK'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -79,7 +78,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BESSELY'), $args); + $result = call_user_func_array([Engineering::class, 'BESSELY'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -95,7 +94,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'COMPLEX'), $args); + $result = call_user_func_array([Engineering::class, 'COMPLEX'], $args); $this->assertEquals($expectedResult, $result); } @@ -111,7 +110,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMAGINARY'), $args); + $result = call_user_func_array([Engineering::class, 'IMAGINARY'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -127,7 +126,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMREAL'), $args); + $result = call_user_func_array([Engineering::class, 'IMREAL'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -143,7 +142,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMABS'), $args); + $result = call_user_func_array([Engineering::class, 'IMABS'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -160,7 +159,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMARGUMENT'), $args); + $result = call_user_func_array([Engineering::class, 'IMARGUMENT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -176,7 +175,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMCONJUGATE'), $args); + $result = call_user_func_array([Engineering::class, 'IMCONJUGATE'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -192,7 +191,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMCOS'), $args); + $result = call_user_func_array([Engineering::class, 'IMCOS'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -211,7 +210,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMDIV'), $args); + $result = call_user_func_array([Engineering::class, 'IMDIV'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -227,7 +226,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMEXP'), $args); + $result = call_user_func_array([Engineering::class, 'IMEXP'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -243,7 +242,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMLN'), $args); + $result = call_user_func_array([Engineering::class, 'IMLN'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -259,7 +258,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMLOG2'), $args); + $result = call_user_func_array([Engineering::class, 'IMLOG2'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -275,7 +274,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMLOG10'), $args); + $result = call_user_func_array([Engineering::class, 'IMLOG10'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -294,7 +293,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMPOWER'), $args); + $result = call_user_func_array([Engineering::class, 'IMPOWER'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -310,7 +309,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMPRODUCT'), $args); + $result = call_user_func_array([Engineering::class, 'IMPRODUCT'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -326,7 +325,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMSIN'), $args); + $result = call_user_func_array([Engineering::class, 'IMSIN'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -342,7 +341,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMSQRT'), $args); + $result = call_user_func_array([Engineering::class, 'IMSQRT'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -361,7 +360,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMSUB'), $args); + $result = call_user_func_array([Engineering::class, 'IMSUB'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -378,7 +377,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'IMSUM'), $args); + $result = call_user_func_array([Engineering::class, 'IMSUM'], $args); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage()); } @@ -394,7 +393,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'ERF'), $args); + $result = call_user_func_array([Engineering::class, 'ERF'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -410,7 +409,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'ERFC'), $args); + $result = call_user_func_array([Engineering::class, 'ERFC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -426,7 +425,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BINTODEC'), $args); + $result = call_user_func_array([Engineering::class, 'BINTODEC'], $args); $this->assertEquals($expectedResult, $result); } @@ -442,7 +441,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BINTOHEX'), $args); + $result = call_user_func_array([Engineering::class, 'BINTOHEX'], $args); $this->assertEquals($expectedResult, $result); } @@ -458,7 +457,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'BINTOOCT'), $args); + $result = call_user_func_array([Engineering::class, 'BINTOOCT'], $args); $this->assertEquals($expectedResult, $result); } @@ -474,7 +473,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'DECTOBIN'), $args); + $result = call_user_func_array([Engineering::class, 'DECTOBIN'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -490,7 +489,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'DECTOHEX'), $args); + $result = call_user_func_array([Engineering::class, 'DECTOHEX'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -506,7 +505,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'DECTOOCT'), $args); + $result = call_user_func_array([Engineering::class, 'DECTOOCT'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -522,7 +521,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'HEXTOBIN'), $args); + $result = call_user_func_array([Engineering::class, 'HEXTOBIN'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -538,7 +537,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'HEXTODEC'), $args); + $result = call_user_func_array([Engineering::class, 'HEXTODEC'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -554,7 +553,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'HEXTOOCT'), $args); + $result = call_user_func_array([Engineering::class, 'HEXTOOCT'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -570,7 +569,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'OCTTOBIN'), $args); + $result = call_user_func_array([Engineering::class, 'OCTTOBIN'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -586,7 +585,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'OCTTODEC'), $args); + $result = call_user_func_array([Engineering::class, 'OCTTODEC'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -602,7 +601,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'OCTTOHEX'), $args); + $result = call_user_func_array([Engineering::class, 'OCTTOHEX'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -618,7 +617,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'DELTA'), $args); + $result = call_user_func_array([Engineering::class, 'DELTA'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -634,7 +633,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'GESTEP'), $args); + $result = call_user_func_array([Engineering::class, 'GESTEP'], $args); $this->assertEquals($expectedResult, $result, null); } @@ -674,7 +673,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Engineering::class,'CONVERTUOM'), $args); + $result = call_user_func_array([Engineering::class, 'CONVERTUOM'], $args); $this->assertEquals($expectedResult, $result, null); } diff --git a/tests/PhpSpreadsheet/Calculation/FinancialTest.php b/tests/PhpSpreadsheet/Calculation/FinancialTest.php index 28006a54..61b3752c 100644 --- a/tests/PhpSpreadsheet/Calculation/FinancialTest.php +++ b/tests/PhpSpreadsheet/Calculation/FinancialTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Calculation\Functions; class FinancialTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -21,7 +20,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'ACCRINT'), $args); + $result = call_user_func_array([Financial::class, 'ACCRINT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -37,7 +36,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'ACCRINTM'), $args); + $result = call_user_func_array([Financial::class, 'ACCRINTM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -53,7 +52,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'AMORDEGRC'), $args); + $result = call_user_func_array([Financial::class, 'AMORDEGRC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -69,7 +68,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'AMORLINC'), $args); + $result = call_user_func_array([Financial::class, 'AMORLINC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -85,7 +84,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPDAYBS'), $args); + $result = call_user_func_array([Financial::class, 'COUPDAYBS'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -101,7 +100,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPDAYS'), $args); + $result = call_user_func_array([Financial::class, 'COUPDAYS'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -117,7 +116,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPDAYSNC'), $args); + $result = call_user_func_array([Financial::class, 'COUPDAYSNC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -133,7 +132,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPNCD'), $args); + $result = call_user_func_array([Financial::class, 'COUPNCD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -149,7 +148,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPNUM'), $args); + $result = call_user_func_array([Financial::class, 'COUPNUM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -165,7 +164,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'COUPPCD'), $args); + $result = call_user_func_array([Financial::class, 'COUPPCD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -181,7 +180,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'CUMIPMT'), $args); + $result = call_user_func_array([Financial::class, 'CUMIPMT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -197,7 +196,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'CUMPRINC'), $args); + $result = call_user_func_array([Financial::class, 'CUMPRINC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -213,7 +212,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DB'), $args); + $result = call_user_func_array([Financial::class, 'DB'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -229,7 +228,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DDB'), $args); + $result = call_user_func_array([Financial::class, 'DDB'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -245,7 +244,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DISC'), $args); + $result = call_user_func_array([Financial::class, 'DISC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -261,7 +260,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DOLLARDE'), $args); + $result = call_user_func_array([Financial::class, 'DOLLARDE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -277,7 +276,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'DOLLARFR'), $args); + $result = call_user_func_array([Financial::class, 'DOLLARFR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -293,7 +292,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'EFFECT'), $args); + $result = call_user_func_array([Financial::class, 'EFFECT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -309,7 +308,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'FV'), $args); + $result = call_user_func_array([Financial::class, 'FV'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -325,7 +324,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'FVSCHEDULE'), $args); + $result = call_user_func_array([Financial::class, 'FVSCHEDULE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -341,7 +340,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'INTRATE'), $args); + $result = call_user_func_array([Financial::class, 'INTRATE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -357,7 +356,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'IPMT'), $args); + $result = call_user_func_array([Financial::class, 'IPMT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -373,7 +372,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'IRR'), $args); + $result = call_user_func_array([Financial::class, 'IRR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -389,7 +388,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'ISPMT'), $args); + $result = call_user_func_array([Financial::class, 'ISPMT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -405,7 +404,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'MIRR'), $args); + $result = call_user_func_array([Financial::class, 'MIRR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -421,7 +420,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'NOMINAL'), $args); + $result = call_user_func_array([Financial::class, 'NOMINAL'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -437,7 +436,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'NPER'), $args); + $result = call_user_func_array([Financial::class, 'NPER'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -453,7 +452,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'NPV'), $args); + $result = call_user_func_array([Financial::class, 'NPV'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -472,7 +471,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'PRICE'), $args); + $result = call_user_func_array([Financial::class, 'PRICE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -491,7 +490,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'RATE'), $args); + $result = call_user_func_array([Financial::class, 'RATE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -510,7 +509,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Financial::class,'XIRR'), $args); + $result = call_user_func_array([Financial::class, 'XIRR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } diff --git a/tests/PhpSpreadsheet/Calculation/FunctionsTest.php b/tests/PhpSpreadsheet/Calculation/FunctionsTest.php index 3303c183..e21b236b 100644 --- a/tests/PhpSpreadsheet/Calculation/FunctionsTest.php +++ b/tests/PhpSpreadsheet/Calculation/FunctionsTest.php @@ -6,7 +6,6 @@ use PhpSpreadsheet\Calculation\Functions; class FunctionsTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -67,7 +66,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isBlank'), $args); + $result = call_user_func_array([Functions::class, 'isBlank'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -83,7 +82,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isErr'), $args); + $result = call_user_func_array([Functions::class, 'isErr'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -99,7 +98,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isError'), $args); + $result = call_user_func_array([Functions::class, 'isError'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -115,7 +114,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'errorType'), $args); + $result = call_user_func_array([Functions::class, 'errorType'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -131,7 +130,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isLogical'), $args); + $result = call_user_func_array([Functions::class, 'isLogical'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -147,7 +146,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isNa'), $args); + $result = call_user_func_array([Functions::class, 'isNa'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -163,7 +162,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isNumber'), $args); + $result = call_user_func_array([Functions::class, 'isNumber'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -179,7 +178,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isText'), $args); + $result = call_user_func_array([Functions::class, 'isText'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -195,7 +194,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isNonText'), $args); + $result = call_user_func_array([Functions::class, 'isNonText'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -211,7 +210,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isEven'), $args); + $result = call_user_func_array([Functions::class, 'isEven'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -227,7 +226,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'isOdd'), $args); + $result = call_user_func_array([Functions::class, 'isOdd'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -243,7 +242,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'TYPE'), $args); + $result = call_user_func_array([Functions::class, 'TYPE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } @@ -259,7 +258,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Functions::class,'n'), $args); + $result = call_user_func_array([Functions::class, 'n'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } diff --git a/tests/PhpSpreadsheet/Calculation/LogicalTest.php b/tests/PhpSpreadsheet/Calculation/LogicalTest.php index 5cad07ac..7ad5256c 100644 --- a/tests/PhpSpreadsheet/Calculation/LogicalTest.php +++ b/tests/PhpSpreadsheet/Calculation/LogicalTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Calculation\Logical; class LogicalTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -16,13 +15,13 @@ class LogicalTest extends \PHPUnit_Framework_TestCase public function testTRUE() { $result = Logical::TRUE(); - $this->assertEquals(true, $result); + $this->assertTrue($result); } public function testFALSE() { $result = Logical::FALSE(); - $this->assertEquals(false, $result); + $this->assertFalse($result); } /** @@ -32,7 +31,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'logicalAnd'), $args); + $result = call_user_func_array([Logical::class, 'logicalAnd'], $args); $this->assertEquals($expectedResult, $result); } @@ -48,7 +47,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'logicalOr'), $args); + $result = call_user_func_array([Logical::class, 'logicalOr'], $args); $this->assertEquals($expectedResult, $result); } @@ -64,7 +63,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'NOT'), $args); + $result = call_user_func_array([Logical::class, 'NOT'], $args); $this->assertEquals($expectedResult, $result); } @@ -80,7 +79,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'statementIf'), $args); + $result = call_user_func_array([Logical::class, 'statementIf'], $args); $this->assertEquals($expectedResult, $result); } @@ -96,7 +95,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Logical::class,'IFERROR'), $args); + $result = call_user_func_array([Logical::class, 'IFERROR'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Calculation/LookupRefTest.php b/tests/PhpSpreadsheet/Calculation/LookupRefTest.php index 29fbaea4..20574732 100644 --- a/tests/PhpSpreadsheet/Calculation/LookupRefTest.php +++ b/tests/PhpSpreadsheet/Calculation/LookupRefTest.php @@ -10,7 +10,6 @@ use PhpSpreadsheet\Calculation\LookupRef; */ class LookupRefTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -24,7 +23,7 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(LookupRef::class,'HLOOKUP'), $args); + $result = call_user_func_array([LookupRef::class, 'HLOOKUP'], $args); $this->assertEquals($expectedResult, $result); } @@ -41,7 +40,7 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(LookupRef::class,'VLOOKUP'), $args); + $result = call_user_func_array([LookupRef::class, 'VLOOKUP'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Calculation/MathTrigTest.php b/tests/PhpSpreadsheet/Calculation/MathTrigTest.php index 0cfb1f4d..ed017e81 100644 --- a/tests/PhpSpreadsheet/Calculation/MathTrigTest.php +++ b/tests/PhpSpreadsheet/Calculation/MathTrigTest.php @@ -8,7 +8,6 @@ use PhpSpreadsheet\Calculation\MathTrig; class MathTrigTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -21,7 +20,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ATAN2'), $args); + $result = call_user_func_array([MathTrig::class, 'ATAN2'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -37,7 +36,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'CEILING'), $args); + $result = call_user_func_array([MathTrig::class, 'CEILING'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -53,7 +52,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'COMBIN'), $args); + $result = call_user_func_array([MathTrig::class, 'COMBIN'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -69,7 +68,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'EVEN'), $args); + $result = call_user_func_array([MathTrig::class, 'EVEN'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -85,7 +84,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ODD'), $args); + $result = call_user_func_array([MathTrig::class, 'ODD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -101,7 +100,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'FACT'), $args); + $result = call_user_func_array([MathTrig::class, 'FACT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -117,7 +116,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'FACTDOUBLE'), $args); + $result = call_user_func_array([MathTrig::class, 'FACTDOUBLE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -133,7 +132,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'FLOOR'), $args); + $result = call_user_func_array([MathTrig::class, 'FLOOR'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -149,7 +148,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'GCD'), $args); + $result = call_user_func_array([MathTrig::class, 'GCD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -165,7 +164,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'LCM'), $args); + $result = call_user_func_array([MathTrig::class, 'LCM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -181,7 +180,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'INT'), $args); + $result = call_user_func_array([MathTrig::class, 'INT'], $args); $this->assertEquals($expectedResult, $result); } @@ -197,7 +196,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'SIGN'), $args); + $result = call_user_func_array([MathTrig::class, 'SIGN'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -213,7 +212,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'POWER'), $args); + $result = call_user_func_array([MathTrig::class, 'POWER'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -229,7 +228,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'logBase'), $args); + $result = call_user_func_array([MathTrig::class, 'logBase'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -245,7 +244,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MOD'), $args); + $result = call_user_func_array([MathTrig::class, 'MOD'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -264,7 +263,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MDETERM'), $args); + $result = call_user_func_array([MathTrig::class, 'MDETERM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -283,7 +282,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MINVERSE'), $args); + $result = call_user_func_array([MathTrig::class, 'MINVERSE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -302,7 +301,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MMULT'), $args); + $result = call_user_func_array([MathTrig::class, 'MMULT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -318,7 +317,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'MULTINOMIAL'), $args); + $result = call_user_func_array([MathTrig::class, 'MULTINOMIAL'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -335,7 +334,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE); - $result = call_user_func_array(array(MathTrig::class,'MROUND'), $args); + $result = call_user_func_array([MathTrig::class, 'MROUND'], $args); Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_ARRAY); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -352,7 +351,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'PRODUCT'), $args); + $result = call_user_func_array([MathTrig::class, 'PRODUCT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -368,7 +367,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'QUOTIENT'), $args); + $result = call_user_func_array([MathTrig::class, 'QUOTIENT'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -384,7 +383,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ROUNDUP'), $args); + $result = call_user_func_array([MathTrig::class, 'ROUNDUP'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -400,7 +399,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ROUNDDOWN'), $args); + $result = call_user_func_array([MathTrig::class, 'ROUNDDOWN'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -416,7 +415,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'SERIESSUM'), $args); + $result = call_user_func_array([MathTrig::class, 'SERIESSUM'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -432,7 +431,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'SUMSQ'), $args); + $result = call_user_func_array([MathTrig::class, 'SUMSQ'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -448,7 +447,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'TRUNC'), $args); + $result = call_user_func_array([MathTrig::class, 'TRUNC'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -464,7 +463,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'ROMAN'), $args); + $result = call_user_func_array([MathTrig::class, 'ROMAN'], $args); $this->assertEquals($expectedResult, $result); } @@ -480,7 +479,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class,'SQRTPI'), $args); + $result = call_user_func_array([MathTrig::class, 'SQRTPI'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } @@ -496,70 +495,70 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(MathTrig::class, 'SUMIF'), $args); + $result = call_user_func_array([MathTrig::class, 'SUMIF'], $args); $this->assertEquals($expectedResult, $result, null, 1E-12); } public function providerSUMIF() { - return array( - array( - array( - array(1), - array(5), - array(10), - ), + return [ + [ + [ + [1], + [5], + [10], + ], '>=5', 15, - ), - array( - array( - array('text'), - array(2), - ), + ], + [ + [ + ['text'], + [2], + ], '=text', - array( - array(10), - array(100), - ), + [ + [10], + [100], + ], 10, - ), - array( - array( - array('"text with quotes"'), - array(2), - ), + ], + [ + [ + ['"text with quotes"'], + [2], + ], '="text with quotes"', - array( - array(10), - array(100), - ), + [ + [10], + [100], + ], 10, - ), - array( - array( - array('"text with quotes"'), - array(''), - ), + ], + [ + [ + ['"text with quotes"'], + [''], + ], '>"', // Compare to the single characater " (double quote) - array( - array(10), - array(100), - ), - 10 - ), - array( - array( - array(''), - array('anything'), - ), + [ + [10], + [100], + ], + 10, + ], + [ + [ + [''], + ['anything'], + ], '>"', // Compare to the single characater " (double quote) - array( - array(10), - array(100), - ), - 100 - ), - ); + [ + [10], + [100], + ], + 100, + ], + ]; } } diff --git a/tests/PhpSpreadsheet/Calculation/TextDataTest.php b/tests/PhpSpreadsheet/Calculation/TextDataTest.php index 98251999..51de92b4 100644 --- a/tests/PhpSpreadsheet/Calculation/TextDataTest.php +++ b/tests/PhpSpreadsheet/Calculation/TextDataTest.php @@ -2,13 +2,12 @@ namespace PhpSpreadsheet\Tests\Calculation; -use PhpSpreadsheet\Shared\StringHelper; use PhpSpreadsheet\Calculation\Functions; use PhpSpreadsheet\Calculation\TextData; +use PhpSpreadsheet\Shared\StringHelper; class TextDataTest extends \PHPUnit_Framework_TestCase { - public function setUp() { Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL); @@ -21,7 +20,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'CHARACTER'), $args); + $result = call_user_func_array([TextData::class, 'CHARACTER'], $args); $this->assertEquals($expectedResult, $result); } @@ -37,7 +36,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'ASCIICODE'), $args); + $result = call_user_func_array([TextData::class, 'ASCIICODE'], $args); $this->assertEquals($expectedResult, $result); } @@ -53,7 +52,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'CONCATENATE'), $args); + $result = call_user_func_array([TextData::class, 'CONCATENATE'], $args); $this->assertEquals($expectedResult, $result); } @@ -69,7 +68,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'LEFT'), $args); + $result = call_user_func_array([TextData::class, 'LEFT'], $args); $this->assertEquals($expectedResult, $result); } @@ -85,7 +84,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'MID'), $args); + $result = call_user_func_array([TextData::class, 'MID'], $args); $this->assertEquals($expectedResult, $result); } @@ -101,7 +100,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'RIGHT'), $args); + $result = call_user_func_array([TextData::class, 'RIGHT'], $args); $this->assertEquals($expectedResult, $result); } @@ -117,7 +116,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'LOWERCASE'), $args); + $result = call_user_func_array([TextData::class, 'LOWERCASE'], $args); $this->assertEquals($expectedResult, $result); } @@ -133,7 +132,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'UPPERCASE'), $args); + $result = call_user_func_array([TextData::class, 'UPPERCASE'], $args); $this->assertEquals($expectedResult, $result); } @@ -149,7 +148,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'PROPERCASE'), $args); + $result = call_user_func_array([TextData::class, 'PROPERCASE'], $args); $this->assertEquals($expectedResult, $result); } @@ -165,7 +164,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'STRINGLENGTH'), $args); + $result = call_user_func_array([TextData::class, 'STRINGLENGTH'], $args); $this->assertEquals($expectedResult, $result); } @@ -181,7 +180,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'SEARCHINSENSITIVE'), $args); + $result = call_user_func_array([TextData::class, 'SEARCHINSENSITIVE'], $args); $this->assertEquals($expectedResult, $result); } @@ -197,7 +196,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'SEARCHSENSITIVE'), $args); + $result = call_user_func_array([TextData::class, 'SEARCHSENSITIVE'], $args); $this->assertEquals($expectedResult, $result); } @@ -213,7 +212,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'REPLACE'), $args); + $result = call_user_func_array([TextData::class, 'REPLACE'], $args); $this->assertEquals($expectedResult, $result); } @@ -229,7 +228,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'SUBSTITUTE'), $args); + $result = call_user_func_array([TextData::class, 'SUBSTITUTE'], $args); $this->assertEquals($expectedResult, $result); } @@ -245,7 +244,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'TRIMSPACES'), $args); + $result = call_user_func_array([TextData::class, 'TRIMSPACES'], $args); $this->assertEquals($expectedResult, $result); } @@ -261,7 +260,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'TRIMNONPRINTABLE'), $args); + $result = call_user_func_array([TextData::class, 'TRIMNONPRINTABLE'], $args); $this->assertEquals($expectedResult, $result); } @@ -277,7 +276,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'DOLLAR'), $args); + $result = call_user_func_array([TextData::class, 'DOLLAR'], $args); $this->assertEquals($expectedResult, $result); } @@ -293,7 +292,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'FIXEDFORMAT'), $args); + $result = call_user_func_array([TextData::class, 'FIXEDFORMAT'], $args); $this->assertEquals($expectedResult, $result); } @@ -309,7 +308,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class,'RETURNSTRING'), $args); + $result = call_user_func_array([TextData::class, 'RETURNSTRING'], $args); $this->assertEquals($expectedResult, $result); } @@ -324,13 +323,13 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function testTEXT() { // Enforce decimal and thousands separator values to UK/US, and currency code to USD - call_user_func(array(StringHelper::class, 'setDecimalSeparator'), '.'); - call_user_func(array(StringHelper::class, 'setThousandsSeparator'), ','); - call_user_func(array(StringHelper::class, 'setCurrencyCode'), '$'); + call_user_func([StringHelper::class, 'setDecimalSeparator'], '.'); + call_user_func([StringHelper::class, 'setThousandsSeparator'], ','); + call_user_func([StringHelper::class, 'setCurrencyCode'], '$'); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class, 'TEXTFORMAT'), $args); + $result = call_user_func_array([TextData::class, 'TEXTFORMAT'], $args); $this->assertEquals($expectedResult, $result); } @@ -344,13 +343,13 @@ class TextDataTest extends \PHPUnit_Framework_TestCase */ public function testVALUE() { - call_user_func(array(StringHelper::class, 'setDecimalSeparator'), '.'); - call_user_func(array(StringHelper::class, 'setThousandsSeparator'), ' '); - call_user_func(array(StringHelper::class, 'setCurrencyCode'), '$'); + call_user_func([StringHelper::class, 'setDecimalSeparator'], '.'); + call_user_func([StringHelper::class, 'setThousandsSeparator'], ' '); + call_user_func([StringHelper::class, 'setCurrencyCode'], '$'); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(TextData::class, 'VALUE'), $args); + $result = call_user_func_array([TextData::class, 'VALUE'], $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } diff --git a/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php b/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php index 86e4e8f3..eec39ba4 100644 --- a/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php +++ b/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php @@ -2,13 +2,13 @@ namespace PhpSpreadsheet\Tests\Cell; -use PhpSpreadsheet\Worksheet; -use PhpSpreadsheet\Style\NumberFormat; -use PhpSpreadsheet\Shared\StringHelper; +use PhpSpreadsheet\CachedObjectStorage\Memory; use PhpSpreadsheet\Cell; use PhpSpreadsheet\Cell\AdvancedValueBinder; use PhpSpreadsheet\Cell\DataType; -use PhpSpreadsheet\CachedObjectStorage\Memory; +use PhpSpreadsheet\Shared\StringHelper; +use PhpSpreadsheet\Style\NumberFormat; +use PhpSpreadsheet\Worksheet; class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase { @@ -17,7 +17,7 @@ class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase if (!defined('PHPSPREADSHEET_ROOT')) { define('PHPSPREADSHEET_ROOT', APPLICATION_PATH . '/'); } - require_once(PHPSPREADSHEET_ROOT . '/Bootstrap.php'); + require_once PHPSPREADSHEET_ROOT . '/Bootstrap.php'; } public function provider() @@ -28,16 +28,16 @@ class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase $currencyUSD = NumberFormat::FORMAT_CURRENCY_USD_SIMPLE; $currencyEURO = str_replace('$', '€', NumberFormat::FORMAT_CURRENCY_USD_SIMPLE); - return array( - array('10%', 0.1, NumberFormat::FORMAT_PERCENTAGE_00, ',', '.', '$'), - array('$10.11', 10.11, $currencyUSD, ',', '.', '$'), - array('$1,010.12', 1010.12, $currencyUSD, ',', '.', '$'), - array('$20,20', 20.2, $currencyUSD, '.', ',', '$'), - array('$2.020,20', 2020.2, $currencyUSD, '.', ',', '$'), - array('€2.020,20', 2020.2, $currencyEURO, '.', ',', '€'), - array('€ 2.020,20', 2020.2, $currencyEURO, '.', ',', '€'), - array('€2,020.22', 2020.22, $currencyEURO, ',', '.', '€'), - ); + return [ + ['10%', 0.1, NumberFormat::FORMAT_PERCENTAGE_00, ',', '.', '$'], + ['$10.11', 10.11, $currencyUSD, ',', '.', '$'], + ['$1,010.12', 1010.12, $currencyUSD, ',', '.', '$'], + ['$20,20', 20.2, $currencyUSD, '.', ',', '$'], + ['$2.020,20', 2020.2, $currencyUSD, '.', ',', '$'], + ['€2.020,20', 2020.2, $currencyEURO, '.', ',', '€'], + ['€ 2.020,20', 2020.2, $currencyEURO, '.', ',', '€'], + ['€2,020.22', 2020.22, $currencyEURO, ',', '.', '€'], + ]; } /** @@ -47,7 +47,7 @@ class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase { $sheet = $this->getMock( Worksheet::class, - array('getStyle', 'getNumberFormat', 'setFormatCode','getCellCacheController') + ['getStyle', 'getNumberFormat', 'setFormatCode', 'getCellCacheController'] ); $cache = $this->getMockBuilder(Memory::class) ->disableOriginalConstructor() diff --git a/tests/PhpSpreadsheet/Cell/DataTypeTest.php b/tests/PhpSpreadsheet/Cell/DataTypeTest.php index 98c342b5..932ba859 100644 --- a/tests/PhpSpreadsheet/Cell/DataTypeTest.php +++ b/tests/PhpSpreadsheet/Cell/DataTypeTest.php @@ -6,18 +6,17 @@ use PhpSpreadsheet\Cell\DataType; class DataTypeTest extends \PHPUnit_Framework_TestCase { - public function setUp() { if (!defined('PHPSPREADSHEET_ROOT')) { define('PHPSPREADSHEET_ROOT', APPLICATION_PATH . '/'); } - require_once(PHPSPREADSHEET_ROOT . '/Bootstrap.php'); + require_once PHPSPREADSHEET_ROOT . '/Bootstrap.php'; } public function testGetErrorCodes() { - $result = call_user_func(array(DataType::class,'getErrorCodes')); + $result = call_user_func([DataType::class, 'getErrorCodes']); $this->assertInternalType('array', $result); $this->assertGreaterThan(0, count($result)); $this->assertArrayHasKey('#NULL!', $result); diff --git a/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php b/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php index 54595e96..d5db5d62 100644 --- a/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php +++ b/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php @@ -2,10 +2,10 @@ namespace PhpSpreadsheet\Tests\Cell; -use PhpSpreadsheet\Cell\DefaultValueBinder; use PhpSpreadsheet\Cell; -use PhpSpreadsheet\RichText; use PhpSpreadsheet\Cell\DataType; +use PhpSpreadsheet\Cell\DefaultValueBinder; +use PhpSpreadsheet\RichText; class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase { @@ -16,7 +16,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase if (!defined('PHPSPREADSHEET_ROOT')) { define('PHPSPREADSHEET_ROOT', APPLICATION_PATH . '/'); } - require_once(PHPSPREADSHEET_ROOT . '/Bootstrap.php'); + require_once PHPSPREADSHEET_ROOT . '/Bootstrap.php'; } protected function createCellStub() @@ -44,20 +44,20 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase public function binderProvider() { - return array( - array(null), - array(''), - array('ABC'), - array('=SUM(A1:B2)'), - array(true), - array(false), - array(123), - array(-123.456), - array('123'), - array('-123.456'), - array('#REF!'), - array(new \DateTime()), - ); + return [ + [null], + [''], + ['ABC'], + ['=SUM(A1:B2)'], + [true], + [false], + [123], + [-123.456], + ['123'], + ['-123.456'], + ['#REF!'], + [new \DateTime()], + ]; } /** @@ -66,7 +66,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase public function testDataTypeForValue() { list($args, $expectedResult) = func_get_args(); - $result = call_user_func_array(array(DefaultValueBinder::class,'dataTypeForValue'), $args); + $result = call_user_func_array([DefaultValueBinder::class, 'dataTypeForValue'], $args); $this->assertEquals($expectedResult, $result); } @@ -81,7 +81,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase $objRichText->createText('Hello World'); $expectedResult = DataType::TYPE_INLINE; - $result = call_user_func(array(DefaultValueBinder::class,'dataTypeForValue'), $objRichText); + $result = call_user_func([DefaultValueBinder::class, 'dataTypeForValue'], $objRichText); $this->assertEquals($expectedResult, $result); } } diff --git a/tests/PhpSpreadsheet/Cell/HyperlinkTest.php b/tests/PhpSpreadsheet/Cell/HyperlinkTest.php index 9c812a57..d3b51271 100644 --- a/tests/PhpSpreadsheet/Cell/HyperlinkTest.php +++ b/tests/PhpSpreadsheet/Cell/HyperlinkTest.php @@ -6,13 +6,12 @@ use PhpSpreadsheet\Cell\Hyperlink; class HyperlinkTest extends \PHPUnit_Framework_TestCase { - public function setUp() { if (!defined('PHPSPREADSHEET_ROOT')) { define('PHPSPREADSHEET_ROOT', APPLICATION_PATH . '/'); } - require_once(PHPSPREADSHEET_ROOT . '/Bootstrap.php'); + require_once PHPSPREADSHEET_ROOT . '/Bootstrap.php'; } public function testGetUrl() diff --git a/tests/PhpSpreadsheet/CellTest.php b/tests/PhpSpreadsheet/CellTest.php index a8083715..5f8d1749 100644 --- a/tests/PhpSpreadsheet/CellTest.php +++ b/tests/PhpSpreadsheet/CellTest.php @@ -14,7 +14,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'columnIndexFromString'), $args); + $result = call_user_func_array([Cell::class, 'columnIndexFromString'], $args); $this->assertEquals($expectedResult, $result); } @@ -27,10 +27,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'ABCD'; try { - $result = call_user_func(array(Cell::class,'columnIndexFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'columnIndexFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Column string index can not be longer than 3 characters'); + return; } $this->fail('An expected exception has not been raised.'); @@ -40,10 +41,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = ''; try { - $result = call_user_func(array(Cell::class,'columnIndexFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'columnIndexFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Column string index can not be empty'); + return; } $this->fail('An expected exception has not been raised.'); @@ -56,7 +58,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'stringFromColumnIndex'), $args); + $result = call_user_func_array([Cell::class, 'stringFromColumnIndex'], $args); $this->assertEquals($expectedResult, $result); } @@ -72,7 +74,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'coordinateFromString'), $args); + $result = call_user_func_array([Cell::class, 'coordinateFromString'], $args); $this->assertEquals($expectedResult, $result); } @@ -85,10 +87,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'A1:AI2012'; try { - $result = call_user_func(array(Cell::class,'coordinateFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'coordinateFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Cell coordinate string can not be a range of cells'); + return; } $this->fail('An expected exception has not been raised.'); @@ -98,10 +101,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = ''; try { - $result = call_user_func(array(Cell::class,'coordinateFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'coordinateFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Cell coordinate can not be zero-length string'); + return; } $this->fail('An expected exception has not been raised.'); @@ -111,10 +115,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'AI'; try { - $result = call_user_func(array(Cell::class,'coordinateFromString'), $cellAddress); + $result = call_user_func([Cell::class, 'coordinateFromString'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); - $this->assertEquals($e->getMessage(), 'Invalid cell coordinate '.$cellAddress); + $this->assertEquals($e->getMessage(), 'Invalid cell coordinate ' . $cellAddress); + return; } $this->fail('An expected exception has not been raised.'); @@ -127,7 +132,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'absoluteCoordinate'), $args); + $result = call_user_func_array([Cell::class, 'absoluteCoordinate'], $args); $this->assertEquals($expectedResult, $result); } @@ -140,10 +145,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'A1:AI2012'; try { - $result = call_user_func(array(Cell::class,'absoluteCoordinate'), $cellAddress); + $result = call_user_func([Cell::class, 'absoluteCoordinate'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Cell coordinate string can not be a range of cells'); + return; } $this->fail('An expected exception has not been raised.'); @@ -156,7 +162,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'absoluteReference'), $args); + $result = call_user_func_array([Cell::class, 'absoluteReference'], $args); $this->assertEquals($expectedResult, $result); } @@ -169,10 +175,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellAddress = 'A1:AI2012'; try { - $result = call_user_func(array(Cell::class,'absoluteReference'), $cellAddress); + $result = call_user_func([Cell::class, 'absoluteReference'], $cellAddress); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Cell coordinate string can not be a range of cells'); + return; } $this->fail('An expected exception has not been raised.'); @@ -185,7 +192,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'splitRange'), $args); + $result = call_user_func_array([Cell::class, 'splitRange'], $args); foreach ($result as $key => $split) { if (!is_array($expectedResult[$key])) { $this->assertEquals($expectedResult[$key], $split[0]); @@ -207,7 +214,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'buildRange'), $args); + $result = call_user_func_array([Cell::class, 'buildRange'], $args); $this->assertEquals($expectedResult, $result); } @@ -220,10 +227,11 @@ class CellTest extends \PHPUnit_Framework_TestCase { $cellRange = ''; try { - $result = call_user_func(array(Cell::class,'buildRange'), $cellRange); + $result = call_user_func([Cell::class, 'buildRange'], $cellRange); } catch (\Exception $e) { $this->assertInstanceOf(Exception::class, $e); $this->assertEquals($e->getMessage(), 'Range does not contain any information'); + return; } $this->fail('An expected exception has not been raised.'); @@ -236,7 +244,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'rangeBoundaries'), $args); + $result = call_user_func_array([Cell::class, 'rangeBoundaries'], $args); $this->assertEquals($expectedResult, $result); } @@ -252,7 +260,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'rangeDimension'), $args); + $result = call_user_func_array([Cell::class, 'rangeDimension'], $args); $this->assertEquals($expectedResult, $result); } @@ -268,7 +276,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'getRangeBoundaries'), $args); + $result = call_user_func_array([Cell::class, 'getRangeBoundaries'], $args); $this->assertEquals($expectedResult, $result); } @@ -284,7 +292,7 @@ class CellTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Cell::class,'extractAllCellReferencesInRange'), $args); + $result = call_user_func_array([Cell::class, 'extractAllCellReferencesInRange'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php b/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php index b0fbdde1..7765cc86 100644 --- a/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php +++ b/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php @@ -9,12 +9,12 @@ class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase { public function testSetDataType() { - $dataTypeValues = array( + $dataTypeValues = [ 'Number', - 'String' - ); + 'String', + ]; - $testInstance = new DataSeriesValues; + $testInstance = new DataSeriesValues(); foreach ($dataTypeValues as $dataTypeValue) { $result = $testInstance->setDataType($dataTypeValue); @@ -24,12 +24,13 @@ class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase public function testSetInvalidDataTypeThrowsException() { - $testInstance = new DataSeriesValues; + $testInstance = new DataSeriesValues(); try { $result = $testInstance->setDataType('BOOLEAN'); } catch (Exception $e) { $this->assertEquals($e->getMessage(), 'Invalid datatype for chart data series values'); + return; } $this->fail('An expected exception has not been raised.'); @@ -39,7 +40,7 @@ class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase { $dataTypeValue = 'String'; - $testInstance = new DataSeriesValues; + $testInstance = new DataSeriesValues(); $setValue = $testInstance->setDataType($dataTypeValue); $result = $testInstance->getDataType(); diff --git a/tests/PhpSpreadsheet/Chart/LayoutTest.php b/tests/PhpSpreadsheet/Chart/LayoutTest.php index 1659021f..03432592 100644 --- a/tests/PhpSpreadsheet/Chart/LayoutTest.php +++ b/tests/PhpSpreadsheet/Chart/LayoutTest.php @@ -10,7 +10,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase { $LayoutTargetValue = 'String'; - $testInstance = new Layout; + $testInstance = new Layout(); $result = $testInstance->setLayoutTarget($LayoutTargetValue); $this->assertTrue($result instanceof Layout); @@ -20,7 +20,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase { $LayoutTargetValue = 'String'; - $testInstance = new Layout; + $testInstance = new Layout(); $setValue = $testInstance->setLayoutTarget($LayoutTargetValue); $result = $testInstance->getLayoutTarget(); diff --git a/tests/PhpSpreadsheet/Chart/LegendTest.php b/tests/PhpSpreadsheet/Chart/LegendTest.php index d4f64c05..901d8441 100644 --- a/tests/PhpSpreadsheet/Chart/LegendTest.php +++ b/tests/PhpSpreadsheet/Chart/LegendTest.php @@ -8,15 +8,15 @@ class LegendTest extends \PHPUnit_Framework_TestCase { public function testSetPosition() { - $positionValues = array( + $positionValues = [ Legend::POSITION_RIGHT, Legend::POSITION_LEFT, Legend::POSITION_TOP, Legend::POSITION_BOTTOM, Legend::POSITION_TOPRIGHT, - ); + ]; - $testInstance = new Legend; + $testInstance = new Legend(); foreach ($positionValues as $positionValue) { $result = $testInstance->setPosition($positionValue); @@ -26,7 +26,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetInvalidPositionReturnsFalse() { - $testInstance = new Legend; + $testInstance = new Legend(); $result = $testInstance->setPosition('BottomLeft'); $this->assertFalse($result); @@ -39,7 +39,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase { $PositionValue = Legend::POSITION_BOTTOM; - $testInstance = new Legend; + $testInstance = new Legend(); $setValue = $testInstance->setPosition($PositionValue); $result = $testInstance->getPosition(); @@ -48,16 +48,16 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetPositionXL() { - $positionValues = array( + $positionValues = [ Legend::XL_LEGEND_POSITION_BOTTOM, Legend::XL_LEGEND_POSITION_CORNER, Legend::XL_LEGEND_POSITION_CUSTOM, Legend::XL_LEGEND_POSITION_LEFT, Legend::XL_LEGEND_POSITION_RIGHT, Legend::XL_LEGEND_POSITION_TOP, - ); + ]; - $testInstance = new Legend; + $testInstance = new Legend(); foreach ($positionValues as $positionValue) { $result = $testInstance->setPositionXL($positionValue); @@ -67,7 +67,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetInvalidXLPositionReturnsFalse() { - $testInstance = new Legend; + $testInstance = new Legend(); $result = $testInstance->setPositionXL(999); $this->assertFalse($result); @@ -80,7 +80,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase { $PositionValue = Legend::XL_LEGEND_POSITION_CORNER; - $testInstance = new Legend; + $testInstance = new Legend(); $setValue = $testInstance->setPositionXL($PositionValue); $result = $testInstance->getPositionXL(); @@ -89,12 +89,12 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetOverlay() { - $overlayValues = array( + $overlayValues = [ true, false, - ); + ]; - $testInstance = new Legend; + $testInstance = new Legend(); foreach ($overlayValues as $overlayValue) { $result = $testInstance->setOverlay($overlayValue); @@ -104,7 +104,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase public function testSetInvalidOverlayReturnsFalse() { - $testInstance = new Legend; + $testInstance = new Legend(); $result = $testInstance->setOverlay('INVALID'); $this->assertFalse($result); @@ -117,7 +117,7 @@ class LegendTest extends \PHPUnit_Framework_TestCase { $OverlayValue = true; - $testInstance = new Legend; + $testInstance = new Legend(); $setValue = $testInstance->setOverlay($OverlayValue); $result = $testInstance->getOverlay(); diff --git a/tests/PhpSpreadsheet/Custom/Complex.php b/tests/PhpSpreadsheet/Custom/Complex.php index 63f9f391..52654a79 100644 --- a/tests/PhpSpreadsheet/Custom/Complex.php +++ b/tests/PhpSpreadsheet/Custom/Complex.php @@ -14,7 +14,7 @@ class Complex { // Test for real number, with no imaginary part if (is_numeric($complexNumber)) { - return array($complexNumber, 0, null); + return [$complexNumber, 0, null]; } // Fix silly human errors @@ -42,7 +42,8 @@ class Complex if ($complexParts[1] === '-') { $imaginary = 0 - $imaginary; } - return array(0, $imaginary, $complexParts[2]); + + return [0, $imaginary, $complexParts[2]]; } // If we don't have an imaginary part, identify whether it should be +1 or -1... @@ -60,19 +61,18 @@ class Complex } // Return real and imaginary parts and suffix as an array, and set a default suffix if user input lazily - return array($complexParts[1], $complexParts[4], !empty($complexParts[9]) ? $complexParts[9] : 'i'); + return [$complexParts[1], $complexParts[4], !empty($complexParts[9]) ? $complexParts[9] : 'i']; } // function _parseComplex() - public function __construct($realPart, $imaginaryPart = null, $suffix = 'i') { if ($imaginaryPart === null) { if (is_array($realPart)) { // We have an array of (potentially) real and imaginary parts, and any suffix - list ($realPart, $imaginaryPart, $suffix) = array_values($realPart) + array(0.0, 0.0, 'i'); + list($realPart, $imaginaryPart, $suffix) = array_values($realPart) + [0.0, 0.0, 'i']; } elseif ((is_string($realPart)) || (is_numeric($realPart))) { // We've been given a string to parse to extract the real and imaginary parts, and any suffix - list ($realPart, $imaginaryPart, $suffix) = self::_parseComplex($realPart); + list($realPart, $imaginaryPart, $suffix) = self::_parseComplex($realPart); } } @@ -99,23 +99,24 @@ class Complex public function __toString() { - $str = ""; + $str = ''; if ($this->imaginaryPart != 0.0) { if (abs($this->imaginaryPart) != 1.0) { $str .= $this->imaginaryPart . $this->suffix; } else { - $str .= (($this->imaginaryPart < 0.0) ? '-' : ''). $this->suffix; + $str .= (($this->imaginaryPart < 0.0) ? '-' : '') . $this->suffix; } } if ($this->realPart != 0.0) { if (($str) && ($this->imaginaryPart > 0.0)) { - $str = "+" . $str; + $str = '+' . $str; } $str = $this->realPart . $str; } if (!$str) { - $str = "0.0"; + $str = '0.0'; } + return $str; } } diff --git a/tests/PhpSpreadsheet/Custom/ComplexAssert.php b/tests/PhpSpreadsheet/Custom/ComplexAssert.php index 290838c8..c6ec3ef4 100644 --- a/tests/PhpSpreadsheet/Custom/ComplexAssert.php +++ b/tests/PhpSpreadsheet/Custom/ComplexAssert.php @@ -4,7 +4,7 @@ namespace PhpSpreadsheet\Tests\Custom; class ComplexAssert { - private $_errorMessage = ''; + private $_errorMessage = ''; public function assertComplexEquals($expected, $actual, $delta = 0) { @@ -14,6 +14,7 @@ class ComplexAssert return true; } $this->_errorMessage = 'Expected Error: ' . $actual . ' !== ' . $expected; + return false; } @@ -23,25 +24,30 @@ class ComplexAssert if (!is_numeric($actualComplex->getReal()) || !is_numeric($expectedComplex->getReal())) { if ($actualComplex->getReal() !== $expectedComplex->getReal()) { $this->_errorMessage = 'Mismatched String: ' . $actualComplex->getReal() . ' !== ' . $expectedComplex->getReal(); + return false; } + return true; } if ($actualComplex->getReal() < ($expectedComplex->getReal() - $delta) || $actualComplex->getReal() > ($expectedComplex->getReal() + $delta)) { $this->_errorMessage = 'Mismatched Real part: ' . $actualComplex->getReal() . ' != ' . $expectedComplex->getReal(); + return false; } if ($actualComplex->getImaginary() < ($expectedComplex->getImaginary() - $delta) || $actualComplex->getImaginary() > ($expectedComplex->getImaginary() + $delta)) { $this->_errorMessage = 'Mismatched Imaginary part: ' . $actualComplex->getImaginary() . ' != ' . $expectedComplex->getImaginary(); + return false; } if ($actualComplex->getSuffix() !== $actualComplex->getSuffix()) { $this->_errorMessage = 'Mismatched Suffix: ' . $actualComplex->getSuffix() . ' != ' . $expectedComplex->getSuffix(); + return false; } diff --git a/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php b/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php index 6965d0cc..689c4be7 100644 --- a/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php +++ b/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php @@ -24,6 +24,7 @@ class XEEValidatorTest extends \PHPUnit_Framework_TestCase foreach (glob('data/Reader/XEETestInvalid*.xml') as $file) { $tests[] = [realpath($file), true]; } + return $tests; } @@ -39,10 +40,11 @@ class XEEValidatorTest extends \PHPUnit_Framework_TestCase public function providerValidXML() { - $tests = array(); + $tests = []; foreach (glob('data/Reader/XEETestValid*.xml') as $file) { $tests[] = [realpath($file), file_get_contents($file)]; } + return $tests; } } diff --git a/tests/PhpSpreadsheet/ReferenceHelperTest.php b/tests/PhpSpreadsheet/ReferenceHelperTest.php index d3586d10..1d188301 100644 --- a/tests/PhpSpreadsheet/ReferenceHelperTest.php +++ b/tests/PhpSpreadsheet/ReferenceHelperTest.php @@ -6,7 +6,6 @@ use PhpSpreadsheet\ReferenceHelper; class ReferenceHelperTest extends \PHPUnit_Framework_TestCase { - public function setUp() { } @@ -14,19 +13,19 @@ class ReferenceHelperTest extends \PHPUnit_Framework_TestCase public function testColumnSort() { $columnBase = $columnExpectedResult = [ - 'A','B','Z', - 'AA','AB','AZ', - 'BA','BB','BZ', - 'ZA','ZB','ZZ', - 'AAA','AAB','AAZ', - 'ABA','ABB','ABZ', - 'AZA','AZB','AZZ', - 'BAA','BAB','BAZ', - 'BBA','BBB','BBZ', - 'BZA','BZB','BZZ' + 'A', 'B', 'Z', + 'AA', 'AB', 'AZ', + 'BA', 'BB', 'BZ', + 'ZA', 'ZB', 'ZZ', + 'AAA', 'AAB', 'AAZ', + 'ABA', 'ABB', 'ABZ', + 'AZA', 'AZB', 'AZZ', + 'BAA', 'BAB', 'BAZ', + 'BBA', 'BBB', 'BBZ', + 'BZA', 'BZB', 'BZZ', ]; shuffle($columnBase); - usort($columnBase, array(ReferenceHelper::class,'columnSort')); + usort($columnBase, [ReferenceHelper::class, 'columnSort']); foreach ($columnBase as $key => $value) { $this->assertEquals($columnExpectedResult[$key], $value); } @@ -35,20 +34,20 @@ class ReferenceHelperTest extends \PHPUnit_Framework_TestCase public function testColumnReverseSort() { $columnBase = $columnExpectedResult = [ - 'A','B','Z', - 'AA','AB','AZ', - 'BA','BB','BZ', - 'ZA','ZB','ZZ', - 'AAA','AAB','AAZ', - 'ABA','ABB','ABZ', - 'AZA','AZB','AZZ', - 'BAA','BAB','BAZ', - 'BBA','BBB','BBZ', - 'BZA','BZB','BZZ' + 'A', 'B', 'Z', + 'AA', 'AB', 'AZ', + 'BA', 'BB', 'BZ', + 'ZA', 'ZB', 'ZZ', + 'AAA', 'AAB', 'AAZ', + 'ABA', 'ABB', 'ABZ', + 'AZA', 'AZB', 'AZZ', + 'BAA', 'BAB', 'BAZ', + 'BBA', 'BBB', 'BBZ', + 'BZA', 'BZB', 'BZZ', ]; shuffle($columnBase); $columnExpectedResult = array_reverse($columnExpectedResult); - usort($columnBase, array(ReferenceHelper::class,'columnReverseSort')); + usort($columnBase, [ReferenceHelper::class, 'columnReverseSort']); foreach ($columnBase as $key => $value) { $this->assertEquals($columnExpectedResult[$key], $value); } diff --git a/tests/PhpSpreadsheet/SettingsTest.php b/tests/PhpSpreadsheet/SettingsTest.php index 552ad7dd..1148a59d 100644 --- a/tests/PhpSpreadsheet/SettingsTest.php +++ b/tests/PhpSpreadsheet/SettingsTest.php @@ -4,7 +4,6 @@ namespace PhpSpreadsheet\Tests; class SettingsTest extends \PHPUnit_Framework_TestCase { - public function setUp() { } @@ -13,7 +12,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase */ public function testGetXMLSettings() { - $result = call_user_func(array(\PhpSpreadsheet\Settings::class,'getLibXmlLoaderOptions')); + $result = call_user_func([\PhpSpreadsheet\Settings::class, 'getLibXmlLoaderOptions']); $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR) & $result)); } @@ -21,8 +20,8 @@ class SettingsTest extends \PHPUnit_Framework_TestCase */ public function testSetXMLSettings() { - call_user_func_array(array(\PhpSpreadsheet\Settings::class,'setLibXmlLoaderOptions'), [LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID]); - $result = call_user_func(array(\PhpSpreadsheet\Settings::class,'getLibXmlLoaderOptions')); + call_user_func_array([\PhpSpreadsheet\Settings::class, 'setLibXmlLoaderOptions'], [LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID]); + $result = call_user_func([\PhpSpreadsheet\Settings::class, 'getLibXmlLoaderOptions']); $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID) & $result)); } } diff --git a/tests/PhpSpreadsheet/Shared/CodePageTest.php b/tests/PhpSpreadsheet/Shared/CodePageTest.php index 4e26c33a..6afea3df 100644 --- a/tests/PhpSpreadsheet/Shared/CodePageTest.php +++ b/tests/PhpSpreadsheet/Shared/CodePageTest.php @@ -2,8 +2,8 @@ namespace PhpSpreadsheet\Tests\Shared; -use PhpSpreadsheet\Shared\CodePage; use PhpSpreadsheet\Exception; +use PhpSpreadsheet\Shared\CodePage; class CodePageTest extends \PHPUnit_Framework_TestCase { @@ -14,7 +14,7 @@ class CodePageTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(CodePage::class,'numberToName'), $args); + $result = call_user_func_array([CodePage::class, 'numberToName'], $args); $this->assertEquals($expectedResult, $result); } @@ -27,9 +27,10 @@ class CodePageTest extends \PHPUnit_Framework_TestCase { $invalidCodePage = 12345; try { - $result = call_user_func(array(CodePage::class,'numberToName'), $invalidCodePage); + $result = call_user_func([CodePage::class, 'numberToName'], $invalidCodePage); } catch (Exception $e) { $this->assertEquals($e->getMessage(), 'Unknown codepage: 12345'); + return; } $this->fail('An expected exception has not been raised.'); @@ -39,9 +40,10 @@ class CodePageTest extends \PHPUnit_Framework_TestCase { $unsupportedCodePage = 720; try { - $result = call_user_func(array(CodePage::class,'numberToName'), $unsupportedCodePage); + $result = call_user_func([CodePage::class, 'numberToName'], $unsupportedCodePage); } catch (Exception $e) { $this->assertEquals($e->getMessage(), 'Code page 720 not supported.'); + return; } $this->fail('An expected exception has not been raised.'); diff --git a/tests/PhpSpreadsheet/Shared/DateTest.php b/tests/PhpSpreadsheet/Shared/DateTest.php index b903c0b5..c7c9cb12 100644 --- a/tests/PhpSpreadsheet/Shared/DateTest.php +++ b/tests/PhpSpreadsheet/Shared/DateTest.php @@ -8,13 +8,13 @@ class DateTest extends \PHPUnit_Framework_TestCase { public function testSetExcelCalendar() { - $calendarValues = array( + $calendarValues = [ Date::CALENDAR_MAC_1904, Date::CALENDAR_WINDOWS_1900, - ); + ]; foreach ($calendarValues as $calendarValue) { - $result = call_user_func(array(Date::class,'setExcelCalendar'), $calendarValue); + $result = call_user_func([Date::class, 'setExcelCalendar'], $calendarValue); $this->assertTrue($result); } } @@ -22,7 +22,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testSetExcelCalendarWithInvalidValue() { $unsupportedCalendar = '2012'; - $result = call_user_func(array(Date::class,'setExcelCalendar'), $unsupportedCalendar); + $result = call_user_func([Date::class, 'setExcelCalendar'], $unsupportedCalendar); $this->assertFalse($result); } @@ -32,13 +32,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeExcelToTimestamp1900() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class, 'excelToTimestamp'), $args); + $result = call_user_func_array([Date::class, 'excelToTimestamp'], $args); $this->assertEquals($expectedResult, $result); } @@ -53,13 +53,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeTimestampToExcel1900() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'timestampToExcel'), $args); + $result = call_user_func_array([Date::class, 'timestampToExcel'], $args); $this->assertEquals($expectedResult, $result, null, 1E-5); } @@ -74,13 +74,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeDateTimeToExcel() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'dateTimeToExcel'), $args); + $result = call_user_func_array([Date::class, 'dateTimeToExcel'], $args); $this->assertEquals($expectedResult, $result, null, 1E-5); } @@ -95,13 +95,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeFormattedPHPToExcel1900() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'formattedPHPToExcel'), $args); + $result = call_user_func_array([Date::class, 'formattedPHPToExcel'], $args); $this->assertEquals($expectedResult, $result, null, 1E-5); } @@ -116,13 +116,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeExcelToTimestamp1904() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_MAC_1904 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'excelToTimestamp'), $args); + $result = call_user_func_array([Date::class, 'excelToTimestamp'], $args); $this->assertEquals($expectedResult, $result); } @@ -137,13 +137,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeTimestampToExcel1904() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_MAC_1904 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'timestampToExcel'), $args); + $result = call_user_func_array([Date::class, 'timestampToExcel'], $args); $this->assertEquals($expectedResult, $result, null, 1E-5); } @@ -159,7 +159,7 @@ class DateTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'isDateTimeFormatCode'), $args); + $result = call_user_func_array([Date::class, 'isDateTimeFormatCode'], $args); $this->assertEquals($expectedResult, $result); } @@ -174,13 +174,13 @@ class DateTest extends \PHPUnit_Framework_TestCase public function testDateTimeExcelToTimestamp1900Timezone() { $result = call_user_func( - array(Date::class,'setExcelCalendar'), + [Date::class, 'setExcelCalendar'], Date::CALENDAR_WINDOWS_1900 ); $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Date::class,'excelToTimestamp'), $args); + $result = call_user_func_array([Date::class, 'excelToTimestamp'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Shared/FileTest.php b/tests/PhpSpreadsheet/Shared/FileTest.php index 7d6b86c2..b7272abb 100644 --- a/tests/PhpSpreadsheet/Shared/FileTest.php +++ b/tests/PhpSpreadsheet/Shared/FileTest.php @@ -10,21 +10,21 @@ class FileTest extends \PHPUnit_Framework_TestCase { $expectedResult = false; - $result = call_user_func(array(File::class,'getUseUploadTempDirectory')); + $result = call_user_func([File::class, 'getUseUploadTempDirectory']); $this->assertEquals($expectedResult, $result); } public function testSetUseUploadTempDirectory() { - $useUploadTempDirectoryValues = array( + $useUploadTempDirectoryValues = [ true, false, - ); + ]; foreach ($useUploadTempDirectoryValues as $useUploadTempDirectoryValue) { - call_user_func(array(File::class,'setUseUploadTempDirectory'), $useUploadTempDirectoryValue); + call_user_func([File::class, 'setUseUploadTempDirectory'], $useUploadTempDirectoryValue); - $result = call_user_func(array(File::class,'getUseUploadTempDirectory')); + $result = call_user_func([File::class, 'getUseUploadTempDirectory']); $this->assertEquals($useUploadTempDirectoryValue, $result); } } diff --git a/tests/PhpSpreadsheet/Shared/FontTest.php b/tests/PhpSpreadsheet/Shared/FontTest.php index c9c711c6..18fbd106 100644 --- a/tests/PhpSpreadsheet/Shared/FontTest.php +++ b/tests/PhpSpreadsheet/Shared/FontTest.php @@ -10,19 +10,19 @@ class FontTest extends \PHPUnit_Framework_TestCase { $expectedResult = Font::AUTOSIZE_METHOD_APPROX; - $result = call_user_func(array(Font::class,'getAutoSizeMethod')); + $result = call_user_func([Font::class, 'getAutoSizeMethod']); $this->assertEquals($expectedResult, $result); } public function testSetAutoSizeMethod() { - $autosizeMethodValues = array( + $autosizeMethodValues = [ Font::AUTOSIZE_METHOD_EXACT, Font::AUTOSIZE_METHOD_APPROX, - ); + ]; foreach ($autosizeMethodValues as $autosizeMethodValue) { - $result = call_user_func(array(Font::class,'setAutoSizeMethod'), $autosizeMethodValue); + $result = call_user_func([Font::class, 'setAutoSizeMethod'], $autosizeMethodValue); $this->assertTrue($result); } } @@ -31,7 +31,7 @@ class FontTest extends \PHPUnit_Framework_TestCase { $unsupportedAutosizeMethod = 'guess'; - $result = call_user_func(array(Font::class,'setAutoSizeMethod'), $unsupportedAutosizeMethod); + $result = call_user_func([Font::class, 'setAutoSizeMethod'], $unsupportedAutosizeMethod); $this->assertFalse($result); } @@ -42,7 +42,7 @@ class FontTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Font::class,'fontSizeToPixels'), $args); + $result = call_user_func_array([Font::class, 'fontSizeToPixels'], $args); $this->assertEquals($expectedResult, $result); } @@ -58,7 +58,7 @@ class FontTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Font::class,'inchSizeToPixels'), $args); + $result = call_user_func_array([Font::class, 'inchSizeToPixels'], $args); $this->assertEquals($expectedResult, $result); } @@ -74,7 +74,7 @@ class FontTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Font::class,'centimeterSizeToPixels'), $args); + $result = call_user_func_array([Font::class, 'centimeterSizeToPixels'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php b/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php index 41addd76..41ebaa30 100644 --- a/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php +++ b/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php @@ -14,7 +14,7 @@ class PasswordHasherTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(PasswordHasher::class,'hashPassword'), $args); + $result = call_user_func_array([PasswordHasher::class, 'hashPassword'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Shared/StringTest.php b/tests/PhpSpreadsheet/Shared/StringTest.php index 957c078d..21934437 100644 --- a/tests/PhpSpreadsheet/Shared/StringTest.php +++ b/tests/PhpSpreadsheet/Shared/StringTest.php @@ -11,18 +11,18 @@ class StringTest extends \PHPUnit_Framework_TestCase parent::setUp(); // Reset Currency Code - call_user_func(array(StringHelper::class,'setCurrencyCode'), null); + call_user_func([StringHelper::class, 'setCurrencyCode'], null); } public function testGetIsMbStringEnabled() { - $result = call_user_func(array(StringHelper::class,'getIsMbstringEnabled')); + $result = call_user_func([StringHelper::class, 'getIsMbstringEnabled']); $this->assertTrue($result); } public function testGetIsIconvEnabled() { - $result = call_user_func(array(StringHelper::class,'getIsIconvEnabled')); + $result = call_user_func([StringHelper::class, 'getIsIconvEnabled']); $this->assertTrue($result); } @@ -31,16 +31,16 @@ class StringTest extends \PHPUnit_Framework_TestCase $localeconv = localeconv(); $expectedResult = (!empty($localeconv['decimal_point'])) ? $localeconv['decimal_point'] : ','; - $result = call_user_func(array(StringHelper::class,'getDecimalSeparator')); + $result = call_user_func([StringHelper::class, 'getDecimalSeparator']); $this->assertEquals($expectedResult, $result); } public function testSetDecimalSeparator() { $expectedResult = ','; - call_user_func(array(StringHelper::class,'setDecimalSeparator'), $expectedResult); + call_user_func([StringHelper::class, 'setDecimalSeparator'], $expectedResult); - $result = call_user_func(array(StringHelper::class,'getDecimalSeparator')); + $result = call_user_func([StringHelper::class, 'getDecimalSeparator']); $this->assertEquals($expectedResult, $result); } @@ -49,16 +49,16 @@ class StringTest extends \PHPUnit_Framework_TestCase $localeconv = localeconv(); $expectedResult = (!empty($localeconv['thousands_sep'])) ? $localeconv['thousands_sep'] : ','; - $result = call_user_func(array(StringHelper::class,'getThousandsSeparator')); + $result = call_user_func([StringHelper::class, 'getThousandsSeparator']); $this->assertEquals($expectedResult, $result); } public function testSetThousandsSeparator() { $expectedResult = ' '; - call_user_func(array(StringHelper::class,'setThousandsSeparator'), $expectedResult); + call_user_func([StringHelper::class, 'setThousandsSeparator'], $expectedResult); - $result = call_user_func(array(StringHelper::class,'getThousandsSeparator')); + $result = call_user_func([StringHelper::class, 'getThousandsSeparator']); $this->assertEquals($expectedResult, $result); } @@ -66,16 +66,16 @@ class StringTest extends \PHPUnit_Framework_TestCase { $localeconv = localeconv(); $expectedResult = (!empty($localeconv['currency_symbol']) ? $localeconv['currency_symbol'] : (!empty($localeconv['int_curr_symbol']) ? $localeconv['int_curr_symbol']: '$')); - $result = call_user_func(array(StringHelper::class,'getCurrencyCode')); + $result = call_user_func([StringHelper::class, 'getCurrencyCode']); $this->assertEquals($expectedResult, $result); } public function testSetCurrencyCode() { $expectedResult = '£'; - call_user_func(array(StringHelper::class,'setCurrencyCode'), $expectedResult); + call_user_func([StringHelper::class, 'setCurrencyCode'], $expectedResult); - $result = call_user_func(array(StringHelper::class,'getCurrencyCode')); + $result = call_user_func([StringHelper::class, 'getCurrencyCode']); $this->assertEquals($expectedResult, $result); } } diff --git a/tests/PhpSpreadsheet/Shared/TimeZoneTest.php b/tests/PhpSpreadsheet/Shared/TimeZoneTest.php index 5c7a99e1..410ea32e 100644 --- a/tests/PhpSpreadsheet/Shared/TimeZoneTest.php +++ b/tests/PhpSpreadsheet/Shared/TimeZoneTest.php @@ -8,16 +8,16 @@ class TimeZoneTest extends \PHPUnit_Framework_TestCase { public function testSetTimezone() { - $timezoneValues = array( + $timezoneValues = [ 'Europe/Prague', 'Asia/Tokyo', 'America/Indiana/Indianapolis', 'Pacific/Honolulu', 'Atlantic/St_Helena', - ); + ]; foreach ($timezoneValues as $timezoneValue) { - $result = call_user_func(array(TimeZone::class,'setTimezone'), $timezoneValue); + $result = call_user_func([TimeZone::class, 'setTimezone'], $timezoneValue); $this->assertTrue($result); } } @@ -25,7 +25,7 @@ class TimeZoneTest extends \PHPUnit_Framework_TestCase public function testSetTimezoneWithInvalidValue() { $unsupportedTimezone = 'Etc/GMT+10'; - $result = call_user_func(array(TimeZone::class,'setTimezone'), $unsupportedTimezone); + $result = call_user_func([TimeZone::class, 'setTimezone'], $unsupportedTimezone); $this->assertFalse($result); } } diff --git a/tests/PhpSpreadsheet/Style/ColorTest.php b/tests/PhpSpreadsheet/Style/ColorTest.php index 928d5234..626ec7f0 100644 --- a/tests/PhpSpreadsheet/Style/ColorTest.php +++ b/tests/PhpSpreadsheet/Style/ColorTest.php @@ -13,7 +13,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Color::class,'getRed'), $args); + $result = call_user_func_array([Color::class, 'getRed'], $args); $this->assertEquals($expectedResult, $result); } @@ -29,7 +29,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Color::class,'getGreen'), $args); + $result = call_user_func_array([Color::class, 'getGreen'], $args); $this->assertEquals($expectedResult, $result); } @@ -45,7 +45,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(Color::class,'getBlue'), $args); + $result = call_user_func_array([Color::class, 'getBlue'], $args); $this->assertEquals($expectedResult, $result); } @@ -60,7 +60,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase public function testChangeBrightness() { list($args, $expectedResult) = func_get_args(); - $result = call_user_func_array(array(Color::class,'changeBrightness'), $args); + $result = call_user_func_array([Color::class, 'changeBrightness'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php b/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php index 9833f7df..a6263997 100644 --- a/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php +++ b/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Style\NumberFormat; class NumberFormatDateTest extends \PHPUnit_Framework_TestCase { - public function setUp() { StringHelper::setDecimalSeparator('.'); @@ -23,7 +22,7 @@ class NumberFormatDateTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(NumberFormat::class,'toFormattedString'), $args); + $result = call_user_func_array([NumberFormat::class, 'toFormattedString'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Style/NumberFormatTest.php b/tests/PhpSpreadsheet/Style/NumberFormatTest.php index 1949667c..a9ec082c 100644 --- a/tests/PhpSpreadsheet/Style/NumberFormatTest.php +++ b/tests/PhpSpreadsheet/Style/NumberFormatTest.php @@ -7,7 +7,6 @@ use PhpSpreadsheet\Style\NumberFormat; class NumberFormatTest extends \PHPUnit_Framework_TestCase { - public function setUp() { StringHelper::setDecimalSeparator('.'); @@ -21,7 +20,7 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array(NumberFormat::class,'toFormattedString'), $args); + $result = call_user_func_array([NumberFormat::class, 'toFormattedString'], $args); $this->assertEquals($expectedResult, $result); } diff --git a/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php b/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php index 44ffa637..601048b7 100644 --- a/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php +++ b/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php @@ -4,7 +4,7 @@ namespace PhpSpreadsheet\Tests\Worksheet\AutoFilter; use PhpSpreadsheet\Worksheet\AutoFilter; -class AutofilterColumnTest extends \PHPUnit_Framework_TestCase +class ColumnTest extends \PHPUnit_Framework_TestCase { private $testInitialColumn = 'H'; @@ -111,9 +111,9 @@ class AutofilterColumnTest extends \PHPUnit_Framework_TestCase public function testSetAttributes() { - $attributeSet = array( 'val' => 100, - 'maxVal' => 200 - ); + $attributeSet = ['val' => 100, + 'maxVal' => 200, + ]; // Setters return the instance to implement the fluent interface $result = $this->testAutoFilterColumnObject->setAttributes($attributeSet); @@ -122,9 +122,9 @@ class AutofilterColumnTest extends \PHPUnit_Framework_TestCase public function testGetAttributes() { - $attributeSet = array( 'val' => 100, - 'maxVal' => 200 - ); + $attributeSet = ['val' => 100, + 'maxVal' => 200, + ]; $this->testAutoFilterColumnObject->setAttributes($attributeSet); @@ -135,9 +135,9 @@ class AutofilterColumnTest extends \PHPUnit_Framework_TestCase public function testSetAttribute() { - $attributeSet = array( 'val' => 100, - 'maxVal' => 200 - ); + $attributeSet = ['val' => 100, + 'maxVal' => 200, + ]; foreach ($attributeSet as $attributeName => $attributeValue) { // Setters return the instance to implement the fluent interface @@ -148,9 +148,9 @@ class AutofilterColumnTest extends \PHPUnit_Framework_TestCase public function testGetAttribute() { - $attributeSet = array( 'val' => 100, - 'maxVal' => 200 - ); + $attributeSet = ['val' => 100, + 'maxVal' => 200, + ]; $this->testAutoFilterColumnObject->setAttributes($attributeSet); diff --git a/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php b/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php index a96b3fb8..6259e0a1 100644 --- a/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php +++ b/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php @@ -2,10 +2,10 @@ namespace PhpSpreadsheet\Tests\Worksheet; +use PhpSpreadsheet\CachedObjectStorage\Memory; +use PhpSpreadsheet\Worksheet; use PhpSpreadsheet\Worksheet\AutoFilter; use PhpSpreadsheet\Worksheet\AutoFilter\Column; -use PhpSpreadsheet\Worksheet; -use PhpSpreadsheet\CachedObjectStorage\Memory; class AutoFilterTest extends \PHPUnit_Framework_TestCase { @@ -70,7 +70,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase { $ranges = [ 'G1:J512' => 'Worksheet1!G1:J512', - 'K1:N20' => 'K1:N20' + 'K1:N20' => 'K1:N20', ]; foreach ($ranges as $actualRange => $fullRange) { @@ -120,7 +120,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase $columnIndexes = [ 'H' => 0, 'K' => 3, - 'M' => 5 + 'M' => 5, ]; // If we request a specific column by its column ID, we should get an @@ -210,7 +210,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase public function testGetColumns() { - $columnIndexes = ['L','M']; + $columnIndexes = ['L', 'M']; foreach ($columnIndexes as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); @@ -229,7 +229,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase public function testGetColumn() { - $columnIndexes = array('L','M'); + $columnIndexes = ['L', 'M']; foreach ($columnIndexes as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); @@ -248,7 +248,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase $columnIndexes = [ 0 => 'H', 3 => 'K', - 5 => 'M' + 5 => 'M', ]; // If we request a specific column by its offset, we should @@ -282,7 +282,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase { $expectedResult = ''; - $columnIndexes = ['L','M','N']; + $columnIndexes = ['L', 'M', 'N']; foreach ($columnIndexes as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); } @@ -306,12 +306,12 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase $expectedResult = 'G1:J512'; // These columns should be retained - $columnIndexes1 = ['I','J']; + $columnIndexes1 = ['I', 'J']; foreach ($columnIndexes1 as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); } // These columns should be discarded - $columnIndexes2 = ['K','L','M']; + $columnIndexes2 = ['K', 'L', 'M']; foreach ($columnIndexes2 as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); } @@ -333,7 +333,7 @@ class AutoFilterTest extends \PHPUnit_Framework_TestCase public function testClone() { - $columnIndexes = ['L','M']; + $columnIndexes = ['L', 'M']; foreach ($columnIndexes as $columnIndex) { $this->testAutoFilterObject->setColumn($columnIndex); diff --git a/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php index 8484f71a..e81fd17c 100644 --- a/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php +++ b/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php @@ -2,9 +2,9 @@ namespace PhpSpreadsheet\Tests\Worksheet; -use PhpSpreadsheet\Worksheet\ColumnCellIterator; use PhpSpreadsheet\Cell; use PhpSpreadsheet\Worksheet; +use PhpSpreadsheet\Worksheet\ColumnCellIterator; class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase { @@ -29,7 +29,6 @@ class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->mockCell)); } - public function testIteratorFullRange() { $iterator = new ColumnCellIterator($this->mockWorksheet, 'A'); @@ -61,7 +60,7 @@ class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase $iterator->seek(4); $this->assertEquals($columnIndexResult, $iterator->key()); - for ($i = 1; $i < $columnIndexResult-1; $i++) { + for ($i = 1; $i < $columnIndexResult - 1; ++$i) { $iterator->prev(); $this->assertEquals($columnIndexResult - $i, $iterator->key()); } diff --git a/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php index 1fb77381..3ff0c922 100644 --- a/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php +++ b/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php @@ -3,8 +3,8 @@ namespace PhpSpreadsheet\Tests\Worksheet; use PhpSpreadsheet\Worksheet; -use PhpSpreadsheet\Worksheet\ColumnIterator; use PhpSpreadsheet\Worksheet\Column; +use PhpSpreadsheet\Worksheet\ColumnIterator; class ColumnIteratorTest extends \PHPUnit_Framework_TestCase { @@ -29,7 +29,6 @@ class ColumnIteratorTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->mockColumn)); } - public function testIteratorFullRange() { $iterator = new ColumnIterator($this->mockWorksheet); @@ -62,7 +61,7 @@ class ColumnIteratorTest extends \PHPUnit_Framework_TestCase $iterator->seek('D'); $this->assertEquals($columnIndexResult, $iterator->key()); - for ($i = 1; $i < array_search($columnIndexResult, $ranges); $i++) { + for ($i = 1; $i < array_search($columnIndexResult, $ranges); ++$i) { $iterator->prev(); $expectedResult = $ranges[array_search($columnIndexResult, $ranges) - $i]; $this->assertEquals($expectedResult, $iterator->key()); diff --git a/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php index c199fc10..450045bf 100644 --- a/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php +++ b/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php @@ -2,8 +2,8 @@ namespace PhpSpreadsheet\Tests\Worksheet; -use PhpSpreadsheet\Worksheet; use PhpSpreadsheet\Cell; +use PhpSpreadsheet\Worksheet; use PhpSpreadsheet\Worksheet\RowCellIterator; class RowCellIteratorTest extends \PHPUnit_Framework_TestCase @@ -29,7 +29,6 @@ class RowCellIteratorTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->mockCell)); } - public function testIteratorFullRange() { $iterator = new RowCellIterator($this->mockWorksheet); @@ -62,7 +61,7 @@ class RowCellIteratorTest extends \PHPUnit_Framework_TestCase $iterator->seek('D'); $this->assertEquals($RowCellIndexResult, $iterator->key()); - for ($i = 1; $i < array_search($RowCellIndexResult, $ranges); $i++) { + for ($i = 1; $i < array_search($RowCellIndexResult, $ranges); ++$i) { $iterator->prev(); $expectedResult = $ranges[array_search($RowCellIndexResult, $ranges) - $i]; $this->assertEquals($expectedResult, $iterator->key()); diff --git a/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php index ceb9a414..a19204a1 100644 --- a/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php +++ b/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php @@ -2,9 +2,9 @@ namespace PhpSpreadsheet\Tests\Worksheet; -use PhpSpreadsheet\Worksheet\RowIterator; use PhpSpreadsheet\Worksheet; use PhpSpreadsheet\Worksheet\Row; +use PhpSpreadsheet\Worksheet\RowIterator; class RowIteratorTest extends \PHPUnit_Framework_TestCase { @@ -29,7 +29,6 @@ class RowIteratorTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->mockRow)); } - public function testIteratorFullRange() { $iterator = new RowIterator($this->mockWorksheet); @@ -61,7 +60,7 @@ class RowIteratorTest extends \PHPUnit_Framework_TestCase $iterator->seek(4); $this->assertEquals($columnIndexResult, $iterator->key()); - for ($i = 1; $i < $columnIndexResult-1; $i++) { + for ($i = 1; $i < $columnIndexResult - 1; ++$i) { $iterator->prev(); $this->assertEquals($columnIndexResult - $i, $iterator->key()); } diff --git a/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php b/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php index 0da62fae..7d11fef1 100644 --- a/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php +++ b/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php @@ -21,7 +21,6 @@ class WorksheetColumnTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue(5)); } - public function testInstantiateColumnDefault() { $column = new Column($this->mockWorksheet); diff --git a/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php b/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php index 48c07d24..2ed9b921 100644 --- a/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php +++ b/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php @@ -21,7 +21,6 @@ class WorksheetRowTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue('E')); } - public function testInstantiateRowDefault() { $row = new Row($this->mockWorksheet); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 31f081cd..1b2011b9 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,10 +1,8 @@ 19-Dec-1960 05:00:00 UTC - [ 25569, 'America/New_York', 18000 ], // 01-Jan-1970 00:00:00 EST => 01-Jan-1970 05:00:00 UTC PHP Base Date - [ 30292, 'America/New_York', 408085200 ], // 07-Dec-1982 00:00:00 EST => 07-Dec-1982 05:00:00 UTC - [ 39611, 'America/New_York', 1213243200 ], // 12-Jun-2008 00:00:00 EDT => 12-Jun-2008 04:00:00 UTC - [ 50424, 'America/New_York', 2147490000 ], // 19-Jan-2038 00:00:00 EST => 19-Jan-2038 05:00:00 UTC PHP 32-bit Latest Date - [ 22345.56789, 'America/New_York', -278486534 ], // 05-Mar-1961 13:37:46 EST => 05-Mar-1961 18:37:46 UTC - [ 22345.6789, 'America/New_York', -278476943 ], // 05-Mar-1961 16:17:37 EST => 05-Mar-1961 21:17:37 UTC - [ 0.5, 'America/New_York', 61200 ], // 12:00:00 EST => 17:00:00 UTC - [ 0.75, 'America/New_York', 82800 ], // 18:00.00 EST => 23:00:00 UTC - [ 0.12345, 'America/New_York', 28666 ], // 02:57:46 EST => 07:57:46 UTC - [ 41215, 'America/New_York', 1351828800 ], // 02-Nov-2012 00:00:00 EDT => 02-Nov-2012 04:00:00 UTC - [ 22269, 'Pacific/Auckland', -285163200 ], // 19-Dec-1960 00:00:00 NZST => 18-Dec-1960 12:00:00 UTC - [ 25569, 'Pacific/Auckland', -43200 ], // 01-Jan-1970 00:00:00 NZST => 31-Dec-1969 12:00:00 UTC PHP Base Date - [ 30292, 'Pacific/Auckland', 408020400 ], // 07-Dec-1982 00:00:00 NZDT => 06-Dec-1982 11:00:00 UTC - [ 39611, 'Pacific/Auckland', 1213185600 ], // 12-Jun-2008 00:00:00 NZST => 11-Jun-2008 12:00:00 UTC - [ 50423.5, 'Pacific/Auckland', 2147382000 ], // 18-Jan-2038 12:00:00 NZDT => 17-Jan-2038 23:00:00 UTC PHP 32-bit Latest Date - [ 22345.56789, 'Pacific/Auckland', -278547734 ], // 05-Mar-1961 13:37:46 NZST => 05-Mar-1961 01:37:46 UTC - [ 22345.6789, 'Pacific/Auckland', -278538143 ], // 05-Mar-1961 16:17:37 NZST => 05-Mar-1961 04:17:37 UTC - [ 0.5, 'Pacific/Auckland', 0 ], // 12:00:00 NZST => 00:00:00 UTC - [ 0.75, 'Pacific/Auckland', 21600 ], // 18:00.00 NZST => 06:00:00 UTC - [ 0.12345, 'Pacific/Auckland', -32534 ], // 02:57:46 NZST => 14:57:46 UTC - [ 41215, 'Pacific/Auckland', 1351767600 ], // 02-Nov-2012 00:00:00 NZDT => 01-Nov-2012 11:00:00 UTC + [22269, 'America/New_York', -285102000], // 19-Dec-1960 00:00:00 EST => 19-Dec-1960 05:00:00 UTC + [25569, 'America/New_York', 18000], // 01-Jan-1970 00:00:00 EST => 01-Jan-1970 05:00:00 UTC PHP Base Date + [30292, 'America/New_York', 408085200], // 07-Dec-1982 00:00:00 EST => 07-Dec-1982 05:00:00 UTC + [39611, 'America/New_York', 1213243200], // 12-Jun-2008 00:00:00 EDT => 12-Jun-2008 04:00:00 UTC + [50424, 'America/New_York', 2147490000], // 19-Jan-2038 00:00:00 EST => 19-Jan-2038 05:00:00 UTC PHP 32-bit Latest Date + [22345.56789, 'America/New_York', -278486534], // 05-Mar-1961 13:37:46 EST => 05-Mar-1961 18:37:46 UTC + [22345.6789, 'America/New_York', -278476943], // 05-Mar-1961 16:17:37 EST => 05-Mar-1961 21:17:37 UTC + [0.5, 'America/New_York', 61200], // 12:00:00 EST => 17:00:00 UTC + [0.75, 'America/New_York', 82800], // 18:00.00 EST => 23:00:00 UTC + [0.12345, 'America/New_York', 28666], // 02:57:46 EST => 07:57:46 UTC + [41215, 'America/New_York', 1351828800], // 02-Nov-2012 00:00:00 EDT => 02-Nov-2012 04:00:00 UTC + [22269, 'Pacific/Auckland', -285163200], // 19-Dec-1960 00:00:00 NZST => 18-Dec-1960 12:00:00 UTC + [25569, 'Pacific/Auckland', -43200], // 01-Jan-1970 00:00:00 NZST => 31-Dec-1969 12:00:00 UTC PHP Base Date + [30292, 'Pacific/Auckland', 408020400], // 07-Dec-1982 00:00:00 NZDT => 06-Dec-1982 11:00:00 UTC + [39611, 'Pacific/Auckland', 1213185600], // 12-Jun-2008 00:00:00 NZST => 11-Jun-2008 12:00:00 UTC + [50423.5, 'Pacific/Auckland', 2147382000], // 18-Jan-2038 12:00:00 NZDT => 17-Jan-2038 23:00:00 UTC PHP 32-bit Latest Date + [22345.56789, 'Pacific/Auckland', -278547734], // 05-Mar-1961 13:37:46 NZST => 05-Mar-1961 01:37:46 UTC + [22345.6789, 'Pacific/Auckland', -278538143], // 05-Mar-1961 16:17:37 NZST => 05-Mar-1961 04:17:37 UTC + [0.5, 'Pacific/Auckland', 0], // 12:00:00 NZST => 00:00:00 UTC + [0.75, 'Pacific/Auckland', 21600], // 18:00.00 NZST => 06:00:00 UTC + [0.12345, 'Pacific/Auckland', -32534], // 02:57:46 NZST => 14:57:46 UTC + [41215, 'Pacific/Auckland', 1351767600], // 02-Nov-2012 00:00:00 NZDT => 01-Nov-2012 11:00:00 UTC ]; diff --git a/tests/data/Shared/Date/ExcelToTimestamp1904.php b/tests/data/Shared/Date/ExcelToTimestamp1904.php index 7716e66b..c7967ba2 100644 --- a/tests/data/Shared/Date/ExcelToTimestamp1904.php +++ b/tests/data/Shared/Date/ExcelToTimestamp1904.php @@ -2,13 +2,13 @@ // Excel DateTimeStamp Result Comments return [ - [ 1462, -1956528000 ], - [ 1463, -1956441600 ], - [ 22269, -158803200 ], - [ 25569, 126316800 ], - [ 30292, 534384000 ], - [ 39611, 1339545600 ], - [ 0.25, 21600 ], // 06:00:00 - [ 0.3333333333333333333, 28800 ], // 08:00.00 - [ 0.54321, 46933 ], // 02:57:46 + [1462, -1956528000], + [1463, -1956441600], + [22269, -158803200], + [25569, 126316800], + [30292, 534384000], + [39611, 1339545600], + [0.25, 21600], // 06:00:00 + [0.3333333333333333333, 28800], // 08:00.00 + [0.54321, 46933], // 02:57:46 ]; diff --git a/tests/data/Shared/Date/FormatCodes.php b/tests/data/Shared/Date/FormatCodes.php index c4be5210..69252ec1 100644 --- a/tests/data/Shared/Date/FormatCodes.php +++ b/tests/data/Shared/Date/FormatCodes.php @@ -2,40 +2,40 @@ // Excel Format Code Result return [ - [ 'General', false ], - [ '@', false ], - [ '0', false ], - [ '0.00', false ], - [ '#,##0.00', false ], - [ '#,##0.00_-', false ], - [ '0%', false ], - [ '0.00%', false ], - [ 'yyyy-mm-dd', true ], - [ 'yy-mm-dd', true ], - [ 'dd/mm/yy', true ], - [ 'd/m/y', true ], - [ 'd-m-y', true ], - [ 'd-m', true ], - [ 'm-y', true ], - [ 'mm-dd-yy', true ], - [ 'd-mmm-yy', true ], - [ 'd-mmm', true ], - [ 'mmm-yy', true ], - [ 'm/d/yy h:mm', true ], - [ 'd/m/y h:mm', true ], - [ 'h:mm AM/PM', true ], - [ 'h:mm:ss AM/PM', true ], - [ 'h:mm', true ], - [ 'h:mm:ss', true ], - [ 'mm:ss', true ], - [ 'h:mm:ss', true ], - [ 'i:s.S', true ], - [ 'h:mm:ss;@', true ], - [ 'yy/mm/dd;@', true ], - [ '"$" #,##0.00_-', false ], - [ '$#,##0_-', false ], - [ '[$EUR ]#,##0.00_-', false ], - [ '_[$EUR ]#,##0.00_-', false ], - [ '[Green]#,##0.00;[Red]#,##0.00_-', false ], - [ '#,##0.00 "dollars"', false ], + ['General', false], + ['@', false], + ['0', false], + ['0.00', false], + ['#,##0.00', false], + ['#,##0.00_-', false], + ['0%', false], + ['0.00%', false], + ['yyyy-mm-dd', true], + ['yy-mm-dd', true], + ['dd/mm/yy', true], + ['d/m/y', true], + ['d-m-y', true], + ['d-m', true], + ['m-y', true], + ['mm-dd-yy', true], + ['d-mmm-yy', true], + ['d-mmm', true], + ['mmm-yy', true], + ['m/d/yy h:mm', true], + ['d/m/y h:mm', true], + ['h:mm AM/PM', true], + ['h:mm:ss AM/PM', true], + ['h:mm', true], + ['h:mm:ss', true], + ['mm:ss', true], + ['h:mm:ss', true], + ['i:s.S', true], + ['h:mm:ss;@', true], + ['yy/mm/dd;@', true], + ['"$" #,##0.00_-', false], + ['$#,##0_-', false], + ['[$EUR ]#,##0.00_-', false], + ['_[$EUR ]#,##0.00_-', false], + ['[Green]#,##0.00;[Red]#,##0.00_-', false], + ['#,##0.00 "dollars"', false], ]; diff --git a/tests/data/Shared/Date/FormattedPHPToExcel1900.php b/tests/data/Shared/Date/FormattedPHPToExcel1900.php index f84c7323..6eafc3cc 100644 --- a/tests/data/Shared/Date/FormattedPHPToExcel1900.php +++ b/tests/data/Shared/Date/FormattedPHPToExcel1900.php @@ -2,15 +2,15 @@ // Year Month Day Hours Minutes Seconds Result Comments return [ - [ 1901, 12, 14, 714 ], // PHP 32-bit Earliest Date 14-Dec-1901 - [ 1903, 12, 31, 1461 ], // 31-Dec-1903 - [ 1904, 1, 1, 1462 ], // Excel 1904 Calendar Base Date 01-Jan-1904 - [ 1904, 1, 2, 1463 ], // 02-Jan-1904 - [ 1960, 12, 19, 22269 ], // 19-Dec-1960 - [ 1970, 1, 1, 25569 ], // PHP Base Date 01-Jan-1970 - [ 1982, 12, 7, 30292 ], // 07-Dec-1982 - [ 2008, 6, 12, 39611 ], // 12-Jun-2008 - [ 2038, 1, 19, 50424 ], // PHP 32-bit Latest Date 19-Jan-2038 - [ 1903, 5, 18, 13, 37, 46, 1234.56789 ], // 18-May-1903 13:37:46 - [ 1933, 10, 18, 16, 17, 37, 12345.6789 ], // 18-Oct-1933 16:17:37 + [1901, 12, 14, 714], // PHP 32-bit Earliest Date 14-Dec-1901 + [1903, 12, 31, 1461], // 31-Dec-1903 + [1904, 1, 1, 1462], // Excel 1904 Calendar Base Date 01-Jan-1904 + [1904, 1, 2, 1463], // 02-Jan-1904 + [1960, 12, 19, 22269], // 19-Dec-1960 + [1970, 1, 1, 25569], // PHP Base Date 01-Jan-1970 + [1982, 12, 7, 30292], // 07-Dec-1982 + [2008, 6, 12, 39611], // 12-Jun-2008 + [2038, 1, 19, 50424], // PHP 32-bit Latest Date 19-Jan-2038 + [1903, 5, 18, 13, 37, 46, 1234.56789], // 18-May-1903 13:37:46 + [1933, 10, 18, 16, 17, 37, 12345.6789], // 18-Oct-1933 16:17:37 ]; diff --git a/tests/data/Shared/Date/TimestampToExcel1900.php b/tests/data/Shared/Date/TimestampToExcel1900.php index 395c4c36..22acbb6f 100644 --- a/tests/data/Shared/Date/TimestampToExcel1900.php +++ b/tests/data/Shared/Date/TimestampToExcel1900.php @@ -2,15 +2,15 @@ // Unix TimeStamp Result Comments return [ - [ -2147472000, 714 ], // PHP 32-bit Earliest Date 14-Dec-1901 - [ -2082931200, 1461 ], // 31-Dec-1903 - [ -2082844800, 1462 ], // Excel 1904 Calendar Base Date 01-Jan-1904 - [ -2082758400, 1463 ], // 02-Jan-1904 - [ -285120000, 22269 ], // 19-Dec-1960 - [ 0, 25569 ], // PHP Base Date 01-Jan-1970 - [ 408067200, 30292 ], // 07-Dec-1982 - [ 1213228800, 39611 ], // 12-Jun-2008 - [ 2147472000, 50424 ], // PHP 32-bit Latest Date 19-Jan-2038 - [ -2102494934, 1234.56789 ], // 18-May-1903 13:37:46 - [ -1142494943, 12345.6789 ], // 18-Oct-1933 16:17:37 + [-2147472000, 714], // PHP 32-bit Earliest Date 14-Dec-1901 + [-2082931200, 1461], // 31-Dec-1903 + [-2082844800, 1462], // Excel 1904 Calendar Base Date 01-Jan-1904 + [-2082758400, 1463], // 02-Jan-1904 + [-285120000, 22269], // 19-Dec-1960 + [0, 25569], // PHP Base Date 01-Jan-1970 + [408067200, 30292], // 07-Dec-1982 + [1213228800, 39611], // 12-Jun-2008 + [2147472000, 50424], // PHP 32-bit Latest Date 19-Jan-2038 + [-2102494934, 1234.56789], // 18-May-1903 13:37:46 + [-1142494943, 12345.6789], // 18-Oct-1933 16:17:37 ]; diff --git a/tests/data/Shared/Date/TimestampToExcel1904.php b/tests/data/Shared/Date/TimestampToExcel1904.php index 4a08ecbf..93f5b700 100644 --- a/tests/data/Shared/Date/TimestampToExcel1904.php +++ b/tests/data/Shared/Date/TimestampToExcel1904.php @@ -2,10 +2,10 @@ // Excel DateTimeStamp Result return [ - [ -1956528000, 1462 ], - [ -1956441600, 1463 ], - [ -158803200, 22269 ], - [ 126316800, 25569 ], - [ 534384000, 30292 ], - [ 1339545600, 39611 ], + [-1956528000, 1462], + [-1956441600, 1463], + [-158803200, 22269], + [126316800, 25569], + [534384000, 30292], + [1339545600, 39611], ]; diff --git a/tests/data/Style/ColorChangeBrightness.php b/tests/data/Style/ColorChangeBrightness.php index a0a99f32..9585b06d 100644 --- a/tests/data/Style/ColorChangeBrightness.php +++ b/tests/data/Style/ColorChangeBrightness.php @@ -1,18 +1,18 @@