danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

fix merge induced errors

Browse Source
This commit is contained in:
orklah 2022-01-15 20:32:09 +01:00
parent 5b82082bbd
commit e8c8161dd6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/MagicMethodAnnotationTest.php
View File

@ -751,7 +751,7 @@ class MagicMethodAnnotationTest extends TestCase
(new Cache)->bar(new \DateTime(), new Cache());' (new Cache)->bar(new \DateTime(), new Cache());'
], ],
'magicMethodInheritance' => [ 'magicMethodInheritance' => [
'<?php 'code' => '<?php
/** /**
* @method string foo() * @method string foo()
*/ */
@ -775,7 +775,7 @@ class MagicMethodAnnotationTest extends TestCase
consumeInt($b->bar());' consumeInt($b->bar());'
], ],
'magicMethodInheritanceOnInterface' => [ 'magicMethodInheritanceOnInterface' => [
'<?php 'code' => '<?php
/** /**
* @method string foo() * @method string foo()
*/ */
@ -787,7 +787,7 @@ class MagicMethodAnnotationTest extends TestCase
consumeString($i->foo());' consumeString($i->foo());'
], ],
'magicStaticMethodInheritance' => [ 'magicStaticMethodInheritance' => [
'<?php 'code' => '<?php
/** /**
* @method static string foo() * @method static string foo()
*/ */
@ -809,7 +809,7 @@ class MagicMethodAnnotationTest extends TestCase
consumeInt(B::bar());' consumeInt(B::bar());'
], ],
'magicStaticMethodInheritanceWithoutCallStatic' => [ 'magicStaticMethodInheritanceWithoutCallStatic' => [
'<?php 'code' => '<?php
/** /**
* @method static int bar() * @method static int bar()
*/ */

6
tests/Template/ClassTemplateTest.php
View File

@ -3581,7 +3581,7 @@ class ClassTemplateTest extends TestCase
}' }'
], ],
'templateOnDocblockMethod' => [ 'templateOnDocblockMethod' => [
'<?php 'code' => '<?php
/** /**
* @template T * @template T
* @method T get() * @method T get()
@ -3602,7 +3602,7 @@ class ClassTemplateTest extends TestCase
' '
], ],
'templateOnDocblockMethodOnInterface' => [ 'templateOnDocblockMethodOnInterface' => [
'<?php 'code' => '<?php
/** /**
* @template T * @template T
* @method T get() * @method T get()
@ -4380,7 +4380,7 @@ class ClassTemplateTest extends TestCase
'error_message' => 'InvalidArgument', 'error_message' => 'InvalidArgument',
], ],
'invalidTemplateArgumentOnDocblockMethod' => [ 'invalidTemplateArgumentOnDocblockMethod' => [
'<?php 'code' => '<?php
/** /**
* @template T * @template T
* @method void set(T $value) * @method void set(T $value)