Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into IBX-8689-extending
Browse files Browse the repository at this point in the history
  • Loading branch information
mnocon committed Dec 19, 2024
2 parents 00ff26d + 8a760dd commit b5dad97
Show file tree
Hide file tree
Showing 23 changed files with 55 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$user = $this->userService->loadUserByLogin('admin');
$this->permissionResolver->setCurrentUserReference($user);

$parentLocationId = $input->getArgument('parentLocationId');
$contentId = $input->getArgument('contentId');
$parentLocationId = (int) $input->getArgument('parentLocationId');
$contentId = (int) $input->getArgument('contentId');

$locationCreateStruct = $this->locationService->newLocationCreateStruct($parentLocationId);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ protected function configure(): void

protected function execute(InputInterface $input, OutputInterface $output): int
{
$locationId = $input->getArgument('locationId');
$locationId = (int) $input->getArgument('locationId');
$location = $this->locationService->loadLocation($locationId);

$this->bookmarkService->createBookmark($location);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private function browseLocation(Location $location, OutputInterface $output, int

protected function execute(InputInterface $input, OutputInterface $output): int
{
$locationId = $input->getArgument('locationId');
$locationId = (int) $input->getArgument('locationId');

$location = $this->locationService->loadLocation($locationId);
$this->browseLocation($location, $output);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$user = $this->userService->loadUserByLogin('admin');
$this->permissionResolver->setCurrentUserReference($user);

$parentLocationId = $input->getArgument('parentLocationId');
$parentLocationId = (int) $input->getArgument('parentLocationId');
$contentTypeIdentifier = $input->getArgument('contentType');
$name = $input->getArgument('name');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$user = $this->userService->loadUserByLogin('admin');
$this->permissionResolver->setCurrentUserReference($user);

$locationId = $input->getArgument('locationId');
$locationId = (int) $input->getArgument('locationId');

$location = $this->locationService->loadLocation($locationId);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected function configure(): void

protected function execute(InputInterface $input, OutputInterface $output)
{
$locationId = $input->getArgument('locationId');
$locationId = (int) $input->getArgument('locationId');
$contentTypeIdentifier = $input->getArgument('contentTypeIdentifier');
$text = $input->getArgument('text');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected function configure(): void

protected function execute(InputInterface $input, OutputInterface $output): int
{
$contentTypeId = $input->getArgument('contentTypeId');
$contentTypeId = (int) $input->getArgument('contentTypeId');

$query = new Query();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$user = $this->userService->loadUserByLogin('admin');
$this->permissionResolver->setCurrentUserReference($user);

$locationId = $input->getArgument('location_id');
$locationId = (int) $input->getArgument('location_id');

$location = $this->locationService->loadLocation($locationId);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$user = $this->userService->loadUserByLogin('admin');
$this->permissionResolver->setCurrentUserReference($user);

$locationId = $input->getArgument('locationId');
$targetLocationId = $input->getArgument('targetLocationId');
$locationId = (int) $input->getArgument('locationId');
$targetLocationId = (int) $input->getArgument('targetLocationId');

$sourceLocation = $this->locationService->loadLocation($locationId);
$targetLocation = $this->locationService->loadLocation($targetLocationId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
}

if ($input->getArgument('contentID')) {
$contentId = $input->getArgument('contentID');
$contentId = (int) $input->getArgument('contentID');
$objectStateToAssign = $objectStateIdentifierList[0];
$contentInfo = $this->contentService->loadContentInfo($contentId);
$objectStateGroup = $this->objectStateService->loadObjectStateGroupByIdentifier($objectStateGroupIdentifier);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int

$sectionName = $input->getArgument('sectionName');
$sectionIdentifier = $input->getArgument('sectionIdentifier');
$contentId = $input->getArgument('contentId');
$contentId = (int) $input->getArgument('contentId');

$sectionCreateStruct = $this->sectionService->newSectionCreateStruct();
$sectionCreateStruct->name = $sectionName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$user = $this->userService->loadUserByLogin('admin');
$this->permissionResolver->setCurrentUserReference($user);

$contentId = $input->getArgument('contentId');
$locationId = $input->getArgument('locationId');
$contentId = (int) $input->getArgument('contentId');
$locationId = (int) $input->getArgument('locationId');

$contentInfo = $this->contentService->loadContentInfo($contentId);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$user = $this->userService->loadUserByLogin('admin');
$this->permissionResolver->setCurrentUserReference($user);

$contentId = $input->getArgument('contentId');
$contentId = (int) $input->getArgument('contentId');
$language = $input->getArgument('language');
$newName = $input->getArgument('nameInNewLanguage');
$secondaryLanguage = $input->getArgument('secondaryLanguage');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$user = $this->userService->loadUserByLogin('admin');
$this->permissionResolver->setCurrentUserReference($user);

$locationId = $input->getArgument('locationId');
$locationId = (int) $input->getArgument('locationId');
if ($input->getArgument('newParentId')) {
$newParentId = $input->getArgument('newParentId');
$newParentId = (int) $input->getArgument('newParentId');
}

$location = $this->locationService->loadLocation($locationId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$user = $this->userService->loadUserByLogin('admin');
$this->permissionResolver->setCurrentUserReference($user);

$contentId = $input->getArgument('contentId');
$contentId = (int) $input->getArgument('contentId');
$newName = $input->getArgument('newName');

$contentInfo = $this->contentService->loadContentInfo($contentId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function configure(): void

protected function execute(InputInterface $input, OutputInterface $output): int
{
$contentId = $input->getArgument('contentId');
$contentId = (int) $input->getArgument('contentId');

$content = $this->contentService->loadContent($contentId);
$contentType = $this->contentTypeService->loadContentType($content->contentInfo->contentTypeId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ protected function configure(): void

protected function execute(InputInterface $input, OutputInterface $output): int
{
$contentId = $input->getArgument('contentId');
$contentId = (int) $input->getArgument('contentId');
$workflowName = $input->getArgument('workflowName');
$transitionName = $input->getArgument('transitionName');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,6 @@ They can be referenced as relative to the root, for example `assets/js/script.j

All project assets are accessible through the `assets` path.

??? note "Removing `assets` manually"

If you ever remove the `assets` folder manually, you need to dump translations before performing
the `yarn encore <dev|prod>` command:

```
php bin/console bazinga:js-translation:dump assets --merge-domains
```

## Configuration

You project's configuration is placed in the respective files in `config/packages`.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<div class="col-12 col-lg-6 col-fhd-3">
<ul>
<li><a href="api/php_api/php_api/">PHP API</a></li>
<li><a href="search/solr_search_engine/">Solr search engine</a></li>
<li><a href="content_management/rich_text/rich_text/">RichText and Online Editor</a></li>
<li><a href="search/search_api/">Search API</a></li>
</ul>
</div>
Expand Down
8 changes: 6 additions & 2 deletions docs/multisite/languages/back_office_translations.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ If your browser language is set to French, the back office is displayed in Frenc

`ibexa.system.<siteaccess>.user_preferences.additional_translations: ['pl_PL', 'fr_FR']`

Then, run `composer run post-update-cmd` and clear the cache.
Then, run `composer run post-update-cmd` and `php bin/console cache:clear --siteaccess=admin`.

### Contributing back office translations

Expand Down Expand Up @@ -117,4 +117,8 @@ The language to display is then selected automatically based on [user preference

!!! note

You may need to clear the cache after adding new translations, before they're available in the back office.
Run `composer run post-update-cmd` which installs your JavaScript translations by using `BazingaJsTranslationBundle`,
and clears the cache of the default SiteAccess.

Run `php bin/console cache:clear --siteaccess=admin` to clear the back office cache.
You may need to replace `admin` with the back office's SiteAccess name used in your installation.
12 changes: 12 additions & 0 deletions docs/update_and_migration/from_3.3/update_from_3.3.md
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,18 @@ Adjust the web server configuration to prevent direct access to the `index.php`

See [the updated Apache and nginx template files](https://github.com/ibexa/post-install/pull/70/files) for more information.

### Removed `symfony/serializer-pack` dependency

This release no longer directly requires the `symfony/serializer-pack` Composer dependency, which can remove some dependencies from your project during the update process.

If you rely on them in your project, for example by using Symfony's `ObjectNormalizer` to create your own REST endpoints, run the following command before updating [[= product_name_base =]] packages:

``` bash
composer require symfony/serializer-pack
```

Then, verify that Symfony Flex installed the versions you were using before.


## Finish the update

Expand Down
14 changes: 14 additions & 0 deletions docs/update_and_migration/from_4.6/update_from_4.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,17 @@ php bin/console ibexa:migrations:migrate --file=2024_07_25_07_00_non_translatabl
Adjust the web server configuration to prevent direct access to the `index.php` file when using URLs consisting of multiple path segments.

See [the updated Apache and nginx template files](https://github.com/ibexa/post-install/pull/70/files) for more information.

## v4.6.15

### Removed `symfony/orm-pack` and `symfony/serializer-pack` dependencies

This release no longer directly requires the `symfony/orm-pack` and `symfony/serializer-pack` Composer dependencies, which can remove some dependencies from your project during the update process.

If you rely on them in your project, for example by using Symfony's `ObjectNormalizer` to create your own REST endpoints, run the following command before updating [[= product_name_base =]] packages:

``` bash
composer require symfony/serializer-pack symfony/orm-pack
```

Then, verify that Symfony Flex installed the versions you were using before.
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ extra:
latest_tag_4_3: '4.3.5'
latest_tag_4_4: '4.4.4'
latest_tag_4_5: '4.5.7'
latest_tag_4_6: '4.6.14'
latest_tag_4_6: '4.6.15'

symfony_doc: 'https://symfony.com/doc/5.4'
user_doc: 'https://doc.ibexa.co/projects/userguide/en/master'
Expand Down

0 comments on commit b5dad97

Please sign in to comment.