diff --git src/wp-includes/class-wp-oembed-controller.php src/wp-includes/class-wp-oembed-controller.php
index 0db5340..bc826c0 100644
--- src/wp-includes/class-wp-oembed-controller.php
+++ src/wp-includes/class-wp-oembed-controller.php
@@ -67,16 +67,16 @@ final class WP_oEmbed_Controller {
 		$post_id = url_to_postid( $request['url'] );
 
 		/**
-		 * Filter the determined post id.
+		 * Filter the determined post ID.
 		 *
 		 * @since 4.4.0
 		 *
 		 * @param int    $post_id The post ID.
-		 * @param string $url     The requestd URL.
+		 * @param string $url     The requested URL.
 		 */
 		$post_id = apply_filters( 'oembed_request_post_id', $post_id, $request['url'] );
 
-		$data = get_oembed_response_data( $post_id, $request['maxwidth'] );
+		$data = get_oembed_response_data( $request['maxwidth'], $post_id );
 
 		if ( ! $data ) {
 			return new WP_Error( 'oembed_invalid_url', get_status_header_desc( 404 ), array( 'status' => 404 ) );
diff --git src/wp-includes/embed-functions.php src/wp-includes/embed-functions.php
index 2f430b5..0649dae 100644
--- src/wp-includes/embed-functions.php
+++ src/wp-includes/embed-functions.php
@@ -446,12 +446,12 @@ function get_oembed_endpoint_url( $permalink = '', $format = 'json' ) {
  *
  * @since 4.4.0
  *
- * @param int|WP_Post $post   Optional. Post ID or object. Default is global `$post`.
  * @param int         $width  The width for the response.
  * @param int         $height The height for the response.
+ * @param int|WP_Post $post   Optional. Post ID or object. Default is global `$post`.
  * @return string|false Embed code on success, false if post doesn't exist.
  */
-function get_post_embed_html( $post = null, $width, $height ) {
+function get_post_embed_html( $width, $height, $post = null ) {
 	$post = get_post( $post );
 
 	if ( ! $post ) {
@@ -510,11 +510,11 @@ JS;
  *
  * @since 4.4.0
  *
- * @param WP_Post|int $post  Optional. Post object or ID. Default is global `$post`.
  * @param int         $width The requested width.
+ * @param WP_Post|int $post  Optional. Post object or ID. Default is global `$post`.
  * @return array|false Response data on success, false if post doesn't exist.
  */
-function get_oembed_response_data( $post = null, $width ) {
+function get_oembed_response_data( $width, $post = null ) {
 	$post = get_post( $post );
 
 	if ( ! $post ) {
@@ -590,7 +590,7 @@ function get_oembed_response_data_rich( $data, $post, $width, $height ) {
 	$data['width']  = absint( $width );
 	$data['height'] = absint( $height );
 	$data['type']   = 'rich';
-	$data['html']   = get_post_embed_html( $post, $width, $height );
+	$data['html']   = get_post_embed_html( $width, $height, $post );
 
 	// Add post thumbnail to response if available.
 	$thumbnail_id = false;
diff --git tests/phpunit/tests/oembed/getResponseData.php tests/phpunit/tests/oembed/getResponseData.php
index 6dcdcbd..2c0b8a3 100644
--- tests/phpunit/tests/oembed/getResponseData.php
+++ tests/phpunit/tests/oembed/getResponseData.php
@@ -5,7 +5,7 @@
  */
 class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 	function test_get_oembed_response_data_non_existent_post() {
-		$this->assertFalse( get_oembed_response_data( 0, 100 ) );
+		$this->assertFalse( get_oembed_response_data( 100, 0 ) );
 	}
 
 	function test_get_oembed_response_data() {
@@ -13,7 +13,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 			'post_title' => 'Some Post',
 		) );
 
-		$data = get_oembed_response_data( $post, 400 );
+		$data = get_oembed_response_data( 400, $post);
 
 		$this->assertEqualSets( array(
 			'version'       => '1.0',
@@ -25,7 +25,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 			'type'          => 'rich',
 			'width'         => 400,
 			'height'        => 225,
-			'html'          => get_post_embed_html( $post, 400, 225 ),
+			'html'          => get_post_embed_html( 400, 225, $post ),
 		), $data );
 	}
 
@@ -42,7 +42,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 			'post_author' => $user_id,
 		) );
 
-		$data = get_oembed_response_data( $post, 400 );
+		$data = get_oembed_response_data( 400, $post);
 
 		$this->assertEqualSets( array(
 			'version'       => '1.0',
@@ -54,7 +54,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 			'type'          => 'rich',
 			'width'         => 400,
 			'height'        => 225,
-			'html'          => get_post_embed_html( $post, 400, 225 ),
+			'html'          => get_post_embed_html( 400, 225, $post ),
 		), $data );
 	}
 
@@ -65,7 +65,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 			'post_title' => 'Some Post',
 		) );
 
-		$data = get_oembed_response_data( $post, 600 );
+		$data = get_oembed_response_data( 600, $post );
 
 		$this->assertEqualSets( array(
 			'version'       => '1.0',
@@ -85,7 +85,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 			'post_status' => 'draft',
 		) );
 
-		$this->assertFalse( get_oembed_response_data( $post, 100 ) );
+		$this->assertFalse( get_oembed_response_data( 100, $post ) );
 	}
 
 	function test_get_oembed_response_data_with_scheduled_post() {
@@ -94,7 +94,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 			'post_date'   => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) ),
 		) );
 
-		$this->assertFalse( get_oembed_response_data( $post, 100 ) );
+		$this->assertFalse( get_oembed_response_data( 100, $post ) );
 	}
 
 	function test_get_oembed_response_data_with_private_post() {
@@ -102,13 +102,13 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 			'post_status' => 'private',
 		) );
 
-		$this->assertFalse( get_oembed_response_data( $post, 100 ) );
+		$this->assertFalse( get_oembed_response_data( 100, $post ) );
 	}
 
 	function test_get_oembed_response_data_maxwidth_too_high() {
 		$post = self::factory()->post->create_and_get();
 
-		$data = get_oembed_response_data( $post, 1000 );
+		$data = get_oembed_response_data( 1000, $post );
 
 		$this->assertEquals( 600, $data['width'] );
 		$this->assertEquals( 338, $data['height'] );
@@ -117,7 +117,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 	function test_get_oembed_response_data_maxwidth_too_low() {
 		$post = self::factory()->post->create_and_get();
 
-		$data = get_oembed_response_data( $post, 100 );
+		$data = get_oembed_response_data( 100, $post );
 
 		$this->assertEquals( 200, $data['width'] );
 		$this->assertEquals( 200, $data['height'] );
@@ -126,12 +126,12 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 	function test_get_oembed_response_data_maxwidth_invalid() {
 		$post = self::factory()->post->create_and_get();
 
-		$data = get_oembed_response_data( $post, '400;" DROP TABLES' );
+		$data = get_oembed_response_data('400;" DROP TABLES', $post );
 
 		$this->assertEquals( 400, $data['width'] );
 		$this->assertEquals( 225, $data['height'] );
 
-		$data = get_oembed_response_data( $post, "lol this isn't even a number?!?!?" );
+		$data = get_oembed_response_data( "lol this isn't even a number?!?!?", $post );
 
 		$this->assertEquals( 200, $data['width'] );
 		$this->assertEquals( 200, $data['height'] );
@@ -145,7 +145,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 		) );
 		set_post_thumbnail( $post, $attachment_id );
 
-		$data = get_oembed_response_data( $post, 400 );
+		$data = get_oembed_response_data( 400, $post );
 
 		$this->assertArrayHasKey( 'thumbnail_url', $data );
 		$this->assertArrayHasKey( 'thumbnail_width', $data );
@@ -160,7 +160,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
 			'post_mime_type' => 'image/jpeg',
 		) );
 
-		$data = get_oembed_response_data( $post, 400 );
+		$data = get_oembed_response_data( 400, $post );
 
 		$this->assertArrayHasKey( 'thumbnail_url', $data );
 		$this->assertArrayHasKey( 'thumbnail_width', $data );
diff --git tests/phpunit/tests/oembed/template.php tests/phpunit/tests/oembed/template.php
index 644a6d5..ca07035 100644
--- tests/phpunit/tests/oembed/template.php
+++ tests/phpunit/tests/oembed/template.php
@@ -236,8 +236,8 @@ class Tests_Embed_Template extends WP_UnitTestCase {
 	}
 
 	function test_get_post_embed_html_non_existent_post() {
-		$this->assertFalse( get_post_embed_html( 0, 200, 200 ) );
-		$this->assertFalse( get_post_embed_html( null, 200, 200 ) );
+		$this->assertFalse( get_post_embed_html( 200, 200, 0 ) );
+		$this->assertFalse( get_post_embed_html( 200, 200 ) );
 	}
 
 	function test_get_post_embed_html() {
@@ -245,7 +245,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
 
 		$expected = '<iframe sandbox="allow-scripts" security="restricted" src="' . esc_url( get_post_embed_url( $post_id ) ) . '" width="200" height="200" title="Embedded WordPress Post" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" class="wp-embedded-content"></iframe>';
 
-		$this->assertStringEndsWith( $expected, get_post_embed_html( $post_id, 200, 200 ) );
+		$this->assertStringEndsWith( $expected, get_post_embed_html( 200, 200, $post_id ) );
 	}
 
 	function test_add_host_js() {