Merge pull request #373 from jrchamp/ci/phpunit-fix-warnings

Ci/phpunit fix warnings
ncstate-delta · Apr 29, 2022 · d68c6e4 · d68c6e4
2 parents 0d28e7e + 559f36d
commit d68c6e4
Showing 1 changed file with 27 additions and 10 deletions.
diff --git a/tests/advanced_passcode_test.php b/tests/advanced_passcode_test.php
@@ -38,6 +38,23 @@ class advanced_passcode_test extends basic_testcase {
      */
     private $zoomdata;
 
+    // phpcs:disable moodle.NamingConventions.ValidFunctionName.LowercaseMethod
+    /**
+     * Backward compatibility support for PHPUnit 8 (PHP 7.2 and 7.3).
+     *
+     * @param string $pattern Regular expression.
+     * @param string $string String.
+     * @param string $message Message.
+     */
+    public static function assertMatchesRegularExpression($pattern, $string, $message = ''): void {
+        // phpcs:enable
+        if (method_exists('basic_testcase', 'assertMatchesRegularExpression')) {
+            parent::assertMatchesRegularExpression($pattern, $string, $message);
+        } else {
+            parent::assertRegExp($pattern, $string, $message);
+        }
+    }
+
     /**
      * Setup to ensure that fixtures are loaded.
      */
@@ -107,8 +124,8 @@ public function test_settings_letter() {
 
         $passcode = zoom_create_default_passcode($this->zoomdata);
         $this->assertEquals(strlen($passcode), 6);
-        $this->assertRegExp('/\d/', $passcode);
-        $this->assertRegExp('/[a-zA-Z]/', $passcode);
+        $this->assertMatchesRegularExpression('/\d/', $passcode);
+        $this->assertMatchesRegularExpression('/[a-zA-Z]/', $passcode);
     }
 
     /**
@@ -125,9 +142,9 @@ public function test_settings_upper_and_lower_letters() {
 
         $passcode = zoom_create_default_passcode($this->zoomdata);
         $this->assertEquals(strlen($passcode), 6);
-        $this->assertRegExp('/\d/', $passcode);
-        $this->assertRegExp('/[A-Z]/', $passcode);
-        $this->assertRegExp('/[a-z]/', $passcode);
+        $this->assertMatchesRegularExpression('/\d/', $passcode);
+        $this->assertMatchesRegularExpression('/[A-Z]/', $passcode);
+        $this->assertMatchesRegularExpression('/[a-z]/', $passcode);
     }
 
     /**
@@ -144,8 +161,8 @@ public function test_settings_special_character() {
 
         $passcode = zoom_create_default_passcode($this->zoomdata);
         $this->assertEquals(strlen($passcode), 6);
-        $this->assertRegExp('/\d/', $passcode);
-        $this->assertRegExp('/[^a-zA-Z\d]/', $passcode);
+        $this->assertMatchesRegularExpression('/\d/', $passcode);
+        $this->assertMatchesRegularExpression('/[^a-zA-Z\d]/', $passcode);
     }
 
     /**
@@ -162,9 +179,9 @@ public function test_settings_all() {
 
         $passcode = zoom_create_default_passcode($this->zoomdata);
         $this->assertEquals(strlen($passcode), 7);
-        $this->assertRegExp('/\d/', $passcode);
-        $this->assertRegExp('/[a-zA-Z]/', $passcode);
-        $this->assertRegExp('/[^a-zA-Z\d]/', $passcode);
+        $this->assertMatchesRegularExpression('/\d/', $passcode);
+        $this->assertMatchesRegularExpression('/[a-zA-Z]/', $passcode);
+        $this->assertMatchesRegularExpression('/[^a-zA-Z\d]/', $passcode);
     }
 
     /**