--- a/wp/wp-admin/includes/class-wp-site-icon.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/includes/class-wp-site-icon.php	Mon Oct 14 18:28:13 2019 +0200
@@ -20,7 +20,7 @@
 	 * @since 4.3.0
 	 * @var int
 	 */
-	public $min_size  = 512;
+	public $min_size = 512;
 
 	/**
 	 * The size to which to crop the image so that we can display it in the UI nicely.
@@ -34,7 +34,7 @@
 	 * List of site icon sizes.
 	 *
 	 * @since 4.3.0
-	 * @var array
+	 * @var int[]
 	 */
 	public $site_icon_sizes = array(
 		/*
@@ -85,18 +85,18 @@
 	public function create_attachment_object( $cropped, $parent_attachment_id ) {
 		$parent     = get_post( $parent_attachment_id );
 		$parent_url = wp_get_attachment_url( $parent->ID );
-		$url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+		$url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
 		$size       = @getimagesize( $cropped );
 		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 
 		$object = array(
 			'ID'             => $parent_attachment_id,
-			'post_title'     => basename( $cropped ),
+			'post_title'     => wp_basename( $cropped ),
 			'post_content'   => $url,
 			'post_mime_type' => $image_type,
 			'guid'           => $url,
-			'context'        => 'site-icon'
+			'context'        => 'site-icon',
 		);
 
 		return $object;
@@ -131,12 +131,12 @@
 	}
 
 	/**
-	 * Adds additional sizes to be made when creating the site_icon images.
+	 * Adds additional sizes to be made when creating the site icon images.
 	 *
 	 * @since 4.3.0
 	 *
-	 * @param array $sizes List of additional sizes.
-	 * @return array Additional image sizes.
+	 * @param array[] $sizes Array of arrays containing information for additional sizes.
+	 * @return array[] Array of arrays containing additional image sizes.
 	 */
 	public function additional_sizes( $sizes = array() ) {
 		$only_crop_sizes = array();
@@ -146,7 +146,7 @@
 		 *
 		 * @since 4.3.0
 		 *
-		 * @param array $site_icon_sizes Sizes available for the Site Icon.
+		 * @param int[] $site_icon_sizes Array of sizes available for the Site Icon.
 		 */
 		$this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes );
 
@@ -179,8 +179,8 @@
 	 *
 	 * @since 4.3.0
 	 *
-	 * @param array $sizes List of image sizes.
-	 * @return array List of intermediate image sizes.
+	 * @param string[] $sizes Array of image size names.
+	 * @return string[] Array of image size names.
 	 */
 	public function intermediate_image_sizes( $sizes = array() ) {
 		/** This filter is documented in wp-admin/includes/class-wp-site-icon.php */