Skip to content

Commit 7eaa79b

Browse files
daniellienertdaniellienert
authored
Merge pull request #162 from gerhard-boden/apply-code-migrations
TASK: Apply code migrations
2 parents a5d04f6 + 0af040f commit 7eaa79b

24 files changed

Lines changed: 212 additions & 143 deletions

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Client/ClientFactory.php renamed to Classes/Client/ClientFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
1515
use Flowpack\ElasticSearch\Domain\Model\Client;
16-
use TYPO3\Flow\Annotations as Flow;
16+
use Neos\Flow\Annotations as Flow;
1717

1818
/**
1919
* ClientFactory

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Command/NodeIndexCommandController.php renamed to Classes/Command/NodeIndexCommandController.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
1515
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexWorkspaceTrait;
16-
use TYPO3\Flow\Annotations as Flow;
17-
use TYPO3\Flow\Cli\CommandController;
18-
use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
16+
use Neos\Flow\Annotations as Flow;
17+
use Neos\Flow\Cli\CommandController;
18+
use Neos\ContentRepository\Domain\Model\NodeInterface;
1919

2020
/**
2121
* Provides CLI features for index handling
@@ -34,25 +34,25 @@ class NodeIndexCommandController extends CommandController
3434

3535
/**
3636
* @Flow\Inject
37-
* @var \TYPO3\TYPO3CR\Domain\Repository\WorkspaceRepository
37+
* @var \Neos\ContentRepository\Domain\Repository\WorkspaceRepository
3838
*/
3939
protected $workspaceRepository;
4040

4141
/**
4242
* @Flow\Inject
43-
* @var \TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository
43+
* @var \Neos\ContentRepository\Domain\Repository\NodeDataRepository
4444
*/
4545
protected $nodeDataRepository;
4646

4747
/**
4848
* @Flow\Inject
49-
* @var \TYPO3\TYPO3CR\Domain\Factory\NodeFactory
49+
* @var \Neos\ContentRepository\Domain\Factory\NodeFactory
5050
*/
5151
protected $nodeFactory;
5252

5353
/**
5454
* @Flow\Inject
55-
* @var \TYPO3\Neos\Domain\Service\ContentDimensionPresetSourceInterface
55+
* @var \Neos\Neos\Domain\Service\ContentDimensionPresetSourceInterface
5656
*/
5757
protected $contentDimensionPresetSource;
5858

@@ -75,7 +75,7 @@ class NodeIndexCommandController extends CommandController
7575

7676
/**
7777
* @Flow\Inject
78-
* @var \TYPO3\Flow\Configuration\ConfigurationManager
78+
* @var \Neos\Flow\Configuration\ConfigurationManager
7979
*/
8080
protected $configurationManager;
8181

@@ -91,8 +91,8 @@ class NodeIndexCommandController extends CommandController
9191
*/
9292
public function initializeObject($cause)
9393
{
94-
if ($cause === \TYPO3\Flow\Object\ObjectManagerInterface::INITIALIZATIONCAUSE_CREATED) {
95-
$this->settings = $this->configurationManager->getConfiguration(\TYPO3\Flow\Configuration\ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'TYPO3.TYPO3CR.Search');
94+
if ($cause === \Neos\Flow\ObjectManagement\ObjectManagerInterface::INITIALIZATIONCAUSE_CREATED) {
95+
$this->settings = $this->configurationManager->getConfiguration(\Neos\Flow\Configuration\ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.ContentRepository.Search');
9696
}
9797
}
9898

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Command/NodeTypeCommandController.php renamed to Classes/Command/NodeTypeCommandController.php

Lines changed: 5 additions & 5 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\Cli\CommandController;
14+
use Neos\Flow\Annotations as Flow;
15+
use Neos\Flow\Cli\CommandController;
1616

1717
/**
1818
* Provides CLI features for debugging the node types.
@@ -25,7 +25,7 @@ class NodeTypeCommandController extends CommandController
2525
{
2626
/**
2727
* @Flow\Inject
28-
* @var \TYPO3\TYPO3CR\Domain\Service\NodeTypeManager
28+
* @var \Neos\ContentRepository\Domain\Service\NodeTypeManager
2929
*/
3030
protected $nodeTypeManager;
3131

@@ -38,13 +38,13 @@ class NodeTypeCommandController extends CommandController
3838
public function showCommand($nodeType = null)
3939
{
4040
if ($nodeType !== null) {
41-
/** @var \TYPO3\TYPO3CR\Domain\Model\NodeType $nodeType */
41+
/** @var \Neos\ContentRepository\Domain\Model\NodeType $nodeType */
4242
$nodeType = $this->nodeTypeManager->getNodeType($nodeType);
4343
$configuration = $nodeType->getFullConfiguration();
4444
} else {
4545
$nodeTypes = $this->nodeTypeManager->getNodeTypes();
4646
$configuration = [];
47-
/** @var \TYPO3\TYPO3CR\Domain\Model\NodeType $nodeType */
47+
/** @var \Neos\ContentRepository\Domain\Model\NodeType $nodeType */
4848
foreach ($nodeTypes as $nodeTypeName => $nodeType) {
4949
$configuration[$nodeTypeName] = $nodeType->getFullConfiguration();
5050
}

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQuery.php renamed to Classes/Eel/ElasticSearchQuery.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313

1414
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
15-
use TYPO3\Flow\Persistence\QueryInterface;
15+
use Neos\Flow\Persistence\QueryInterface;
1616

1717
/**
1818
* This ElasticSearchQuery object is just used inside ElasticSearchQueryResult->getQuery(), so that pagination
@@ -110,7 +110,7 @@ public function getOffset()
110110
*/
111111
public function getType()
112112
{
113-
return 'TYPO3\TYPO3CR\Domain\Model\NodeInterface';
113+
return 'Neos\ContentRepository\Domain\Model\NodeInterface';
114114
}
115115

116116
/**

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryBuilder.php renamed to Classes/Eel/ElasticSearchQueryBuilder.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
*/
1313

1414
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException;
15-
use TYPO3\Eel\ProtectedContextAwareInterface;
16-
use TYPO3\Flow\Annotations as Flow;
17-
use TYPO3\Flow\Utility\Arrays;
18-
use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
19-
use TYPO3\TYPO3CR\Search\Search\QueryBuilderInterface;
15+
use Neos\Eel\ProtectedContextAwareInterface;
16+
use Neos\Flow\Annotations as Flow;
17+
use Neos\Utility\Arrays;
18+
use Neos\ContentRepository\Domain\Model\NodeInterface;
19+
use Neos\ContentRepository\Search\Search\QueryBuilderInterface;
2020

2121
/**
2222
* Query Builder for ElasticSearch Queries
@@ -396,9 +396,9 @@ public function appendAtPath($path, array $data)
396396
*
397397
* Example Usage:
398398
*
399-
* searchFilter = TYPO3.TypoScript:RawArray {
399+
* searchFilter = Neos.Fusion:RawArray {
400400
* author = 'Max'
401-
* tags = TYPO3.TypoScript:RawArray {
401+
* tags = Neos.Fusion:RawArray {
402402
* 0 = 'a'
403403
* 1 = 'b'
404404
* }
@@ -459,8 +459,8 @@ public function fieldBasedAggregation($name, $field, $type = "terms", $parentPat
459459
*
460460
* Example Usage to create a terms aggregation for a property color:
461461
*
462-
* aggregationDefinition = TYPO3.TypoScript:RawArray {
463-
* terms = TYPO3.TypoScript:RawArray {
462+
* aggregationDefinition = Neos.Fusion:RawArray {
463+
* terms = Neos.Fusion:RawArray {
464464
* field = "color"
465465
* }
466466
* }
@@ -552,9 +552,9 @@ public function termSuggestions($text, $field = '_all', $name = 'suggestions')
552552
*
553553
* Example Usage of a term suggestion for the fulltext search
554554
*
555-
* suggestionDefinition = TYPO3.TypoScript:RawArray {
555+
* suggestionDefinition = Neos.Fusion:RawArray {
556556
* text = "some text"
557-
* terms = TYPO3.TypoScript:RawArray {
557+
* terms = Neos.Fusion:RawArray {
558558
* field = "body"
559559
* }
560560
* }
@@ -650,7 +650,7 @@ public function getFullElasticSearchHitForNode(NodeInterface $node)
650650
*
651651
* This method is rather internal; just to be called from the ElasticSearchQueryResult. For the public API, please use execute()
652652
*
653-
* @return array<\TYPO3\TYPO3CR\Domain\Model\NodeInterface>
653+
* @return array<\Neos\ContentRepository\Domain\Model\NodeInterface>
654654
*/
655655
public function fetch()
656656
{
@@ -676,7 +676,7 @@ public function fetch()
676676
/**
677677
* Get a query result object for lazy execution of the query
678678
*
679-
* @return \Traversable<\TYPO3\Flow\Persistence\QueryResultInterface>
679+
* @return \Traversable<\Neos\Flow\Persistence\QueryResultInterface>
680680
* @api
681681
*/
682682
public function execute()

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryResult.php renamed to Classes/Eel/ElasticSearchQueryResult.php

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

14-
use TYPO3\Eel\ProtectedContextAwareInterface;
15-
use TYPO3\Flow\Persistence\QueryResultInterface;
16-
use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
14+
use Neos\Eel\ProtectedContextAwareInterface;
15+
use Neos\Flow\Persistence\QueryResultInterface;
16+
use Neos\ContentRepository\Domain\Model\NodeInterface;
1717

1818
class ElasticSearchQueryResult implements QueryResultInterface, ProtectedContextAwareInterface
1919
{

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/ElasticSearchClient.php renamed to Classes/ElasticSearchClient.php

Lines changed: 4 additions & 4 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\Configuration\ConfigurationManager;
14+
use Neos\Flow\Annotations as Flow;
15+
use Neos\Flow\Configuration\ConfigurationManager;
1616

1717
/**
1818
* The elasticsearch client to be used by the content repository adapter. Singleton, can be injected.
@@ -46,8 +46,8 @@ class ElasticSearchClient extends \Flowpack\ElasticSearch\Domain\Model\Client
4646
*/
4747
public function initializeObject($cause)
4848
{
49-
if ($cause === \TYPO3\Flow\Object\ObjectManagerInterface::INITIALIZATIONCAUSE_CREATED) {
50-
$settings = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'TYPO3.TYPO3CR.Search');
49+
if ($cause === \Neos\Flow\ObjectManagement\ObjectManagerInterface::INITIALIZATIONCAUSE_CREATED) {
50+
$settings = $this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.ContentRepository.Search');
5151
$this->indexName = $settings['elasticSearch']['indexName'];
5252
}
5353
}

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Exception.php renamed to Classes/Exception.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\Flow\Annotations as Flow;
14+
use Neos\Flow\Annotations as Flow;
1515

16-
class Exception extends \TYPO3\Flow\Exception
16+
class Exception extends \Neos\Flow\Exception
1717
{
1818
}

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Exception/QueryBuildingException.php renamed to Classes/Exception/QueryBuildingException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* source code.
1212
*/
1313

14-
use TYPO3\Flow\Annotations as Flow;
14+
use Neos\Flow\Annotations as Flow;
1515

1616
/**
1717
* A Query Building Exception

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php renamed to Classes/Indexer/NodeIndexer.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
1717
use Flowpack\ElasticSearch\Domain\Model\Document as ElasticSearchDocument;
1818
use Flowpack\ElasticSearch\Domain\Model\Index;
19-
use TYPO3\Flow\Annotations as Flow;
20-
use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
21-
use TYPO3\TYPO3CR\Domain\Service\ContentDimensionCombinator;
22-
use TYPO3\TYPO3CR\Domain\Service\ContextFactory;
23-
use TYPO3\TYPO3CR\Domain\Service\NodeTypeManager;
24-
use TYPO3\TYPO3CR\Search\Indexer\AbstractNodeIndexer;
25-
use TYPO3\TYPO3CR\Search\Indexer\BulkNodeIndexerInterface;
19+
use Neos\Flow\Annotations as Flow;
20+
use Neos\ContentRepository\Domain\Model\NodeInterface;
21+
use Neos\ContentRepository\Domain\Service\ContentDimensionCombinator;
22+
use Neos\ContentRepository\Domain\Service\ContextFactory;
23+
use Neos\ContentRepository\Domain\Service\NodeTypeManager;
24+
use Neos\ContentRepository\Search\Indexer\AbstractNodeIndexer;
25+
use Neos\ContentRepository\Search\Indexer\BulkNodeIndexerInterface;
2626

2727
/**
2828
* Indexer for Content Repository Nodes. Triggered from the NodeIndexingManager.
@@ -54,7 +54,7 @@ class NodeIndexer extends AbstractNodeIndexer implements BulkNodeIndexerInterfac
5454

5555
/**
5656
* @Flow\Inject
57-
* @var \TYPO3\Flow\Persistence\PersistenceManagerInterface
57+
* @var \Neos\Flow\Persistence\PersistenceManagerInterface
5858
*/
5959
protected $persistenceManager;
6060

@@ -139,7 +139,7 @@ public function getIndex()
139139
* @param NodeInterface $node
140140
* @param string $targetWorkspaceName In case this is triggered during publishing, a workspace name will be passed in
141141
* @return void
142-
* @throws \TYPO3\TYPO3CR\Search\Exception\IndexingException
142+
* @throws \Neos\ContentRepository\Search\Exception\IndexingException
143143
*/
144144
public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
145145
{

0 commit comments

Comments
 (0)