Skip to content

Commit d8f5370

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents a3625b3 + 6556c6f commit d8f5370

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.form

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@
175175
<component id="69cac" class="javax.swing.JTextArea" binding="textAreaOutput">
176176
<constraints/>
177177
<properties>
178-
<background color="-1"/>
179178
<editable value="false"/>
180179
<font name="Courier New"/>
181180
<lineWrap value="true"/>

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ private static boolean phpStringLiteralExpressionClassReference(String signature
162162
}
163163

164164
ParameterList parameterList = (ParameterList) psiElement.getContext();
165-
if (parameterList == null || !(parameterList.getContext() instanceof NewExpression)) {
165+
if (!(parameterList.getContext() instanceof NewExpression)) {
166166
return false;
167167
}
168168

0 commit comments

Comments
 (0)