diff --git a/composer.json b/composer.json index 069f6cedd9..8f93afa201 100644 --- a/composer.json +++ b/composer.json @@ -122,7 +122,8 @@ "symplify/easy-coding-standard": "^9.4" }, "conflict": { - "pimcore/pimcore": "10.2.0 || 10.2.1" + "pimcore/pimcore": "10.2.0 || 10.2.1", + "thecodingmachine/safe": "< 2.0.0" }, "suggest": { "dpfaffenbauer/process-manager": "Allows to start Processes from within Pimcore UI and also tracks the status." diff --git a/phpstan-package.neon b/phpstan-package.neon index 4ad4cb85a1..23048b31d2 100644 --- a/phpstan-package.neon +++ b/phpstan-package.neon @@ -34,6 +34,7 @@ parameters: - '/Method Pimcore\\Model\\DataObject\\Concrete::getLatestVersion\(\)\(.*\)/' - '/Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\)/' - '/Method CoreShop\\Bundle\\ResourceBundle\\Routing\\ResourceLoader::getResolver\(\) should return Symfony\\Component\\Config\\Loader\\LoaderResolverInterface but return statement is missing./' + - '/PHPDoc type string of property CoreShop\\Bundle\\PayumBundle\\Request\\GetStatus::\$status is not covariant with PHPDoc type int of overridden property Payum\\Core\\Request\\BaseGetStatus::\$status./' # Pimcore BC Breaks - '/Class Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\Href not found/' diff --git a/psalm.xml b/psalm.xml index e851f57471..b431b0b42c 100644 --- a/psalm.xml +++ b/psalm.xml @@ -25,6 +25,11 @@ + + + + +