Merge branch '1.2'

Author: sebastianbergmann

Tests/_files/source_with_oneline_annotations.php

@@ -1,7 +1,7 @@
 <?php
 
 /** Docblock */
-interface {
+interface Foo {
     public function bar();
 }