Merge pull request #9880 from kkmuffme/fix-failing-mock-tests

fix failing mock tests

.circleci/config.yml

@@ -37,7 +37,7 @@ jobs:
 
       - run:
           name: Code Style Analysis with PHPCS
-          command: vendor/bin/phpcs
+          command: vendor/bin/phpcs -d memory_limit=512M
 
   phar-build:
     executor: php-74

src/Psalm/Internal/Algebra.php

@@ -326,6 +326,7 @@ public static function simplifyCNF(array $clauses): array
      * Look for clauses with only one possible value
      *
      * doesn't infer the "unset" correctly
+     *
      * @psalm-suppress MoreSpecificReturnType
      * @param  list<Clause>  $clauses
      * @param  array<string, bool> $cond_referenced_var_ids

src/Psalm/Internal/Fork/Pool.php

@@ -98,6 +98,7 @@ class Pool
      * @param array<int, array<int, mixed>> $process_task_data_iterator
      * An array of task data items to be divided up among the
      * workers. The size of this is the number of forked processes.
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint
      * @param Closure $startup_closure
      * A closure to execute upon starting a child
      * @param Closure(int, mixed):mixed $task_closure

src/Psalm/Internal/Provider/FileReferenceCacheProvider.php

@@ -23,10 +23,10 @@
 use const LOCK_EX;
 
 /**
- * @psalm-import-type FileMapType from Analyzer
- *
  * Used to determine which files reference other files, necessary for using the --diff
  * option from the command line.
+ *
+ * @psalm-import-type FileMapType from Analyzer
  * @internal
  */
 class FileReferenceCacheProvider

src/Psalm/Internal/Provider/FileReferenceProvider.php

@@ -17,10 +17,10 @@
 use function file_exists;
 
 /**
- * @psalm-import-type FileMapType from Analyzer
- *
  * Used to determine which files reference other files, necessary for using the --diff
  * option from the command line.
+ *
+ * @psalm-import-type FileMapType from Analyzer
  * @internal
  */
 class FileReferenceProvider

src/Psalm/Type/Atomic/TCallableList.php

@@ -7,9 +7,9 @@
 use function array_fill;
 
 /**
- * @deprecated Will be removed in Psalm v6, please use TCallableKeyedArrays with is_list=true instead.
- *
  * Denotes a list that is _also_ `callable`.
+ *
+ * @deprecated Will be removed in Psalm v6, please use TCallableKeyedArrays with is_list=true instead.
  * @psalm-immutable
  */
 final class TCallableList extends TNonEmptyList

src/Psalm/Type/Atomic/TDependentListKey.php

@@ -3,9 +3,9 @@
 namespace Psalm\Type\Atomic;
 
 /**
- * @deprecated Will be removed in Psalm v6, use TIntRange instead
- *
  * Represents a list key created from foreach ($list as $key => $value)
+ *
+ * @deprecated Will be removed in Psalm v6, use TIntRange instead
  * @psalm-immutable
  */
 final class TDependentListKey extends TInt implements DependentType

src/Psalm/Type/Atomic/TList.php

@@ -14,16 +14,15 @@
 use function get_class;
 
 /**
- * @deprecated Will be removed in Psalm v6, please use TKeyedArrays with is_list=true instead.
- *
  * You may also use the \Psalm\Type::getListAtomic shortcut, which creates unsealed list-like shaped arrays
  * with all elements optional, semantically equivalent to a TList.
  *
- *
  * Represents an array that has some particularities:
  * - its keys are integers
  * - they start at 0
  * - they are consecutive and go upwards (no negative int)
+ *
+ * @deprecated Will be removed in Psalm v6, please use TKeyedArrays with is_list=true instead.
  * @psalm-immutable
  */
 class TList extends Atomic

src/Psalm/Type/Atomic/TNonEmptyList.php

@@ -8,13 +8,12 @@
 use function array_fill;
 
 /**
- * @deprecated Will be removed in Psalm v6, please use TKeyedArrays with is_list=true instead.
- *
  * You may also use the \Psalm\Type::getNonEmptyListAtomic shortcut, which creates unsealed list-like shaped arrays
  * with one non-optional element, semantically equivalent to a TNonEmptyList.
  *
- *
  * Represents a non-empty list
+ *
+ * @deprecated Will be removed in Psalm v6, please use TKeyedArrays with is_list=true instead.
  * @psalm-immutable
  */
 class TNonEmptyList extends TList

tests/EndToEnd/SuicidalAutoloaderTest.php

@@ -18,6 +18,6 @@ public function testSucceedsWithEmptyFile(): void
             $this->markTestSkipped('Test case requires PHP 7.2.');
         }
 
-        $this->runPsalm(['--no-cache'], __DIR__ . '/' . '../fixtures/SuicidalAutoloader/');
+        $this->runPsalm(['--no-cache'], __DIR__ . '/' . '../fixtures/SuicidalAutoloader');
     }
 }

tests/Template/FunctionClassStringTemplateTest.php

@@ -407,7 +407,7 @@ public function checkExpectations() : void
                      * @psalm-suppress MixedInferredReturnType
                      * @psalm-suppress MixedReturnStatement
                      */
-                    function mock(string $className)
+                    function mockHelper(string $className)
                     {
                         eval(\'"there be dragons"\');
 
@@ -424,10 +424,10 @@ public function foo() : void {}
                      */
                     function useMockTemplated(string $className) : void
                     {
-                        mock($className)->checkExpectations();
+                        mockHelper($className)->checkExpectations();
                     }
 
-                    mock(A::class)->foo();',
+                    mockHelper(A::class)->foo();',
             ],
             'allowTemplatedIntersectionFirstTemplatedMock' => [
                 'code' => '<?php
@@ -445,7 +445,7 @@ public function checkExpectations() : void
                      * @psalm-suppress MixedInferredReturnType
                      * @psalm-suppress MixedReturnStatement
                      */
-                    function mock(string $className)
+                    function mockHelper(string $className)
                     {
                         eval(\'"there be dragons"\');
 
@@ -462,10 +462,10 @@ public function foo() : void {}
                      */
                     function useMockTemplated(string $className) : void
                     {
-                        mock($className)->checkExpectations();
+                        mockHelper($className)->checkExpectations();
                     }
 
-                    mock(A::class)->foo();',
+                    mockHelper(A::class)->foo();',
             ],
             'allowTemplatedIntersectionSecond' => [
                 'code' => '<?php
@@ -483,7 +483,7 @@ public function checkExpectations() : void
                      * @psalm-suppress MixedInferredReturnType
                      * @psalm-suppress MixedReturnStatement
                      */
-                    function mock(string $className)
+                    function mockHelper(string $className)
                     {
                         eval(\'"there be dragons"\');
 
@@ -498,7 +498,7 @@ public function foo() : void {}
                      * @psalm-param class-string $className
                      */
                     function useMock(string $className) : void {
-                        mock($className)->checkExpectations();
+                        mockHelper($className)->checkExpectations();
                     }
 
                     /**
@@ -507,10 +507,10 @@ function useMock(string $className) : void {
                      */
                     function useMockTemplated(string $className) : void
                     {
-                        mock($className)->checkExpectations();
+                        mockHelper($className)->checkExpectations();
                     }
 
-                    mock(A::class)->foo();',
+                    mockHelper(A::class)->foo();',
             ],
             'returnClassString' => [
                 'code' => '<?php

tests/fixtures/SuicidalAutoloader/autoloader.php

@@ -9,13 +9,14 @@
         ResourceBundle::class, // symfony/polyfill-php73
         Transliterator::class, // symfony/string
         InstalledVersions::class, // composer v2
-        // it's unclear why Psalm tries to autoload parent
-        'parent',
+        'Mockery\Closure', // Mockery/mockery 1.6.1
+        'parent', // it's unclear why Psalm tries to autoload parent
         'PHPUnit\Framework\ArrayAccess',
         'PHPUnit\Framework\Countable',
         'PHPUnit\Framework\DOMDocument',
         'PHPUnit\Framework\DOMElement',
         'Stringable',
+        'AllowDynamicProperties',
 
         // https://github.com/symfony/symfony/pull/40203
         // these are actually functions, referenced as `if (!function_exists(u::class))`