Skip to content

Latest commit

 

History

History
249 lines (149 loc) · 9.54 KB

File metadata and controls

249 lines (149 loc) · 9.54 KB

Overview of merged pull requests

closes: #3371

## 1

> the dutch translation f.x. doesnt have correctly formatted <br/> tags. See f.x.: 'shortcut.clickToContinueToParentNode' and compare the spanish &lt; br / &gt; to the english source &lt;br /&gt;. A search for &lt; br / &gt; reveals multiple cases. The problem is, that this invalid html (due to the space) and will be rendered as text (< br / >).

before in NL: !image

after: !image

## 2

> this translation id doesnt exist: 'shortcut.toSpecificTarget' so the value / fallback This is a shortcut to a specific target: is always used.

It has been missed in 2014 (since Neos 2) ^^ https://github.com/neos/neos-development-collection/commit/`02f8ff96e1ecd3dfbd9a356c4c6f55bb565916c7 <https://github.com/neos/neos-development-collection/commit/02f8ff96e1ecd3dfbd9a356c4c6f55bb565916c7>_#diff-d1bec08a4f5050d463e4f7af3d61b767974d858d <https://github.com/neos/neos-development-collection/commit/d1bec08a4f5050d463e4f7af3d61b767974d858d>`_3d56ced85581ca55c27126dcR6

before in DE (or any other language): !image

after: nothing to see here yet - but now we can translate via weblate :D

Upgrade instructions

Review instructions

Check the shortcode rendering in the backend. If you switch your user language - flush the fusion cache - as this is not calculated into the shortcut cache: ./flow cache:flushone Neos_Fusion_Content

  • Packages: Neos

Review instructions

Fixes small spelling errors in the priviligeTargets

  • Packages: Neos

BUGFIX: DI conflict in DataSource `Call to a member function log Throwable() on null <#3931>`_

closes #3858

when one throws an exception in a datasource, it fails logging it and an uncaught error is thrown, because the ThrowableStorage is not injected:

Call to a member function log Throwable() on null

this seems due to a dependency injection conflict with inheritance.

this pr only prevents this conflict from happening

the controller that handles datasources extends the AbstractServiceController which injects the throwableStorage

`php /** * @Flow\\Inject * @var ThrowableStorageInterface */ protected $throwableStorage;`

but the AbstractServiceController also extends the ActionController which injects the throwableStorage via an inject method into a private property

`php /** * @var ThrowableStorageInterface */ private $throwableStorage; /** * Injects the throwable storage. * * @param ThrowableStorageInterface $throwableStorage * @return void */ public function injectThrowableStorage(ThrowableStorageInterface $throwableStorage) { $this->throwableStorage = $throwableStorage; }`

this combined doesnt work and results in the @Flow\\Inject in the AbstractServiceController not working

solutions are:

  • fix the flow DI? (assuming this is a issue)
  • rename the variable (what id did now)
  • use also AbstractServiceController::injectThrowableStorage and call parent / not the @Flow\\Inject annotation
  • use a protected property in ActionController and reuse it

## update 1 this is indeed defined behaviour from flow: https://flowframework.readthedocs.io/en/8.1/TheDefinitiveGuide/PartIII/ObjectManagement.html#property-injection > If a setter method exists for the same property, it has precedence.

Upgrade instructions

  • Packages: Neos

closes #3885

findChildNodes is corrently implemented, but countChildNodes doesnt transform the argument $nodeTypeConstraints NodeTypeConstraints to a string for the legacy api:

either this snipped must be included: `php $filter = $nodeTypeConstraints !== null ? $nodeTypeConstraints->asLegacyNodeTypeFilterString() : null;`

or we must use $this->findChildNodes

without that, the NodeTypeConstraints is passed further down, and due to lack of typesafety it fails at the last moment: `php Argument 2 passed to Neos\\Utility\\Arrays::trimExplode() must be of the type string, object given, called in /tmp/neos/Development/SubContextddev/Cache/Code/Flow_Object_Classes/Neos_ContentRepository_Domain_Repository_NodeDataRepository.php on line 1127`

Upgrade instructions

  • Packages: Neos ContentRepository

This makes it possible to use @process with a regular string.

Closes #3846

Review instructions try the fusion code from the issue.

it now works as we switched a condition (the count will only happen if it is an array and not possibly a simple value)

  • Packages: Neos Fusion

This enables the possibility of uploading .ico files.

Closes #3922

  • Packages: Neos Media

Fix Neos.Media commands media:clearthumbnails, media:createthumbnails and media:removeunused to properly print a final newline.

Output before: ` user $ ./flow media:clearthumbnails 0 [->--------------------------]user $ ^-- next prompt Output after: user $ ./flow media:clearthumbnails 0 [->--------------------------] user $ Resolved: #3894 <#3894>`_

Upgrade instructions

None.

Review instructions

in bash, execute ./flow media:clearthumbnails (by default, zsh is less affected, it recovers but shows a percent sign)

  • Packages: Neos Media
  • Packages: Media.Browser Neos .github

Removes the use of remote fonts from Google in favor of local font files. Additionally node-sass was updated to allow compilation on M1 Macs.

Replaces #3873

Review instructions

Noto should still be the font used on error pages.

  • Packages: Neos

Renames the index in the NodeData model to match the index name in migration and database.

  • Fixes: #3888
  • Packages: Neos ContentRepository

Review instructions

The build on PHP 8.1 should succeed.

  • Packages: Neos .github