fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM-4245 "Strict Error Message: ProcessMaker\\Util\\DateTime..." SOLVED

Browse Source 
Issue:
    Strict Error Message: ProcessMaker\\Util\\DateTime::convertDataToTimeZone() should not be called statically
Cause:
    Llamada invalida de un metodo publico desde un metodo estatico
Solution:
    Se instancia un objeto para las llamadas a los metodos publicos
This commit is contained in:
Victor Saisa Lopez
2015-11-30 14:30:42 -04:00
parent cbf285ba7e
commit 41db9044a8
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/src/ProcessMaker/Util/DateTime.php
View File

@@ -38,7 +38,7 @@ class DateTime
{ {
try { try {
foreach (\DateTimeZone::listIdentifiers() as $value) { foreach (\DateTimeZone::listIdentifiers() as $value) {
$timeZoneOffset = self::getTimeZoneOffsetByTimeZoneId($value); $timeZoneOffset = $this->getTimeZoneOffsetByTimeZoneId($value);
if ($timeZoneOffset !== false && $timeZoneOffset == $offset) { if ($timeZoneOffset !== false && $timeZoneOffset == $offset) {
//Return //Return
@@ -75,7 +75,7 @@ class DateTime
$offset = (($sign == '+')? '' : '-') . (($h * 60 * 60) + ($m * 60)); //Convert UTC Offset to seconds $offset = (($sign == '+')? '' : '-') . (($h * 60 * 60) + ($m * 60)); //Convert UTC Offset to seconds
//Return //Return
return self::getTimeZoneIdByTimeZoneOffset((int)($offset)); return $this->getTimeZoneIdByTimeZoneOffset((int)($offset));
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;
} }
@@ -119,7 +119,7 @@ class DateTime
$fromTimeZone = 'UTC'; $fromTimeZone = 'UTC';
if (preg_match('/^.+([\+\-]\d{2}:\d{2})$/', $dateIso8601, $arrayMatch)) { if (preg_match('/^.+([\+\-]\d{2}:\d{2})$/', $dateIso8601, $arrayMatch)) {
$fromTimeZone = self::getTimeZoneIdByUtcOffset($arrayMatch[1]); $fromTimeZone = $this->getTimeZoneIdByUtcOffset($arrayMatch[1]);
} }
$dt = \DateTime::createFromFormat(self::ISO8601, $dateIso8601, new \DateTimeZone($fromTimeZone)); //From ISO-8601 $dt = \DateTime::createFromFormat(self::ISO8601, $dateIso8601, new \DateTimeZone($fromTimeZone)); //From ISO-8601
@@ -158,12 +158,12 @@ class DateTime
case 'string': case 'string':
if (is_string($data) && preg_match($regexpDatetime, $data)) { if (is_string($data) && preg_match($regexpDatetime, $data)) {
if ($fromTimeZone != $toTimeZone) { if ($fromTimeZone != $toTimeZone) {
$data = self::convertTimeZone($data, $fromTimeZone, $toTimeZone, $format); $data = $this->convertTimeZone($data, $fromTimeZone, $toTimeZone, $format);
} }
} }
if (is_string($data) && preg_match($regexpIso8601, $data)) { if (is_string($data) && preg_match($regexpIso8601, $data)) {
$data = self::convertIso8601ToTimeZone($data, $toTimeZone, $format); $data = $this->convertIso8601ToTimeZone($data, $toTimeZone, $format);
} }
break; break;
case 'array': case 'array':
@@ -177,12 +177,12 @@ class DateTime
if ($arrayData['regexpKey'] == '' || preg_match($arrayData['regexpKey'], $key)) { if ($arrayData['regexpKey'] == '' || preg_match($arrayData['regexpKey'], $key)) {
if (is_string($value) && preg_match($arrayData['regexpDatetime'], $value)) { if (is_string($value) && preg_match($arrayData['regexpDatetime'], $value)) {
if ($arrayData['fromTimeZone'] != $arrayData['toTimeZone']) { if ($arrayData['fromTimeZone'] != $arrayData['toTimeZone']) {
$value = self::convertTimeZone($value, $arrayData['fromTimeZone'], $arrayData['toTimeZone'], $arrayData['format']); $value = $this->convertTimeZone($value, $arrayData['fromTimeZone'], $arrayData['toTimeZone'], $arrayData['format']);
} }
} }
if (is_string($value) && preg_match($arrayData['regexpIso8601'], $value)) { if (is_string($value) && preg_match($arrayData['regexpIso8601'], $value)) {
$value = self::convertIso8601ToTimeZone($value, $arrayData['toTimeZone'], $arrayData['format']); $value = $this->convertIso8601ToTimeZone($value, $arrayData['toTimeZone'], $arrayData['format']);
} }
} }
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -194,7 +194,7 @@ class DateTime
break; break;
case 'object': case 'object':
$data = json_decode(json_encode($data), true); $data = json_decode(json_encode($data), true);
$data = self::convertDataToTimeZone($data, $fromTimeZone, $toTimeZone, $arrayKey, $format); $data = $this->convertDataToTimeZone($data, $fromTimeZone, $toTimeZone, $arrayKey, $format);
$data = json_decode(json_encode($data)); $data = json_decode(json_encode($data));
break; break;
} }
@@ -230,7 +230,7 @@ class DateTime
case 'string': case 'string':
if (is_string($data) && preg_match($regexpDatetime, $data)) { if (is_string($data) && preg_match($regexpDatetime, $data)) {
if ($fromTimeZone != $toTimeZone) { if ($fromTimeZone != $toTimeZone) {
$data = self::convertTimeZone($data, $fromTimeZone, $toTimeZone); $data = $this->convertTimeZone($data, $fromTimeZone, $toTimeZone);
} }
$dt = \DateTime::createFromFormat('Y-m-d H:i:s', $data, new \DateTimeZone($toTimeZone)); $dt = \DateTime::createFromFormat('Y-m-d H:i:s', $data, new \DateTimeZone($toTimeZone));
@@ -250,7 +250,7 @@ class DateTime
is_string($value) && preg_match($arrayData['regexpDatetime'], $value) is_string($value) && preg_match($arrayData['regexpDatetime'], $value)
) { ) {
if ($arrayData['fromTimeZone'] != $arrayData['toTimeZone']) { if ($arrayData['fromTimeZone'] != $arrayData['toTimeZone']) {
$value = self::convertTimeZone($value, $arrayData['fromTimeZone'], $arrayData['toTimeZone']); $value = $this->convertTimeZone($value, $arrayData['fromTimeZone'], $arrayData['toTimeZone']);
} }
$dt = \DateTime::createFromFormat('Y-m-d H:i:s', $value, new \DateTimeZone($arrayData['toTimeZone'])); $dt = \DateTime::createFromFormat('Y-m-d H:i:s', $value, new \DateTimeZone($arrayData['toTimeZone']));
@@ -266,7 +266,7 @@ class DateTime
break; break;
case 'object': case 'object':
$data = json_decode(json_encode($data), true); $data = json_decode(json_encode($data), true);
$data = self::convertDataToIso8601($data, $fromTimeZone, $toTimeZone, $arrayKey); $data = $this->convertDataToIso8601($data, $fromTimeZone, $toTimeZone, $arrayKey);
$data = json_decode(json_encode($data)); $data = json_decode(json_encode($data));
break; break;
} }
@@ -299,7 +299,7 @@ class DateTime
$toTimeZone = 'UTC'; $toTimeZone = 'UTC';
//Return //Return
return self::convertDataToTimeZone($data, $fromTimeZone, $toTimeZone, $arrayKey, $format); return (new \ProcessMaker\Util\DateTime())->convertDataToTimeZone($data, $fromTimeZone, $toTimeZone, $arrayKey, $format);
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;
} }
@@ -326,7 +326,7 @@ class DateTime
$toTimeZone = \ProcessMaker\BusinessModel\User::getUserLoggedTimeZone(); $toTimeZone = \ProcessMaker\BusinessModel\User::getUserLoggedTimeZone();
//Return //Return
return self::convertDataToTimeZone($data, $fromTimeZone, $toTimeZone, $arrayKey, $format); return (new \ProcessMaker\Util\DateTime())->convertDataToTimeZone($data, $fromTimeZone, $toTimeZone, $arrayKey, $format);
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;
} }
@@ -352,7 +352,7 @@ class DateTime
$toTimeZone = \ProcessMaker\BusinessModel\User::getUserLoggedTimeZone(); $toTimeZone = \ProcessMaker\BusinessModel\User::getUserLoggedTimeZone();
//Return //Return
return self::convertDataToIso8601($data, $fromTimeZone, $toTimeZone, $arrayKey); return (new \ProcessMaker\Util\DateTime())->convertDataToIso8601($data, $fromTimeZone, $toTimeZone, $arrayKey);
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;
} }