Skip to content

Commit 6dfcbd4

Browse files
daniellienertdaniellienert
authored
Merge pull request #19 from gerhard-boden/apply-core-migrations
TASK: Apply core migrations
2 parents 7096186 + de1a8e0 commit 6dfcbd4

14 files changed

Lines changed: 80 additions & 45 deletions

File tree

Classes/Flowpack/SearchPlugin/Controller/AjaxSearchController.php renamed to Classes/Controller/AjaxSearchController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
* source code.
1212
*/
1313

14-
use TYPO3\Flow\Annotations as Flow;
15-
use TYPO3\Flow\Mvc\Controller\ActionController;
16-
use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
14+
use Neos\Flow\Annotations as Flow;
15+
use Neos\Flow\Mvc\Controller\ActionController;
16+
use Neos\ContentRepository\Domain\Model\NodeInterface;
1717

1818
/**
1919
* Class AjaxSearchController
@@ -26,15 +26,15 @@ class AjaxSearchController extends ActionController
2626
* @var string
2727
* @api
2828
*/
29-
protected $defaultViewObjectName = \TYPO3\Neos\View\TypoScriptView::class;
29+
protected $defaultViewObjectName = \Neos\Neos\View\TypoScriptView::class;
3030

3131
/**
3232
* @param NodeInterface $node
3333
* @return void
3434
*/
3535
public function searchAction(NodeInterface $node)
3636
{
37-
/* @var $view \TYPO3\Neos\View\TypoScriptView */
37+
/* @var $view \Neos\Neos\View\TypoScriptView */
3838
$view = $this->view;
3939
$view->setTypoScriptPath('ajaxSearch');
4040
$view->assign('value', $node);

Classes/Flowpack/SearchPlugin/Controller/SuggestController.php renamed to Classes/Controller/SuggestController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
* source code.
1212
*/
1313

14-
use TYPO3\Flow\Annotations as Flow;
15-
use TYPO3\Flow\Mvc\Controller\ActionController;
14+
use Neos\Flow\Annotations as Flow;
15+
use Neos\Flow\Mvc\Controller\ActionController;
1616

1717
/**
1818
* Class SuggestController
@@ -29,7 +29,7 @@ class SuggestController extends ActionController
2929
* @var array
3030
*/
3131
protected $viewFormatToObjectNameMap = [
32-
'json' => 'TYPO3\Flow\Mvc\View\JsonView'
32+
'json' => 'Neos\Flow\Mvc\View\JsonView'
3333
];
3434

3535
/**

Classes/Flowpack/SearchPlugin/EelHelper/SearchArrayHelper.php renamed to Classes/EelHelper/SearchArrayHelper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
* source code.
1212
*/
1313

14-
use TYPO3\Eel\ProtectedContextAwareInterface;
15-
use TYPO3\Flow\Annotations as Flow;
14+
use Neos\Eel\ProtectedContextAwareInterface;
15+
use Neos\Flow\Annotations as Flow;
1616

1717
/**
1818
* Additional Array Helpers which might once

Classes/Flowpack/SearchPlugin/TypoScriptObjects/CanRenderImplementation.php renamed to Classes/FusionObjects/CanRenderImplementation.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Flowpack\SearchPlugin\TypoScriptObjects;
2+
namespace Flowpack\SearchPlugin\FusionObjects;
33

44
/*
55
* This file is part of the Flowpack.SearchPlugin package.
@@ -11,14 +11,14 @@
1111
* source code.
1212
*/
1313

14-
use TYPO3\Flow\Annotations as Flow;
15-
use TYPO3\TypoScript\TypoScriptObjects\AbstractTypoScriptObject;
14+
use Neos\Flow\Annotations as Flow;
15+
use Neos\Fusion\FusionObjects\AbstractFusionObject;
1616

1717
/**
1818
* Class CanRenderImplementation
1919
*
2020
*/
21-
class CanRenderImplementation extends AbstractTypoScriptObject
21+
class CanRenderImplementation extends AbstractFusionObject
2222
{
2323
/**
2424
* TypoScript Type which shall be rendered

‎Configuration/NodeTypes.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'Flowpack.SearchPlugin:Search':
22
superTypes:
3-
'TYPO3.Neos:Content': true
3+
'Neos.Neos:Content': true
44
ui:
55
label: 'Search'
66
icon: 'icon-search'

‎Configuration/Policy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
privilegeTargets:
2-
TYPO3\Flow\Security\Authorization\Privilege\Method\MethodPrivilege:
2+
Neos\Flow\Security\Authorization\Privilege\Method\MethodPrivilege:
33
Flowpack_SearchPlugin_Controller_SuggestController:
44
matcher: method(Flowpack\SearchPlugin\Controller\SuggestController->indexAction())
55
Flowpack_SearchPlugin_Controller_AjaxSearchController:
66
matcher: method(Flowpack\SearchPlugin\Controller\AjaxSearchController->searchAction())
77

88
roles:
9-
'TYPO3.Flow:Everybody':
9+
'Neos.Flow:Everybody':
1010
privileges:
1111
-
1212
privilegeTarget: Flowpack_SearchPlugin_Controller_SuggestController

‎Configuration/Settings.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
TYPO3:
1+
2+
Neos:
23
Neos:
34
typoScript:
45
autoInclude:
5-
'Flowpack.SearchPlugin': true
6-
7-
TypoScript:
6+
Flowpack.SearchPlugin: true
7+
Fusion:
88
defaultContext:
9-
Flowpack.SearchPlugin.Array: 'Flowpack\SearchPlugin\EelHelper\SearchArrayHelper'
9+
Flowpack.SearchPlugin.Array: Flowpack\SearchPlugin\EelHelper\SearchArrayHelper

Resources/Private/TypoScript/AjaxSearch.ts2 renamed to Resources/Private/Fusion/AjaxSearch.ts2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
prototype(Flowpack.SearchPlugin:AjaxSearch) < prototype(TYPO3.TypoScript:Template) {
1+
prototype(Flowpack.SearchPlugin:AjaxSearch) < prototype(Neos.Fusion:Template) {
22
templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/NodeTypes/AjaxSearch.html'
33
searchResultRenderer = Flowpack.SearchPlugin:SearchResultRenderer {
44
@context.searchResults = ${Search.query(site).fulltext(request.arguments.q).execute()}

Resources/Private/TypoScript/ResultRendering.ts2 renamed to Resources/Private/Fusion/ResultRendering.ts2

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
prototype(Flowpack.SearchPlugin:SingleResult) < prototype(TYPO3.TypoScript:Case) {
1+
prototype(Flowpack.SearchPlugin:SingleResult) < prototype(Neos.Fusion:Case) {
22
default {
33
condition = Flowpack.SearchPlugin:CanRender {
44
type = ${node.nodeType.name + 'SearchResult'}
@@ -8,18 +8,18 @@ prototype(Flowpack.SearchPlugin:SingleResult) < prototype(TYPO3.TypoScript:Case)
88

99
fallback {
1010
condition = TRUE
11-
type = 'TYPO3.Neos:DocumentSearchResult'
11+
type = 'Neos.Neos:DocumentSearchResult'
1212
}
1313
}
1414

15-
prototype(TYPO3.Neos:DocumentSearchResult) < prototype(TYPO3.TypoScript:Template) {
15+
prototype(Neos.Neos:DocumentSearchResult) < prototype(Neos.Fusion:Template) {
1616
templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/SearchResult/DocumentSearchResult.html'
1717
node = ${node}
1818
highlight = ${Flowpack.SearchPlugin.Array.flatten(searchHit.highlight)}
1919

2020
title = ${q(node).property('title')}
2121
description = ''
22-
parents = ${Array.reverse(q(node).parents('[instanceof TYPO3.Neos:Document]').get())}
22+
parents = ${Array.reverse(q(node).parents('[instanceof Neos.Neos:Document]').get())}
2323
}
2424

25-
prototype(TYPO3.Neos.NodeTypes:PageSearchResult) < prototype(TYPO3.Neos:DocumentSearchResult)
25+
prototype(Neos.NodeTypes:PageSearchResult) < prototype(Neos.Neos:DocumentSearchResult)

Resources/Private/TypoScript/Root.ts2 renamed to Resources/Private/Fusion/Root.fusion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
prototype(Flowpack.SearchPlugin:CanRender).@class = 'Flowpack\\SearchPlugin\\TypoScriptObjects\\CanRenderImplementation'
1+
prototype(Flowpack.SearchPlugin:CanRender).@class = 'Flowpack\\SearchPlugin\\FusionObjects\\CanRenderImplementation'
22

33
include: SearchPlugin.ts2
44
include: ResultRendering.ts2

0 commit comments

Comments
 (0)