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 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 @@ -74,8 +74,7 @@
"phpstan/phpstan": "^1.9.2",
"phpstan/phpstan-phpunit": "^1.3.0",
"phpunit/phpunit": "^9.5.27",
"predis/predis": "^1.1.10",
"vimeo/psalm": "^5.0"
"predis/predis": "^1.1.10"
},
"conflict": {
"doctrine/orm": "2.12.0"
Expand Down Expand Up @@ -115,13 +114,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
25 changes: 0 additions & 25 deletions psalm-baseline.xml

This file was deleted.

18 changes: 0 additions & 18 deletions psalm.xml

This file was deleted.

2 changes: 1 addition & 1 deletion src/Form/Element/ObjectMultiCheckbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use function array_map;
use function is_array;

/** @psalm-import-type ValueOptionSpec from MultiCheckbox */
/** @phpstan-import-type ValueOptionSpec from MultiCheckbox */
class ObjectMultiCheckbox extends MultiCheckbox
{
use GetProxy;
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Element/ObjectRadio.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Laminas\Form\Element\MultiCheckbox;
use Laminas\Form\Element\Radio as RadioElement;

/** @psalm-import-type ValueOptionSpec from MultiCheckbox */
/** @phpstan-import-type ValueOptionSpec from MultiCheckbox */
class ObjectRadio extends RadioElement
{
use GetProxy;
Expand Down
2 changes: 1 addition & 1 deletion src/Options/Authentication.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ final class Authentication extends AbstractOptions
/**
* Entity's class name
*
* @psalm-var class-string
* @phpstan-var class-string
*/
protected string $identityClass;

Expand Down
4 changes: 2 additions & 2 deletions src/Paginator/Adapter/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
use function count;

/**
* @psalm-template TKey of array-key
* @psalm-template T
* @phpstan-template TKey of array-key
* @phpstan-template T
* @template-implements AdapterInterface<int, T>
*/
class Collection implements AdapterInterface
Expand Down