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
2 changes: 1 addition & 1 deletion src/bundle/Controller/ContentTypeGroupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public function viewAction(Request $request, ContentTypeGroup $group, int $page
return $this->render('@ibexadesign/content_type/content_type_group/index.html.twig', [
'content_type_group' => $group,
'page' => $page,
'route_name' => $request->get('_route'),
'route_name' => $request->attributes->get('_route'),
'can_create' => $this->isGranted(new Attribute('class', 'create')),
]);
}
Expand Down
28 changes: 14 additions & 14 deletions src/bundle/Controller/ContentViewController.php
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ private function supplyDraftPagination(ContentView $view, Request $request): voi

$view->addParameters([
'draft_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'route_name' => $request->attributes->get('_route'),
'route_params' => $request->attributes->get('_route_params'),
'page' => (int) ($page['version_draft'] ?? 1),
'pages_map' => $page,
'limit' => $this->configResolver->getParameter('pagination.version_draft_limit'),
Expand All @@ -265,8 +265,8 @@ private function supplyRelationPagination(ContentView $view, Request $request):

$view->addParameters([
'relation_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'route_name' => $request->attributes->get('_route'),
'route_params' => $request->attributes->get('_route_params'),
'page' => (int) ($page['relation'] ?? 1),
'pages_map' => $page,
'limit' => $this->configResolver->getParameter('pagination.relation_limit'),
Expand All @@ -280,8 +280,8 @@ private function supplyReverseRelationPagination(ContentView $view, Request $req

$view->addParameters([
'reverse_relation_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'route_name' => $request->attributes->get('_route'),
'route_params' => $request->attributes->get('_route_params'),
'page' => (int) ($page['reverse_relation'] ?? 1),
'pages_map' => $page,
'limit' => $this->configResolver->getParameter(
Expand All @@ -297,8 +297,8 @@ private function supplyCustomUrlPagination(ContentView $view, Request $request):

$view->addParameters([
'custom_urls_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'route_name' => $request->attributes->get('_route'),
'route_params' => $request->attributes->get('_route_params'),
'page' => (int) ($page['custom_url'] ?? 1),
'limit' => $this->configResolver->getParameter(
'pagination.content_custom_url_limit'
Expand All @@ -313,8 +313,8 @@ private function supplySystemUrlPagination(ContentView $view, Request $request):

$view->addParameters([
'system_urls_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'route_name' => $request->attributes->get('_route'),
'route_params' => $request->attributes->get('_route_params'),
'page' => (int) ($page['system_url'] ?? 1),
'limit' => $this->configResolver->getParameter(
'pagination.content_system_url_limit'
Expand All @@ -329,8 +329,8 @@ private function supplyRolePagination(ContentView $view, Request $request): void

$view->addParameters([
'roles_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'route_name' => $request->attributes->get('_route'),
'route_params' => $request->attributes->get('_route_params'),
'page' => (int) ($page['role'] ?? 1),
'limit' => $this->configResolver->getParameter(
'pagination.content_role_limit'
Expand All @@ -345,8 +345,8 @@ private function supplyPolicyPagination(ContentView $view, Request $request): vo

$view->addParameters([
'policies_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'route_name' => $request->attributes->get('_route'),
'route_params' => $request->attributes->get('_route_params'),
'page' => (int) ($page['policy'] ?? 1),
'limit' => $this->configResolver->getParameter(
'pagination.content_policy_limit'
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Controller/RoleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function viewAction(Request $request, Role $role, int $policyPage = 1, in
return $this->render('@ibexadesign/user/role/index.html.twig', [
'role' => $role,
'delete_form' => $deleteForm,
'route_name' => $request->get('_route'),
'route_name' => $request->attributes->get('_route'),
'policy_page' => $policyPage,
'assignment_page' => $assignmentPage,
]);
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Controller/TrashController.php
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ function (TrashItemDeleteData $data) use ($request): RedirectResponse {

private function redirectToTrashList(Request $request): RedirectResponse
{
$trashSearchParams = $request->get('trash_search');
$trashSearchParams = $request->query->all('trash_search');
$params = $trashSearchParams ? ['trash_search' => $trashSearchParams] : [];

return $this->redirectToRoute('ibexa.trash.list', $params);
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Controller/VersionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function __construct(
*/
public function removeAction(Request $request): Response
{
$isDraftForm = null !== $request->get(
$isDraftForm = $request->request->has(
sprintf('version-remove-%s', VersionsTab::FORM_REMOVE_DRAFT)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder): void
->arrayNode('subitems_module')
->info('Subitems module configuration')
->children()
->integerNode('limit')->isRequired()->defaultValue(10)->end()
->integerNode('limit')->isRequired()->end()
->end()
->end();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends '@ibexadesign/content/content_view_fields.html.twig' %}

{% block extras %}
{% set current_language = app.request.get('languageCode') ?: content.prioritizedFieldLanguageCode %}
{% set current_language = app.request.attributes.get('languageCode') ?: content.prioritizedFieldLanguageCode %}

{% if languages|length > 1 %}
<form class="form-inline ibexa-raw-content-title__language-form">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% import "@ibexadesign/content_type/macros.html.twig" as macros %}

{% trans_default_domain 'ibexa_content_type' %}
{% set current_language = app.request.get('languageCode') ?: language_code %}
{% set current_language = app.request.attributes.get('languageCode') ?: language_code %}

{% set global_properties_items = [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{% endblock %}

{% block content %}
{% set trash_search_params = app.request.get('trash_search') %}
{% set trash_search_params = app.request.query.all('trash_search') %}
{% set creator = form_search.vars.data ? form_search.vars.data.creator : '' %}
{% set creator_exists = creator is not empty %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
data-parent-content-type-identifier="{{ contentType.identifier }}"
data-parent-content-type-id="{{ contentType.id }}"
data-parent-name="{{ location.contentInfo.name }}"
data-current-language="{{ app.request.get('languageCode') ?: content.prioritizedFieldLanguageCode }}"
data-current-language="{{ app.request.attributes.get('languageCode') ?: content.prioritizedFieldLanguageCode }}"
></div>
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
'admin-ui-image-edit-actions-after',
{
'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier,
'contentId' : content_id ?? app.request.get('contentId'),
'versionNo' : version_no ?? app.request.get('versionNo'),
'contentId' : content_id ?? app.request.attributes.get('contentId'),
'versionNo' : version_no ?? app.request.attributes.get('versionNo'),
'disabled': readonly ? true : false,
}
) }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@
'admin-ui-image-edit-actions-after',
{
'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier,
'contentId' : content_id ?? app.request.get('contentId'),
'versionNo' : version_no ?? app.request.get('versionNo'),
'contentId' : content_id ?? app.request.attributes.get('contentId'),
'versionNo' : version_no ?? app.request.attributes.get('versionNo'),
'disabled': readonly ? true : false,
}
) }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<meta name="CSRF-Token" content="{{ csrf_token(ibexa_get_rest_csrf_token_intention()) }}" />
<meta name="SiteAccess" content="{{ app.request.get('siteaccess').name }}" />
<meta name="SiteAccess" content="{{ app.request.attributes.get('siteaccess').name }}" />
<meta name="UserId" content="{{ ibexa_admin_ui_config.user.user.id|default() }}" />
<script>
const userAgent = navigator.userAgent.toLowerCase();
Expand Down
2 changes: 1 addition & 1 deletion src/lib/EventListener/AdminExceptionListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private function isAdminException(ExceptionEvent $event): bool
$request = $event->getRequest();

/** @var \Ibexa\Core\MVC\Symfony\SiteAccess $siteAccess */
$siteAccess = $request->get('siteaccess', new SiteAccess('default'));
$siteAccess = $request->attributes->get('siteaccess', new SiteAccess('default'));

return in_array(
$siteAccess->name,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/EventListener/RequestAttributesListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private function hasContentLanguage(Request $request, ParameterBag $parameterBag
{
return $parameterBag->has('languageCode')
&& $parameterBag->has('location')
&& $request->get('_route') === self::TRANSLATED_CONTENT_VIEW_ROUTE_NAME;
&& $request->attributes->get('_route') === self::TRANSLATED_CONTENT_VIEW_ROUTE_NAME;
}

private function loadLocation(int $locationId): Location
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Form/Data/Role/RoleAssignmentCreateData.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ final class RoleAssignmentCreateData implements TranslationContainerInterface
private array $locations;

#[Assert\NotNull]
#[Assert\Choice([
#[Assert\Choice(choices: [
RoleAssignmentCreateData::LIMITATION_TYPE_NONE,
RoleAssignmentCreateData::LIMITATION_TYPE_SECTION,
RoleAssignmentCreateData::LIMITATION_TYPE_LOCATION,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function validateLocationId(Request $request): self
$this->validator
->atPath('{locationId}')
->validate(
$request->get('locationId'),
$request->attributes->get('locationId'),
new Assert\Type('numeric')
);

Expand Down
15 changes: 15 additions & 0 deletions src/lib/Validator/Constraints/DateRangeConstraint.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,27 @@

use JMS\TranslationBundle\Model\Message;
use JMS\TranslationBundle\Translation\TranslationContainerInterface;
use Symfony\Component\Validator\Attribute\HasNamedArguments;
use Symfony\Component\Validator\Constraint;

final class DateRangeConstraint extends Constraint implements TranslationContainerInterface
{
public string $message = 'ibexa.date_range.invalid_range';

/**
* @param array<string>|null $groups
*/
#[HasNamedArguments]
public function __construct(
?string $message = null,
?array $groups = null,
mixed $payload = null
) {
parent::__construct(null, $groups, $payload);

$this->message = $message ?? $this->message;
}

/**
* @return array<\JMS\TranslationBundle\Model\Message>
*/
Expand Down
15 changes: 15 additions & 0 deletions src/lib/Validator/Constraints/FieldDefinitionDefaultValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace Ibexa\AdminUi\Validator\Constraints;

use Symfony\Component\Validator\Attribute\HasNamedArguments;
use Symfony\Component\Validator\Constraint;

/**
Expand All @@ -17,6 +18,20 @@ final class FieldDefinitionDefaultValue extends Constraint
{
public string $message = 'ez.field_definition.default_field_value';

/**
* @param array<string>|null $groups
*/
#[HasNamedArguments]
public function __construct(
?string $message = null,
?array $groups = null,
mixed $payload = null
) {
parent::__construct(null, $groups, $payload);

$this->message = $message ?? $this->message;
}

public function getTargets(): string
{
return self::CLASS_CONSTRAINT;
Expand Down
15 changes: 15 additions & 0 deletions src/lib/Validator/Constraints/FieldSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace Ibexa\AdminUi\Validator\Constraints;

use Symfony\Component\Validator\Attribute\HasNamedArguments;
use Symfony\Component\Validator\Constraint;

/**
Expand All @@ -17,6 +18,20 @@ final class FieldSettings extends Constraint
{
public string $message = 'ez.field_definition.field_settings';

/**
* @param array<string>|null $groups
*/
#[HasNamedArguments]
public function __construct(
?string $message = null,
?array $groups = null,
mixed $payload = null
) {
parent::__construct(null, $groups, $payload);

$this->message = $message ?? $this->message;
}

public function getTargets(): string
{
return self::CLASS_CONSTRAINT;
Expand Down
15 changes: 15 additions & 0 deletions src/lib/Validator/Constraints/LocationHasChildren.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,27 @@

use JMS\TranslationBundle\Model\Message;
use JMS\TranslationBundle\Translation\TranslationContainerInterface;
use Symfony\Component\Validator\Attribute\HasNamedArguments;
use Symfony\Component\Validator\Constraint;

final class LocationHasChildren extends Constraint implements TranslationContainerInterface
{
public string $message = 'ezplatform.trash.location_has_no_children';

/**
* @param array<string>|null $groups
*/
#[HasNamedArguments]
public function __construct(
?string $message = null,
?array $groups = null,
mixed $payload = null
) {
parent::__construct(null, $groups, $payload);

$this->message = $message ?? $this->message;
}

public static function getTranslationMessages(): array
{
return [
Expand Down
15 changes: 15 additions & 0 deletions src/lib/Validator/Constraints/LocationHaveUniqueAssetRelation.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,27 @@

use JMS\TranslationBundle\Model\Message;
use JMS\TranslationBundle\Translation\TranslationContainerInterface;
use Symfony\Component\Validator\Attribute\HasNamedArguments;
use Symfony\Component\Validator\Constraint;

final class LocationHaveUniqueAssetRelation extends Constraint implements TranslationContainerInterface
{
public string $message = 'ezplatform.trash.have_used_assets';

/**
* @param array<string>|null $groups
*/
#[HasNamedArguments]
public function __construct(
?string $message = null,
?array $groups = null,
mixed $payload = null
) {
parent::__construct(null, $groups, $payload);

$this->message = $message ?? $this->message;
}

public static function getTranslationMessages(): array
{
return [
Expand Down
15 changes: 15 additions & 0 deletions src/lib/Validator/Constraints/LocationIsContainer.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,27 @@

use JMS\TranslationBundle\Model\Message;
use JMS\TranslationBundle\Translation\TranslationContainerInterface;
use Symfony\Component\Validator\Attribute\HasNamedArguments;
use Symfony\Component\Validator\Constraint;

final class LocationIsContainer extends Constraint implements TranslationContainerInterface
{
public string $message = 'ezplatform.copy_subtree.is_not_container';

/**
* @param array<string>|null $groups
*/
#[HasNamedArguments]
public function __construct(
?string $message = null,
?array $groups = null,
mixed $payload = null
) {
parent::__construct(null, $groups, $payload);

$this->message = $message ?? $this->message;
}

public static function getTranslationMessages(): array
{
return [
Expand Down
Loading