Skip to content

BUGFIX: Comments must not be null when handled to string functions #5698

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

Open
daniellienert wants to merge 4 commits into
base: 9.0
Choose a base branch
from
+21 −35
Open

BUGFIX: Comments must not be null when handled to string functions #5698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1267a5
BUGFIX: Comments must not be null when handled to string functions
daniellienert Dec 6, 2025
71abbed
TASK: Add types for all fields of MigrationConfiguration
daniellienert Dec 13, 2025
484318a
TASK: Fix phpstan complains
daniellienert Dec 16, 2025
6dcd15a
PATCH: Revert adding odd whitespaces
mhsdesign Jan 23, 2026
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
34 changes: 8 additions & 26 deletions Neos.ContentRepository.NodeMigration/src/Command/MigrationConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,14 @@
*/
class MigrationConfiguration
{
/**
* @var string
*/
protected $comments;
protected ?string $comments;

/**
* @var string
*/
protected $warnings;
protected ?string $warnings;

/**
* @var array<int,mixed>
*/
protected $migration;
protected ?array $migration;

/**
* @param array<string,mixed> $configuration
Expand All @@ -44,42 +38,30 @@ public function __construct(array $configuration = [])
$this->migration = $configuration['migration'] ?? null;
}

/**
* @return string
*/
public function getComments()
public function getComments(): ?string
{
return $this->comments;
}

/**
* @return boolean
*/
public function hasComments()
public function hasComments(): bool
{
return ($this->comments !== null);
}

/**
* @return array<int,mixed>
*/
public function getMigration(): array
public function getMigration(): ?array
{
return $this->migration;
}

/**
* @return string
*/
public function getWarnings()
public function getWarnings(): ?string
{
return $this->warnings;
}

/**
* @return boolean
*/
public function hasWarnings()
public function hasWarnings(): bool
{
return ($this->warnings !== null);
}
Expand Down
14 changes: 8 additions & 6 deletions Neos.ContentRepository.NodeMigration/src/NodeMigrationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,14 @@ public function executeMigration(ExecuteMigration $command): void
}

$transformationSteps = TransformationSteps::createEmpty();
foreach ($command->migrationConfiguration->getMigration() as $migrationDescription) {
$transformationSteps = $transformationSteps->merge($this->executeSubMigration(
$migrationDescription,
$command->sourceWorkspaceName,
$command->targetWorkspaceName
));
if ($command->migrationConfiguration->getMigration() !== null) {
foreach ($command->migrationConfiguration->getMigration() as $migrationDescription) {
$transformationSteps = $transformationSteps->merge($this->executeSubMigration(
$migrationDescription,
$command->sourceWorkspaceName,
$command->targetWorkspaceName
));
}
}

if ($command->requireConfirmation) {
Expand Down
8 changes: 5 additions & 3 deletions Neos.ContentRepositoryRegistry/Classes/Command/NodeMigrationCommandController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ public function listCommand(): void

$tableRows = [];
foreach ($availableMigrations as $version => $migration) {
$migrationUpConfigurationComments = $this->migrationFactory->getMigrationForVersion($version)->getComments();
$migrationUpConfiguration = $this->migrationFactory->getMigrationForVersion($version);
/** @var string $migrationUpConfigurationComments */
$migrationUpConfigurationComments = $migrationUpConfiguration->hasComments() ? $migrationUpConfiguration->getComments() : '';

$tableRows[] = [
$version,
Expand All @@ -195,13 +197,13 @@ protected function outputCommentsAndWarnings(MigrationConfiguration $migrationCo
if ($migrationConfiguration->hasComments()) {
$this->outputLine();
$this->outputLine('<b>Comments</b>');
$this->outputFormatted($migrationConfiguration->getComments(), [], 2);
$this->outputFormatted($migrationConfiguration->getComments() ?? '', [], 2);
}

if ($migrationConfiguration->hasWarnings()) {
$this->outputLine();
$this->outputLine('<b><u>Warnings</u></b>');
$this->outputFormatted($migrationConfiguration->getWarnings(), [], 2);
$this->outputFormatted($migrationConfiguration->getWarnings() ?? '', [], 2);
}
}
}