Merge pull request #392 from doctrine/2.1.x

Merge 2.1.x up into 2.2.x
doctrine · Feb 18, 2024 · 9ee74e0 · 9ee74e0
2 parents 0798e51 + a423a74
commit 9ee74e0
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 13 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -33,15 +33,12 @@ jobs:
         run: "rm composer.json"
 
       - name: "Require phpdocumentor/guides-cli"
-        run: "composer require --dev phpdocumentor/guides-cli dev-main@dev --no-update"
-
-      - name: "Configure minimum stability"
-        run: "composer config minimum-stability dev"
+        run: "composer require --dev phpdocumentor/guides-cli --no-update"
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v2"
         with:
           dependency-versions: "highest"
 
       - name: "Run guides-cli"
-        run: "vendor/bin/guides -vvv --no-progress --fail-on-log docs/en /tmp/test"
+        run: "vendor/bin/guides -vvv --no-progress --fail-on-log docs/en"
diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Doctrine\\Tests\\": "tests"
+            "Doctrine\\Tests\\Common\\Collections\\": "tests"
         }
     },
     "config": {

diff --git a/docs/en/sidebar.rst b/docs/en/sidebar.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 .. toctree::
     :depth: 3
 

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -33,10 +33,10 @@
     </rule>
 
     <rule ref="Squiz.NamingConventions.ValidVariableName.NotCamelCaps">
-        <exclude-pattern>tests/Common/Collections/ClosureExpressionVisitorTest.php</exclude-pattern>
+        <exclude-pattern>tests/ClosureExpressionVisitorTest.php</exclude-pattern>
     </rule>
     <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
-        <exclude-pattern>tests/Common/Collections/ClosureExpressionVisitorTest.php</exclude-pattern>
+        <exclude-pattern>tests/ClosureExpressionVisitorTest.php</exclude-pattern>
     </rule>
 
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">

diff --git a/...tions/AbstractLazyArrayCollectionTest.php → tests/AbstractLazyArrayCollectionTest.php b/...tions/AbstractLazyArrayCollectionTest.php → tests/AbstractLazyArrayCollectionTest.php
@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Tests\LazyArrayCollection;
 
 use function assert;
 

diff --git a/...ollections/AbstractLazyCollectionTest.php → tests/AbstractLazyCollectionTest.php b/...ollections/AbstractLazyCollectionTest.php → tests/AbstractLazyCollectionTest.php
@@ -5,7 +5,6 @@
 namespace Doctrine\Tests\Common\Collections;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Tests\LazyArrayCollection;
 
 use function assert;
 use function is_array;

diff --git a/...ommon/Collections/ArrayCollectionTest.php → tests/ArrayCollectionTest.php b/...ommon/Collections/ArrayCollectionTest.php → tests/ArrayCollectionTest.php
diff --git a/...n/Collections/BaseArrayCollectionTest.php → tests/BaseArrayCollectionTest.php b/...n/Collections/BaseArrayCollectionTest.php → tests/BaseArrayCollectionTest.php
diff --git a/...Common/Collections/BaseCollectionTest.php → tests/BaseCollectionTest.php b/...Common/Collections/BaseCollectionTest.php → tests/BaseCollectionTest.php
diff --git a/...lections/ClosureExpressionVisitorTest.php → tests/ClosureExpressionVisitorTest.php b/...lections/ClosureExpressionVisitorTest.php → tests/ClosureExpressionVisitorTest.php
diff --git a/tests/Common/Collections/CollectionTest.php → tests/CollectionTest.php b/tests/Common/Collections/CollectionTest.php → tests/CollectionTest.php
diff --git a/tests/Common/Collections/CriteriaTest.php → tests/CriteriaTest.php b/tests/Common/Collections/CriteriaTest.php → tests/CriteriaTest.php
diff --git a/tests/DerivedArrayCollection.php b/tests/DerivedArrayCollection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\Tests;
+namespace Doctrine\Tests\Common\Collections;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use stdClass;

diff --git a/...mon/Collections/DerivedCollectionTest.php → tests/DerivedCollectionTest.php b/...mon/Collections/DerivedCollectionTest.php → tests/DerivedCollectionTest.php
@@ -5,7 +5,6 @@
 namespace Doctrine\Tests\Common\Collections;
 
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\Tests\DerivedArrayCollection;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 

diff --git a/...ommon/Collections/Expr/ComparisonTest.php → tests/Expr/ComparisonTest.php b/...ommon/Collections/Expr/ComparisonTest.php → tests/Expr/ComparisonTest.php
diff --git a/...lections/Expr/CompositeExpressionTest.php → tests/Expr/CompositeExpressionTest.php b/...lections/Expr/CompositeExpressionTest.php → tests/Expr/CompositeExpressionTest.php
diff --git a/tests/Common/Collections/Expr/ValueTest.php → tests/Expr/ValueTest.php b/tests/Common/Collections/Expr/ValueTest.php → tests/Expr/ValueTest.php
diff --git a/...mon/Collections/ExpressionBuilderTest.php → tests/ExpressionBuilderTest.php b/...mon/Collections/ExpressionBuilderTest.php → tests/ExpressionBuilderTest.php
diff --git a/tests/LazyArrayCollection.php b/tests/LazyArrayCollection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\Tests;
+namespace Doctrine\Tests\Common\Collections;
 
 use Doctrine\Common\Collections\AbstractLazyCollection;
 use Doctrine\Common\Collections\Collection;