Skip to content

Commit dcb2981

Browse files
greg0iregreg0ire
authored
Merge pull request #535 from greg0ire/modern-directory-structure
Switch to a modern directory structure
2 parents 62db2f2 + 47020af commit dcb2981

27 files changed

+30
-40
lines changed

‎composer.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,10 @@
4444
"vimeo/psalm": "^4.30 || ^5.15"
4545
},
4646
"autoload": {
47-
"psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "" },
48-
"exclude-from-classmap": [
49-
"/Tests/"
50-
]
47+
"psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "src" }
5148
},
5249
"autoload-dev": {
53-
"psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\Tests\\": "Tests" }
50+
"psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\Tests\\": "tests" }
5451
},
5552
"config": {
5653
"allow-plugins": {

‎Resources/config/schema/doctrine_migrations-3.0.xsd renamed to ‎config/schema/doctrine_migrations-3.0.xsd

File renamed without changes.

‎Resources/config/services.xml renamed to ‎config/services.xml

File renamed without changes.

‎Resources/doc/index.rst renamed to ‎docs/index.rst

File renamed without changes.

‎phpcs.xml.dist

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@
1111

1212
<config name="php_version" value="70200"/>
1313

14-
<file>Collector</file>
15-
<file>MigrationsFactory</file>
16-
<file>DoctrineMigrationsBundle.php</file>
17-
<file>DependencyInjection</file>
18-
<file>Tests</file>
14+
<file>src</file>
15+
<file>tests</file>
1916

20-
<exclude-pattern>Tests/Fixtures/CustomEntityManager.php</exclude-pattern>
17+
<exclude-pattern>tests/Fixtures/CustomEntityManager.php</exclude-pattern>
2118

2219
<rule ref="Doctrine">
2320
<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint" />

‎phpstan-baseline.neon

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ parameters:
33
-
44
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
55
count: 1
6-
path: Collector/MigrationsCollector.php
6+
path: src/Collector/MigrationsCollector.php
77

88
-
99
message: "#^Only booleans are allowed in a negated boolean, Doctrine\\\\Migrations\\\\AbstractMigration\\|null given\\.$#"
1010
count: 1
11-
path: Collector/MigrationsFlattener.php
11+
path: src/Collector/MigrationsFlattener.php
1212

1313
-
1414
message: "#^Only booleans are allowed in a ternary operator condition, Doctrine\\\\Migrations\\\\AbstractMigration\\|null given\\.$#"
1515
count: 2
16-
path: Collector/MigrationsFlattener.php
16+
path: src/Collector/MigrationsFlattener.php
1717

1818
-
1919
message: "#^Call to method setContainer\\(\\) on an unknown class Symfony\\\\Component\\\\DependencyInjection\\\\ContainerAwareInterface\\.$#"
2020
count: 1
21-
path: MigrationsFactory/ContainerAwareMigrationFactory.php
21+
path: src/MigrationsFactory/ContainerAwareMigrationFactory.php
2222

2323
-
2424
message: "#^Class Symfony\\\\Component\\\\DependencyInjection\\\\ContainerAwareInterface not found\\.$#"
2525
count: 2
26-
path: MigrationsFactory/ContainerAwareMigrationFactory.php
26+
path: src/MigrationsFactory/ContainerAwareMigrationFactory.php

‎phpstan.neon.dist

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@ parameters:
22
level: 7
33
phpVersion: 80200
44
paths:
5-
- Collector
6-
- DependencyInjection
7-
- DoctrineMigrationsBundle.php
8-
- MigrationsFactory
9-
- Tests
5+
- src
6+
- tests
107

118
excludePaths:
129
# That file contains an error that cannot be ignored
13-
- Tests/Fixtures/Migrations/ContainerAwareMigration.php
10+
- tests/Fixtures/Migrations/ContainerAwareMigration.php
1411

1512
ignoreErrors:
1613
- '~Parameter \#1 \$configs.*DoctrineMigrationsExtension::load.*~'

‎phpunit.xml.dist

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@
33
<phpunit colors="true" bootstrap="vendor/autoload.php">
44
<testsuites>
55
<testsuite name="DoctrineMigrationsBundle for the Symfony Framework">
6-
<directory>./Tests</directory>
6+
<directory>./tests</directory>
77
</testsuite>
88
</testsuites>
99

1010
<filter>
1111
<whitelist>
12-
<directory>.</directory>
13-
<exclude>
14-
<directory>./Resources</directory>
15-
<directory>./Tests</directory>
16-
<directory>./vendor</directory>
17-
</exclude>
12+
<directory>src</directory>
1813
</whitelist>
1914
</filter>
2015

‎psalm-baseline.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
3-
<file src="DependencyInjection/Configuration.php">
3+
<file src="src/DependencyInjection/Configuration.php">
44
<UndefinedInterfaceMethod>
55
<code><![CDATA[end]]></code>
66
</UndefinedInterfaceMethod>
77
</file>
8-
<file src="DependencyInjection/DoctrineMigrationsExtension.php">
8+
<file src="src/DependencyInjection/DoctrineMigrationsExtension.php">
99
<MoreSpecificImplementedParamType>
1010
<code><![CDATA[$configs]]></code>
1111
</MoreSpecificImplementedParamType>
1212
</file>
13-
<file src="MigrationsFactory/ContainerAwareMigrationFactory.php">
13+
<file src="src/MigrationsFactory/ContainerAwareMigrationFactory.php">
1414
<ContainerDependency>
1515
<code><![CDATA[ContainerInterface $container]]></code>
1616
</ContainerDependency>
1717
<UndefinedClass>
1818
<code><![CDATA[ContainerAwareInterface]]></code>
1919
</UndefinedClass>
2020
</file>
21-
<file src="Tests/Fixtures/Migrations/ContainerAwareMigration.php">
21+
<file src="tests/Fixtures/Migrations/ContainerAwareMigration.php">
2222
<UndefinedClass>
2323
<code><![CDATA[ContainerAwareInterface]]></code>
2424
</UndefinedClass>

‎psalm.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
errorBaseline="psalm-baseline.xml"
1111
>
1212
<projectFiles>
13-
<directory name="Collector" />
14-
<directory name="DependencyInjection" />
15-
<directory name="MigrationsFactory" />
16-
<directory name="Tests" />
17-
<file name="DoctrineMigrationsBundle.php" />
13+
<directory name="src" />
14+
<directory name="tests" />
1815
<ignoreFiles>
1916
<directory name="vendor" />
2017
</ignoreFiles>

0 commit comments

Comments
 (0)