Fix NPE in NamespaceAndUseStatementCheck

SonarSource · Nov 5, 2015 · 1e9a351 · 1e9a351
1 parent c021ab3
commit 1e9a351
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/php-checks/src/main/java/org/sonar/php/checks/formatting/NamespaceAndUseStatementCheck.java b/php-checks/src/main/java/org/sonar/php/checks/formatting/NamespaceAndUseStatementCheck.java
@@ -69,16 +69,11 @@ public void visitScript(ScriptTree tree) {
       nextStatement = statements.get(i + 1);
       statements.get(i).accept(this);
     }
-
-    nextStatement = null;
-    statements.get(nbStatements - 1).accept(this);
-
   }
 
-
   @Override
   public void visitNamespaceStatement(NamespaceStatementTree tree) {
-    if (check.hasNamespaceBlankLine && nextStatement != null && !isFollowedWithBlankLine(tree)) {
+    if (check.hasNamespaceBlankLine && !isFollowedWithBlankLine(tree)) {
       String message = String.format(
         BLANK_LINE_NAMESPACE_MESSAGE,
         tree.namespaceName() == null ? "" : " " + tree.namespaceName().fullName());
@@ -90,7 +85,7 @@ public void visitNamespaceStatement(NamespaceStatementTree tree) {
   public void visitUseStatement(UseStatementTree tree) {
     useStatements.add(tree);
 
-    if (nextStatement != null && !nextStatement.is(USE_KINDS)) {
+    if (!nextStatement.is(USE_KINDS)) {
       checkUsesAreBeforeNamespace();
       checkBlankLineAfterUses(tree);
       useStatements.clear();

diff --git a/...ecks/src/test/java/org/sonar/php/checks/formatting/NamespaceAndUseStatementCheckTest.java b/...ecks/src/test/java/org/sonar/php/checks/formatting/NamespaceAndUseStatementCheckTest.java
@@ -40,4 +40,11 @@ public void custom() throws Exception {
     deactivateAll();
     PHPCheckTest.check(check, TestUtils.getCheckFile(TEST_DIR + "NamespaceAndUseStatementCheck.php"), ImmutableList.<Issue>of());
   }
+
+  @Test
+  public void emptyScript() throws Exception {
+    activeOnly("hasNamespaceBlankLine", "isUseAfterNamespace", "hasUseBlankLine");
+    PHPCheckTest.check(check, TestUtils.getCheckFile(TEST_DIR + "empty-script.php"));
+  }
+
 }
diff --git a/php-checks/src/test/resources/checks/formattingCheck/empty-script.php b/php-checks/src/test/resources/checks/formattingCheck/empty-script.php
@@ -0,0 +1 @@
+<?php