finish removing Neos.ContentRepository.DimensionSpace package

neos · Aug 28, 2022 · 40c2d74 · 40c2d74
1 parent 22aa688
commit 40c2d74
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 828 deletions.
diff --git a/.composer.json b/.composer.json
@@ -12,7 +12,7 @@
   "suggest": {
   },
   "scripts": {
-    "lint:phpcs": "../../bin/phpcs --colors --standard=PSR12 ./Neos.ContentGraph.DoctrineDbalAdapter/src ./Neos.ContentGraph.PostgreSQLAdapter/src ./Neos.ContentRepository.BehavioralTests/Classes ./Neos.ContentRepository.DimensionSpace/src ./Neos.ContentRepository/src ./Neos.EventSourcedContentRepository.LegacyApi/Classes ./Neos.EventSourcedNeosAdjustments/Classes ./Neos.Neos/Classes",
+    "lint:phpcs": "../../bin/phpcs --colors --standard=PSR12 ./Neos.ContentGraph.DoctrineDbalAdapter/src ./Neos.ContentGraph.PostgreSQLAdapter/src ./Neos.ContentRepository.BehavioralTests/Classes ./Neos.ContentRepository/src ./Neos.EventSourcedContentRepository.LegacyApi/Classes ./Neos.EventSourcedNeosAdjustments/Classes ./Neos.Neos/Classes",
     "lint:phpstan": "../../bin/phpstan analyse",
     "lint": [
       "@lint:phpcs",

diff --git a/Neos.ContentRepository.DimensionSpace/LICENSE b/Neos.ContentRepository.DimensionSpace/LICENSE
diff --git a/Neos.ContentRepository.DimensionSpace/README.md b/Neos.ContentRepository.DimensionSpace/README.md
diff --git a/Neos.ContentRepository.DimensionSpace/composer.json b/Neos.ContentRepository.DimensionSpace/composer.json
diff --git a/...rationBasedContentDimensionSourceTest.php → ...rationBasedContentDimensionSourceTest.php b/...rationBasedContentDimensionSourceTest.php → ...rationBasedContentDimensionSourceTest.php
@@ -12,9 +12,9 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\Dimension;
+namespace Neos\ContentRepository\Tests\Unit\Dimension;
 
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 use Neos\ContentRepository\Dimension\ContentDimensionConstraintSet;
 use Neos\Flow\Tests\UnitTestCase;
 

diff --git a/...nsion/ContentDimensionConstraintsTest.php → ...nsion/ContentDimensionConstraintsTest.php b/...nsion/ContentDimensionConstraintsTest.php → ...nsion/ContentDimensionConstraintsTest.php
@@ -12,9 +12,9 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\Dimension;
+namespace Neos\ContentRepository\Tests\Unit\Dimension;
 
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 use Neos\Flow\Tests\UnitTestCase;
 
 /**

diff --git a/...ension/ContentDimensionIdentifierTest.php → ...ension/ContentDimensionIdentifierTest.php b/...ension/ContentDimensionIdentifierTest.php → ...ension/ContentDimensionIdentifierTest.php
@@ -12,9 +12,9 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\Dimension;
+namespace Neos\ContentRepository\Tests\Unit\Dimension;
 
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 use Neos\Flow\Tests\UnitTestCase;
 
 /**

diff --git a/...s/Unit/Dimension/ContentDimensionTest.php → ...s/Unit/Dimension/ContentDimensionTest.php b/...s/Unit/Dimension/ContentDimensionTest.php → ...s/Unit/Dimension/ContentDimensionTest.php
@@ -12,9 +12,9 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\Dimension;
+namespace Neos\ContentRepository\Tests\Unit\Dimension;
 
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 use Neos\ContentRepository\Dimension\Exception\ContentDimensionValuesAreInvalid;
 use Neos\ContentRepository\Dimension\Exception\GeneralizationIsInvalid;
 use Neos\Flow\Tests\UnitTestCase;

diff --git a/...DimensionValueSpecializationDepthTest.php → ...DimensionValueSpecializationDepthTest.php b/...DimensionValueSpecializationDepthTest.php → ...DimensionValueSpecializationDepthTest.php
@@ -12,9 +12,9 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\Dimension;
+namespace Neos\ContentRepository\Tests\Unit\Dimension;
 
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid;
 use Neos\Flow\Tests\UnitTestCase;
 

diff --git a/...t/Dimension/ContentDimensionValueTest.php → ...t/Dimension/ContentDimensionValueTest.php b/...t/Dimension/ContentDimensionValueTest.php → ...t/Dimension/ContentDimensionValueTest.php
@@ -12,9 +12,9 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\Dimension;
+namespace Neos\ContentRepository\Tests\Unit\Dimension;
 
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueIsInvalid;
 use Neos\Flow\Tests\UnitTestCase;
 

diff --git a/...onSpace/ContentDimensionZookeeperTest.php → ...onSpace/ContentDimensionZookeeperTest.php b/...onSpace/ContentDimensionZookeeperTest.php → ...onSpace/ContentDimensionZookeeperTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\DimensionSpace;
+namespace Neos\ContentRepository\Tests\Unit\DimensionSpace;
 
 /*
  * This file is part of the Neos.ContentRepository.DimensionSpace package.
@@ -12,7 +12,7 @@
  * source code.
  */
 use Neos\ContentRepository\DimensionSpace;
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 use Neos\Flow\Tests\UnitTestCase;
 
 // NOTE: not sure why this is needed

diff --git a/...ce/ContentSubgraphVariationWeightTest.php → ...ce/ContentSubgraphVariationWeightTest.php b/...ce/ContentSubgraphVariationWeightTest.php → ...ce/ContentSubgraphVariationWeightTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\DimensionSpace;
+namespace Neos\ContentRepository\Tests\Unit\DimensionSpace;
 
 /*
  * This file is part of the Neos.ContentRepository.DimensionSpace package.
@@ -11,7 +11,7 @@
  * information, please view the LICENSE file which was distributed with this
  * source code.
  */
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid;
 use Neos\ContentRepository\DimensionSpace;
 use Neos\ContentRepository\DimensionSpace\Exception\ContentSubgraphVariationWeightsAreIncomparable;

diff --git a/...Space/Fixtures/ExampleDimensionSource.php → ...Space/Fixtures/ExampleDimensionSource.php b/...Space/Fixtures/ExampleDimensionSource.php → ...Space/Fixtures/ExampleDimensionSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\DimensionSpace\Fixtures;
+namespace Neos\ContentRepository\Tests\Unit\DimensionSpace\Fixtures;
 
 /*
  * This file is part of the Neos.ContentRepository.DimensionSpace package.
@@ -11,7 +11,7 @@
  * information, please view the LICENSE file which was distributed with this
  * source code.
  */
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 
 /**
  * The example dimension source fixture

diff --git a/...e/Fixtures/NullExampleDimensionSource.php → ...e/Fixtures/NullExampleDimensionSource.php b/...e/Fixtures/NullExampleDimensionSource.php → ...e/Fixtures/NullExampleDimensionSource.php
@@ -10,9 +10,9 @@
  * source code.
  */
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\DimensionSpace\Fixtures;
+namespace Neos\ContentRepository\Tests\Unit\DimensionSpace\Fixtures;
 
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 
 /**
  * A dimension source fixture with no dimensions defined

diff --git a/...tures/VariationExampleDimensionSource.php → ...tures/VariationExampleDimensionSource.php b/...tures/VariationExampleDimensionSource.php → ...tures/VariationExampleDimensionSource.php
@@ -10,9 +10,9 @@
  * source code.
  */
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\DimensionSpace\Fixtures;
+namespace Neos\ContentRepository\Tests\Unit\DimensionSpace\Fixtures;
 
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 
 /**
  * The dimension source fixture with variation examples

diff --git a/...ce/InterDimensionalVariationGraphTest.php → ...ce/InterDimensionalVariationGraphTest.php b/...ce/InterDimensionalVariationGraphTest.php → ...ce/InterDimensionalVariationGraphTest.php
@@ -10,9 +10,9 @@
  * source code.
  */
 
-namespace Neos\ContentRepository\DimensionSpace\Tests\Unit\DimensionSpace;
+namespace Neos\ContentRepository\Tests\Unit\DimensionSpace;
 
-use Neos\ContentRepository\DimensionSpace\Dimension;
+use Neos\ContentRepository\Dimension;
 use Neos\ContentRepository\DimensionSpace;
 use Neos\Flow\Tests\UnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;

diff --git a/Neos.ContentRepository/composer.json b/Neos.ContentRepository/composer.json
@@ -7,7 +7,6 @@
     "require": {
         "neos/eventstore": "*",
         "neos/eventstore-doctrineadapter": "*",
-        "neos/contentrepository-dimensionspace": "*",
         "php": "^8.1",
         "neos/error-messages": "*",
         "neos/utility-objecthandling": "*",

diff --git a/composer.json b/composer.json
@@ -11,14 +11,14 @@
         "php": "^8.1",
         "doctrine/dbal": "^2.8",
         "doctrine/migrations": "*",
-        "neos/utility-arrays": "*",
         "league/flysystem": "^3",
         "webmozart/assert": "^1.11",
         "neos/neos-ui": "*",
         "neos/eventstore": "*",
         "neos/eventstore-doctrineadapter": "*",
         "neos/error-messages": "*",
         "neos/utility-objecthandling": "*",
+        "neos/utility-arrays": "*",
         "symfony/serializer": "*",
         "neos/flow": "*",
         "symfony/property-access": "*",
@@ -40,7 +40,6 @@
         "neos/kickstarter": "*"
     },
     "replace": {
-        "neos/content-repository-dimensionspace": "self.version",
         "typo3/typo3cr": "self.version",
         "neos/content-repository": "self.version",
         "packagefactory/atomicfusion-afx": "*",
@@ -53,7 +52,6 @@
         "neos/contentgraph-doctrinedbaladapter": "self.version",
         "neos/contentgraph-postgresqladapter": "self.version",
         "neos/contentrepository-behavioraltests": "self.version",
-        "neos/contentrepository-dimensionspace": "self.version",
         "neos/contentrepository-export": "self.version",
         "neos/contentrepository-legacynodemigration": "self.version",
         "neos/contentrepository-nodeaccess": "self.version",
@@ -92,7 +90,7 @@
         "neos/redirecthandler-neosadapter": "Adds automatic redirects for moved/renamed pages"
     },
     "scripts": {
-        "lint:phpcs": "../../bin/phpcs --colors --standard=PSR12 ./Neos.ContentGraph.DoctrineDbalAdapter/src ./Neos.ContentGraph.PostgreSQLAdapter/src ./Neos.ContentRepository.BehavioralTests/Classes ./Neos.ContentRepository.DimensionSpace/src ./Neos.ContentRepository/src ./Neos.EventSourcedContentRepository.LegacyApi/Classes ./Neos.EventSourcedNeosAdjustments/Classes ./Neos.Neos/Classes",
+        "lint:phpcs": "../../bin/phpcs --colors --standard=PSR12 ./Neos.ContentGraph.DoctrineDbalAdapter/src ./Neos.ContentGraph.PostgreSQLAdapter/src ./Neos.ContentRepository.BehavioralTests/Classes ./Neos.ContentRepository/src ./Neos.EventSourcedContentRepository.LegacyApi/Classes ./Neos.EventSourcedNeosAdjustments/Classes ./Neos.Neos/Classes",
         "lint:phpstan": "../../bin/phpstan analyse",
         "lint": [
             "@lint:phpcs",
@@ -139,9 +137,6 @@
             "Neos\\ContentRepository\\BehavioralTests\\": [
                 "Neos.ContentRepository.BehavioralTests/Classes"
             ],
-            "Neos\\ContentRepository\\DimensionSpace\\": [
-                "Neos.ContentRepository.DimensionSpace/src"
-            ],
             "Neos\\ContentRepository\\Export\\": [
                 "Neos.ContentRepository.Export/src/"
             ],
@@ -245,9 +240,6 @@
             "Neos\\ContentRepository\\BehavioralTests\\Tests\\": [
                 "Neos.ContentRepository.BehavioralTests/Tests"
             ],
-            "Neos\\ContentRepository\\DimensionSpace\\Tests\\": [
-                "Neos.ContentRepository.DimensionSpace/Tests"
-            ],
             "Neos\\ContentRepository\\LegacyNodeMigration\\Tests\\": [
                 "Neos.ContentRepository.LegacyNodeMigration/Tests"
             ],