Skip to content
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

Jump to bottom

swap mkdir and is_dir in check to prevent php errors #1853

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

swap mkdir and is_dir in check to prevent php errors #1853

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3692dd2
possible solution for https://github.com/kalessil/phpinspectionsea/is…
rmpel Oct 19, 2022
bf27006
Apply suggestions from code review
rmpel Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 13 additions & 13 deletions .../phpStorm/phpInspectionsEA/inspectors/semanticalAnalysis/MkdirRaceConditionInspector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*/

public class MkdirRaceConditionInspector extends BasePhpInspection {
private static final String patternDirectCall = "Following construct should be used: 'if (!mkdir(%s) && !is_dir(...)) { ... }'.";
private static final String patternFailAndCondition = "Some check are missing: '!mkdir(%s) && !is_dir(...)'.";
private static final String patternFailOrCondition = "Some check are missing: 'mkdir(%s) || is_dir(...)'.";
private static final String patternDirectCall = "Following construct should be used: 'if (!is_dir(%s) && !mkdir(...)) { ... }'.";
private static final String patternFailAndCondition = "Some check are missing: '!is_dir(%s) && !mkdir(...)'.";
private static final String patternFailOrCondition = "Some check are missing: 'is_dir(%s) || mkdir(...)'.";

@NotNull
@Override
Expand Down Expand Up @@ -226,11 +226,11 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
final String code;
if (this.withVariable) {
final String throwPart = "throw new \\RuntimeException(sprintf('Directory \"%s\" was not created', $concurrentDirectory));";
final String pattern = "if (!mkdir($concurrentDirectory = %s) && !is_dir($concurrentDirectory)) { %s }";
final String pattern = "if (!is_dir($concurrentDirectory) && !mkdir($concurrentDirectory = %s)) { %s }";
code = String.format(pattern, this.arguments, throwPart);
} else {
final String throwPart = "throw new \\RuntimeException(sprintf('Directory \"%%s\" was not created', %s));";
final String pattern = "if (!mkdir(%s) && !is_dir(%s)) { %s }";
final String pattern = "if (!is_dir(%s) && !mkdir(%s)) { %s }";
code = String.format(pattern, this.arguments, this.resource, String.format(throwPart, this.resource));
}
target.replace(PhpPsiElementFactory.createPhpPsiFromText(project, If.class, code));
Expand Down Expand Up @@ -274,15 +274,15 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
final String code;
if (this.withVariable) {
if (this.isInverted) {
code = String.format("(!mkdir($concurrentDirectory = %s) && !is_dir($concurrentDirectory))", this.arguments);
code = String.format("(!is_dir($concurrentDirectory) && !mkdir($concurrentDirectory = %s))", this.arguments);
} else {
code = String.format("(mkdir($concurrentDirectory = %s) || !is_dir($concurrentDirectory)", this.arguments);
code = String.format("(is_dir($concurrentDirectory) || !mkdir($concurrentDirectory = %s)", this.arguments);
}
} else {
if (this.isInverted) {
code = String.format("(!mkdir(%s) && !is_dir(%s))", this.arguments, this.resource);
code = String.format("(!is_dir(%s) && !mkdir(%s))", this.arguments, this.resource);
} else {
code = String.format("(mkdir(%s) || is_dir(%s))", this.arguments, this.resource);
code = String.format("(is_dir(%s) || mkdir(%s))", this.arguments, this.resource);
}
}
target.replace(PhpPsiElementFactory.createPhpPsiFromText(project, ParenthesizedExpression.class, code).getArgument());
Expand All @@ -293,17 +293,17 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri
if (PhpTokenTypes.tsSHORT_CIRCUIT_AND_OPS.contains(operation)) {
final String code;
if (this.withVariable) {
code = String.format("(%s && !mkdir($concurrentDirectory = %s) && !is_dir($concurrentDirectory))", conditions, this.arguments);
code = String.format("(%s && !is_dir($concurrentDirectory) && !mkdir($concurrentDirectory = %s))", conditions, this.arguments);
} else {
code = String.format("(%s && !mkdir(%s) && !is_dir(%s))", conditions, this.arguments, this.resource);
code = String.format("(%s && !is_dir(%s) && !mkdir(%s))", conditions, this.arguments, this.resource);
}
parent.replace(PhpPsiElementFactory.createPhpPsiFromText(project, ParenthesizedExpression.class, code).getArgument());
} else if (PhpTokenTypes.tsSHORT_CIRCUIT_OR_OPS.contains(operation)) {
final String code;
if (this.withVariable) {
code = String.format("(%s || mkdir($concurrentDirectory = %s) || is_dir($concurrentDirectory))", conditions, this.arguments);
code = String.format("(%s || is_dir($concurrentDirectory) || mkdir($concurrentDirectory = %s))", conditions, this.arguments);
} else {
code = String.format("(%s || mkdir(%s) || is_dir(%s))", conditions, this.arguments, this.resource);
code = String.format("(%s || is_dir(%s) || mkdir(%s))", conditions, this.arguments, this.resource);
}
parent.replace(PhpPsiElementFactory.createPhpPsiFromText(project, ParenthesizedExpression.class, code).getArgument());
}
Expand Down