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

Fix a couple of errors introduced with the last namespace changes

This commit is contained in:
MarkBaker 2015-05-30 16:54:51 +01:00
parent 621fc9aec7
commit a39e15f49d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace class PHPExcel\Shared\Escher\DgContainer; namespace PHPExcel\Shared\Escher\DgContainer;
/** /**
* PHPExcel_Shared_Escher_DgContainer_SpgrContainer * PHPExcel_Shared_Escher_DgContainer_SpgrContainer

6
src/PhpSpreadsheet/Shared/TimeZone.php
View File

@ -43,7 +43,7 @@ class TimeZone
* @param string $timezone Time zone (e.g. 'Europe/London') * @param string $timezone Time zone (e.g. 'Europe/London')
* @return boolean Success or failure * @return boolean Success or failure
*/ */
public static function _validateTimeZone($timezone) private static function validateTimeZone($timezone)
{ {
if (in_array($timezone, DateTimeZone::listIdentifiers())) { if (in_array($timezone, DateTimeZone::listIdentifiers())) {
return true; return true;
@ -59,7 +59,7 @@ class TimeZone
*/ */
public static function setTimeZone($timezone) public static function setTimeZone($timezone)
{ {
if (self::_validateTimezone($timezone)) { if (self::validateTimezone($timezone)) {
self::$timezone = $timezone; self::$timezone = $timezone;
return true; return true;
} }
@ -114,7 +114,7 @@ class TimeZone
public static function getTimeZoneAdjustment($timezone, $timestamp) public static function getTimeZoneAdjustment($timezone, $timestamp)
{ {
if ($timezone !== null) { if ($timezone !== null) {
if (!self::_validateTimezone($timezone)) { if (!self::validateTimezone($timezone)) {
throw new \PHPExcel\Exception("Invalid timezone " . $timezone); throw new \PHPExcel\Exception("Invalid timezone " . $timezone);
} }
} else { } else {