Skip to content
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: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@
/phpcs.xml.dist export-ignore
/phpstan.neon export-ignore
/phpunit.xml.dist export-ignore
/psalm.xml.dist export-ignore
/psalm-baseline.xml export-ignore
/tests/ export-ignore
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
"phpstan/phpstan": "^1.4.6",
"phpstan/phpstan-phpunit": "^1.0.0",
"phpunit/phpunit": "^9.5.13",
"squizlabs/php_codesniffer": "^3.6.2",
"vimeo/psalm": "^5.4.0"
"squizlabs/php_codesniffer": "^3.6.2"
},
"conflict": {
"doctrine/migrations": "<3.3"
Expand Down Expand Up @@ -81,13 +80,11 @@
"check": [
"@cs-check",
"@phpstan",
"@psalm",
"@test"
],
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"phpstan": "phpstan analyse",
"psalm": "psalm --stats",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover=coverage.xml"
}
Expand Down
17 changes: 0 additions & 17 deletions psalm.xml

This file was deleted.

1 change: 0 additions & 1 deletion src/CliConfigurator.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ private function getObjectManagerName(): string
return $this->defaultObjectManagerName;
}

/** @psalm-suppress ReservedWord */
return $arguments->getParameterOption('--object-manager');
}

Expand Down
8 changes: 3 additions & 5 deletions src/Paginator/Adapter/DoctrinePaginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
/**
* Paginator adapter for the Laminas\Paginator component
*
* @psalm-template T of object
* @psalm-template TKey of int
* @psalm-template TValue
* @phpstan-template T of object
* @phpstan-template TKey of int
* @phpstan-template TValue
* @template-implements AdapterInterface<TKey, TValue>
*/
class DoctrinePaginator implements AdapterInterface, JsonSerializable
Expand Down Expand Up @@ -57,8 +57,6 @@ public function getPaginator(): Paginator
* @param int|null $itemCountPerPage
*
* @return ArrayIterator<TKey, TValue>
*
* @psalm-suppress LessSpecificImplementedReturnType
*/
public function getItems($offset, $itemCountPerPage)
{
Expand Down
1 change: 0 additions & 1 deletion src/Service/DBALConnectionFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?ar
$configuration = $serviceLocator->get($options->getConfiguration());
$eventManager = $serviceLocator->get($options->getEventManager());

/** @psalm-suppress InvalidArgument */
$connection = DriverManager::getConnection($params, $configuration, $eventManager);
foreach ($options->getDoctrineTypeMappings() as $dbType => $doctrineType) {
$connection->getDatabasePlatform()->registerDoctrineTypeMapping($dbType, $doctrineType);
Expand Down
1 change: 0 additions & 1 deletion src/Service/MigrationsCommandFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ private function getObjectManagerName(): string
return $this->defaultObjectManagerName;
}

/** @psalm-suppress ReservedWord */
return $arguments->getParameterOption('--object-manager');
}
}
2 changes: 1 addition & 1 deletion src/Service/SQLLoggerCollectorFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ protected function getOptions(ContainerInterface $serviceLocator): mixed
}

/**
* @psalm-return class-string
* @phpstan-return class-string
*/
protected function getOptionsClass(): string
{
Expand Down
2 changes: 1 addition & 1 deletion src/Yuml/MetadataGrapher.php
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ private function getParent(ClassMetadata $class): ?ClassMetadata
/**
* Visit a given association and mark it as visited
*
* @psalm-param class-string $className
* @phpstan-param class-string $className
*
* @return bool true if the association was visited before
*/
Expand Down