Use a shallower tree

This should make it easier to use fuzzy matchers. Also, it make configuration files for tools more legible.
greg0ire · Sep 29, 2022 · e1751ba · e1751ba
1 parent 6ca4391
commit e1751ba
Show file tree

Hide file tree

Showing 33 changed files with 18 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -46,12 +46,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
+            "Doctrine\\Common\\Collections\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Doctrine\\Tests\\": "tests/Doctrine/Tests"
+            "Doctrine\\Tests\\": "tests"
         }
     },
     "config": {

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -11,7 +11,7 @@
     <!-- Ignore warnings, show progress of the run and show sniff names -->
     <arg value="nps"/>
 
-    <file>lib</file>
+    <file>src</file>
     <file>tests</file>
 
     <rule ref="Doctrine" >
@@ -27,19 +27,19 @@
     </rule>
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming">
-        <exclude-pattern>lib/Doctrine/Common/Collections/AbstractLazyCollection.php</exclude-pattern>
+        <exclude-pattern>src/AbstractLazyCollection.php</exclude-pattern>
     </rule>
 
     <rule ref="Squiz.NamingConventions.ValidVariableName.NotCamelCaps">
-        <exclude-pattern>tests/Doctrine/Tests/Common/Collections/ClosureExpressionVisitorTest.php</exclude-pattern>
+        <exclude-pattern>tests/Common/Collections/ClosureExpressionVisitorTest.php</exclude-pattern>
     </rule>
     <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
-        <exclude-pattern>tests/Doctrine/Tests/Common/Collections/ClosureExpressionVisitorTest.php</exclude-pattern>
+        <exclude-pattern>tests/Common/Collections/ClosureExpressionVisitorTest.php</exclude-pattern>
     </rule>
 
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
-        <exclude-pattern>lib/Doctrine/Common/Collections/AbstractLazyCollection.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/Common/Collections/ArrayCollection.php</exclude-pattern>
-        <exclude-pattern>lib/Doctrine/Common/Collections/Collection.php</exclude-pattern>
+        <exclude-pattern>src/AbstractLazyCollection.php</exclude-pattern>
+        <exclude-pattern>src/ArrayCollection.php</exclude-pattern>
+        <exclude-pattern>src/Collection.php</exclude-pattern>
     </rule>
 </ruleset>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,15 +1,15 @@
 parameters:
     level: 8
     paths:
-        - lib
+        - src
 
     ignoreErrors:
         -
             message: '~Parameter #1 \$key of method Doctrine\\Common\\Collections\\ArrayCollection<TKey of \(int\|string\),T>::set\(\) expects TKey of \(int\|string\), int\|string given\.~'
-            path: 'lib/Doctrine/Common/Collections/ArrayCollection.php'
+            path: 'src/ArrayCollection.php'
         -
             message: '~Cannot call method .* on Doctrine\\Common\\Collections\\Collection<TKey of \(int\|string\), T>\|null\.~'
-            path: 'lib/Doctrine/Common/Collections/AbstractLazyCollection.php'
+            path: 'src/AbstractLazyCollection.php'
 
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,13 +9,13 @@
 >
     <testsuites>
         <testsuite name="Doctrine Collections Test Suite">
-            <directory>./tests/Doctrine/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory>./lib/Doctrine/</directory>
+            <directory>./src/</directory>
         </include>
     </coverage>
 </phpunit>
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -6,10 +6,10 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
-        <directory name="lib" />
+        <directory name="src" />
         <ignoreFiles>
             <directory name="vendor" />
-            <directory name="lib/Doctrine/Common/Collections/Expr"/>
+            <directory name="src/Expr"/>
         </ignoreFiles>
     </projectFiles>
 
@@ -27,7 +27,7 @@
 
         <UnsafeGenericInstantiation>
             <errorLevel type="suppress">
-                <file name="lib/Doctrine/Common/Collections/ArrayCollection.php"/>
+                <file name="src/ArrayCollection.php"/>
             </errorLevel>
         </UnsafeGenericInstantiation>
 
@@ -41,7 +41,7 @@
         <InvalidTemplateParam>
             <errorLevel type="suppress">
                 <!-- https://github.com/vimeo/psalm/issues/8212 -->
-                <file name="lib/Doctrine/Common/Collections/ReadableCollection.php"/>
+                <file name="src/ReadableCollection.php"/>
             </errorLevel>
         </InvalidTemplateParam>
     </issueHandlers>

diff --git a/...on/Collections/AbstractLazyCollection.php → src/AbstractLazyCollection.php b/...on/Collections/AbstractLazyCollection.php → src/AbstractLazyCollection.php
diff --git a/...ne/Common/Collections/ArrayCollection.php → src/ArrayCollection.php b/...ne/Common/Collections/ArrayCollection.php → src/ArrayCollection.php
diff --git a/...octrine/Common/Collections/Collection.php → src/Collection.php b/...octrine/Common/Collections/Collection.php → src/Collection.php
diff --git a/lib/Doctrine/Common/Collections/Criteria.php → src/Criteria.php b/lib/Doctrine/Common/Collections/Criteria.php → src/Criteria.php
diff --git a/...ections/Expr/ClosureExpressionVisitor.php → src/Expr/ClosureExpressionVisitor.php b/...ections/Expr/ClosureExpressionVisitor.php → src/Expr/ClosureExpressionVisitor.php
diff --git a/...ne/Common/Collections/Expr/Comparison.php → src/Expr/Comparison.php b/...ne/Common/Collections/Expr/Comparison.php → src/Expr/Comparison.php
diff --git a/.../Collections/Expr/CompositeExpression.php → src/Expr/CompositeExpression.php b/.../Collections/Expr/CompositeExpression.php → src/Expr/CompositeExpression.php
diff --git a/...ne/Common/Collections/Expr/Expression.php → src/Expr/Expression.php b/...ne/Common/Collections/Expr/Expression.php → src/Expr/Expression.php
diff --git a/...on/Collections/Expr/ExpressionVisitor.php → src/Expr/ExpressionVisitor.php b/...on/Collections/Expr/ExpressionVisitor.php → src/Expr/ExpressionVisitor.php
diff --git a/...octrine/Common/Collections/Expr/Value.php → src/Expr/Value.php b/...octrine/Common/Collections/Expr/Value.php → src/Expr/Value.php
diff --git a/.../Common/Collections/ExpressionBuilder.php → src/ExpressionBuilder.php b/.../Common/Collections/ExpressionBuilder.php → src/ExpressionBuilder.php
diff --git a/...Common/Collections/ReadableCollection.php → src/ReadableCollection.php b/...Common/Collections/ReadableCollection.php → src/ReadableCollection.php
diff --git a/...octrine/Common/Collections/Selectable.php → src/Selectable.php b/...octrine/Common/Collections/Selectable.php → src/Selectable.php
diff --git a/...tions/AbstractLazyArrayCollectionTest.php → ...tions/AbstractLazyArrayCollectionTest.php b/...tions/AbstractLazyArrayCollectionTest.php → ...tions/AbstractLazyArrayCollectionTest.php
diff --git a/...ollections/AbstractLazyCollectionTest.php → ...ollections/AbstractLazyCollectionTest.php b/...ollections/AbstractLazyCollectionTest.php → ...ollections/AbstractLazyCollectionTest.php
diff --git a/...ommon/Collections/ArrayCollectionTest.php → ...ommon/Collections/ArrayCollectionTest.php b/...ommon/Collections/ArrayCollectionTest.php → ...ommon/Collections/ArrayCollectionTest.php
diff --git a/...n/Collections/BaseArrayCollectionTest.php → ...n/Collections/BaseArrayCollectionTest.php b/...n/Collections/BaseArrayCollectionTest.php → ...n/Collections/BaseArrayCollectionTest.php
diff --git a/...Common/Collections/BaseCollectionTest.php → ...Common/Collections/BaseCollectionTest.php b/...Common/Collections/BaseCollectionTest.php → ...Common/Collections/BaseCollectionTest.php
diff --git a/...lections/ClosureExpressionVisitorTest.php → ...lections/ClosureExpressionVisitorTest.php b/...lections/ClosureExpressionVisitorTest.php → ...lections/ClosureExpressionVisitorTest.php
diff --git a/...sts/Common/Collections/CollectionTest.php → tests/Common/Collections/CollectionTest.php b/...sts/Common/Collections/CollectionTest.php → tests/Common/Collections/CollectionTest.php
diff --git a/...Tests/Common/Collections/CriteriaTest.php → tests/Common/Collections/CriteriaTest.php b/...Tests/Common/Collections/CriteriaTest.php → tests/Common/Collections/CriteriaTest.php
diff --git a/...mon/Collections/DerivedCollectionTest.php → ...mon/Collections/DerivedCollectionTest.php b/...mon/Collections/DerivedCollectionTest.php → ...mon/Collections/DerivedCollectionTest.php
diff --git a/...ommon/Collections/Expr/ComparisonTest.php → ...ommon/Collections/Expr/ComparisonTest.php b/...ommon/Collections/Expr/ComparisonTest.php → ...ommon/Collections/Expr/ComparisonTest.php
diff --git a/...lections/Expr/CompositeExpressionTest.php → ...lections/Expr/CompositeExpressionTest.php b/...lections/Expr/CompositeExpressionTest.php → ...lections/Expr/CompositeExpressionTest.php
diff --git a/...sts/Common/Collections/Expr/ValueTest.php → tests/Common/Collections/Expr/ValueTest.php b/...sts/Common/Collections/Expr/ValueTest.php → tests/Common/Collections/Expr/ValueTest.php
diff --git a/...mon/Collections/ExpressionBuilderTest.php → ...mon/Collections/ExpressionBuilderTest.php b/...mon/Collections/ExpressionBuilderTest.php → ...mon/Collections/ExpressionBuilderTest.php
diff --git a/...Doctrine/Tests/DerivedArrayCollection.php → tests/DerivedArrayCollection.php b/...Doctrine/Tests/DerivedArrayCollection.php → tests/DerivedArrayCollection.php
diff --git a/tests/Doctrine/Tests/LazyArrayCollection.php → tests/LazyArrayCollection.php b/tests/Doctrine/Tests/LazyArrayCollection.php → tests/LazyArrayCollection.php