Skip to content

Commit 8a0ee01

Browse files
authored
[UPMERGE] 2.0 -> 2.1 (#423)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/InvoicingPlugin/blob/1.0/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/2.1 -m "Resolve conflicts between 2.0 and 2.1" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/InvoicingPlugin` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
2 parents c37ee63 + 4bde789 commit 8a0ee01

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

ecs.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
$config->import('vendor/sylius-labs/coding-standard/ecs.php');
2424

2525
$config->parallel();
26-
$config->paths(['src', 'spec']);
26+
$config->paths(['src', 'tests/DependencyInjection', 'tests/Unit', 'tests/Behat']);
2727
$config->skip([
2828
InlineDocCommentDeclarationSniff::class . '.MissingVariable',
2929
InlineDocCommentDeclarationSniff::class . '.NoAssignment',
30-
VisibilityRequiredFixer::class => ['*Spec.php'],
3130
'**/var/*',
3231
'src/Migrations/*',
3332
]);

phpstan.neon

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ parameters:
1818
- '/Method Sylius\\InvoicingPlugin\\[a-zA-Z\\]+::getFlashBag\(\) should return Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface but returns Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface\./'
1919
- '/Method Sylius\\InvoicingPlugin\\Security\\Voter\\InvoiceVoter::supports\(\) has parameter \$attribute with no typehint specified./'
2020
- '/Method Sylius\\InvoicingPlugin\\Security\\Voter\\InvoiceVoter::supports\(\) has parameter \$subject with no typehint specified./'
21+
- '/Call to method scalarNode\(\) on an unknown class Symfony\\Component\\Config\\Definition\\Builder\\NodeBuilder<Symfony\\Component\\Config\\Definition\\Builder\\ArrayNodeDefinition>./'
2122
- '/expects string, string\|null given\.$/'

0 commit comments

Comments
 (0)