Align fixtures and tests

Author: abias

tests/Command/CodeCheckerCommandTest.php

@@ -96,7 +96,7 @@ abstract private function somefunc() { // To verify PHPCompatibility sniff.
         $output = $commandTester->getDisplay();
         $this->assertMatchesRegularExpression('/E\.* 10\.* \/ 10 \(100%\)/', $output);                // Progress.
         $this->assertMatchesRegularExpression('/\/fixable.php/', $output);                            // File.
-        $this->assertMatchesRegularExpression('/ 11 ERRORS AND 1 WARNING AFFECTING 8 /', $output);    // Summary.
+        $this->assertMatchesRegularExpression('/ 13 ERRORS AND 1 WARNING AFFECTING 8 /', $output);    // Summary.
         $this->assertMatchesRegularExpression('/BoilerplateComment\.NoBoilerplateComment/', $output); // Moodle sniff.
         $this->assertMatchesRegularExpression('/Expected MOODLE_INTERNAL check/', $output);           // Moodle sniff.
         $this->assertMatchesRegularExpression('/print_error\(\) has been deprecated/', $output);      // Moodle sniff.
@@ -108,8 +108,9 @@ abstract private function somefunc() { // To verify PHPCompatibility sniff.
         $this->assertMatchesRegularExpression('/Missing docblock for function somefunc/', $output);   // Moodle sniff.
         $this->assertMatchesRegularExpression('/AbstractPrivateMethods\.Found/', $output);    // PHPCompatibility sniff.
         $this->assertMatchesRegularExpression('/Opening brace must be the last content/', $output);   // Generic sniff.
-        $this->assertMatchesRegularExpression('/Files\.EndFileNewline\.NotFound/', $output);          // Generic of file.
-        $this->assertMatchesRegularExpression('/PHPCBF CAN FIX THE 4 MARKED SNIFF/', $output);        // PHPCBF note.
+        $this->assertMatchesRegularExpression('/Closing brace must not be followed by/', $output);    // PSR12 sniff.
+        $this->assertMatchesRegularExpression('/Files\.EndFileNewline\.NoneFound/', $output);         // Generic of file.
+        $this->assertMatchesRegularExpression('/PHPCBF CAN FIX THE 5 MARKED SNIFF/', $output);        // PHPCBF note.
         $this->assertMatchesRegularExpression('/Time:.*Memory:/', $output);                           // Time.
 
         // Also verify display info is correct.
@@ -228,7 +229,9 @@ public function testExecuteWithExclusions()
             ['--exclude' => 'moodle.Files.RequireLogin,' .
                 'moodle.Files.BoilerplateComment,' .
                 'moodle.Commenting.MissingDocblock,' .
-                'moodle.Commenting.FileExpectedTags']
+                'moodle.Commenting.FileExpectedTags,' .
+                'PSR12.Files.OpenTag,' .
+                'PSR12.Operators.OperatorSpacing']
         );
         $this->assertSame(0, $commandTester->getStatusCode());
     }

tests/Command/CodeFixerCommandTest.php

@@ -78,7 +78,7 @@ public function testExecute()
         $output = $commandTester->getDisplay();
         $this->assertMatchesRegularExpression('/F\.* 10\.* \/ 10 \(100%\)/', $output);                // Progress.
         $this->assertMatchesRegularExpression('/\/fixable.php/', $output);                            // File.
-        $this->assertMatchesRegularExpression('/A TOTAL OF 2 ERRORS WERE FIXED IN 1 FILE/', $output); // Summary.
+        $this->assertMatchesRegularExpression('/A TOTAL OF 4 ERRORS WERE FIXED IN 1 FILE/', $output); // Summary.
         $this->assertMatchesRegularExpression('/Time:.*Memory:/', $output);                           // Time.
 
         // Also verify display info is correct.
@@ -102,9 +102,7 @@ public function testExecute()
 // along with Moodle.  If not, see <https://www.gnu.org/licenses/>.
 
 if (true) {
-
 } else if (false) {
-
 }
 
 EOT;

tests/Fixture/moodle-local_ci/classes/output/mobile.php

@@ -32,7 +32,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class mobile {
-
     /**
      * Render index page.
      *
@@ -48,5 +47,4 @@ public static function view_index() {
             ],
         ];
     }
-
 }

tests/Fixture/moodle-local_ci/tests/lib_test.php

@@ -28,7 +28,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-require_once(__DIR__.'/../lib.php');
+require_once(__DIR__ . '/../lib.php');
 
 /**
  * The test