Skip to content

Commit

Permalink
Drop Psalm
Browse files Browse the repository at this point in the history
This is an equivalent of 1669e8d and a17744e for 4.0.x
It is easier and safer to re-run the same search and replace than to
address conflicts.
  • Loading branch information
greg0ire committed Oct 26, 2024
1 parent 56497a3 commit 14fe525
Show file tree
Hide file tree
Showing 39 changed files with 102 additions and 277 deletions.
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,4 @@
/phpcs.xml.dist export-ignore
/phpstan.neon export-ignore
/phpstan-baseline.neon export-ignore
/psalm.xml export-ignore
/psalm-baseline.xml export-ignore
/psalm.phpstub export-ignore
/composer.lock export-ignore
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ on:
jobs:
static-analysis:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.2.0"
uses: "doctrine/.github/.github/workflows/phpstan.yml@5.2.0"
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"phpstan/phpstan-strict-rules": "^1.1",
"doctrine/coding-standard": "^12",
"phpunit/phpunit": "^9.6",
"symfony/cache": "^4.4 || ^5.4 || ^6.0 || ^7.0",
"vimeo/psalm": "4.30.0 || 5.26.1"
"symfony/cache": "^4.4 || ^5.4 || ^6.0 || ^7.0"
},
"conflict": {
"doctrine/common": "<2.10"
Expand Down
48 changes: 0 additions & 48 deletions psalm-baseline.xml

This file was deleted.

12 changes: 0 additions & 12 deletions psalm.phpstub

This file was deleted.

72 changes: 0 additions & 72 deletions psalm.xml

This file was deleted.

4 changes: 2 additions & 2 deletions src/Persistence/AbstractManagerRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ abstract class AbstractManagerRegistry implements ManagerRegistry
/**
* @param array<string, string> $connections
* @param array<string, string> $managers
* @psalm-param class-string $proxyInterfaceName
* @phpstan-param class-string $proxyInterfaceName
*/
public function __construct(
private readonly string $name,
Expand Down Expand Up @@ -204,7 +204,7 @@ public function resetManager(string|null $name = null): ObjectManager
return $this->getManager($name);
}

/** @psalm-param class-string $persistentObject */
/** @phpstan-param class-string $persistentObject */
private function selectManager(
string $persistentObject,
string|null $persistentManagerName = null,
Expand Down
4 changes: 2 additions & 2 deletions src/Persistence/Event/LifecycleEventArgs.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
class LifecycleEventArgs extends EventArgs
{
/** @psalm-param TObjectManager $objectManager */
/** @phpstan-param TObjectManager $objectManager */
public function __construct(
private readonly object $object,
private readonly ObjectManager $objectManager,
Expand All @@ -31,7 +31,7 @@ public function getObject(): object
/**
* Retrieves the associated ObjectManager.
*
* @psalm-return TObjectManager
* @phpstan-return TObjectManager
*/
public function getObjectManager(): ObjectManager
{
Expand Down
8 changes: 4 additions & 4 deletions src/Persistence/Event/LoadClassMetadataEventArgs.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
class LoadClassMetadataEventArgs extends EventArgs
{
/**
* @psalm-param TClassMetadata $classMetadata
* @psalm-param TObjectManager $objectManager
* @phpstan-param TClassMetadata $classMetadata
* @phpstan-param TObjectManager $objectManager
*/
public function __construct(
private readonly ClassMetadata $classMetadata,
Expand All @@ -29,7 +29,7 @@ public function __construct(
/**
* Retrieves the associated ClassMetadata.
*
* @psalm-return TClassMetadata
* @phpstan-return TClassMetadata
*/
public function getClassMetadata(): ClassMetadata
{
Expand All @@ -39,7 +39,7 @@ public function getClassMetadata(): ClassMetadata
/**
* Retrieves the associated ObjectManager.
*
* @psalm-return TObjectManager
* @phpstan-return TObjectManager
*/
public function getObjectManager(): ObjectManager
{
Expand Down
4 changes: 2 additions & 2 deletions src/Persistence/Event/ManagerEventArgs.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
class ManagerEventArgs extends EventArgs
{
/** @psalm-param TObjectManager $objectManager */
/** @phpstan-param TObjectManager $objectManager */
public function __construct(
private readonly ObjectManager $objectManager,
) {
Expand All @@ -23,7 +23,7 @@ public function __construct(
/**
* Retrieves the associated ObjectManager.
*
* @psalm-return TObjectManager
* @phpstan-return TObjectManager
*/
public function getObjectManager(): ObjectManager
{
Expand Down
4 changes: 2 additions & 2 deletions src/Persistence/Event/OnClearEventArgs.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class OnClearEventArgs extends EventArgs
{
/**
* @param ObjectManager $objectManager The object manager.
* @psalm-param TObjectManager $objectManager
* @phpstan-param TObjectManager $objectManager
*/
public function __construct(private readonly ObjectManager $objectManager)
{
Expand All @@ -25,7 +25,7 @@ public function __construct(private readonly ObjectManager $objectManager)
/**
* Retrieves the associated ObjectManager.
*
* @psalm-return TObjectManager
* @phpstan-return TObjectManager
*/
public function getObjectManager(): ObjectManager
{
Expand Down
2 changes: 1 addition & 1 deletion src/Persistence/Event/PreUpdateEventArgs.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class PreUpdateEventArgs extends LifecycleEventArgs

/**
* @param array<string, array<int, mixed>> $changeSet
* @psalm-param TObjectManager $objectManager
* @phpstan-param TObjectManager $objectManager
*/
public function __construct(object $entity, ObjectManager $objectManager, array &$changeSet)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Persistence/ManagerRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ public function getManagerNames(): array;
*
* @param string $persistentObject The name of the persistent object.
* @param string|null $persistentManagerName The object manager name (null for the default one).
* @psalm-param class-string<T> $persistentObject
* @phpstan-param class-string<T> $persistentObject
*
* @psalm-return ObjectRepository<T>
* @phpstan-return ObjectRepository<T>
*
* @template T of object
*/
Expand Down
Loading

0 comments on commit 14fe525

Please sign in to comment.