Fix last of lint issues leading up to packaging

include/class.faq.php

@@ -112,7 +112,7 @@ class FAQ {
     function setKeywords($words) { $this->ht['keywords'] = $words; }
     function setNotes($text) { $this->ht['notes'] = $text; }
 
-    /* For ->attach() and ->detach(), use $this->attachments() */
+    /* For ->attach() and ->detach(), use $this->attachments() (nolint) */
     function attach($file) { return $this->_attachments->add($file); }
     function detach($file) { return $this->_attachments->remove($file); }
 

setup/test/tests/class.php_analyze.php

@@ -195,7 +195,7 @@ class SourceAnalyzer extends Test {
                 break;
             case T_STATIC:
                 $c = current($this->tokens);
-                // static::func() or static::$var
+                // (nolint) static::func() or static::$var
                 if ($c[0] == T_PAAMAYIM_NEKUDOTAYIM)
                     break;
             case T_GLOBAL:

setup/test/tests/test.undefinedmethods.php

@@ -32,7 +32,7 @@ function find_function_calls($scripts) {
         $lineno=0;
         foreach ($lines as $line) {
             $lineno++; $matches=array();
-            preg_match_all('/(?:-[>]|::)([a-zA-Z0-9_]+)\(.*/', $line, $matches,
+            preg_match_all('/^.*\w+(?:-[>]|::)([a-zA-Z0-9_]+)\(.*/', $line, $matches,
                 PREG_SET_ORDER);
             foreach ($matches as $m)
                 if (strpos($m[0], 'nolint') === false)