Merge branch 'develop'

baijunyao · Feb 18, 2023 · fab2521 · fab2521
2 parents 37e221b + ac0553b
commit fab2521
Show file tree

Hide file tree

Showing 15 changed files with 1,975 additions and 1,308 deletions.
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
@@ -2365,6 +2365,10 @@
         ]));
 
 
+    override(\Illuminate\Foundation\Testing\Concerns\InteractsWithContainer::mock(0), map(["" => "@&\Mockery\MockInterface"]));
+    override(\Illuminate\Foundation\Testing\Concerns\InteractsWithContainer::partialMock(0), map(["" => "@&\Mockery\MockInterface"]));
+    override(\Illuminate\Foundation\Testing\Concerns\InteractsWithContainer::instance(0), type(1));
+    override(\Illuminate\Foundation\Testing\Concerns\InteractsWithContainer::spy(0), map(["" => "@&\Mockery\MockInterface"]));
     override(\Illuminate\Support\Arr::add(0), type(0));
     override(\Illuminate\Support\Arr::except(0), type(0));
     override(\Illuminate\Support\Arr::first(0), elementType(0));

diff --git a/_ide_helper.php b/_ide_helper.php