Skip to content

Skip post_migrate when running tests #1193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 23, 2021
+2 −7
Merged

Skip post_migrate when running tests #1193

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04c1139
Skip post_migrate when running tests
netpok Mar 22, 2021
40c02c5
Add changelog entry
netpok Mar 22, 2021
dedd69e
Remove already resolved issue from psalm baseline
netpok Mar 22, 2021
c2dec69
Remove unused import
netpok Mar 22, 2021
df994eb
Merge branch 'master' into skip_generate_in_phpunit
netpok Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.9.2...master)
--------------
### Fixed
- Running tests triggering post_migrate hooks [\#1193 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/1193)
- Array_merge error when config is cached prior to package install [\#1184 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/1184)

2021-03-15, 2.9.1
5 changes: 0 additions & 5 deletions psalm-baseline.xml
View file
Original file line number Diff line number Diff line change
@@ -17,9 +17,4 @@
<code>\Storage</code>
</UndefinedClass>
</file>
<file src="src/IdeHelperServiceProvider.php">
<TooFewArguments occurrences="1">
<code>new PhpEngine()</code>
</TooFewArguments>
</file>
</files>
3 changes: 1 addition & 2 deletions src/IdeHelperServiceProvider.php
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@
use Illuminate\Console\Events\CommandFinished;
use Illuminate\Contracts\Support\DeferrableProvider;
use Illuminate\Database\Events\MigrationsEnded;
use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
use Illuminate\View\Engines\EngineResolver;
use Illuminate\View\Engines\PhpEngine;
@@ -35,7 +34,7 @@ class IdeHelperServiceProvider extends ServiceProvider implements DeferrableProv
*/
public function boot()
{
if ($this->app['config']->get('ide-helper.post_migrate', [])) {
if (!$this->app->runningUnitTests() && $this->app['config']->get('ide-helper.post_migrate', [])) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this work with Lumen? 😬

Copy link
Contributor Author

@netpok netpok Mar 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should: https://github.com/laravel/lumen-framework/blob/8.x/src/Application.php#L896

Edit: Lumen integration test passes so it does

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, LGTM!

Could you please resolve the merge conflicts? Don't see any blockerS!

$this->app['events']->listen(CommandFinished::class, GenerateModelHelper::class);
$this->app['events']->listen(MigrationsEnded::class, function () {
GenerateModelHelper::$shouldRun = true;