jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

composer upgrade, prevent dbal upgrade, new phpstan version (#2900)

Browse Source
This commit is contained in:
Kevin Papst
2021-11-03 14:58:10 +01:00
committed by GitHub
parent eb63dae405
commit d4278996ae
7 changed files with 324 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
composer.json
View File

@@ -20,6 +20,7 @@
"ext-zip": "*", "ext-zip": "*",
"beberlei/doctrineextensions": "^1.2", "beberlei/doctrineextensions": "^1.2",
"composer/package-versions-deprecated": "^1.8", "composer/package-versions-deprecated": "^1.8",
"doctrine/dbal": "^2.1",
"doctrine/doctrine-bundle": "^2.0", "doctrine/doctrine-bundle": "^2.0",
"doctrine/doctrine-migrations-bundle": "^3.0", "doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/orm": "^2.8", "doctrine/orm": "^2.8",
@@ -78,10 +79,10 @@
"doctrine/doctrine-fixtures-bundle": "^3.2", "doctrine/doctrine-fixtures-bundle": "^3.2",
"fakerphp/faker": "^1.15", "fakerphp/faker": "^1.15",
"friendsofphp/php-cs-fixer": "^3.0", "friendsofphp/php-cs-fixer": "^3.0",
"phpstan/phpstan": "^0.12", "phpstan/phpstan": "^1.0",
"phpstan/phpstan-doctrine": "^0.12", "phpstan/phpstan-doctrine": "^1.0",
"phpstan/phpstan-phpunit": "^0.12", "phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-symfony": "^0.12", "phpstan/phpstan-symfony": "^1.0",
"phpunit/phpunit": "^8.0", "phpunit/phpunit": "^8.0",
"symfony/browser-kit": "^4.4", "symfony/browser-kit": "^4.4",
"symfony/css-selector": "^4.4", "symfony/css-selector": "^4.4",

686
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
phpstan.neon
View File

@@ -8,7 +8,7 @@ parameters:
tmpDir: %rootDir%/../../../var/cache/phpstan tmpDir: %rootDir%/../../../var/cache/phpstan
ignoreErrors: ignoreErrors:
- '#Method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\) invoked with 2 parameters, 1 required.#' - '#Method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\) invoked with 2 parameters, 1 required.#'
excludes_analyse: excludePaths:
- %rootDir%/../../../src/Ldap/LdapDriver.php - %rootDir%/../../../src/Ldap/LdapDriver.php
treatPhpDocTypesAsCertain: false treatPhpDocTypesAsCertain: false
inferPrivatePropertyTypeFromConstructor: true inferPrivatePropertyTypeFromConstructor: true

2
tests/Export/Spreadsheet/Entities/DemoFull.php
View File

@@ -29,6 +29,7 @@ class DemoFull
protected $protectedProperty = false; protected $protectedProperty = false;
/** /**
* @Exporter\Expose(label="label.Private-Property", type="integer") * @Exporter\Expose(label="label.Private-Property", type="integer")
* @phpstan-ignore-next-line
*/ */
private $privateProperty = 123; private $privateProperty = 123;
@@ -63,6 +64,7 @@ class DemoFull
/** /**
* @Exporter\Expose(name="fake-method", label="label.Private-Method", type="boolean") * @Exporter\Expose(name="fake-method", label="label.Private-Method", type="boolean")
* @phpstan-ignore-next-line
*/ */
private function privateMethod(): bool private function privateMethod(): bool
{ {

1
tests/Export/Spreadsheet/Entities/ExpressionOnProperty.php
View File

@@ -15,6 +15,7 @@ class ExpressionOnProperty
{ {
/** /**
* @Exporter\Expose("accessor", label="label.accessor", exp="object.foo") * @Exporter\Expose("accessor", label="label.accessor", exp="object.foo")
* @phpstan-ignore-next-line
*/ */
private $foo; private $foo;
} }

2
tests/Saml/Security/SamlAuthenticationSuccessHandlerTest.php
View File

@@ -20,8 +20,6 @@ use Symfony\Component\Security\Http\HttpUtils;
*/ */
class SamlAuthenticationSuccessHandlerTest extends TestCase class SamlAuthenticationSuccessHandlerTest extends TestCase
{ {
private $handler;
public function testWithAlwaysUseDefaultTargetPath() public function testWithAlwaysUseDefaultTargetPath()
{ {
$httpUtils = new HttpUtils($this->getUrlGenerator()); $httpUtils = new HttpUtils($this->getUrlGenerator());

2
tests/phpstan.neon
View File

@@ -7,6 +7,6 @@ parameters:
tmpDir: %rootDir%/../../../var/cache/phpstan tmpDir: %rootDir%/../../../var/cache/phpstan
ignoreErrors: ignoreErrors:
- '#Call to static method PHPUnit\\Framework\\Assert::assertSame\(\) with App\\Entity\\[a-zA-Z0-9]+ and null will always evaluate to false.#' - '#Call to static method PHPUnit\\Framework\\Assert::assertSame\(\) with App\\Entity\\[a-zA-Z0-9]+ and null will always evaluate to false.#'
excludes_analyse: excludePaths:
- %rootDir%/../../../tests/Ldap/LdapDriverTest.php - %rootDir%/../../../tests/Ldap/LdapDriverTest.php
inferPrivatePropertyTypeFromConstructor: true inferPrivatePropertyTypeFromConstructor: true