Changeset 53795

Timestamp:

07/29/2022 02:33:15 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Simplify some function calls in Tests_Media.

The remaining assertions using preg_match_all() do actually pass a regex, but the third parameter $matches is never used.

This third parameter became optional in PHP 5.4, so we may as well remove it.

Reference: ​PHP Manual: preg_match_all()

Follow-up to [711/tests], [53558], [53790].

Props jrf.
See #55652.

File:

• trunk/tests/phpunit/tests/media.php (modified) (3 diffs)

trunk/tests/phpunit/tests/media.php

@@ -214 +214 @@
                 $content_preg = preg_quote( self::HTML_CONTENT );
 
-                $this->assertSame( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
-                $this->assertSame( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
+                $this->assertSame( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result ) );
+                $this->assertSame( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result ) );
         }
 
@@ -227 +227 @@
                 $content_preg = preg_quote( self::HTML_CONTENT );
 
-                $this->assertSame( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
-                $this->assertSame( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
+                $this->assertSame( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result ) );
+                $this->assertSame( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result ) );
         }
 
@@ -240 +240 @@
                 $content_preg = preg_quote( self::HTML_CONTENT );
 
-                $this->assertSame( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result, $_r ) );
-                $this->assertSame( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
+                $this->assertSame( 1, preg_match_all( "~{$img_preg}.*wp-caption-text~", $result ) );
+                $this->assertSame( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result ) );
         }