Merge "phpcs: Normalize methods declarations to "[final abstract] [visibility]"."

diff --cc tests/parser/parserTest.inc
index b9bb33f,6b56dcf..aa56e6e
--- 1/tests/parser/parserTest.inc
--- 2/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@@ -228,10 -227,11 +228,10 @@@ class ParserTest 
         * Remove last character if it is a newline
         * @group utility
         */
-       static public function chomp( $s ) {
+       public static function chomp( $s ) {
                if ( substr( $s, -1 ) === "\n" ) {
                        return substr( $s, 0, -1 );
 -              }
 -              else {
 +              } else {
                        return $s;
                }
        }

diff --cc tests/selenium/Selenium.php
Simple merge

diff --cc tests/selenium/SeleniumTestSuite.php
Simple merge