diff --git a/src/js/media/views/modal.js b/src/js/media/views/modal.js
index f28c92e7e6..8ef4fbb6e1 100644
--- a/src/js/media/views/modal.js
+++ b/src/js/media/views/modal.js
@@ -138,7 +138,7 @@ Modal = wp.media.View.extend(/** @lends wp.media.view.Modal.prototype */{
 		// Enable page scrolling.
 		$( 'body' ).removeClass( 'modal-open' );
 
-		// Hide the modal element by adding display none.
+		// Hide the modal element by adding display:none.
 		this.$el.hide();
 
 		/*
diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
index 399fdcf629..2eb0111d09 100644
--- a/src/wp-admin/includes/file.php
+++ b/src/wp-admin/includes/file.php
@@ -1194,8 +1194,10 @@ function download_url( $url, $timeout = 300, $signature_verification = false ) {
 			$tmpfname_disposition = '';
 		}
 
-		// Potential file name must be valid string
-		if ( $tmpfname_disposition && is_string( $tmpfname_disposition ) && ( 0 === validate_file( $tmpfname_disposition ) ) ) {
+		// Potential file name must be valid string.
+		if ( $tmpfname_disposition && is_string( $tmpfname_disposition )
+			&& ( 0 === validate_file( $tmpfname_disposition ) )
+		) {
 			if ( rename( $tmpfname, $tmpfname_disposition ) ) {
 				$tmpfname = $tmpfname_disposition;
 			}
diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
index 517daf513c..30347a4b24 100644
--- a/src/wp-includes/rest-api.php
+++ b/src/wp-includes/rest-api.php
@@ -3056,7 +3056,8 @@ function rest_default_additional_properties_to_false( $schema ) {
  * @since 5.5.0
  *
  * @param int|WP_Post $post Post ID or post object.
- * @return string The route path with a leading slash for the given post, or an empty string if there is not a route.
+ * @return string The route path with a leading slash for the given post,
+ *                or an empty string if there is not a route.
  */
 function rest_get_route_for_post( $post ) {
 	$post = get_post( $post );
@@ -3089,7 +3090,8 @@ function rest_get_route_for_post( $post ) {
  * @since 5.9.0
  *
  * @param string $post_type The name of a registered post type.
- * @return string The route path with a leading slash for the given post type, or an empty string if there is not a route.
+ * @return string The route path with a leading slash for the given post type,
+ *                or an empty string if there is not a route.
  */
 function rest_get_route_for_post_type_items( $post_type ) {
 	$post_type = get_post_type_object( $post_type );
@@ -3122,7 +3124,8 @@ function rest_get_route_for_post_type_items( $post_type ) {
  * @since 5.5.0
  *
  * @param int|WP_Term $term Term ID or term object.
- * @return string The route path with a leading slash for the given term, or an empty string if there is not a route.
+ * @return string The route path with a leading slash for the given term,
+ *                or an empty string if there is not a route.
  */
 function rest_get_route_for_term( $term ) {
 	$term = get_term( $term );
diff --git a/tests/phpunit/includes/mock-invokable.php b/tests/phpunit/includes/mock-invokable.php
index 03db3e053a..c809046bd3 100644
--- a/tests/phpunit/includes/mock-invokable.php
+++ b/tests/phpunit/includes/mock-invokable.php
@@ -9,7 +9,7 @@
 /**
  * Class Mock_Invokable.
  *
- * This class is using to mock a class that has __invoke method.
+ * This class is used to mock a class that has an `__invoke` method.
  */
 class Mock_Invokable {
 
diff --git a/tests/phpunit/includes/spy-rest-server.php b/tests/phpunit/includes/spy-rest-server.php
index 5bfd1d2dba..0702ebbb23 100644
--- a/tests/phpunit/includes/spy-rest-server.php
+++ b/tests/phpunit/includes/spy-rest-server.php
@@ -38,14 +38,6 @@ class Spy_REST_Server extends WP_REST_Server {
 		$this->sent_headers[ $header ] = $value;
 	}
 
-	/**
-	 * Stores last set status.
-	 * @param int $code HTTP status.
-	 */
-	public function set_status( $status ) {
-		$this->status = $status;
-	}
-
 	/**
 	 * Removes a header from the list of sent headers.
 	 *
@@ -55,6 +47,15 @@ class Spy_REST_Server extends WP_REST_Server {
 		unset( $this->sent_headers[ $header ] );
 	}
 
+	/**
+	 * Stores last set status.
+	 *
+	 * @param int $code HTTP status.
+	 */
+	public function set_status( $status ) {
+		$this->status = $status;
+	}
+
 	/**
 	 * Overrides the dispatch method so we can get a handle on the request object.
 	 *
diff --git a/tests/phpunit/tests/admin/includesFile.php b/tests/phpunit/tests/admin/includesFile.php
index 9ac46ad333..eb6cc7c826 100644
--- a/tests/phpunit/tests/admin/includesFile.php
+++ b/tests/phpunit/tests/admin/includesFile.php
@@ -88,7 +88,7 @@ class Tests_Admin_IncludesFile extends WP_UnitTestCase {
 	 *
 	 * @covers ::download_url
 	 *
-	 * @param $filter  A callback containing a fake Content-Disposition header.
+	 * @param $filter A callback containing a fake Content-Disposition header.
 	 */
 	public function test_download_url_should_respect_filename_from_content_disposition_header( $filter ) {
 		add_filter( 'pre_http_request', array( $this, $filter ), 10, 3 );
@@ -174,7 +174,7 @@ class Tests_Admin_IncludesFile extends WP_UnitTestCase {
 	 *
 	 * @covers ::download_url
 	 *
-	 * @param $filter  A callback containing a fake Content-Disposition header.
+	 * @param $filter A callback containing a fake Content-Disposition header.
 	 */
 	public function test_download_url_should_reject_filename_from_invalid_content_disposition_header( $filter ) {
 		add_filter( 'pre_http_request', array( $this, $filter ), 10, 3 );