Skip to content

Commit

Permalink
Moved library classes from lib/Doctrine/DBAL to src/
Browse files Browse the repository at this point in the history
  • Loading branch information
morozov committed Mar 21, 2020
1 parent 40cc9bd commit 936e7e3
Show file tree
Hide file tree
Showing 235 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"sort-packages": true
},
"autoload": {
"psr-4": { "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" }
"psr-4": { "Doctrine\\DBAL\\": "src" }
},
"autoload-dev": {
"psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" }
Expand Down
2 changes: 1 addition & 1 deletion docs/en/reference/caching.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ object is closed:

.. warning::

When using the cache layer not all fetch modes are supported. See the code of the `ResultCacheStatement <https://github.com/doctrine/dbal/blob/master/lib/Doctrine/DBAL/Cache/ResultCacheStatement.php>`_ for details.
When using the cache layer not all fetch modes are supported. See the code of the `ResultCacheStatement <https://github.com/doctrine/dbal/blob/master/src/Cache/ResultCacheStatement.php>`_ for details.
24 changes: 12 additions & 12 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<arg value="nps"/>

<file>bin</file>
<file>lib</file>
<file>src</file>
<file>tests</file>

<rule ref="Doctrine">
Expand All @@ -22,11 +22,11 @@
</rule>

<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint">
<exclude-pattern>*/lib/*</exclude-pattern>
<exclude-pattern>*/src/*</exclude-pattern>
</rule>

<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint">
<exclude-pattern>*/lib/*</exclude-pattern>
<exclude-pattern>*/src/*</exclude-pattern>
</rule>

<rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
Expand All @@ -38,7 +38,7 @@
</rule>

<rule ref="Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase">
<exclude-pattern>lib/Doctrine/DBAL/Events.php</exclude-pattern>
<exclude-pattern>src/Events.php</exclude-pattern>
</rule>

<rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements.UnusedProperty">
Expand All @@ -47,19 +47,19 @@

<!-- see https://github.com/squizlabs/PHP_CodeSniffer/issues/2099 -->
<rule ref="Squiz.Commenting.FunctionComment.InvalidNoReturn">
<exclude-pattern>lib/Doctrine/DBAL/Platforms/AbstractPlatform.php</exclude-pattern>
<exclude-pattern>lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php</exclude-pattern>
<exclude-pattern>src/Platforms/AbstractPlatform.php</exclude-pattern>
<exclude-pattern>src/Schema/AbstractSchemaManager.php</exclude-pattern>
<exclude-pattern>tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php</exclude-pattern>
</rule>

<!-- some statement classes close cursor using an empty while-loop -->
<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedWhile">
<exclude-pattern>lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
<exclude-pattern>src/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
</rule>

<!-- sqlsrv functions are documented in upper case but reflected in lower case -->
<rule ref="Squiz.PHP.LowercasePHPFunctions.CallUppercase">
<exclude-pattern>lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
<exclude-pattern>src/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
</rule>

<!-- see https://github.com/squizlabs/PHP_CodeSniffer/issues/2165 -->
Expand All @@ -70,19 +70,19 @@

<!-- see https://github.com/doctrine/dbal/issues/3377 -->
<rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators.DisallowedNotEqualOperator">
<exclude-pattern>lib/Doctrine/DBAL/Schema/Comparator.php</exclude-pattern>
<exclude-pattern>src/Schema/Comparator.php</exclude-pattern>
</rule>

<!-- see https://github.com/slevomat/coding-standard/issues/737 -->
<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.IncorrectReturnTypeHint">
<exclude-pattern>lib/Doctrine/DBAL/Types/ArrayType.php</exclude-pattern>
<exclude-pattern>lib/Doctrine/DBAL/Types/ObjectType.php</exclude-pattern>
<exclude-pattern>src/Types/ArrayType.php</exclude-pattern>
<exclude-pattern>src/Types/ObjectType.php</exclude-pattern>
<exclude-pattern>tests/Doctrine/Tests/DBAL/Driver/Mysqli/MysqliConnectionTest.php</exclude-pattern>
</rule>

<!-- The SQLSRV_* functions are defined in the upper case by the sqlsrv extension and violate the standard
see https://docs.microsoft.com/en-us/sql/connect/php/constants-microsoft-drivers-for-php-for-sql-server -->
<rule ref="Squiz.PHP.LowercasePHPFunctions.UseStatementUppercase">
<exclude-pattern>lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
<exclude-pattern>src/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
</rule>
</ruleset>
2 changes: 1 addition & 1 deletion phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
level: 7
paths:
- %currentWorkingDirectory%/lib
- %currentWorkingDirectory%/src
autoload_files:
- %currentWorkingDirectory%/tests/phpstan-polyfill.php
reportUnmatchedIgnoredErrors: false
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

<filter>
<whitelist>
<directory suffix=".php">lib/Doctrine</directory>
<directory suffix=".php">src</directory>
</whitelist>
</filter>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/continuousphp/oci8.phpunit.continuousphp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/continuousphp/pdo-oci.phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/travis/ibm_db2.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/travis/mariadb.docker.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/travis/mariadb.mysqli.docker.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/travis/mysql.docker.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/travis/mysqli.docker.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/travis/pdo_sqlsrv.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/travis/pgsql.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/travis/sqlite.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down
2 changes: 1 addition & 1 deletion tests/travis/sqlsrv.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
<directory suffix=".php">../../src</directory>
</whitelist>
</filter>

Expand Down

0 comments on commit 936e7e3

Please sign in to comment.