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.

Sign up for GitHub

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

Jump to bottom

Update build tools #506

Merged
merged 4 commits into from
Apr 30, 2023
Merged

Update build tools #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
809d117
Update build tools
core23 Apr 30, 2023
f54b3a9
Update php-cs-fixer config
core23 Apr 30, 2023
64c6210
Fix CS
core23 Apr 30, 2023
3e2b0e7
Ignore false-positive psalm error
core23 Apr 30, 2023
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.php-cs-fixer.cache
.php-cs-fixer.php
.phpunit.result.cache
coverage
composer.lock
phpunit.xml
/.phpunit.cache/
/build/
/vendor/
!/vendor-bin/tools/composer.lock
Expand Down
3 changes: 3 additions & 0 deletions .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
'import_constants' => false,
'import_functions' => false,
],
'phpdoc_to_comment' => [
'ignored_tags' => ['psalm-suppress'],
],
])
->setFinder($finder)
;
Expand Down
16 changes: 7 additions & 9 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage>
<include>
<directory suffix=".php">./src/</directory>
</include>
</coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache">
<coverage/>
<php>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
</php>
Expand All @@ -13,7 +9,9 @@
<directory>./tests/</directory>
</testsuite>
</testsuites>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
</listeners>
<source>
<include>
<directory suffix=".php">./src/</directory>
</include>
</source>
</phpunit>
2 changes: 2 additions & 0 deletions src/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public function getConfigTreeBuilder(): TreeBuilder

private function addRegistrationSection(ArrayNodeDefinition $node): void
{
/** @psalm-suppress UndefinedInterfaceMethod */
$node
->children()
->arrayNode('registration')
Expand All @@ -51,6 +52,7 @@ private function addRegistrationSection(ArrayNodeDefinition $node): void

private function addServiceSection(ArrayNodeDefinition $node): void
{
/** @psalm-suppress UndefinedInterfaceMethod */
$node
->addDefaultsIfNotSet()
->children()
Expand Down
1 change: 0 additions & 1 deletion src/Resources/config/email_confirmation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@
new Reference('router'),
new Reference('request_stack'),
])

;
};
1 change: 0 additions & 1 deletion src/Resources/config/mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@
])

->set('nucleos_profile.mailer.noop', NoopRegistrationMailer::class)

;
};
1 change: 0 additions & 1 deletion src/Resources/config/profile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,5 @@
new Reference('twig'),
new Reference('security.helper'),
])

;
};
1 change: 0 additions & 1 deletion src/Resources/config/registration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,5 @@
new Reference('security.helper'),
new Reference('security.token_storage'),
])

;
};
30 changes: 14 additions & 16 deletions vendor-bin/tools/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,20 @@
"description": "Development tools that do not conflict the project dependencies",
"type": "project",
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.0",
"jangregor/phpstan-prophecy": "^1.0",
"maglnet/composer-require-checker": "^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
"phpmd/phpmd": "^2.9",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-strict-rules": "^1.0",
"phpstan/phpstan-symfony": "^1.0",
"phpunit/phpunit": "^8.5 || ^9.0",
"psalm/plugin-phpunit": "^0.18",
"psalm/plugin-symfony": "^5.0",
"symfony/phpunit-bridge": "^6.0",
"vimeo/psalm": "^5.0.0"
"friendsofphp/php-cs-fixer": "^3.16",
"maglnet/composer-require-checker": "^4.6",
"matthiasnoback/symfony-dependency-injection-test": "^4.3",
"phpmd/phpmd": "^2.13",
"phpstan/extension-installer": "^1.3",
"phpstan/phpstan": "^1.10.14",
"phpstan/phpstan-phpunit": "^1.3.11",
"phpstan/phpstan-strict-rules": "^1.5.1",
"phpstan/phpstan-symfony": "^1.3.1",
"phpunit/phpunit": "^10.1.2",
"psalm/plugin-phpunit": "^0.18.4",
"psalm/plugin-symfony": "^5.0.3",
"symfony/phpunit-bridge": "^6.2.7",
"vimeo/psalm": "^5.9"
},
"config": {
"allow-plugins": {
Expand Down
Loading