Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.3.x up into 3.4.x #528

Merged
merged 5 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ migration to execute:

.. code-block:: terminal

$ php bin/console doctrine:migrations:status --show-versions
$ php bin/console doctrine:migrations:status

Now you can add some migration code to the ``up()`` and ``down()`` methods and
finally migrate when you're ready:
Expand Down
8 changes: 6 additions & 2 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ parameters:
level: 7
phpVersion: 80200
paths:
- %currentWorkingDirectory%/DependencyInjection
- %currentWorkingDirectory%/Tests
- DependencyInjection
- Tests

excludePaths:
# That file contains an error that cannot be ignored
- Tests/Fixtures/Migrations/ContainerAwareMigration.php

ignoreErrors:
- '~Parameter \#1 \$configs.*DoctrineMigrationsExtension::load.*~'
Expand Down
11 changes: 8 additions & 3 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
<file src="DependencyInjection/Configuration.php">
<UndefinedInterfaceMethod>
<code>end</code>
<code><![CDATA[end]]></code>
</UndefinedInterfaceMethod>
</file>
<file src="DependencyInjection/DoctrineMigrationsExtension.php">
<MoreSpecificImplementedParamType>
<code>$configs</code>
<code><![CDATA[$configs]]></code>
</MoreSpecificImplementedParamType>
</file>
<file src="Tests/Fixtures/Migrations/ContainerAwareMigration.php">
<UndefinedClass>
<code><![CDATA[ContainerAwareInterface]]></code>
</UndefinedClass>
</file>
</files>
Loading