fixed white space

Author: Paul Bearne

tests/phpunit/tests/admin/includes/misc/gotUrlRewrite.php

@@ -10,6 +10,32 @@
  */
 class Tests_got_url_rewrite extends WP_UnitTestCase {
 
+	/**
+	 * Saved value of the $is_nginx global.
+	 * @var bool
+	 */
+	private $prev_nginx;
+
+	/**
+	 * Saved value of the $is_caddy global.
+	 * @var bool
+	 */
+	private $prev_caddy;
+
+	public function set_up() {
+		parent::set_up();
+		global $is_nginx, $is_caddy;
+		$this->prev_nginx = $is_nginx;
+		$this->prev_caddy = $is_caddy;
+	}
+
+	public function tear_down() {
+		global $is_nginx, $is_caddy;
+		$is_nginx = $this->prev_nginx;
+		$is_caddy = $this->prev_caddy;
+		parent::tear_down();
+	}
+
 	/**
 	 * Tests that got_url_rewrite() correctly detects URL rewrite support based on server and filters.
 	 *
@@ -19,20 +45,16 @@ class Tests_got_url_rewrite extends WP_UnitTestCase {
 	 *
 	 * @param bool $expected     The expected result from got_url_rewrite().
 	 * @param bool $mod_rewrite  Whether mod_rewrite is reported as supported.
-	 * @param bool $is_nginx     Value for the $is_nginx global.
-	 * @param bool $is_caddy     Value for the $is_caddy global.
+	 * @param bool $is_nginx_val Value for the $is_nginx global.
+	 * @param bool $is_caddy_val Value for the $is_caddy global.
 	 * @param bool $iis7_perm    Whether IIS7 supports permalinks (simulated).
 	 * @param bool|null $filter_val Optional value for the 'got_url_rewrite' filter.
 	 */
-	public function test_got_url_rewrite( $expected, $mod_rewrite, $is_nginx, $is_caddy, $iis7_perm, $filter_val = null ) {
+	public function test_got_url_rewrite( $expected, $mod_rewrite, $is_nginx_val, $is_caddy_val, $iis7_perm, $filter_val = null ) {
 		global $is_nginx, $is_caddy;
 
-		// Backup globals.
-		$prev_nginx = $is_nginx;
-		$prev_caddy = $is_caddy;
-
-		$is_nginx = $is_nginx;
-		$is_caddy = $is_caddy;
+		$is_nginx = $is_nginx_val;
+		$is_caddy = $is_caddy_val;
 
 		// Mock got_mod_rewrite and iis7_supports_permalinks via filters if possible.
 		// However, got_url_rewrite calls got_mod_rewrite() which calls apache_mod_loaded.
@@ -54,25 +76,32 @@ public function test_got_url_rewrite( $expected, $mod_rewrite, $is_nginx, $is_ca
 		if ( null !== $filter_val ) {
 			remove_filter( 'got_url_rewrite', $filter_val ? '__return_true' : '__return_false' );
 		}
-		$is_nginx = $prev_nginx;
-		$is_caddy = $prev_caddy;
 	}
 
-	/**
-	 * Data provider for test_got_url_rewrite.
-	 *
-	 * @return array[] {
-	 *     @type bool      $expected    The expected result.
-	 *     @type bool      $mod_rewrite Whether mod_rewrite is supported.
-	 *     @type bool      $is_nginx    Whether server is nginx.
-	 *     @type bool      $is_caddy    Whether server is Caddy.
-	 *     @type bool      $iis7_perm   Whether IIS7 supports permalinks.
-	 *     @type bool|null $filter_val  Optional filter value.
-	 * }
-	 */
+ /**
+  * Data provider for test_got_url_rewrite.
+  *
+  * @return array[] {
+  *     @type bool      $expected    The expected result.
+  *     @type bool      $mod_rewrite Whether mod_rewrite is supported.
+  *     @type bool      $is_nginx    Whether server is nginx.
+  *     @type bool      $is_caddy    Whether server is Caddy.
+  *     @type bool      $iis7_perm   Whether IIS7 supports permalinks.
+  *     @type bool|null $filter_val  Optional filter value.
+  * }
+  *
+  * @phpstan-return array<string, array{
+  *     expected:    bool,
+  *     mod_rewrite: bool,
+  *     is_nginx:    bool,
+  *     is_caddy:    bool,
+  *     iis7_perm:   bool,
+  *     filter_val?: bool|null,
+  * }>
+  */
 	public function data_got_url_rewrite() {
 		return array(
-			'All false' => array(
+			'All false'                    => array(
 				'expected'    => false,
 				'mod_rewrite' => false,
 				'is_nginx'    => false,
@@ -86,29 +115,29 @@ public function data_got_url_rewrite() {
 				'is_caddy'    => false,
 				'iis7_perm'   => false,
 			),
-			'Nginx supported' => array(
+			'Nginx supported'              => array(
 				'expected'    => true,
 				'mod_rewrite' => false,
 				'is_nginx'    => true,
 				'is_caddy'    => false,
 				'iis7_perm'   => false,
 			),
-			'Caddy supported' => array(
+			'Caddy supported'              => array(
 				'expected'    => true,
 				'mod_rewrite' => false,
 				'is_nginx'    => false,
 				'is_caddy'    => true,
 				'iis7_perm'   => false,
 			),
-			'Filter overrides to true' => array(
+			'Filter overrides to true'     => array(
 				'expected'    => true,
 				'mod_rewrite' => false,
 				'is_nginx'    => false,
 				'is_caddy'    => false,
 				'iis7_perm'   => false,
 				'filter_val'  => true,
 			),
-			'Filter overrides to false' => array(
+			'Filter overrides to false'    => array(
 				'expected'    => false,
 				'mod_rewrite' => true,
 				'is_nginx'    => true,