Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ jobs:
static-analysis: 'yes'
experimental: false
dependencies: 'highest'
- php-versions: '8.4'
static-analysis: 'yes'
experimental: false
dependencies: 'highest'

runs-on: ubuntu-latest
services:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ public function __construct(private readonly EelExpressionPositions $eelExpressi
);
}

public function visitValueAssignment(ValueAssignment $valueAssignment, array $currentPath = null)
public function visitValueAssignment(ValueAssignment $valueAssignment, ?array $currentPath = null)
{
$currentPath ?? throw new \BadMethodCallException('$currentPath is required.');

// send currentPath to eel expression value
$valueAssignment->pathValue->visit($this, $currentPath);
}

public function visitEelExpressionValue(EelExpressionValue $eelExpressionValue, array $currentPath = null)
public function visitEelExpressionValue(EelExpressionValue $eelExpressionValue, ?array $currentPath = null)
{
$eelExpressionPosition = $this->eelExpressionPositions->byEelExpressionValue($eelExpressionValue);
if ($eelExpressionPosition) {
Expand Down
14 changes: 7 additions & 7 deletions Neos.Media/Classes/Eel/ImageHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ class ImageHelper implements ProtectedContextAwareInterface
*/
public function createThumbnail(
AssetInterface $asset,
string $preset = null,
int $width = null,
int $maximumWidth = null,
int $height = null,
int $maximumHeight = null,
?string $preset = null,
?int $width = null,
?int $maximumWidth = null,
?int $height = null,
?int $maximumHeight = null,
bool $allowCropping = false,
bool $allowUpScaling = false,
bool $async = false,
int $quality = null,
string $format = null
?int $quality = null,
?string $format = null
): ?ImageInterface {
if (!empty($preset)) {
$thumbnailConfiguration = $this->thumbnailService->getThumbnailConfigurationForPreset($preset);
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Classes/Command/UserCommandController.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function listCommand(): void
* @return void
* @throws Exception|StopCommandException
*/
public function showCommand(string $username, string $authenticationProvider = null): void
public function showCommand(string $username, ?string $authenticationProvider): void
{
$user = $this->userService->getUser($username, $authenticationProvider);
if (!$user instanceof User) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function indexAction(
string $searchTerm = '',
string $sortBy = 'accounts.accountIdentifier',
string $sortDirection = QueryInterface::ORDER_ASCENDING,
string $role = null,
?string $role = null,
): void {
$allowedRoles = $this->getAllowedRoles();

Expand Down Expand Up @@ -255,7 +255,7 @@ public function editAction(User $user): void
{
if (!$this->isEditingAllowed($user)) {
$this->addFlashMessage(
$this->translator->translateById('users.userEditingDenied.editing.body', [htmlspecialchars($user->getName())], null, null, 'Modules', 'Neos.Neos'),
$this->translator->translateById('users.userEditingDenied.editing.body', [htmlspecialchars($user->getName()->getFullName())], null, null, 'Modules', 'Neos.Neos'),
$this->translator->translateById('users.userEditingDenied.editing.‚title', [], null, null, 'Modules', 'Neos.Neos'),
Message::SEVERITY_ERROR,
[],
Expand Down Expand Up @@ -510,7 +510,6 @@ public function deleteElectronicAddressAction(User $user, ElectronicAddress $ele
$user->removeElectronicAddress($electronicAddress);
$this->userService->updateUser($user);

/** @var PersonName $personName */
$personName = $user->getName();
$name = $personName ? $personName->getFullName() : '';
$this->addFlashMessage(
Expand All @@ -534,7 +533,6 @@ protected function assignElectronicAddressOptions(): void
$electronicAddressTypes[$type] = $type;
}
$electronicAddressUsageTypes = [];
$translationHelper = new TranslationHelper();
foreach ($electronicAddress->getAvailableUsageTypes() as $type) {
$electronicAddressUsageTypes[$type] = $type;
}
Expand Down