From 5e458f65bd0f17b16017639c6d102a7dbc306fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Fri, 16 Feb 2024 22:16:20 +0100 Subject: [PATCH 1/2] Flatten directory tree This seems to have been forgotten in e1751ba7993e25bc6609ea220f03e6261706a10c --- composer.json | 2 +- phpcs.xml.dist | 4 ++-- .../Collections => }/AbstractLazyArrayCollectionTest.php | 1 - tests/{Common/Collections => }/AbstractLazyCollectionTest.php | 1 - tests/{Common/Collections => }/ArrayCollectionTest.php | 0 tests/{Common/Collections => }/BaseArrayCollectionTest.php | 0 tests/{Common/Collections => }/BaseCollectionTest.php | 0 .../{Common/Collections => }/ClosureExpressionVisitorTest.php | 0 tests/{Common/Collections => }/CollectionTest.php | 0 tests/{Common/Collections => }/CriteriaTest.php | 0 tests/DerivedArrayCollection.php | 2 +- tests/{Common/Collections => }/DerivedCollectionTest.php | 1 - tests/{Common/Collections => }/Expr/ComparisonTest.php | 0 .../{Common/Collections => }/Expr/CompositeExpressionTest.php | 0 tests/{Common/Collections => }/Expr/ValueTest.php | 0 tests/{Common/Collections => }/ExpressionBuilderTest.php | 0 tests/LazyArrayCollection.php | 2 +- 17 files changed, 5 insertions(+), 8 deletions(-) rename tests/{Common/Collections => }/AbstractLazyArrayCollectionTest.php (95%) rename tests/{Common/Collections => }/AbstractLazyCollectionTest.php (98%) rename tests/{Common/Collections => }/ArrayCollectionTest.php (100%) rename tests/{Common/Collections => }/BaseArrayCollectionTest.php (100%) rename tests/{Common/Collections => }/BaseCollectionTest.php (100%) rename tests/{Common/Collections => }/ClosureExpressionVisitorTest.php (100%) rename tests/{Common/Collections => }/CollectionTest.php (100%) rename tests/{Common/Collections => }/CriteriaTest.php (100%) rename tests/{Common/Collections => }/DerivedCollectionTest.php (95%) rename tests/{Common/Collections => }/Expr/ComparisonTest.php (100%) rename tests/{Common/Collections => }/Expr/CompositeExpressionTest.php (100%) rename tests/{Common/Collections => }/Expr/ValueTest.php (100%) rename tests/{Common/Collections => }/ExpressionBuilderTest.php (100%) diff --git a/composer.json b/composer.json index ff939f367..b9ef287a8 100644 --- 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/phpcs.xml.dist b/phpcs.xml.dist index a5d8d83ad..3f95aff7b 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -33,10 +33,10 @@ - tests/Common/Collections/ClosureExpressionVisitorTest.php + tests/ClosureExpressionVisitorTest.php - tests/Common/Collections/ClosureExpressionVisitorTest.php + tests/ClosureExpressionVisitorTest.php diff --git a/tests/Common/Collections/AbstractLazyArrayCollectionTest.php b/tests/AbstractLazyArrayCollectionTest.php similarity index 95% rename from tests/Common/Collections/AbstractLazyArrayCollectionTest.php rename to tests/AbstractLazyArrayCollectionTest.php index fdc6a48bb..28e62cef9 100644 --- a/tests/Common/Collections/AbstractLazyArrayCollectionTest.php +++ b/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/tests/Common/Collections/AbstractLazyCollectionTest.php b/tests/AbstractLazyCollectionTest.php similarity index 98% rename from tests/Common/Collections/AbstractLazyCollectionTest.php rename to tests/AbstractLazyCollectionTest.php index 71886f1c7..e30b69693 100644 --- a/tests/Common/Collections/AbstractLazyCollectionTest.php +++ b/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/tests/Common/Collections/ArrayCollectionTest.php b/tests/ArrayCollectionTest.php similarity index 100% rename from tests/Common/Collections/ArrayCollectionTest.php rename to tests/ArrayCollectionTest.php diff --git a/tests/Common/Collections/BaseArrayCollectionTest.php b/tests/BaseArrayCollectionTest.php similarity index 100% rename from tests/Common/Collections/BaseArrayCollectionTest.php rename to tests/BaseArrayCollectionTest.php diff --git a/tests/Common/Collections/BaseCollectionTest.php b/tests/BaseCollectionTest.php similarity index 100% rename from tests/Common/Collections/BaseCollectionTest.php rename to tests/BaseCollectionTest.php diff --git a/tests/Common/Collections/ClosureExpressionVisitorTest.php b/tests/ClosureExpressionVisitorTest.php similarity index 100% rename from tests/Common/Collections/ClosureExpressionVisitorTest.php rename to tests/ClosureExpressionVisitorTest.php diff --git a/tests/Common/Collections/CollectionTest.php b/tests/CollectionTest.php similarity index 100% rename from tests/Common/Collections/CollectionTest.php rename to tests/CollectionTest.php diff --git a/tests/Common/Collections/CriteriaTest.php b/tests/CriteriaTest.php similarity index 100% rename from tests/Common/Collections/CriteriaTest.php rename to tests/CriteriaTest.php diff --git a/tests/DerivedArrayCollection.php b/tests/DerivedArrayCollection.php index 215b2b3f0..9f9f6e823 100644 --- 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/tests/Common/Collections/DerivedCollectionTest.php b/tests/DerivedCollectionTest.php similarity index 95% rename from tests/Common/Collections/DerivedCollectionTest.php rename to tests/DerivedCollectionTest.php index 11241b0ad..a8aece782 100644 --- a/tests/Common/Collections/DerivedCollectionTest.php +++ b/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/tests/Common/Collections/Expr/ComparisonTest.php b/tests/Expr/ComparisonTest.php similarity index 100% rename from tests/Common/Collections/Expr/ComparisonTest.php rename to tests/Expr/ComparisonTest.php diff --git a/tests/Common/Collections/Expr/CompositeExpressionTest.php b/tests/Expr/CompositeExpressionTest.php similarity index 100% rename from tests/Common/Collections/Expr/CompositeExpressionTest.php rename to tests/Expr/CompositeExpressionTest.php diff --git a/tests/Common/Collections/Expr/ValueTest.php b/tests/Expr/ValueTest.php similarity index 100% rename from tests/Common/Collections/Expr/ValueTest.php rename to tests/Expr/ValueTest.php diff --git a/tests/Common/Collections/ExpressionBuilderTest.php b/tests/ExpressionBuilderTest.php similarity index 100% rename from tests/Common/Collections/ExpressionBuilderTest.php rename to tests/ExpressionBuilderTest.php diff --git a/tests/LazyArrayCollection.php b/tests/LazyArrayCollection.php index 755368693..afdca3809 100644 --- 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; From 0cf9f062b8af687b3865ff5fdb463148ca713ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sat, 17 Feb 2024 12:24:18 +0100 Subject: [PATCH 2/2] Use a stable version of the guides-cli --- .github/workflows/documentation.yml | 7 ++----- docs/en/sidebar.rst | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 37d3ae3d6..2e8758952 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -33,10 +33,7 @@ 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" @@ -44,4 +41,4 @@ jobs: 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/docs/en/sidebar.rst b/docs/en/sidebar.rst index ef62a6ebd..ebfb11cb3 100644 --- a/docs/en/sidebar.rst +++ b/docs/en/sidebar.rst @@ -1,3 +1,5 @@ +:orphan: + .. toctree:: :depth: 3