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

Merge branch 'develop' into feature/gh-17

This commit is contained in:
MarkBaker 2016-08-13 16:59:03 +01:00
parent 8569f04090 80af21d962
commit fd2df82faf
13 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -1,29 +1,31 @@
language: php
php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm
matrix:
allow_failures:
- php: 7.1
- php: hhvm
cache:
directories:
- vendor
- $HOME/.composer/cache
before_script:
## Packages
- sudo apt-get -qq update > /dev/null
## Composer
- composer self-update
- composer install --prefer-source --dev
- phpenv global "$TRAVIS_PHP_VERSION"
- composer install
script:
## PHP_CodeSniffer
- ./vendor/bin/phpcs --report-width=200 --report-summary --report-full src/ unitTests/ --standard=PSR2 -n
## PHPUnit
- ./vendor/bin/phpunit -c ./unitTests/
notifications:
email: false

1
src/PhpSpreadsheet/Calculation/TextData.php
View File

@ -215,7 +215,6 @@ class TextData
}
return \PHPExcel\Style\NumberFormat::toFormattedString($value, $mask);
}

2
src/PhpSpreadsheet/Document/Properties.php
View File

@ -427,7 +427,6 @@ class Properties
if (isset($this->customProperties[$propertyName])) {
return $this->customProperties[$propertyName]['value'];
}
}
/**
@ -441,7 +440,6 @@ class Properties
if (isset($this->customProperties[$propertyName])) {
return $this->customProperties[$propertyName]['type'];
}
}
/**

3
src/PhpSpreadsheet/Reader/Excel5.php
View File

@ -1628,7 +1628,6 @@ class Excel5 extends BaseReader implements IReader
// ->setAuthor($author)
}
}
}
@ -2503,7 +2502,6 @@ class Excel5 extends BaseReader implements IReader
$offset += $cb;
}
}
}
@ -5258,7 +5256,6 @@ class Excel5 extends BaseReader implements IReader
);
return $splicedData;
}

52
src/PhpSpreadsheet/Shared/Date.php
View File

@ -33,6 +33,39 @@ class Date
const CALENDAR_WINDOWS_1900 = 1900; // Base date of 1st Jan 1900 = 1.0
const CALENDAR_MAC_1904 = 1904; // Base date of 2nd Jan 1904 = 1.0
/*
* Names of the months of the year, indexed by shortname
* Planned usage for locale settings
*
* @public
* @var string[]
*/
public static $monthNames = [
'Jan' => 'January',
'Feb' => 'February',
'Mar' => 'March',
'Apr' => 'April',
'May' => 'May',
'Jun' => 'June',
'Jul' => 'July',
'Aug' => 'August',
'Sep' => 'September',
'Oct' => 'October',
'Nov' => 'November',
'Dec' => 'December',
];
/*
* @public
* @var string[]
*/
public static $numberSuffixes = [
'st',
'nd',
'rd',
'th',
];
/*
* Base calendar year to use for calculations
* Value is either CALENDAR_WINDOWS_1900 (1900) or CALENDAR_MAC_1904 (1904)
@ -112,7 +145,8 @@ class Date
* @return \DateTimeZone The timezone as a timezone object
* @throws \Exception
*/
protected static function validateTimeZone($timeZone) {
protected static function validateTimeZone($timeZone)
{
if (is_object($timeZone) && $timeZone instanceof \DateTimeZone) {
return $timeZone;
} elseif (is_string($timeZone)) {
@ -130,14 +164,15 @@ class Date
* @return \DateTime PHP date/time object
* @throws \Exception
*/
public static function excelToDateTimeObject($excelTimestamp = 0, $timeZone = null) {
public static function excelToDateTimeObject($excelTimestamp = 0, $timeZone = null)
{
$timeZone = ($timeZone === null) ? self::getDefaultTimezone() : self::validateTimeZone($timeZone);
if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) {
$baseDate = ($excelTimestamp < 60) ? new \DateTime('1899-12-31', $timeZone) : new \DateTime('1899-12-30', $timeZone);
} else {
$baseDate = new \DateTime('1904-01-01', $timeZone);
}
$days = floor($excelTimestamp);
$days = floor($excelTimestamp);
$partDay = $excelTimestamp - $days;
$hours = floor($partDay * 24);
$partDay = $partDay * 24 - $hours;
@ -147,9 +182,9 @@ class Date
// $fraction = $partDay - $seconds;
$interval = '+' . $days . ' days';
return $baseDate->modify($interval)
return $baseDate->modify($interval)
->setTime($hours, $minutes, $seconds);
}
}
/**
* Convert a MS serialized datetime value from Excel to a unix timestamp
@ -158,10 +193,11 @@ class Date
* @return integer Unix timetamp for this date/time
* @throws \Exception
*/
public static function excelToTimestamp($excelTimestamp = 0, $timeZone = null) {
return self::excelToDateTimeObject($excelTimestamp, $timeZone)
public static function excelToTimestamp($excelTimestamp = 0, $timeZone = null)
{
return self::excelToDateTimeObject($excelTimestamp, $timeZone)
->format('U');
}
}
/**

1
src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
View File

@ -428,7 +428,6 @@ class SingularValueDecomposition
break;
} // end switch
} // end while
} // end constructor

1
src/PhpSpreadsheet/Spreadsheet.php
View File

@ -563,7 +563,6 @@ class Spreadsheet
($pIndex > count($this->workSheetCollection) - 1)) {
--$this->activeSheetIndex;
}
}
/**

1
src/PhpSpreadsheet/Writer/Excel2007/RelsVBA.php
View File

@ -59,6 +59,5 @@ class RelsVBA extends WriterPart
$objWriter->endElement();
return $objWriter->getData();
}
}

1
src/PhpSpreadsheet/Writer/Excel5/Workbook.php
View File

@ -232,7 +232,6 @@ class Workbook extends BIFFwriter
$this->addColor($phpSheet->getTabColor()->getRGB());
}
}
}
/**

1
src/PhpSpreadsheet/Writer/Excel5/Xf.php
View File

@ -151,7 +151,6 @@ class Xf
$this->rightBorderColor = 0x40;
$this->_diag_color = 0x40;
$this->_style = $style;
}

1
unitTests/Classes/src/Cell/DefaultValueBinderTest.php
View File

@ -26,7 +26,6 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase
$this->cellStub->expects($this->any())
->method('setValueExplicit')
->will($this->returnValue(true));
}
/**

1
unitTests/Classes/src/Shared/TimeZoneTest.php
View File

@ -18,7 +18,6 @@ class TimeZoneTest extends \PHPUnit_Framework_TestCase
$result = call_user_func(array('\PHPExcel\Shared\TimeZone','setTimezone'), $timezoneValue);
$this->assertTrue($result);
}
}
public function testSetTimezoneWithInvalidValue()

1
unitTests/classes/src/SettingsTest.php
View File

@ -25,5 +25,4 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
$result = call_user_func(array('PHPExcel\\Settings','getLibXmlLoaderOptions'));
$this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID) & $result));
}
}