Skip to content

Commit 3a319de

Browse files
committed
Merge remote-tracking branch 'origin/8.0'
2 parents ce4f262 + b649dab commit 3a319de

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

Classes/Command/NodeIndexCommandController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class NodeIndexCommandController extends CommandController
114114
* @Flow\Inject
115115
*/
116116
protected $indexDriver;
117-
117+
118118
#[Flow\Inject]
119119
protected ContentRepositoryRegistry $contentRepositoryRegistry;
120120

Classes/Command/NodeTypeCommandController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class NodeTypeCommandController extends CommandController
4242
/**
4343
* Show node type configuration after applying all supertypes etc
4444
*
45-
* @param string $nodeType the node type to optionally filter for
45+
* @param string|null $nodeType the node type to optionally filter for
4646
* @return void
4747
*/
4848
public function showCommand(string $contentRepository = 'default', ?string $nodeType = null): void

Classes/Driver/IndexerDriverInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function document(string $indexName, Node $node, ElasticSearchDocument $d
3939
*
4040
* @param Node $node
4141
* @param array $fulltextIndexOfNode
42-
* @param string $targetWorkspaceName
42+
* @param string|null $targetWorkspaceName
4343
* @return array
4444
*/
4545
public function fulltext(Node $node, array $fulltextIndexOfNode, ?WorkspaceName $targetWorkspaceName = null): array;

Classes/Indexer/NodeIndexer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public function getIndex(): Index
215215
* Index this node, and add it to the current bulk request.
216216
*
217217
* @param Node $node
218-
* @param string $targetWorkspaceName In case indexing is triggered during publishing, a target workspace name will be passed in
218+
* @param string|null $targetWorkspaceName In case indexing is triggered during publishing, a target workspace name will be passed in
219219
* @return void
220220
* @throws Exception
221221
*/

Classes/ViewHelpers/GetHitArrayForNodeViewHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class GetHitArrayForNodeViewHelper extends AbstractViewHelper
4545
/**
4646
* @param ElasticSearchQueryResult $queryResultObject
4747
* @param Node $node
48-
* @param array|string $path
48+
* @param array|string|null $path
4949
* @return mixed
5050
*/
5151
public function render(ElasticSearchQueryResult $queryResultObject, Node $node, $path = null)

0 commit comments

Comments
 (0)