Merge pull request #1363 from scyzoryck/phpstan-1.x

Update phpstan to 1.0.2
schmittjoh · Nov 8, 2021 · 832c8f2 · 832c8f2
2 parents 0c83e1f + c222109
commit 832c8f2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "doctrine/phpcr-odm": "^1.3|^2.0",
         "jackalope/jackalope-doctrine-dbal": "^1.1.5",
         "ocramius/proxy-manager": "^1.0|^2.0",
-        "phpstan/phpstan": "^0.12.65",
+        "phpstan/phpstan": "^1.0.2",
         "phpunit/phpunit": "^8.0||^9.0",
         "psr/container": "^1.0",
         "symfony/dependency-injection": "^3.0|^4.0|^5.0|^6.0",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -6,6 +6,7 @@ parameters:
         - '~Class Doctrine\\ODM\\MongoDB\\PersistentCollection not found~'
         - '~Class Symfony\\Component\\Translation\\TranslatorInterface not found~'
         - '#Constructor of class JMS\\Serializer\\Annotation\\.*? has an unused parameter#'
+        - '#Class JMS\\Serializer\\Annotation\\ReadOnly extends @final class JMS\\Serializer\\Annotation\\ReadOnlyProperty.#'
 
     paths:
         - %currentWorkingDirectory%/src

diff --git a/src/JsonSerializationVisitor.php b/src/JsonSerializationVisitor.php
@@ -22,7 +22,7 @@ final class JsonSerializationVisitor extends AbstractVisitor implements Serializ
      */
     private $dataStack;
     /**
-     * @var \ArrayObject
+     * @var \ArrayObject|array
      */
     private $data;