Skip to content

Commit

Permalink
fix merge induced errors
Browse files Browse the repository at this point in the history
  • Loading branch information
orklah committed Jan 15, 2022
1 parent 5b82082 commit e8c8161
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions tests/MagicMethodAnnotationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ public function __call(string $method, array $args) {
(new Cache)->bar(new \DateTime(), new Cache());'
],
'magicMethodInheritance' => [
'<?php
'code' => '<?php
/**
* @method string foo()
*/
Expand All @@ -775,7 +775,7 @@ function consumeInt(int $i): void {}
consumeInt($b->bar());'
],
'magicMethodInheritanceOnInterface' => [
'<?php
'code' => '<?php
/**
* @method string foo()
*/
Expand All @@ -787,7 +787,7 @@ function consumeString(string $s): void {}
consumeString($i->foo());'
],
'magicStaticMethodInheritance' => [
'<?php
'code' => '<?php
/**
* @method static string foo()
*/
Expand All @@ -809,7 +809,7 @@ function consumeInt(int $i): void {}
consumeInt(B::bar());'
],
'magicStaticMethodInheritanceWithoutCallStatic' => [
'<?php
'code' => '<?php
/**
* @method static int bar()
*/
Expand Down
6 changes: 3 additions & 3 deletions tests/Template/ClassTemplateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3581,7 +3581,7 @@ function bar(A $a, B $b): void {
}'
],
'templateOnDocblockMethod' => [
'<?php
'code' => '<?php
/**
* @template T
* @method T get()
Expand All @@ -3602,7 +3602,7 @@ function foo(A $a): void {}
'
],
'templateOnDocblockMethodOnInterface' => [
'<?php
'code' => '<?php
/**
* @template T
* @method T get()
Expand Down Expand Up @@ -4380,7 +4380,7 @@ function foo(Collection $c, object $d): void {
'error_message' => 'InvalidArgument',
],
'invalidTemplateArgumentOnDocblockMethod' => [
'<?php
'code' => '<?php
/**
* @template T
* @method void set(T $value)
Expand Down

0 comments on commit e8c8161

Please sign in to comment.