Empty is also the bottom type

vimeo · Feb 8, 2020 · b439a57 · b439a57
1 parent b26deb4
commit b439a57
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Analyzer/TypeAnalyzer.php b/src/Psalm/Internal/Analyzer/TypeAnalyzer.php
@@ -714,7 +714,7 @@ public static function isAtomicContainedBy(
             return true;
         }
 
-        if ($input_type_part instanceof TNever) {
+        if ($input_type_part instanceof TNever || $input_type_part instanceof Type\Atomic\TEmpty) {
             return true;
         }
 

diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php
@@ -2274,7 +2274,49 @@ public function __construct(string $type) {
                         }
                     }'
             ],
-            'newGenericBecomesPropertyType' => [
+            'createEmptyArrayCollection' => [
+                '<?php
+                    $a = new ArrayCollection([]);
+
+                    /**
+                     * @psalm-template TKey of array-key
+                     * @psalm-template T
+                     */
+                    class ArrayCollection
+                    {
+                        /**
+                         * An array containing the entries of this collection.
+                         *
+                         * @psalm-var array<TKey,T>
+                         * @var array
+                         */
+                        private $elements = [];
+
+                        /**
+                         * Initializes a new ArrayCollection.
+                         *
+                         * @param array $elements
+                         *
+                         * @psalm-param array<TKey,T> $elements
+                         */
+                        public function __construct(array $elements = [])
+                        {
+                            $this->elements = $elements;
+                        }
+
+                        /**
+                         * @param TKey $key
+                         * @param T $t
+                         */
+                        public function add($key, $t) : void {
+                            $this->elements[$key] = $t;
+                        }
+                    }',
+                [
+                    '$a' => 'ArrayCollection<empty, empty>'
+                ]
+            ],
+            'newGenericBecomesPropertyTypeValidArg' => [
                 '<?php
                     class B {}
 
@@ -2289,7 +2331,7 @@ public function __construct() {
                     }
 
                     /**
-                     * @psalm-template TKey
+                     * @psalm-template TKey of array-key
                      * @psalm-template T
                      */
                     class ArrayCollection
@@ -2323,6 +2365,76 @@ public function add($key, $t) : void {
                         }
                     }'
             ],
+            'allowPropertyCoercion' => [
+                '<?php
+                    class Test
+                    {
+                        /**
+                         * @var ArrayCollection<int, DateTime>
+                         */
+                        private $c;
+
+                        public function __construct()
+                        {
+                            $this->c = new ArrayCollection();
+                            $this->c->filter(function (DateTime $dt): bool {
+                                return $dt === $dt;
+                            });
+                        }
+                    }
+
+                    /**
+                     * @psalm-template TKey of array-key
+                     * @psalm-template T
+                     */
+                    interface Collection
+                    {
+                        /**
+                         * @param Closure $p
+                         *
+                         * @return Collection A
+                         *
+                         * @psalm-param Closure(T=):bool $p
+                         * @psalm-return Collection<TKey, T>
+                         */
+                        public function filter(Closure $p);
+                    }
+
+
+                    /**
+                     * @psalm-template TKey of array-key
+                     * @psalm-template T
+                     * @template-implements Collection<TKey,T>
+                     */
+                    class ArrayCollection implements Collection
+                    {
+                        /**
+                         * @psalm-var array<TKey,T>
+                         * @var array
+                         */
+                        private $elements;
+
+                        /**
+                         * @param array $elements
+                         *
+                         * @psalm-param array<TKey,T> $elements
+                         */
+                        public function __construct(array $elements = [])
+                        {
+                            $this->elements = $elements;
+                        }
+
+                        /**
+                         * {@inheritDoc}
+                         *
+                         * @return static
+                         */
+                        public function filter(Closure $p)
+                        {
+                            return $this;
+                        }
+                    }'
+            ],
         ];
     }
 
@@ -2770,7 +2882,7 @@ public static function foo($t) : void {}
                     }',
                 'error_message' => 'UndefinedDocblockClass'
             ],
-            'newGenericBecomesPropertyType' => [
+            'newGenericBecomesPropertyTypeInvalidArg' => [
                 '<?php
                     class B {}
                     class C {}