Add types to constructors and private/final/internal methods (Batch III)

Author: derrabus

Caster/Caster.php

@@ -41,12 +41,11 @@ class Caster
      * Casts objects to arrays and adds the dynamic property prefix.
      *
      * @param object $obj          The object to cast
-     * @param string $class        The class of the object
      * @param bool   $hasDebugInfo Whether the __debugInfo method exists on $obj or not
      *
      * @return array The array-cast of the object, with prefixed dynamic properties
      */
-    public static function castObject($obj, $class, $hasDebugInfo = false): array
+    public static function castObject($obj, string $class, bool $hasDebugInfo = false): array
     {
         $a = $obj instanceof \Closure ? [] : (array) $obj;
 
@@ -110,7 +109,7 @@ public static function castObject($obj, $class, $hasDebugInfo = false): array
      *
      * @return array The filtered array
      */
-    public static function filter(array $a, $filter, array $listedProperties = [], &$count = 0): array
+    public static function filter(array $a, int $filter, array $listedProperties = [], ?int &$count = 0): array
     {
         $count = 0;
 
@@ -151,7 +150,7 @@ public static function filter(array $a, $filter, array $listedProperties = [], &
         return $a;
     }
 
-    public static function castPhpIncompleteClass(\__PHP_Incomplete_Class $c, array $a, Stub $stub, $isNested)
+    public static function castPhpIncompleteClass(\__PHP_Incomplete_Class $c, array $a, Stub $stub, bool $isNested): array
     {
         if (isset($a['__PHP_Incomplete_Class_Name'])) {
             $stub->class .= '('.$a['__PHP_Incomplete_Class_Name'].')';

Caster/DateCaster.php

@@ -52,7 +52,7 @@ public static function castInterval(\DateInterval $interval, array $a, Stub $stu
         return $filter & Caster::EXCLUDE_VERBOSE ? $i : $i + $a;
     }
 
-    private static function formatInterval(\DateInterval $i)
+    private static function formatInterval(\DateInterval $i): string
     {
         $format = '%R ';
 

Caster/MemcachedCaster.php

@@ -33,7 +33,7 @@ public static function castMemcached(\Memcached $c, array $a, Stub $stub, $isNes
         return $a;
     }
 
-    private static function getNonDefaultOptions(\Memcached $c)
+    private static function getNonDefaultOptions(\Memcached $c): array
     {
         self::$defaultOptions = self::$defaultOptions ?? self::discoverDefaultOptions();
         self::$optionConstants = self::$optionConstants ?? self::getOptionConstants();
@@ -48,7 +48,7 @@ private static function getNonDefaultOptions(\Memcached $c)
         return $nonDefaultOptions;
     }
 
-    private static function discoverDefaultOptions()
+    private static function discoverDefaultOptions(): array
     {
         $defaultMemcached = new \Memcached();
         $defaultMemcached->addServer('127.0.0.1', 11211);
@@ -63,7 +63,7 @@ private static function discoverDefaultOptions()
         return $defaultOptions;
     }
 
-    private static function getOptionConstants()
+    private static function getOptionConstants(): array
     {
         $reflectedMemcached = new \ReflectionClass(\Memcached::class);
 

Caster/ReflectionCaster.php

@@ -361,7 +361,7 @@ public static function getSignature(array $a)
         return $signature;
     }
 
-    private static function addExtra(&$a, \Reflector $c)
+    private static function addExtra(array &$a, \Reflector $c)
     {
         $x = isset($a[Caster::PREFIX_VIRTUAL.'extra']) ? $a[Caster::PREFIX_VIRTUAL.'extra']->value : [];
 
@@ -377,7 +377,7 @@ private static function addExtra(&$a, \Reflector $c)
         }
     }
 
-    private static function addMap(&$a, \Reflector $c, $map, $prefix = Caster::PREFIX_VIRTUAL)
+    private static function addMap(array &$a, \Reflector $c, array $map, string $prefix = Caster::PREFIX_VIRTUAL)
     {
         foreach ($map as $k => $m) {
             if (method_exists($c, $m) && false !== ($m = $c->$m()) && null !== $m) {

Caster/SplCaster.php

@@ -195,7 +195,7 @@ public static function castWeakReference(\WeakReference $c, array $a, Stub $stub
         return $a;
     }
 
-    private static function castSplArray($c, array $a, Stub $stub, $isNested)
+    private static function castSplArray($c, array $a, Stub $stub, bool $isNested): array
     {
         $prefix = Caster::PREFIX_VIRTUAL;
         $class = $stub->class;

Test/VarDumperTestTrait.php

@@ -76,7 +76,7 @@ protected function getDump($data, $key = null, $filter = 0)
         return rtrim($dumper->dump($data, true));
     }
 
-    private function prepareExpectation($expected, int $filter)
+    private function prepareExpectation($expected, int $filter): string
     {
         if (!\is_string($expected)) {
             $expected = $this->getDump($expected, null, $filter);