alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove undesired annotations

This commit is contained in:
Adrien Crivelli 2020-05-18 15:49:29 +09:00
parent fcd9f10663
commit 137268d61a
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
22 changed files with 55 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.php_cs.dist
View File

@ -56,7 +56,7 @@ return PhpCsFixer\Config::create()
'function_declaration' => true, 'function_declaration' => true,
'function_to_constant' => true, 'function_to_constant' => true,
'function_typehint_space' => true, 'function_typehint_space' => true,
'general_phpdoc_annotation_remove' => false, // No use for that 'general_phpdoc_annotation_remove' => ['access', 'category', 'copyright', 'method', 'throws'],
'global_namespace_import' => true, 'global_namespace_import' => true,
'hash_to_slash_comment' => false, // Deprecated 'hash_to_slash_comment' => false, // Deprecated
'header_comment' => false, // We don't use common header in all our files 'header_comment' => false, // We don't use common header in all our files

24
src/PhpSpreadsheet/Calculation/Database.php
View File

@ -130,8 +130,6 @@ class Database
* Excel Function: * Excel Function:
* DAVERAGE(database,field,criteria) * DAVERAGE(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -174,8 +172,6 @@ class Database
* Excel Function: * Excel Function:
* DAVERAGE(database,field,criteria) * DAVERAGE(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -217,8 +213,6 @@ class Database
* Excel Function: * Excel Function:
* DCOUNTA(database,[field],criteria) * DCOUNTA(database,[field],criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -269,8 +263,6 @@ class Database
* Excel Function: * Excel Function:
* DGET(database,field,criteria) * DGET(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -313,8 +305,6 @@ class Database
* Excel Function: * Excel Function:
* DMAX(database,field,criteria) * DMAX(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -354,8 +344,6 @@ class Database
* Excel Function: * Excel Function:
* DMIN(database,field,criteria) * DMIN(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -394,8 +382,6 @@ class Database
* Excel Function: * Excel Function:
* DPRODUCT(database,field,criteria) * DPRODUCT(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -435,8 +421,6 @@ class Database
* Excel Function: * Excel Function:
* DSTDEV(database,field,criteria) * DSTDEV(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -476,8 +460,6 @@ class Database
* Excel Function: * Excel Function:
* DSTDEVP(database,field,criteria) * DSTDEVP(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -516,8 +498,6 @@ class Database
* Excel Function: * Excel Function:
* DSUM(database,field,criteria) * DSUM(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -557,8 +537,6 @@ class Database
* Excel Function: * Excel Function:
* DVAR(database,field,criteria) * DVAR(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The
@ -598,8 +576,6 @@ class Database
* Excel Function: * Excel Function:
* DVARP(database,field,criteria) * DVARP(database,field,criteria)
* *
* @category Database Functions
*
* @param mixed[] $database The range of cells that makes up the list or database. * @param mixed[] $database The range of cells that makes up the list or database.
* A database is a list of related data in which rows of related * A database is a list of related data in which rows of related
* information are records, and columns of data are fields. The * information are records, and columns of data are fields. The

22
src/PhpSpreadsheet/Calculation/DateTime.php
View File

@ -139,8 +139,6 @@ class DateTime
* Excel Function: * Excel Function:
* NOW() * NOW()
* *
* @category Date/Time Functions
*
* @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object, * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
* depending on the value of the ReturnDateType flag * depending on the value of the ReturnDateType flag
*/ */
@ -182,8 +180,6 @@ class DateTime
* Excel Function: * Excel Function:
* TODAY() * TODAY()
* *
* @category Date/Time Functions
*
* @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object, * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
* depending on the value of the ReturnDateType flag * depending on the value of the ReturnDateType flag
*/ */
@ -227,8 +223,6 @@ class DateTime
* A Month name or abbreviation (English only at this point) such as 'January' or 'Jan' will still be accepted, * A Month name or abbreviation (English only at this point) such as 'January' or 'Jan' will still be accepted,
* as will a day value with a suffix (e.g. '21st' rather than simply 21); again only English language. * as will a day value with a suffix (e.g. '21st' rather than simply 21); again only English language.
* *
* @category Date/Time Functions
*
* @param int $year The value of the year argument can include one to four digits. * @param int $year The value of the year argument can include one to four digits.
* Excel interprets the year argument according to the configured * Excel interprets the year argument according to the configured
* date system: 1900 or 1904. * date system: 1900 or 1904.
@ -341,8 +335,6 @@ class DateTime
* Excel Function: * Excel Function:
* TIME(hour,minute,second) * TIME(hour,minute,second)
* *
* @category Date/Time Functions
*
* @param int $hour A number from 0 (zero) to 32767 representing the hour. * @param int $hour A number from 0 (zero) to 32767 representing the hour.
* Any value greater than 23 will be divided by 24 and the remainder * Any value greater than 23 will be divided by 24 and the remainder
* will be treated as the hour value. For example, TIME(27,0,0) = * will be treated as the hour value. For example, TIME(27,0,0) =
@ -454,8 +446,6 @@ class DateTime
* Excel Function: * Excel Function:
* DATEVALUE(dateValue) * DATEVALUE(dateValue)
* *
* @category Date/Time Functions
*
* @param string $dateValue Text that represents a date in a Microsoft Excel date format. * @param string $dateValue Text that represents a date in a Microsoft Excel date format.
* For example, "1/30/2008" or "30-Jan-2008" are text strings within * For example, "1/30/2008" or "30-Jan-2008" are text strings within
* quotation marks that represent dates. Using the default date * quotation marks that represent dates. Using the default date
@ -589,8 +579,6 @@ class DateTime
* Excel Function: * Excel Function:
* TIMEVALUE(timeValue) * TIMEVALUE(timeValue)
* *
* @category Date/Time Functions
*
* @param string $timeValue A text string that represents a time in any one of the Microsoft * @param string $timeValue A text string that represents a time in any one of the Microsoft
* Excel time formats; for example, "6:45 PM" and "18:45" text strings * Excel time formats; for example, "6:45 PM" and "18:45" text strings
* within quotation marks that represent time. * within quotation marks that represent time.
@ -768,8 +756,6 @@ class DateTime
* Excel Function: * Excel Function:
* DAYS(endDate, startDate) * DAYS(endDate, startDate)
* *
* @category Date/Time Functions
*
* @param DateTimeImmutable|float|int|string $endDate Excel date serial value (float), * @param DateTimeImmutable|float|int|string $endDate Excel date serial value (float),
* PHP date timestamp (integer), PHP DateTime object, or a standard date string * PHP date timestamp (integer), PHP DateTime object, or a standard date string
* @param DateTimeImmutable|float|int|string $startDate Excel date serial value (float), * @param DateTimeImmutable|float|int|string $startDate Excel date serial value (float),
@ -816,8 +802,6 @@ class DateTime
* Excel Function: * Excel Function:
* DAYS360(startDate,endDate[,method]) * DAYS360(startDate,endDate[,method])
* *
* @category Date/Time Functions
*
* @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer), * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
* PHP DateTime object, or a standard date string * PHP DateTime object, or a standard date string
* @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer), * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
@ -879,8 +863,6 @@ class DateTime
* See https://lists.oasis-open.org/archives/office-formula/200806/msg00039.html * See https://lists.oasis-open.org/archives/office-formula/200806/msg00039.html
* for description of algorithm used in Excel * for description of algorithm used in Excel
* *
* @category Date/Time Functions
*
* @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer), * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
* PHP DateTime object, or a standard date string * PHP DateTime object, or a standard date string
* @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer), * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
@ -981,8 +963,6 @@ class DateTime
* Excel Function: * Excel Function:
* NETWORKDAYS(startDate,endDate[,holidays[,holiday[,...]]]) * NETWORKDAYS(startDate,endDate[,holidays[,holiday[,...]]])
* *
* @category Date/Time Functions
*
* @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer), * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
* PHP DateTime object, or a standard date string * PHP DateTime object, or a standard date string
* @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer), * @param mixed $endDate Excel date serial value (float), PHP date timestamp (integer),
@ -1061,8 +1041,6 @@ class DateTime
* Excel Function: * Excel Function:
* WORKDAY(startDate,endDays[,holidays[,holiday[,...]]]) * WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
* *
* @category Date/Time Functions
*
* @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer), * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
* PHP DateTime object, or a standard date string * PHP DateTime object, or a standard date string
* @param int $endDays The number of nonweekend and nonholiday days before or after * @param int $endDays The number of nonweekend and nonholiday days before or after

48
src/PhpSpreadsheet/Calculation/Engineering.php
View File

@ -776,8 +776,6 @@ class Engineering
* Excel Function: * Excel Function:
* BESSELI(x,ord) * BESSELI(x,ord)
* *
* @category Engineering Functions
*
* @param float $x The value at which to evaluate the function. * @param float $x The value at which to evaluate the function.
* If x is nonnumeric, BESSELI returns the #VALUE! error value. * If x is nonnumeric, BESSELI returns the #VALUE! error value.
* @param int $ord The order of the Bessel function. * @param int $ord The order of the Bessel function.
@ -831,8 +829,6 @@ class Engineering
* Excel Function: * Excel Function:
* BESSELJ(x,ord) * BESSELJ(x,ord)
* *
* @category Engineering Functions
*
* @param float $x The value at which to evaluate the function. * @param float $x The value at which to evaluate the function.
* If x is nonnumeric, BESSELJ returns the #VALUE! error value. * If x is nonnumeric, BESSELJ returns the #VALUE! error value.
* @param int $ord The order of the Bessel function. If n is not an integer, it is truncated. * @param int $ord The order of the Bessel function. If n is not an integer, it is truncated.
@ -924,8 +920,6 @@ class Engineering
* Excel Function: * Excel Function:
* BESSELK(x,ord) * BESSELK(x,ord)
* *
* @category Engineering Functions
*
* @param float $x The value at which to evaluate the function. * @param float $x The value at which to evaluate the function.
* If x is nonnumeric, BESSELK returns the #VALUE! error value. * If x is nonnumeric, BESSELK returns the #VALUE! error value.
* @param int $ord The order of the Bessel function. If n is not an integer, it is truncated. * @param int $ord The order of the Bessel function. If n is not an integer, it is truncated.
@ -1013,8 +1007,6 @@ class Engineering
* Excel Function: * Excel Function:
* BESSELY(x,ord) * BESSELY(x,ord)
* *
* @category Engineering Functions
*
* @param float $x The value at which to evaluate the function. * @param float $x The value at which to evaluate the function.
* If x is nonnumeric, BESSELK returns the #VALUE! error value. * If x is nonnumeric, BESSELK returns the #VALUE! error value.
* @param int $ord The order of the Bessel function. If n is not an integer, it is truncated. * @param int $ord The order of the Bessel function. If n is not an integer, it is truncated.
@ -1067,8 +1059,6 @@ class Engineering
* Excel Function: * Excel Function:
* BIN2DEC(x) * BIN2DEC(x)
* *
* @category Engineering Functions
*
* @param string $x The binary number (as a string) that you want to convert. The number * @param string $x The binary number (as a string) that you want to convert. The number
* cannot contain more than 10 characters (10 bits). The most significant * cannot contain more than 10 characters (10 bits). The most significant
* bit of number is the sign bit. The remaining 9 bits are magnitude bits. * bit of number is the sign bit. The remaining 9 bits are magnitude bits.
@ -1116,8 +1106,6 @@ class Engineering
* Excel Function: * Excel Function:
* BIN2HEX(x[,places]) * BIN2HEX(x[,places])
* *
* @category Engineering Functions
*
* @param string $x The binary number (as a string) that you want to convert. The number * @param string $x The binary number (as a string) that you want to convert. The number
* cannot contain more than 10 characters (10 bits). The most significant * cannot contain more than 10 characters (10 bits). The most significant
* bit of number is the sign bit. The remaining 9 bits are magnitude bits. * bit of number is the sign bit. The remaining 9 bits are magnitude bits.
@ -1172,8 +1160,6 @@ class Engineering
* Excel Function: * Excel Function:
* BIN2OCT(x[,places]) * BIN2OCT(x[,places])
* *
* @category Engineering Functions
*
* @param string $x The binary number (as a string) that you want to convert. The number * @param string $x The binary number (as a string) that you want to convert. The number
* cannot contain more than 10 characters (10 bits). The most significant * cannot contain more than 10 characters (10 bits). The most significant
* bit of number is the sign bit. The remaining 9 bits are magnitude bits. * bit of number is the sign bit. The remaining 9 bits are magnitude bits.
@ -1227,8 +1213,6 @@ class Engineering
* Excel Function: * Excel Function:
* DEC2BIN(x[,places]) * DEC2BIN(x[,places])
* *
* @category Engineering Functions
*
* @param string $x The decimal integer you want to convert. If number is negative, * @param string $x The decimal integer you want to convert. If number is negative,
* valid place values are ignored and DEC2BIN returns a 10-character * valid place values are ignored and DEC2BIN returns a 10-character
* (10-bit) binary number in which the most significant bit is the sign * (10-bit) binary number in which the most significant bit is the sign
@ -1288,8 +1272,6 @@ class Engineering
* Excel Function: * Excel Function:
* DEC2HEX(x[,places]) * DEC2HEX(x[,places])
* *
* @category Engineering Functions
*
* @param string $x The decimal integer you want to convert. If number is negative, * @param string $x The decimal integer you want to convert. If number is negative,
* places is ignored and DEC2HEX returns a 10-character (40-bit) * places is ignored and DEC2HEX returns a 10-character (40-bit)
* hexadecimal number in which the most significant bit is the sign * hexadecimal number in which the most significant bit is the sign
@ -1343,8 +1325,6 @@ class Engineering
* Excel Function: * Excel Function:
* DEC2OCT(x[,places]) * DEC2OCT(x[,places])
* *
* @category Engineering Functions
*
* @param string $x The decimal integer you want to convert. If number is negative, * @param string $x The decimal integer you want to convert. If number is negative,
* places is ignored and DEC2OCT returns a 10-character (30-bit) * places is ignored and DEC2OCT returns a 10-character (30-bit)
* octal number in which the most significant bit is the sign bit. * octal number in which the most significant bit is the sign bit.
@ -1399,8 +1379,6 @@ class Engineering
* Excel Function: * Excel Function:
* HEX2BIN(x[,places]) * HEX2BIN(x[,places])
* *
* @category Engineering Functions
*
* @param string $x the hexadecimal number you want to convert. * @param string $x the hexadecimal number you want to convert.
* Number cannot contain more than 10 characters. * Number cannot contain more than 10 characters.
* The most significant bit of number is the sign bit (40th bit from the right). * The most significant bit of number is the sign bit (40th bit from the right).
@ -1444,8 +1422,6 @@ class Engineering
* Excel Function: * Excel Function:
* HEX2DEC(x) * HEX2DEC(x)
* *
* @category Engineering Functions
*
* @param string $x The hexadecimal number you want to convert. This number cannot * @param string $x The hexadecimal number you want to convert. This number cannot
* contain more than 10 characters (40 bits). The most significant * contain more than 10 characters (40 bits). The most significant
* bit of number is the sign bit. The remaining 39 bits are magnitude * bit of number is the sign bit. The remaining 39 bits are magnitude
@ -1495,8 +1471,6 @@ class Engineering
* Excel Function: * Excel Function:
* HEX2OCT(x[,places]) * HEX2OCT(x[,places])
* *
* @category Engineering Functions
*
* @param string $x The hexadecimal number you want to convert. Number cannot * @param string $x The hexadecimal number you want to convert. Number cannot
* contain more than 10 characters. The most significant bit of * contain more than 10 characters. The most significant bit of
* number is the sign bit. The remaining 39 bits are magnitude * number is the sign bit. The remaining 39 bits are magnitude
@ -1549,8 +1523,6 @@ class Engineering
* Excel Function: * Excel Function:
* OCT2BIN(x[,places]) * OCT2BIN(x[,places])
* *
* @category Engineering Functions
*
* @param string $x The octal number you want to convert. Number may not * @param string $x The octal number you want to convert. Number may not
* contain more than 10 characters. The most significant * contain more than 10 characters. The most significant
* bit of number is the sign bit. The remaining 29 bits * bit of number is the sign bit. The remaining 29 bits
@ -1600,8 +1572,6 @@ class Engineering
* Excel Function: * Excel Function:
* OCT2DEC(x) * OCT2DEC(x)
* *
* @category Engineering Functions
*
* @param string $x The octal number you want to convert. Number may not contain * @param string $x The octal number you want to convert. Number may not contain
* more than 10 octal characters (30 bits). The most significant * more than 10 octal characters (30 bits). The most significant
* bit of number is the sign bit. The remaining 29 bits are * bit of number is the sign bit. The remaining 29 bits are
@ -1646,8 +1616,6 @@ class Engineering
* Excel Function: * Excel Function:
* OCT2HEX(x[,places]) * OCT2HEX(x[,places])
* *
* @category Engineering Functions
*
* @param string $x The octal number you want to convert. Number may not contain * @param string $x The octal number you want to convert. Number may not contain
* more than 10 octal characters (30 bits). The most significant * more than 10 octal characters (30 bits). The most significant
* bit of number is the sign bit. The remaining 29 bits are * bit of number is the sign bit. The remaining 29 bits are
@ -1693,8 +1661,6 @@ class Engineering
* Excel Function: * Excel Function:
* COMPLEX(realNumber,imaginary[,suffix]) * COMPLEX(realNumber,imaginary[,suffix])
* *
* @category Engineering Functions
*
* @param float $realNumber the real coefficient of the complex number * @param float $realNumber the real coefficient of the complex number
* @param float $imaginary the imaginary coefficient of the complex number * @param float $imaginary the imaginary coefficient of the complex number
* @param string $suffix The suffix for the imaginary component of the complex number. * @param string $suffix The suffix for the imaginary component of the complex number.
@ -1727,8 +1693,6 @@ class Engineering
* Excel Function: * Excel Function:
* IMAGINARY(complexNumber) * IMAGINARY(complexNumber)
* *
* @category Engineering Functions
*
* @param string $complexNumber the complex number for which you want the imaginary * @param string $complexNumber the complex number for which you want the imaginary
* coefficient * coefficient
* *
@ -1749,8 +1713,6 @@ class Engineering
* Excel Function: * Excel Function:
* IMREAL(complexNumber) * IMREAL(complexNumber)
* *
* @category Engineering Functions
*
* @param string $complexNumber the complex number for which you want the real coefficient * @param string $complexNumber the complex number for which you want the real coefficient
* *
* @return float * @return float
@ -2378,8 +2340,6 @@ class Engineering
* Excel Function: * Excel Function:
* BITAND(number1, number2) * BITAND(number1, number2)
* *
* @category Engineering Functions
*
* @param int $number1 * @param int $number1
* @param int $number2 * @param int $number2
* *
@ -2405,8 +2365,6 @@ class Engineering
* Excel Function: * Excel Function:
* BITOR(number1, number2) * BITOR(number1, number2)
* *
* @category Engineering Functions
*
* @param int $number1 * @param int $number1
* @param int $number2 * @param int $number2
* *
@ -2432,8 +2390,6 @@ class Engineering
* Excel Function: * Excel Function:
* BITXOR(number1, number2) * BITXOR(number1, number2)
* *
* @category Engineering Functions
*
* @param int $number1 * @param int $number1
* @param int $number2 * @param int $number2
* *
@ -2459,8 +2415,6 @@ class Engineering
* Excel Function: * Excel Function:
* BITLSHIFT(number, shift_amount) * BITLSHIFT(number, shift_amount)
* *
* @category Engineering Functions
*
* @param int $number * @param int $number
* @param int $shiftAmount * @param int $shiftAmount
* *
@ -2492,8 +2446,6 @@ class Engineering
* Excel Function: * Excel Function:
* BITRSHIFT(number, shift_amount) * BITRSHIFT(number, shift_amount)
* *
* @category Engineering Functions
*
* @param int $number * @param int $number
* @param int $shiftAmount * @param int $shiftAmount
* *

40
src/PhpSpreadsheet/Calculation/Financial.php
View File

@ -114,8 +114,6 @@ class Financial
* Excel Function: * Excel Function:
* ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis]) * ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis])
* *
* @category Financial Functions
*
* @param mixed $issue the security's issue date * @param mixed $issue the security's issue date
* @param mixed $firstinterest the security's first interest date * @param mixed $firstinterest the security's first interest date
* @param mixed $settlement The security's settlement date. * @param mixed $settlement The security's settlement date.
@ -175,8 +173,6 @@ class Financial
* Excel Function: * Excel Function:
* ACCRINTM(issue,settlement,rate[,par[,basis]]) * ACCRINTM(issue,settlement,rate[,par[,basis]])
* *
* @category Financial Functions
*
* @param mixed $issue The security's issue date * @param mixed $issue The security's issue date
* @param mixed $settlement The security's settlement (or maturity) date * @param mixed $settlement The security's settlement (or maturity) date
* @param float $rate The security's annual coupon rate * @param float $rate The security's annual coupon rate
@ -233,8 +229,6 @@ class Financial
* Excel Function: * Excel Function:
* AMORDEGRC(cost,purchased,firstPeriod,salvage,period,rate[,basis]) * AMORDEGRC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
* *
* @category Financial Functions
*
* @param float $cost The cost of the asset * @param float $cost The cost of the asset
* @param mixed $purchased Date of the purchase of the asset * @param mixed $purchased Date of the purchase of the asset
* @param mixed $firstPeriod Date of the end of the first period * @param mixed $firstPeriod Date of the end of the first period
@ -311,8 +305,6 @@ class Financial
* Excel Function: * Excel Function:
* AMORLINC(cost,purchased,firstPeriod,salvage,period,rate[,basis]) * AMORLINC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
* *
* @category Financial Functions
*
* @param float $cost The cost of the asset * @param float $cost The cost of the asset
* @param mixed $purchased Date of the purchase of the asset * @param mixed $purchased Date of the purchase of the asset
* @param mixed $firstPeriod Date of the end of the first period * @param mixed $firstPeriod Date of the end of the first period
@ -370,8 +362,6 @@ class Financial
* Excel Function: * Excel Function:
* COUPDAYBS(settlement,maturity,frequency[,basis]) * COUPDAYBS(settlement,maturity,frequency[,basis])
* *
* @category Financial Functions
*
* @param mixed $settlement The security's settlement date. * @param mixed $settlement The security's settlement date.
* The security settlement date is the date after the issue * The security settlement date is the date after the issue
* date when the security is traded to the buyer. * date when the security is traded to the buyer.
@ -429,8 +419,6 @@ class Financial
* Excel Function: * Excel Function:
* COUPDAYS(settlement,maturity,frequency[,basis]) * COUPDAYS(settlement,maturity,frequency[,basis])
* *
* @category Financial Functions
*
* @param mixed $settlement The security's settlement date. * @param mixed $settlement The security's settlement date.
* The security settlement date is the date after the issue * The security settlement date is the date after the issue
* date when the security is traded to the buyer. * date when the security is traded to the buyer.
@ -499,8 +487,6 @@ class Financial
* Excel Function: * Excel Function:
* COUPDAYSNC(settlement,maturity,frequency[,basis]) * COUPDAYSNC(settlement,maturity,frequency[,basis])
* *
* @category Financial Functions
*
* @param mixed $settlement The security's settlement date. * @param mixed $settlement The security's settlement date.
* The security settlement date is the date after the issue * The security settlement date is the date after the issue
* date when the security is traded to the buyer. * date when the security is traded to the buyer.
@ -554,8 +540,6 @@ class Financial
* Excel Function: * Excel Function:
* COUPNCD(settlement,maturity,frequency[,basis]) * COUPNCD(settlement,maturity,frequency[,basis])
* *
* @category Financial Functions
*
* @param mixed $settlement The security's settlement date. * @param mixed $settlement The security's settlement date.
* The security settlement date is the date after the issue * The security settlement date is the date after the issue
* date when the security is traded to the buyer. * date when the security is traded to the buyer.
@ -608,8 +592,6 @@ class Financial
* Excel Function: * Excel Function:
* COUPNUM(settlement,maturity,frequency[,basis]) * COUPNUM(settlement,maturity,frequency[,basis])
* *
* @category Financial Functions
*
* @param mixed $settlement The security's settlement date. * @param mixed $settlement The security's settlement date.
* The security settlement date is the date after the issue * The security settlement date is the date after the issue
* date when the security is traded to the buyer. * date when the security is traded to the buyer.
@ -662,8 +644,6 @@ class Financial
* Excel Function: * Excel Function:
* COUPPCD(settlement,maturity,frequency[,basis]) * COUPPCD(settlement,maturity,frequency[,basis])
* *
* @category Financial Functions
*
* @param mixed $settlement The security's settlement date. * @param mixed $settlement The security's settlement date.
* The security settlement date is the date after the issue * The security settlement date is the date after the issue
* date when the security is traded to the buyer. * date when the security is traded to the buyer.
@ -715,8 +695,6 @@ class Financial
* Excel Function: * Excel Function:
* CUMIPMT(rate,nper,pv,start,end[,type]) * CUMIPMT(rate,nper,pv,start,end[,type])
* *
* @category Financial Functions
*
* @param float $rate The Interest rate * @param float $rate The Interest rate
* @param int $nper The total number of payment periods * @param int $nper The total number of payment periods
* @param float $pv Present Value * @param float $pv Present Value
@ -763,8 +741,6 @@ class Financial
* Excel Function: * Excel Function:
* CUMPRINC(rate,nper,pv,start,end[,type]) * CUMPRINC(rate,nper,pv,start,end[,type])
* *
* @category Financial Functions
*
* @param float $rate The Interest rate * @param float $rate The Interest rate
* @param int $nper The total number of payment periods * @param int $nper The total number of payment periods
* @param float $pv Present Value * @param float $pv Present Value
@ -816,8 +792,6 @@ class Financial
* Excel Function: * Excel Function:
* DB(cost,salvage,life,period[,month]) * DB(cost,salvage,life,period[,month])
* *
* @category Financial Functions
*
* @param float $cost Initial cost of the asset * @param float $cost Initial cost of the asset
* @param float $salvage Value at the end of the depreciation. * @param float $salvage Value at the end of the depreciation.
* (Sometimes called the salvage value of the asset) * (Sometimes called the salvage value of the asset)
@ -883,8 +857,6 @@ class Financial
* Excel Function: * Excel Function:
* DDB(cost,salvage,life,period[,factor]) * DDB(cost,salvage,life,period[,factor])
* *
* @category Financial Functions
*
* @param float $cost Initial cost of the asset * @param float $cost Initial cost of the asset
* @param float $salvage Value at the end of the depreciation. * @param float $salvage Value at the end of the depreciation.
* (Sometimes called the salvage value of the asset) * (Sometimes called the salvage value of the asset)
@ -942,8 +914,6 @@ class Financial
* Excel Function: * Excel Function:
* DISC(settlement,maturity,price,redemption[,basis]) * DISC(settlement,maturity,price,redemption[,basis])
* *
* @category Financial Functions
*
* @param mixed $settlement The security's settlement date. * @param mixed $settlement The security's settlement date.
* The security settlement date is the date after the issue * The security settlement date is the date after the issue
* date when the security is traded to the buyer. * date when the security is traded to the buyer.
@ -998,8 +968,6 @@ class Financial
* Excel Function: * Excel Function:
* DOLLARDE(fractional_dollar,fraction) * DOLLARDE(fractional_dollar,fraction)
* *
* @category Financial Functions
*
* @param float $fractional_dollar Fractional Dollar * @param float $fractional_dollar Fractional Dollar
* @param int $fraction Fraction * @param int $fraction Fraction
* *
@ -1036,8 +1004,6 @@ class Financial
* Excel Function: * Excel Function:
* DOLLARFR(decimal_dollar,fraction) * DOLLARFR(decimal_dollar,fraction)
* *
* @category Financial Functions
*
* @param float $decimal_dollar Decimal Dollar * @param float $decimal_dollar Decimal Dollar
* @param int $fraction Fraction * @param int $fraction Fraction
* *
@ -1073,8 +1039,6 @@ class Financial
* Excel Function: * Excel Function:
* EFFECT(nominal_rate,npery) * EFFECT(nominal_rate,npery)
* *
* @category Financial Functions
*
* @param float $nominal_rate Nominal interest rate * @param float $nominal_rate Nominal interest rate
* @param int $npery Number of compounding payments per year * @param int $npery Number of compounding payments per year
* *
@ -1101,8 +1065,6 @@ class Financial
* Excel Function: * Excel Function:
* FV(rate,nper,pmt[,pv[,type]]) * FV(rate,nper,pmt[,pv[,type]])
* *
* @category Financial Functions
*
* @param float $rate The interest rate per period * @param float $rate The interest rate per period
* @param int $nper Total number of payment periods in an annuity * @param int $nper Total number of payment periods in an annuity
* @param float $pmt The payment made each period: it cannot change over the * @param float $pmt The payment made each period: it cannot change over the
@ -1837,8 +1799,6 @@ class Financial
* Excel Function: * Excel Function:
* RATE(nper,pmt,pv[,fv[,type[,guess]]]) * RATE(nper,pmt,pv[,fv[,type[,guess]]])
* *
* @category Financial Functions
*
* @param float $nper The total number of payment periods in an annuity * @param float $nper The total number of payment periods in an annuity
* @param float $pmt The payment made each period and cannot change over the life * @param float $pmt The payment made each period and cannot change over the life
* of the annuity. * of the annuity.

24
src/PhpSpreadsheet/Calculation/Functions.php
View File

@ -57,8 +57,6 @@ class Functions
/** /**
* Set the Compatibility Mode. * Set the Compatibility Mode.
* *
* @category Function Configuration
*
* @param string $compatibilityMode Compatibility Mode * @param string $compatibilityMode Compatibility Mode
* Permitted values are: * Permitted values are:
* Functions::COMPATIBILITY_EXCEL 'Excel' * Functions::COMPATIBILITY_EXCEL 'Excel'
@ -84,8 +82,6 @@ class Functions
/** /**
* Return the current Compatibility Mode. * Return the current Compatibility Mode.
* *
* @category Function Configuration
*
* @return string Compatibility Mode * @return string Compatibility Mode
* Possible Return values are: * Possible Return values are:
* Functions::COMPATIBILITY_EXCEL 'Excel' * Functions::COMPATIBILITY_EXCEL 'Excel'
@ -100,8 +96,6 @@ class Functions
/** /**
* Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object). * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object).
* *
* @category Function Configuration
*
* @param string $returnDateType Return Date Format * @param string $returnDateType Return Date Format
* Permitted values are: * Permitted values are:
* Functions::RETURNDATE_UNIX_TIMESTAMP 'P' * Functions::RETURNDATE_UNIX_TIMESTAMP 'P'
@ -127,8 +121,6 @@ class Functions
/** /**
* Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object). * Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object).
* *
* @category Function Configuration
*
* @return string Return Date Format * @return string Return Date Format
* Possible Return values are: * Possible Return values are:
* Functions::RETURNDATE_UNIX_TIMESTAMP 'P' * Functions::RETURNDATE_UNIX_TIMESTAMP 'P'
@ -143,8 +135,6 @@ class Functions
/** /**
* DUMMY. * DUMMY.
* *
* @category Error Returns
*
* @return string #Not Yet Implemented * @return string #Not Yet Implemented
*/ */
public static function DUMMY() public static function DUMMY()
@ -155,8 +145,6 @@ class Functions
/** /**
* DIV0. * DIV0.
* *
* @category Error Returns
*
* @return string #Not Yet Implemented * @return string #Not Yet Implemented
*/ */
public static function DIV0() public static function DIV0()
@ -173,8 +161,6 @@ class Functions
* Returns the error value #N/A * Returns the error value #N/A
* #N/A is the error value that means "no value is available." * #N/A is the error value that means "no value is available."
* *
* @category Logical Functions
*
* @return string #N/A! * @return string #N/A!
*/ */
public static function NA() public static function NA()
@ -187,8 +173,6 @@ class Functions
* *
* Returns the error value #NUM! * Returns the error value #NUM!
* *
* @category Error Returns
*
* @return string #NUM! * @return string #NUM!
*/ */
public static function NAN() public static function NAN()
@ -201,8 +185,6 @@ class Functions
* *
* Returns the error value #NAME? * Returns the error value #NAME?
* *
* @category Error Returns
*
* @return string #NAME? * @return string #NAME?
*/ */
public static function NAME() public static function NAME()
@ -215,8 +197,6 @@ class Functions
* *
* Returns the error value #REF! * Returns the error value #REF!
* *
* @category Error Returns
*
* @return string #REF! * @return string #REF!
*/ */
public static function REF() public static function REF()
@ -229,8 +209,6 @@ class Functions
* *
* Returns the error value #NULL! * Returns the error value #NULL!
* *
* @category Error Returns
*
* @return string #NULL! * @return string #NULL!
*/ */
public static function null() public static function null()
@ -243,8 +221,6 @@ class Functions
* *
* Returns the error value #VALUE! * Returns the error value #VALUE!
* *
* @category Error Returns
*
* @return string #VALUE! * @return string #VALUE!
*/ */
public static function VALUE() public static function VALUE()

20
src/PhpSpreadsheet/Calculation/Logical.php
View File

@ -12,8 +12,6 @@ class Logical
* Excel Function: * Excel Function:
* =TRUE() * =TRUE()
* *
* @category Logical Functions
*
* @return bool True * @return bool True
*/ */
public static function true() public static function true()
@ -29,8 +27,6 @@ class Logical
* Excel Function: * Excel Function:
* =FALSE() * =FALSE()
* *
* @category Logical Functions
*
* @return bool False * @return bool False
*/ */
public static function false() public static function false()
@ -80,8 +76,6 @@ class Logical
* If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds * If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
* the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value * the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
* *
* @category Logical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return bool|string the logical AND of the arguments * @return bool|string the logical AND of the arguments
@ -123,8 +117,6 @@ class Logical
* If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds * If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
* the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value * the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
* *
* @category Logical Functions
*
* @param mixed $args Data values * @param mixed $args Data values
* *
* @return bool|string the logical OR of the arguments * @return bool|string the logical OR of the arguments
@ -166,8 +158,6 @@ class Logical
* If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds * If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
* the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value * the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
* *
* @category Logical Functions
*
* @param mixed $args Data values * @param mixed $args Data values
* *
* @return bool|string the logical XOR of the arguments * @return bool|string the logical XOR of the arguments
@ -207,8 +197,6 @@ class Logical
* If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds * If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
* the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value * the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
* *
* @category Logical Functions
*
* @param mixed $logical A value or expression that can be evaluated to TRUE or FALSE * @param mixed $logical A value or expression that can be evaluated to TRUE or FALSE
* *
* @return bool|string the boolean inverse of the argument * @return bool|string the boolean inverse of the argument
@ -256,8 +244,6 @@ class Logical
* If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned. * If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned.
* ReturnIfFalse can be another formula. * ReturnIfFalse can be another formula.
* *
* @category Logical Functions
*
* @param mixed $condition Condition to evaluate * @param mixed $condition Condition to evaluate
* @param mixed $returnIfTrue Value to return when condition is true * @param mixed $returnIfTrue Value to return when condition is true
* @param mixed $returnIfFalse Optional value to return when condition is false * @param mixed $returnIfFalse Optional value to return when condition is false
@ -294,8 +280,6 @@ class Logical
* default * default
* Optional. It is the default to return if expression does not match any of the values (value1, value2, ... value_n). * Optional. It is the default to return if expression does not match any of the values (value1, value2, ... value_n).
* *
* @category Logical Functions
*
* @param mixed $arguments Statement arguments * @param mixed $arguments Statement arguments
* *
* @return mixed The value of matched expression * @return mixed The value of matched expression
@ -337,8 +321,6 @@ class Logical
* Excel Function: * Excel Function:
* =IFERROR(testValue,errorpart) * =IFERROR(testValue,errorpart)
* *
* @category Logical Functions
*
* @param mixed $testValue Value to check, is also the value returned when no error * @param mixed $testValue Value to check, is also the value returned when no error
* @param mixed $errorpart Value to return when testValue is an error condition * @param mixed $errorpart Value to return when testValue is an error condition
* *
@ -358,8 +340,6 @@ class Logical
* Excel Function: * Excel Function:
* =IFNA(testValue,napart) * =IFNA(testValue,napart)
* *
* @category Logical Functions
*
* @param mixed $testValue Value to check, is also the value returned when not an NA * @param mixed $testValue Value to check, is also the value returned when not an NA
* @param mixed $napart Value to return when testValue is an NA condition * @param mixed $napart Value to return when testValue is an NA condition
* *

4
src/PhpSpreadsheet/Calculation/LookupRef.php
View File

@ -230,8 +230,6 @@ class LookupRef
* Excel Function: * Excel Function:
* =HYPERLINK(linkURL,displayName) * =HYPERLINK(linkURL,displayName)
* *
* @category Logical Functions
*
* @param string $linkURL Value to check, is also the value returned when no error * @param string $linkURL Value to check, is also the value returned when no error
* @param string $displayName Value to return when testValue is an error condition * @param string $displayName Value to return when testValue is an error condition
* @param Cell $pCell The cell to set the hyperlink in * @param Cell $pCell The cell to set the hyperlink in
@ -273,7 +271,7 @@ class LookupRef
* *
* @return mixed The cells referenced by cellAddress * @return mixed The cells referenced by cellAddress
* *
* @todo Support for the optional a1 parameter introduced in Excel 2010 * @TODO Support for the optional a1 parameter introduced in Excel 2010
*/ */
public static function INDIRECT($cellAddress = null, ?Cell $pCell = null) public static function INDIRECT($cellAddress = null, ?Cell $pCell = null)
{ {

48
src/PhpSpreadsheet/Calculation/MathTrig.php
View File

@ -47,8 +47,6 @@ class MathTrig
* Excel Function: * Excel Function:
* ARABIC(text) * ARABIC(text)
* *
* @category Mathematical and Trigonometric Functions
*
* @param string $roman * @param string $roman
* *
* @return int|string the arabic numberal contrived from the roman numeral * @return int|string the arabic numberal contrived from the roman numeral
@ -136,8 +134,6 @@ class MathTrig
* Excel Function: * Excel Function:
* ATAN2(xCoordinate,yCoordinate) * ATAN2(xCoordinate,yCoordinate)
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $xCoordinate the x-coordinate of the point * @param float $xCoordinate the x-coordinate of the point
* @param float $yCoordinate the y-coordinate of the point * @param float $yCoordinate the y-coordinate of the point
* *
@ -174,8 +170,6 @@ class MathTrig
* Excel Function: * Excel Function:
* BASE(Number, Radix [Min_length]) * BASE(Number, Radix [Min_length])
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $number * @param float $number
* @param float $radix * @param float $radix
* @param int $minLength * @param int $minLength
@ -220,8 +214,6 @@ class MathTrig
* Excel Function: * Excel Function:
* CEILING(number[,significance]) * CEILING(number[,significance])
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $number the number you want to round * @param float $number the number you want to round
* @param float $significance the multiple to which you want to round * @param float $significance the multiple to which you want to round
* *
@ -259,8 +251,6 @@ class MathTrig
* Excel Function: * Excel Function:
* COMBIN(numObjs,numInSet) * COMBIN(numObjs,numInSet)
* *
* @category Mathematical and Trigonometric Functions
*
* @param int $numObjs Number of different objects * @param int $numObjs Number of different objects
* @param int $numInSet Number of objects in each combination * @param int $numInSet Number of objects in each combination
* *
@ -296,8 +286,6 @@ class MathTrig
* Excel Function: * Excel Function:
* EVEN(number) * EVEN(number)
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $number Number to round * @param float $number Number to round
* *
* @return int|string Rounded Number, or a string containing an error * @return int|string Rounded Number, or a string containing an error
@ -330,8 +318,6 @@ class MathTrig
* Excel Function: * Excel Function:
* FACT(factVal) * FACT(factVal)
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $factVal Factorial Value * @param float $factVal Factorial Value
* *
* @return int|string Factorial, or a string containing an error * @return int|string Factorial, or a string containing an error
@ -369,8 +355,6 @@ class MathTrig
* Excel Function: * Excel Function:
* FACTDOUBLE(factVal) * FACTDOUBLE(factVal)
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $factVal Factorial Value * @param float $factVal Factorial Value
* *
* @return int|string Double Factorial, or a string containing an error * @return int|string Double Factorial, or a string containing an error
@ -404,8 +388,6 @@ class MathTrig
* Excel Function: * Excel Function:
* FLOOR(number[,significance]) * FLOOR(number[,significance])
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $number Number to round * @param float $number Number to round
* @param float $significance Significance * @param float $significance Significance
* *
@ -446,8 +428,6 @@ class MathTrig
* Excel Function: * Excel Function:
* FLOOR.MATH(number[,significance[,mode]]) * FLOOR.MATH(number[,significance[,mode]])
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $number Number to round * @param float $number Number to round
* @param float $significance Significance * @param float $significance Significance
* @param int $mode direction to round negative numbers * @param int $mode direction to round negative numbers
@ -487,8 +467,6 @@ class MathTrig
* Excel Function: * Excel Function:
* FLOOR.PRECISE(number[,significance]) * FLOOR.PRECISE(number[,significance])
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $number Number to round * @param float $number Number to round
* @param float $significance Significance * @param float $significance Significance
* *
@ -527,8 +505,6 @@ class MathTrig
* Excel Function: * Excel Function:
* GCD(number1[,number2[, ...]]) * GCD(number1[,number2[, ...]])
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return int|mixed|string Greatest Common Divisor, or a string containing an error * @return int|mixed|string Greatest Common Divisor, or a string containing an error
@ -561,8 +537,6 @@ class MathTrig
* Excel Function: * Excel Function:
* INT(number) * INT(number)
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $number Number to cast to an integer * @param float $number Number to cast to an integer
* *
* @return int|string Integer value, or a string containing an error * @return int|string Integer value, or a string containing an error
@ -594,8 +568,6 @@ class MathTrig
* Excel Function: * Excel Function:
* LCM(number1[,number2[, ...]]) * LCM(number1[,number2[, ...]])
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return int|string Lowest Common Multiplier, or a string containing an error * @return int|string Lowest Common Multiplier, or a string containing an error
@ -645,8 +617,6 @@ class MathTrig
* Excel Function: * Excel Function:
* LOG(number[,base]) * LOG(number[,base])
* *
* @category Mathematical and Trigonometric Functions
*
* @param float $number The positive real number for which you want the logarithm * @param float $number The positive real number for which you want the logarithm
* @param float $base The base of the logarithm. If base is omitted, it is assumed to be 10. * @param float $base The base of the logarithm. If base is omitted, it is assumed to be 10.
* *
@ -675,8 +645,6 @@ class MathTrig
* Excel Function: * Excel Function:
* MDETERM(array) * MDETERM(array)
* *
* @category Mathematical and Trigonometric Functions
*
* @param array $matrixValues A matrix of values * @param array $matrixValues A matrix of values
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
@ -727,8 +695,6 @@ class MathTrig
* Excel Function: * Excel Function:
* MINVERSE(array) * MINVERSE(array)
* *
* @category Mathematical and Trigonometric Functions
*
* @param array $matrixValues A matrix of values * @param array $matrixValues A matrix of values
* *
* @return array|string The result, or a string containing an error * @return array|string The result, or a string containing an error
@ -999,8 +965,6 @@ class MathTrig
* Excel Function: * Excel Function:
* PRODUCT(value1[,value2[, ...]]) * PRODUCT(value1[,value2[, ...]])
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -1039,8 +1003,6 @@ class MathTrig
* Excel Function: * Excel Function:
* QUOTIENT(value1[,value2[, ...]]) * QUOTIENT(value1[,value2[, ...]])
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -1364,8 +1326,6 @@ class MathTrig
* Excel Function: * Excel Function:
* SUM(value1[,value2[, ...]]) * SUM(value1[,value2[, ...]])
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -1393,8 +1353,6 @@ class MathTrig
* Excel Function: * Excel Function:
* SUMIF(value1[,value2[, ...]],condition) * SUMIF(value1[,value2[, ...]],condition)
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed $aArgs Data values * @param mixed $aArgs Data values
* @param string $condition the criteria that defines which cells will be summed * @param string $condition the criteria that defines which cells will be summed
* @param mixed $sumArgs * @param mixed $sumArgs
@ -1439,8 +1397,6 @@ class MathTrig
* Excel Function: * Excel Function:
* SUMIFS(value1[,value2[, ...]],condition) * SUMIFS(value1[,value2[, ...]],condition)
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed $args Data values * @param mixed $args Data values
* *
* @return float * @return float
@ -1496,8 +1452,6 @@ class MathTrig
* Excel Function: * Excel Function:
* SUMPRODUCT(value1[,value2[, ...]]) * SUMPRODUCT(value1[,value2[, ...]])
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
@ -1541,8 +1495,6 @@ class MathTrig
* Excel Function: * Excel Function:
* SUMSQ(value1[,value2[, ...]]) * SUMSQ(value1[,value2[, ...]])
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float

70
src/PhpSpreadsheet/Calculation/Statistical.php
View File

@ -565,8 +565,6 @@ class Statistical
* Excel Function: * Excel Function:
* AVEDEV(value1[,value2[, ...]]) * AVEDEV(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string * @return float|string
@ -616,8 +614,6 @@ class Statistical
* Excel Function: * Excel Function:
* AVERAGE(value1[,value2[, ...]]) * AVERAGE(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string * @return float|string
@ -657,8 +653,6 @@ class Statistical
* Excel Function: * Excel Function:
* AVERAGEA(value1[,value2[, ...]]) * AVERAGEA(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string * @return float|string
@ -700,8 +694,6 @@ class Statistical
* Excel Function: * Excel Function:
* AVERAGEIF(value1[,value2[, ...]],condition) * AVERAGEIF(value1[,value2[, ...]],condition)
* *
* @category Mathematical and Trigonometric Functions
*
* @param mixed $aArgs Data values * @param mixed $aArgs Data values
* @param string $condition the criteria that defines which cells will be checked * @param string $condition the criteria that defines which cells will be checked
* @param mixed[] $averageArgs Data values * @param mixed[] $averageArgs Data values
@ -1053,8 +1045,6 @@ class Statistical
* Excel Function: * Excel Function:
* COUNT(value1[,value2[, ...]]) * COUNT(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return int * @return int
@ -1086,8 +1076,6 @@ class Statistical
* Excel Function: * Excel Function:
* COUNTA(value1[,value2[, ...]]) * COUNTA(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return int * @return int
@ -1116,8 +1104,6 @@ class Statistical
* Excel Function: * Excel Function:
* COUNTBLANK(value1[,value2[, ...]]) * COUNTBLANK(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return int * @return int
@ -1146,8 +1132,6 @@ class Statistical
* Excel Function: * Excel Function:
* COUNTIF(value1[,value2[, ...]],condition) * COUNTIF(value1[,value2[, ...]],condition)
* *
* @category Statistical Functions
*
* @param mixed $aArgs Data values * @param mixed $aArgs Data values
* @param string $condition the criteria that defines which cells will be counted * @param string $condition the criteria that defines which cells will be counted
* *
@ -1188,8 +1172,6 @@ class Statistical
* Excel Function: * Excel Function:
* COUNTIFS(criteria_range1, criteria1, [criteria_range2, criteria2]…) * COUNTIFS(criteria_range1, criteria1, [criteria_range2, criteria2]…)
* *
* @category Statistical Functions
*
* @param mixed $args Criterias * @param mixed $args Criterias
* *
* @return int * @return int
@ -1295,7 +1277,7 @@ class Statistical
* *
* @return int|string * @return int|string
* *
* @todo Warning. This implementation differs from the algorithm detailed on the MS * @TODO Warning. This implementation differs from the algorithm detailed on the MS
* web site in that $CumPGuessMinus1 = $CumPGuess - 1 rather than $CumPGuess - $PGuess * web site in that $CumPGuessMinus1 = $CumPGuess - 1 rather than $CumPGuess - $PGuess
* This eliminates a potential endless loop error, but may have an adverse affect on the * This eliminates a potential endless loop error, but may have an adverse affect on the
* accuracy of the function (although all my tests have so far returned correct results). * accuracy of the function (although all my tests have so far returned correct results).
@ -1416,8 +1398,6 @@ class Statistical
* Excel Function: * Excel Function:
* DEVSQ(value1[,value2[, ...]]) * DEVSQ(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string * @return float|string
@ -1707,8 +1687,6 @@ class Statistical
* Excel Function: * Excel Function:
* GEOMEAN(value1[,value2[, ...]]) * GEOMEAN(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string * @return float|string
@ -1769,8 +1747,6 @@ class Statistical
* Excel Function: * Excel Function:
* HARMEAN(value1[,value2[, ...]]) * HARMEAN(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string * @return float|string
@ -1924,8 +1900,6 @@ class Statistical
* Excel Function: * Excel Function:
* LARGE(value1[,value2[, ...]],entry) * LARGE(value1[,value2[, ...]],entry)
* *
* @category Statistical Functions
*
* @param mixed $args Data values * @param mixed $args Data values
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
@ -2093,7 +2067,7 @@ class Statistical
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
* *
* @todo Try implementing P J Acklam's refinement algorithm for greater * @TODO Try implementing P J Acklam's refinement algorithm for greater
* accuracy if I can get my head round the mathematics * accuracy if I can get my head round the mathematics
* (as described at) http://home.online.no/~pjacklam/notes/invnorm/ * (as described at) http://home.online.no/~pjacklam/notes/invnorm/
*/ */
@ -2152,8 +2126,6 @@ class Statistical
* Excel Function: * Excel Function:
* MAX(value1[,value2[, ...]]) * MAX(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -2188,8 +2160,6 @@ class Statistical
* Excel Function: * Excel Function:
* MAXA(value1[,value2[, ...]]) * MAXA(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -2229,8 +2199,6 @@ class Statistical
* Excel Function: * Excel Function:
* MAXIFS(max_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...) * MAXIFS(max_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...)
* *
* @category Statistical Functions
*
* @param mixed $args Data range and criterias * @param mixed $args Data range and criterias
* *
* @return float * @return float
@ -2288,8 +2256,6 @@ class Statistical
* Excel Function: * Excel Function:
* MEDIAN(value1[,value2[, ...]]) * MEDIAN(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
@ -2332,8 +2298,6 @@ class Statistical
* Excel Function: * Excel Function:
* MIN(value1[,value2[, ...]]) * MIN(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -2368,8 +2332,6 @@ class Statistical
* Excel Function: * Excel Function:
* MINA(value1[,value2[, ...]]) * MINA(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -2409,8 +2371,6 @@ class Statistical
* Excel Function: * Excel Function:
* MINIFS(min_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...) * MINIFS(min_range, criteria_range1, criteria1, [criteria_range2, criteria2], ...)
* *
* @category Statistical Functions
*
* @param mixed $args Data range and criterias * @param mixed $args Data range and criterias
* *
* @return float * @return float
@ -2517,8 +2477,6 @@ class Statistical
* Excel Function: * Excel Function:
* MODE(value1[,value2[, ...]]) * MODE(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
@ -2691,8 +2649,6 @@ class Statistical
* Excel Function: * Excel Function:
* PERCENTILE(value1[,value2[, ...]],entry) * PERCENTILE(value1[,value2[, ...]],entry)
* *
* @category Statistical Functions
*
* @param mixed $args Data values * @param mixed $args Data values
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
@ -2860,8 +2816,6 @@ class Statistical
* Excel Function: * Excel Function:
* QUARTILE(value1[,value2[, ...]],entry) * QUARTILE(value1[,value2[, ...]],entry)
* *
* @category Statistical Functions
*
* @param mixed $args Data values * @param mixed $args Data values
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
@ -3027,8 +2981,6 @@ class Statistical
* Excel Function: * Excel Function:
* SMALL(value1[,value2[, ...]],entry) * SMALL(value1[,value2[, ...]],entry)
* *
* @category Statistical Functions
*
* @param mixed $args Data values * @param mixed $args Data values
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
@ -3098,8 +3050,6 @@ class Statistical
* Excel Function: * Excel Function:
* STDEV(value1[,value2[, ...]]) * STDEV(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string The result, or a string containing an error * @return float|string The result, or a string containing an error
@ -3147,8 +3097,6 @@ class Statistical
* Excel Function: * Excel Function:
* STDEVA(value1[,value2[, ...]]) * STDEVA(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string * @return float|string
@ -3199,8 +3147,6 @@ class Statistical
* Excel Function: * Excel Function:
* STDEVP(value1[,value2[, ...]]) * STDEVP(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string * @return float|string
@ -3246,8 +3192,6 @@ class Statistical
* Excel Function: * Excel Function:
* STDEVPA(value1[,value2[, ...]]) * STDEVPA(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float|string * @return float|string
@ -3484,8 +3428,6 @@ class Statistical
* Excel Function: * Excel Function:
* TRIMEAN(value1[,value2[, ...]], $discard) * TRIMEAN(value1[,value2[, ...]], $discard)
* *
* @category Statistical Functions
*
* @param mixed $args Data values * @param mixed $args Data values
* *
* @return float|string * @return float|string
@ -3529,8 +3471,6 @@ class Statistical
* Excel Function: * Excel Function:
* VAR(value1[,value2[, ...]]) * VAR(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -3573,8 +3513,6 @@ class Statistical
* Excel Function: * Excel Function:
* VARA(value1[,value2[, ...]]) * VARA(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -3626,8 +3564,6 @@ class Statistical
* Excel Function: * Excel Function:
* VARP(value1[,value2[, ...]]) * VARP(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float
@ -3671,8 +3607,6 @@ class Statistical
* Excel Function: * Excel Function:
* VARPA(value1[,value2[, ...]]) * VARPA(value1[,value2[, ...]])
* *
* @category Statistical Functions
*
* @param mixed ...$args Data values * @param mixed ...$args Data values
* *
* @return float * @return float

2
src/PhpSpreadsheet/Shared/OLE.php
View File

@ -38,8 +38,6 @@ $GLOBALS['_OLE_INSTANCES'] = [];
* *
* @author Xavier Noguer <xnoguer@php.net> * @author Xavier Noguer <xnoguer@php.net>
* @author Christian Schmidt <schmidt@php.net> * @author Christian Schmidt <schmidt@php.net>
*
* @category PhpSpreadsheet
*/ */
class OLE class OLE
{ {

2
src/PhpSpreadsheet/Shared/OLE/PPS.php
View File

@ -26,8 +26,6 @@ use PhpOffice\PhpSpreadsheet\Shared\OLE;
* Class for creating PPS's for OLE containers. * Class for creating PPS's for OLE containers.
* *
* @author Xavier Noguer <xnoguer@php.net> * @author Xavier Noguer <xnoguer@php.net>
*
* @category PhpSpreadsheet
*/ */
class PPS class PPS
{ {

2
src/PhpSpreadsheet/Shared/OLE/PPS/File.php
View File

@ -27,8 +27,6 @@ use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
* Class for creating File PPS's for OLE containers. * Class for creating File PPS's for OLE containers.
* *
* @author Xavier Noguer <xnoguer@php.net> * @author Xavier Noguer <xnoguer@php.net>
*
* @category PhpSpreadsheet
*/ */
class File extends PPS class File extends PPS
{ {

2
src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
View File

@ -27,8 +27,6 @@ use PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
* Class for creating Root PPS's for OLE containers. * Class for creating Root PPS's for OLE containers.
* *
* @author Xavier Noguer <xnoguer@php.net> * @author Xavier Noguer <xnoguer@php.net>
*
* @category PhpSpreadsheet
*/ */
class Root extends PPS class Root extends PPS
{ {

4
src/PhpSpreadsheet/Worksheet/PageSetup.php
View File

@ -76,10 +76,6 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
* 67 = A3 transverse paper (297 mm by 420 mm) * 67 = A3 transverse paper (297 mm by 420 mm)
* 68 = A3 extra transverse paper (322 mm by 445 mm) * 68 = A3 extra transverse paper (322 mm by 445 mm)
* </code> * </code>
*
* @category PhpSpreadsheet
*
* @copyright Copyright (c) 2006 - 2016 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
*/ */
class PageSetup class PageSetup
{ {

2
src/PhpSpreadsheet/Writer/Html.php
View File

@ -1448,8 +1448,6 @@ class Html extends BaseWriter
* @param int $pRow Row number (0-based) * @param int $pRow Row number (0-based)
* @param string $cellType eg: 'td' * @param string $cellType eg: 'td'
* *
* @throws WriterException
*
* @return string * @return string
*/ */
private function generateRow(Worksheet $pSheet, array $pValues, $pRow, $cellType) private function generateRow(Worksheet $pSheet, array $pValues, $pRow, $cellType)

3
src/PhpSpreadsheet/Writer/Ods/Cell/Comment.php
View File

@ -6,9 +6,6 @@ use PhpOffice\PhpSpreadsheet\Cell\Cell;
use PhpOffice\PhpSpreadsheet\Shared\XMLWriter; use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
/** /**
* @category PhpSpreadsheet
*
* @copyright Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
* @author Alexander Pervakov <frost-nzcr4@jagmort.com> * @author Alexander Pervakov <frost-nzcr4@jagmort.com>
*/ */
class Comment class Comment

6
src/PhpSpreadsheet/Writer/Ods/Content.php
View File

@ -12,15 +12,9 @@ use PhpOffice\PhpSpreadsheet\Style\Font;
use PhpOffice\PhpSpreadsheet\Worksheet\Row; use PhpOffice\PhpSpreadsheet\Worksheet\Row;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
use PhpOffice\PhpSpreadsheet\Writer\Exception; use PhpOffice\PhpSpreadsheet\Writer\Exception;
use PhpOffice\PhpSpreadsheet\Writer\Ods;
use PhpOffice\PhpSpreadsheet\Writer\Ods\Cell\Comment; use PhpOffice\PhpSpreadsheet\Writer\Ods\Cell\Comment;
/** /**
* @category PhpSpreadsheet
*
* @method Ods getParentWriter
*
* @copyright Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
* @author Alexander Pervakov <frost-nzcr4@jagmort.com> * @author Alexander Pervakov <frost-nzcr4@jagmort.com>
*/ */
class Content extends WriterPart class Content extends WriterPart

100
src/PhpSpreadsheet/Writer/Xls/Worksheet.php
View File

@ -538,7 +538,7 @@ class Worksheet extends BIFFwriter
$arrConditionalStyles = $phpSheet->getConditionalStylesCollection(); $arrConditionalStyles = $phpSheet->getConditionalStylesCollection();
if (!empty($arrConditionalStyles)) { if (!empty($arrConditionalStyles)) {
$arrConditional = []; $arrConditional = [];
// @todo CFRule & CFHeader // @TODO CFRule & CFHeader
// Write CFHEADER record // Write CFHEADER record
$this->writeCFHeader(); $this->writeCFHeader();
// Write ConditionalFormattingTable records // Write ConditionalFormattingTable records
@ -607,6 +607,7 @@ class Worksheet extends BIFFwriter
return $tmp; return $tmp;
} }
// No data to return // No data to return
return false; return false;
} }
@ -881,8 +882,8 @@ class Worksheet extends BIFFwriter
$header = pack('vv', $record, $length); $header = pack('vv', $record, $length);
$data = pack('vvv', $row, $col, $xfIndex) $data = pack('vvv', $row, $col, $xfIndex)
. $num . $num
. pack('vVv', $grbit, $unknown, $formlen); . pack('vVv', $grbit, $unknown, $formlen);
$this->append($header . $data . $formula); $this->append($header . $data . $formula);
// Append also a STRING record if necessary // Append also a STRING record if necessary
@ -945,8 +946,6 @@ class Worksheet extends BIFFwriter
* to be written. These are either, Web (http, ftp, mailto), Internal * to be written. These are either, Web (http, ftp, mailto), Internal
* (Sheet1!A1) or external ('c:\temp\foo.xls#Sheet1!A1'). * (Sheet1!A1) or external ('c:\temp\foo.xls#Sheet1!A1').
* *
* @see writeUrl()
*
* @param int $row1 Start row * @param int $row1 Start row
* @param int $col1 Start column * @param int $col1 Start column
* @param int $row2 End row * @param int $row2 End row
@ -954,6 +953,8 @@ class Worksheet extends BIFFwriter
* @param string $url URL string * @param string $url URL string
* *
* @return int * @return int
*
* @see writeUrl()
*/ */
public function writeUrlRange($row1, $col1, $row2, $col2, $url) public function writeUrlRange($row1, $col1, $row2, $col2, $url)
{ {
@ -973,8 +974,6 @@ class Worksheet extends BIFFwriter
* The link type ($options) is 0x03 is the same as absolute dir ref without * The link type ($options) is 0x03 is the same as absolute dir ref without
* sheet. However it is differentiated by the $unknown2 data stream. * sheet. However it is differentiated by the $unknown2 data stream.
* *
* @see writeUrl()
*
* @param int $row1 Start row * @param int $row1 Start row
* @param int $col1 Start column * @param int $col1 Start column
* @param int $row2 End row * @param int $row2 End row
@ -982,6 +981,8 @@ class Worksheet extends BIFFwriter
* @param string $url URL string * @param string $url URL string
* *
* @return int * @return int
*
* @see writeUrl()
*/ */
public function writeUrlWeb($row1, $col1, $row2, $col2, $url) public function writeUrlWeb($row1, $col1, $row2, $col2, $url)
{ {
@ -1018,8 +1019,6 @@ class Worksheet extends BIFFwriter
/** /**
* Used to write internal reference hyperlinks such as "Sheet1!A1". * Used to write internal reference hyperlinks such as "Sheet1!A1".
* *
* @see writeUrl()
*
* @param int $row1 Start row * @param int $row1 Start row
* @param int $col1 Start column * @param int $col1 Start column
* @param int $row2 End row * @param int $row2 End row
@ -1027,6 +1026,8 @@ class Worksheet extends BIFFwriter
* @param string $url URL string * @param string $url URL string
* *
* @return int * @return int
*
* @see writeUrl()
*/ */
public function writeUrlInternal($row1, $col1, $row2, $col2, $url) public function writeUrlInternal($row1, $col1, $row2, $col2, $url)
{ {
@ -1071,8 +1072,6 @@ class Worksheet extends BIFFwriter
* Note: Excel writes some relative links with the $dir_long string. We ignore * Note: Excel writes some relative links with the $dir_long string. We ignore
* these cases for the sake of simpler code. * these cases for the sake of simpler code.
* *
* @see writeUrl()
*
* @param int $row1 Start row * @param int $row1 Start row
* @param int $col1 Start column * @param int $col1 Start column
* @param int $row2 End row * @param int $row2 End row
@ -1080,6 +1079,8 @@ class Worksheet extends BIFFwriter
* @param string $url URL string * @param string $url URL string
* *
* @return int * @return int
*
* @see writeUrl()
*/ */
public function writeUrlExternal($row1, $col1, $row2, $col2, $url) public function writeUrlExternal($row1, $col1, $row2, $col2, $url)
{ {
@ -1142,14 +1143,14 @@ class Worksheet extends BIFFwriter
// Pack the main data stream // Pack the main data stream
$data = pack('vvvv', $row1, $row2, $col1, $col2) . $data = pack('vvvv', $row1, $row2, $col1, $col2) .
$unknown1 . $unknown1 .
$link_type . $link_type .
$unknown2 . $unknown2 .
$up_count . $up_count .
$dir_short_len . $dir_short_len .
$dir_short . $dir_short .
$unknown3 . $unknown3 .
$stream_len; /*. $stream_len; /*.
$dir_long_len . $dir_long_len .
$unknown4 . $unknown4 .
$dir_long . $dir_long .
@ -1534,20 +1535,20 @@ class Worksheet extends BIFFwriter
// prepare options // prepare options
$options = (int) !$this->phpSheet->getProtection()->getObjects() $options = (int) !$this->phpSheet->getProtection()->getObjects()
| (int) !$this->phpSheet->getProtection()->getScenarios() << 1 | (int) !$this->phpSheet->getProtection()->getScenarios() << 1
| (int) !$this->phpSheet->getProtection()->getFormatCells() << 2 | (int) !$this->phpSheet->getProtection()->getFormatCells() << 2
| (int) !$this->phpSheet->getProtection()->getFormatColumns() << 3 | (int) !$this->phpSheet->getProtection()->getFormatColumns() << 3
| (int) !$this->phpSheet->getProtection()->getFormatRows() << 4 | (int) !$this->phpSheet->getProtection()->getFormatRows() << 4
| (int) !$this->phpSheet->getProtection()->getInsertColumns() << 5 | (int) !$this->phpSheet->getProtection()->getInsertColumns() << 5
| (int) !$this->phpSheet->getProtection()->getInsertRows() << 6 | (int) !$this->phpSheet->getProtection()->getInsertRows() << 6
| (int) !$this->phpSheet->getProtection()->getInsertHyperlinks() << 7 | (int) !$this->phpSheet->getProtection()->getInsertHyperlinks() << 7
| (int) !$this->phpSheet->getProtection()->getDeleteColumns() << 8 | (int) !$this->phpSheet->getProtection()->getDeleteColumns() << 8
| (int) !$this->phpSheet->getProtection()->getDeleteRows() << 9 | (int) !$this->phpSheet->getProtection()->getDeleteRows() << 9
| (int) !$this->phpSheet->getProtection()->getSelectLockedCells() << 10 | (int) !$this->phpSheet->getProtection()->getSelectLockedCells() << 10
| (int) !$this->phpSheet->getProtection()->getSort() << 11 | (int) !$this->phpSheet->getProtection()->getSort() << 11
| (int) !$this->phpSheet->getProtection()->getAutoFilter() << 12 | (int) !$this->phpSheet->getProtection()->getAutoFilter() << 12
| (int) !$this->phpSheet->getProtection()->getPivotTables() << 13 | (int) !$this->phpSheet->getProtection()->getPivotTables() << 13
| (int) !$this->phpSheet->getProtection()->getSelectUnlockedCells() << 14; | (int) !$this->phpSheet->getProtection()->getSelectUnlockedCells() << 14;
// record data // record data
$recordData = pack( $recordData = pack(
@ -3014,7 +3015,7 @@ class Worksheet extends BIFFwriter
$operatorType = 0x01; $operatorType = 0x01;
break; break;
// not OPERATOR_NOTBETWEEN 0x02 // not OPERATOR_NOTBETWEEN 0x02
} }
} }
@ -3062,13 +3063,13 @@ class Worksheet extends BIFFwriter
} }
// Border // Border
$bBorderLeft = ($conditional->getStyle()->getBorders()->getLeft()->getColor()->getARGB() == Color::COLOR_BLACK $bBorderLeft = ($conditional->getStyle()->getBorders()->getLeft()->getColor()->getARGB() == Color::COLOR_BLACK
&& $conditional->getStyle()->getBorders()->getLeft()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0); && $conditional->getStyle()->getBorders()->getLeft()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0);
$bBorderRight = ($conditional->getStyle()->getBorders()->getRight()->getColor()->getARGB() == Color::COLOR_BLACK $bBorderRight = ($conditional->getStyle()->getBorders()->getRight()->getColor()->getARGB() == Color::COLOR_BLACK
&& $conditional->getStyle()->getBorders()->getRight()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0); && $conditional->getStyle()->getBorders()->getRight()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0);
$bBorderTop = ($conditional->getStyle()->getBorders()->getTop()->getColor()->getARGB() == Color::COLOR_BLACK $bBorderTop = ($conditional->getStyle()->getBorders()->getTop()->getColor()->getARGB() == Color::COLOR_BLACK
&& $conditional->getStyle()->getBorders()->getTop()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0); && $conditional->getStyle()->getBorders()->getTop()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0);
$bBorderBottom = ($conditional->getStyle()->getBorders()->getBottom()->getColor()->getARGB() == Color::COLOR_BLACK $bBorderBottom = ($conditional->getStyle()->getBorders()->getBottom()->getColor()->getARGB() == Color::COLOR_BLACK
&& $conditional->getStyle()->getBorders()->getBottom()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0); && $conditional->getStyle()->getBorders()->getBottom()->getBorderStyle() == Border::BORDER_NONE ? 1 : 0);
if ($bBorderLeft == 0 || $bBorderRight == 0 || $bBorderTop == 0 || $bBorderBottom == 0) { if ($bBorderLeft == 0 || $bBorderRight == 0 || $bBorderTop == 0 || $bBorderBottom == 0) {
$bFormatBorder = 1; $bFormatBorder = 1;
} else { } else {
@ -3767,16 +3768,15 @@ class Worksheet extends BIFFwriter
break; break;
} }
/**
*@todo writeCFRule() => $blockLineStyle => Index Color for left line // TODO writeCFRule() => $blockLineStyle => Index Color for left line
*@todo writeCFRule() => $blockLineStyle => Index Color for right line // TODO writeCFRule() => $blockLineStyle => Index Color for right line
*@todo writeCFRule() => $blockLineStyle => Top-left to bottom-right on/off // TODO writeCFRule() => $blockLineStyle => Top-left to bottom-right on/off
*@todo writeCFRule() => $blockLineStyle => Bottom-left to top-right on/off // TODO writeCFRule() => $blockLineStyle => Bottom-left to top-right on/off
*/
$blockColor = 0; $blockColor = 0;
//@todo writeCFRule() => $blockColor => Index Color for top line // TODO writeCFRule() => $blockColor => Index Color for top line
//@todo writeCFRule() => $blockColor => Index Color for bottom line // TODO writeCFRule() => $blockColor => Index Color for bottom line
//@todo writeCFRule() => $blockColor => Index Color for diagonal line // TODO writeCFRule() => $blockColor => Index Color for diagonal line
switch ($conditional->getStyle()->getBorders()->getDiagonal()->getBorderStyle()) { switch ($conditional->getStyle()->getBorders()->getDiagonal()->getBorderStyle()) {
case Border::BORDER_NONE: case Border::BORDER_NONE:
$blockColor |= 0x00 << 21; $blockColor |= 0x00 << 21;
@ -4157,7 +4157,7 @@ class Worksheet extends BIFFwriter
break; break;
default: default:
$colorIdxBg = 0x41; $colorIdxBg = 0x41;
break; break;
} }
@ -4388,7 +4388,7 @@ class Worksheet extends BIFFwriter
break; break;
default: default:
$colorIdxFg = 0x40; $colorIdxFg = 0x40;
break; break;
} }
@ -4447,7 +4447,7 @@ class Worksheet extends BIFFwriter
foreach ($this->phpSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) { foreach ($this->phpSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
foreach ($conditionalStyles as $conditional) { foreach ($conditionalStyles as $conditional) {
if ($conditional->getConditionType() == Conditional::CONDITION_EXPRESSION if ($conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
|| $conditional->getConditionType() == Conditional::CONDITION_CELLIS) { || $conditional->getConditionType() == Conditional::CONDITION_CELLIS) {
if (!in_array($conditional->getHashCode(), $arrConditional)) { if (!in_array($conditional->getHashCode(), $arrConditional)) {
$arrConditional[] = $conditional->getHashCode(); $arrConditional[] = $conditional->getHashCode();
} }

5
src/PhpSpreadsheet/Writer/Xlsx/Theme.php
View File

@ -5,11 +5,6 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
use PhpOffice\PhpSpreadsheet\Shared\XMLWriter; use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Spreadsheet;
/**
* @category PhpSpreadsheet
*
* @copyright Copyright (c) 2006 - 2016 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
*/
class Theme extends WriterPart class Theme extends WriterPart
{ {
/** /**

5
src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
View File

@ -13,11 +13,6 @@ use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule;
use PhpOffice\PhpSpreadsheet\Worksheet\SheetView; use PhpOffice\PhpSpreadsheet\Worksheet\SheetView;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as PhpspreadsheetWorksheet; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as PhpspreadsheetWorksheet;
/**
* @category PhpSpreadsheet
*
* @copyright Copyright (c) 2006 - 2015 PhpSpreadsheet (https://github.com/PHPOffice/PhpSpreadsheet)
*/
class Worksheet extends WriterPart class Worksheet extends WriterPart
{ {
/** /**

2
tests/PhpSpreadsheetTests/Reader/OdsTest.php
View File

@ -10,7 +10,7 @@ use PhpOffice\PhpSpreadsheet\Style\Font;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
/** /**
* @todo The class doesn't read the bold/italic/underline properties (rich text) * @TODO The class doesn't read the bold/italic/underline properties (rich text)
*/ */
class OdsTest extends TestCase class OdsTest extends TestCase
{ {