Skip to content

Merge branch '1.3' of ezsystems/ezplatform-kernel into 4.2 #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alongosz merged 2 commits into from
Oct 18, 2022
Merged

Merge branch '1.3' of ezsystems/ezplatform-kernel into 4.2 #160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6019e73
IBX-3595: Fixed processing timestamps in ibexa:timestamps:to-utc comm…
damianz5 Oct 18, 2022
65e8bd2
Merged branch '1.3' of ezsystems/ezplatform-kernel into 4.2
alongosz Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/bundle/Core/Command/UpdateTimestampsToUTCCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$processScriptFragments[] = '--dry-run';
}

$process = new Process(
implode(' ', $processScriptFragments)
);
$process = new Process($processScriptFragments);

$process->setEnv(['INNER_CALL' => 1]);
$process->run();
Expand Down Expand Up @@ -272,7 +270,7 @@ protected function processTimestamps($offset, $limit, $output)
$dateTimeInUTC->setTimezone(new DateTimeZone('UTC'));

foreach ($timestampBasedFields as $timestampBasedField) {
$timestamp = $timestampBasedField['data_int'];
$timestamp = (int)$timestampBasedField['data_int'];
$dateTimeInUTC->setTimestamp($timestamp);
$newTimestamp = $this->convertToUtcTimestamp($timestamp);

Expand Down Expand Up @@ -373,7 +371,7 @@ protected function convertToUtcTimestamp($timestamp)
$dateTimeZone = new DateTimeZone($this->timezone);
$dateTimeZoneUTC = new DateTimeZone('UTC');

$dateTime = new DateTime(null, $dateTimeZone);
$dateTime = new DateTime('now', $dateTimeZone);
$dateTime->setTimestamp($timestamp);
$dateTimeUTC = new DateTime($dateTime->format('Y-m-d H:i:s'), $dateTimeZoneUTC);

Expand Down