Merge pull request #263 from sensiolabs-de/inferPrivatePropertyTypeFr…

…omConstructor phpstan - inferPrivatePropertyTypeFromConstructor
qossmic · Sep 20, 2019 · 68e6027 · 68e6027
2 parents 9e85f7e + 168a097
commit 68e6027
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 5 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,3 +1,4 @@
 parameters:
+    inferPrivatePropertyTypeFromConstructor: true
     level: max
     paths: [src]
diff --git a/src/AstRunner/AstMap/AstClassReference.php b/src/AstRunner/AstMap/AstClassReference.php
@@ -8,7 +8,11 @@ class AstClassReference
 {
     private $className;
     private $fileReference;
+
+    /** @var AstDependency[] */
     private $dependencies;
+
+    /** @var AstInherit[] */
     private $inherits;
 
     public function __construct(string $className, AstFileReference $fileReference = null)

diff --git a/src/AstRunner/AstMap/AstFileReference.php b/src/AstRunner/AstMap/AstFileReference.php
@@ -7,7 +7,11 @@
 class AstFileReference
 {
     private $filepath;
+
+    /** @var AstClassReference[] */
     private $astClassReferences;
+
+    /** @var AstDependency[] */
     private $dependencies;
 
     public function __construct(string $filepath)

diff --git a/src/AstRunner/AstMap/AstInherit.php b/src/AstRunner/AstMap/AstInherit.php
@@ -13,6 +13,8 @@ class AstInherit
     private $className;
     private $line;
     private $type;
+
+    /** @var AstInherit[] */
     private $path;
 
     private function __construct(string $className, int $line, int $type)

diff --git a/src/AstRunner/AstParser/AstFileReferenceFileCache.php b/src/AstRunner/AstParser/AstFileReferenceFileCache.php
@@ -12,6 +12,7 @@
 
 class AstFileReferenceFileCache implements AstFileReferenceCache
 {
+    /** @var array<string, array> */
     private $cache;
     private $cacheFile;
     private $loaded = false;

diff --git a/src/AstRunner/AstParser/NikicPhpParser/FileParser.php b/src/AstRunner/AstParser/NikicPhpParser/FileParser.php
@@ -22,7 +22,7 @@ public function __construct(Parser $parser)
     public function parse(\SplFileInfo $data): array
     {
         return (array) $this->parser->parse(
-            file_get_contents($data->getPathname())
+            (string) file_get_contents($data->getPathname())
         );
     }
 }
diff --git a/src/Configuration/ConfigurationRuleset.php b/src/Configuration/ConfigurationRuleset.php
@@ -6,15 +6,19 @@
 
 class ConfigurationRuleset
 {
-    private $layerMap = [];
+    /** @var array<string, string[]> */
+    private $layerMap;
 
+    /**
+     * @param array<string, string[]> $arr
+     */
     public static function fromArray(array $arr): self
     {
         return new static($arr);
     }
 
     /**
-     * @param string[] $layerMap
+     * @param array<string, string[]> $layerMap
      */
     private function __construct(array $layerMap)
     {

diff --git a/src/Configuration/ConfigurationSkippedViolation.php b/src/Configuration/ConfigurationSkippedViolation.php
@@ -9,15 +9,19 @@
  */
 class ConfigurationSkippedViolation
 {
-    private $classesDeps = [];
+    /** @var array<string, string[]> */
+    private $classesDeps;
 
+    /**
+     * @param array<string, string[]> $arr
+     */
     public static function fromArray(array $arr): self
     {
         return new static($arr);
     }
 
     /**
-     * @param string[] $classesDeps
+     * @param array<string, string[]> $classesDeps
      */
     private function __construct(array $classesDeps)
     {