Skip to content

Commit

Permalink
Move files to the new bundle directory structure
Browse files Browse the repository at this point in the history
  • Loading branch information
GromNaN committed Dec 21, 2023
1 parent 3785d8d commit e1ef9ab
Show file tree
Hide file tree
Showing 173 changed files with 27 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
with:
args: --short
env:
DOCS_DIR: 'Resources/doc/'
DOCS_DIR: 'docs/'
9 changes: 3 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,12 @@
"minimum-stability": "stable",
"autoload": {
"psr-4": {
"Doctrine\\Bundle\\MongoDBBundle\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
"Doctrine\\Bundle\\MongoDBBundle\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Doctrine\\Bundle\\MongoDBBundle\\Tests\\": "Tests"
"Doctrine\\Bundle\\MongoDBBundle\\Tests\\": "tests"
}
},
"config": {
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.
12 changes: 6 additions & 6 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

<config name="php_version" value="80100"/>

<file>.</file>

<exclude-pattern>vendor/*</exclude-pattern>
<file>config</file>
<file>src</file>
<file>tests</file>

<rule ref="Doctrine">
<!-- Traversable type hints often end up as mixed[], so we skip them for now -->
Expand All @@ -32,15 +32,15 @@
</rule>

<rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
<exclude-pattern>Tests/*</exclude-pattern>
<exclude-pattern>tests/*</exclude-pattern>
</rule>

<rule ref="Squiz.Classes.ClassFileName.NoMatch">
<exclude-pattern>Tests/*</exclude-pattern>
<exclude-pattern>tests/*</exclude-pattern>
</rule>

<!-- It fails when using Nowdoc in method call -->
<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall.MissingTrailingComma">
<exclude-pattern>Command/*</exclude-pattern>
<exclude-pattern>src/Command/*</exclude-pattern>
</rule>
</ruleset>
11 changes: 3 additions & 8 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
bootstrap="./Tests/bootstrap.php"
bootstrap="tests/bootstrap.php"
>
<testsuites>
<testsuite name="DoctrineMongoDBBundle Test Suite">
<directory>./Tests/</directory>
<directory>tests</directory>
</testsuite>
</testsuites>

Expand All @@ -28,13 +28,8 @@

<coverage>
<include>
<directory>./</directory>
<directory>src</directory>
</include>
<exclude>
<directory>./Resources</directory>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>

<listeners>
Expand Down
13 changes: 9 additions & 4 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d">
<file src="Command/LoadDataFixturesDoctrineODMCommand.php">
<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
<file src="config/value_resolver.php">
<UndefinedClass>
<code>ExpressionLanguage</code>
</UndefinedClass>
</file>
<file src="src/Command/LoadDataFixturesDoctrineODMCommand.php">
<UndefinedInterfaceMethod>
<code>ask</code>
</UndefinedInterfaceMethod>
</file>
<file src="DependencyInjection/Configuration.php">
<file src="src/DependencyInjection/Configuration.php">
<UndefinedInterfaceMethod>
<code>arrayNode</code>
<code>end</code>
Expand All @@ -16,7 +21,7 @@
<code>children</code>
</UndefinedMethod>
</file>
<file src="Tests/Form/Type/GuesserTestType.php">
<file src="tests/Form/Type/GuesserTestType.php">
<MissingTemplateParam>
<code>GuesserTestType</code>
</MissingTemplateParam>
Expand Down
19 changes: 3 additions & 16 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,9 @@
<pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
</plugins>
<projectFiles>
<directory name="APM"/>
<directory name="CacheWarmer"/>
<directory name="Command"/>
<directory name="DataCollector"/>
<directory name="DependencyInjection"/>
<directory name="EventSubscriber"/>
<directory name="Fixture"/>
<directory name="Form"/>
<directory name="Loader"/>
<directory name="Mapping"/>
<directory name="Repository"/>
<directory name="Tests"/>
<directory name="Validator"/>
<file name="DoctrineMongoDBBundle.php"/>
<file name="ManagerConfigurator.php"/>
<file name="ManagerRegistry.php"/>
<directory name="./config"/>
<directory name="./src"/>
<directory name="./tests"/>
<ignoreFiles>
<directory name="vendor"/>
</ignoreFiles>
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.
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class DoctrineMongoDBExtension extends AbstractDoctrineExtension
*/
public function load(array $configs, ContainerBuilder $container): void
{
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../config'));

$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);
Expand Down Expand Up @@ -562,7 +562,7 @@ public function getNamespace(): string

public function getXsdValidationBasePath(): string
{
return __DIR__ . '/../Resources/config/schema';
return __DIR__ . '/../../config/schema';
}

/**
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.

0 comments on commit e1ef9ab

Please sign in to comment.