Skip to content

[5.4] Database Factory includes non-php files #18336

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 2 commits into from
Mar 14, 2017
Merged

[5.4] Database Factory includes non-php files #18336

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
558a666
fixed Factory.php including all files, also non .php files eg. .php~
eyJhb Mar 14, 2017
99a0d06
FIX: use Finder to only loop over *.php in database factories
eyJhb Mar 14, 2017
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
4 changes: 4 additions & 0 deletions src/Illuminate/Database/Eloquent/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ public function load($path)

if (is_dir($path)) {
foreach (Finder::create()->files()->in($path) as $file) {
if(pathinfo($file->getRealPath(), PATHINFO_EXTENSION) !== 'php') {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not just Finder::create()->files()->name('*.php')->in($path) ?

continue;
}

require $file->getRealPath();
}
}
Expand Down