[^"]+)"#s', $html, $matches ) ) { + $props['fallback'] = sprintf( + '<a fallback href="%s">%s</a>', + esc_url( $url ), + esc_html( $matches['title'] ) + ); + } + + if ( preg_match( '#<iframe[^>]*?height="(?P<height>\d+)"#s', $html, $matches ) ) { + $props['height'] = (int) $matches['height']; + } + + if ( preg_match( '#<iframe[^>]*?width="(?P<width>\d+)"#s', $html, $matches ) ) { + $props['width'] = (int) $matches['width']; + } + + $embed = $this->render( $props, $url ); } } return $embed; @@ -94,68 +117,87 @@ private function parse_amp_component_from_iframe( $html ) { /** * Render shortcode. * + * @todo Move this to Jetpack. + * * @param array $attr Shortcode attributes. * @param string $content Shortcode content. * @return string Rendered shortcode. */ public function shortcode( $attr, $content = null ) { - $output = ''; - if ( function_exists( 'soundcloud_shortcode' ) ) { - if ( empty( $attr['url'] ) && ! empty( $attr['id'] ) ) { - $attr['url'] = 'https://api.soundcloud.com/tracks/' . intval( $attr['id'] ); - } - $output = soundcloud_shortcode( $attr, $content ); - $output = $this->parse_amp_component_from_iframe( $output ); - } else { - $url = null; - if ( isset( $attr['id'] ) ) { - $url = 'https://w.soundcloud.com/player/?url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F' . intval( $attr['id'] ); - } + if ( ! function_exists( 'soundcloud_shortcode' ) ) { + return ''; + } - if ( isset( $attr['url'] ) ) { - $url = $attr['url']; - } elseif ( isset( $attr[0] ) ) { - $url = $attr[0]; - } elseif ( function_exists( 'shortcode_new_to_old_params' ) ) { - $url = shortcode_new_to_old_params( $attr ); - } + if ( isset( $attr['url'] ) ) { + $url = $attr['url']; + } elseif ( isset( $attr['id'] ) ) { + $url = 'https://api.soundcloud.com/tracks/' . $attr['id']; + } elseif ( isset( $attr[0] ) ) { + $url = is_numeric( $attr[0] ) ? 'https://api.soundcloud.com/tracks/' . $attr[0] : $attr[0]; + } elseif ( function_exists( 'shortcode_new_to_old_params' ) ) { + $url = shortcode_new_to_old_params( $attr ); + } - if ( $url ) { - $output = $this->render_embed_fallback( $url ); - } + // Defer to oEmbed if an oEmbeddable URL is provided. + if ( isset( $url ) && 'api.soundcloud.com' !== wp_parse_url( $url, PHP_URL_HOST ) ) { + global $wp_embed; + return $wp_embed->shortcode( $attr, $url ); + } + + if ( isset( $url ) && ! isset( $attr['url'] ) ) { + $attr['url'] = $url; } - return $output; + $output = soundcloud_shortcode( $attr, $content ); + + return $this->parse_amp_component_from_iframe( $output, null ); } /** * Render embed. * - * @param array $args Args. + * @param array $args Args. + * @param string $url Embed URL for fallback purposes. Optional. * @return string Rendered embed. * @global WP_Embed $wp_embed */ - public function render( $args ) { + public function render( $args, $url ) { $args = wp_parse_args( $args, array( - 'track_id' => false, - 'url' => null, + 'track_id' => false, + 'playlist_id' => false, + 'height' => null, + 'width' => null, + 'visual' => null, + 'fallback' => '', ) ); - if ( empty( $args['track_id'] ) ) { - return $this->render_embed_fallback( $args['url'] ); + $this->did_convert_elements = true; + + $attributes = array(); + if ( ! empty( $args['track_id'] ) ) { + $attributes['data-trackid'] = $args['track_id']; + } elseif ( ! empty( $args['playlist_id'] ) ) { + $attributes['data-playlistid'] = $args['playlist_id']; + } elseif ( $url ) { + return $this->render_embed_fallback( $url ); + } else { + return ''; + } + + if ( isset( $args['visual'] ) ) { + $attributes['data-visual'] = rest_sanitize_boolean( $args['visual'] ) ? 'true' : 'false'; } - $this->did_convert_elements = true; + // @todo Set width to $args['width'] and layout to responsive once amp-soundcloud supports it: <https://github.com/ampproject/amphtml/issues/23144>. + $attributes['height'] = $args['height'] ? $args['height'] : $this->args['height']; + $attributes['layout'] = 'fixed-height'; return AMP_HTML_Utils::build_tag( 'amp-soundcloud', - array( - 'data-trackid' => $args['track_id'], - 'layout' => 'fixed-height', - 'height' => $this->args['height'], - ) + $attributes, + $args['fallback'] ); } @@ -163,13 +205,13 @@ public function render( $args ) { * Render embed fallback. * * @param string $url URL. - * @returns string + * @return string Fallback link. */ private function render_embed_fallback( $url ) { return AMP_HTML_Utils::build_tag( 'a', array( - 'href' => esc_url( $url ), + 'href' => esc_url_raw( $url ), 'class' => 'amp-wp-embed-fallback', ), esc_html( $url ) @@ -177,17 +219,23 @@ private function render_embed_fallback( $url ) { } /** - * Get track_id from URL. + * Get params from Soundcloud iframe src. * * @param string $url URL. - * - * @return string Track ID or empty string if none matched. + * @return array Params extracted from URL. */ - private function get_track_id_from_url( $url ) { + private function extract_params_from_iframe_src( $url ) { $parsed_url = wp_parse_url( $url ); - if ( ! preg_match( '#tracks/(?P<track_id>[^/]+)#', $parsed_url['path'], $matches ) ) { - return ''; + if ( preg_match( '#tracks/(?P<track_id>\d+)#', $parsed_url['path'], $matches ) ) { + return array( + 'track_id' => $matches['track_id'], + ); + } + if ( preg_match( '#playlists/(?P<playlist_id>\d+)#', $parsed_url['path'], $matches ) ) { + return array( + 'playlist_id' => $matches['playlist_id'], + ); } - return $matches['track_id']; + return array(); } } diff --git a/tests/test-amp-soundcloud-embed.php b/tests/test-amp-soundcloud-embed.php index 389a8a4ebb0..aa82a9c5c18 100644 --- a/tests/test-amp-soundcloud-embed.php +++ b/tests/test-amp-soundcloud-embed.php @@ -13,19 +13,34 @@ class AMP_SoundCloud_Embed_Test extends WP_UnitTestCase { /** - * The oEmbed URL. + * Track URL. * * @var string */ - protected $oembed_url = 'https://soundcloud.com/jack-villano-villano/mozart-requiem-in-d-minor'; + protected $track_url = 'https://soundcloud.com/jack-villano-villano/mozart-requiem-in-d-minor'; /** - * Response for oEmbed request. + * Playlist URL. * - * @see AMP_SoundCloud_Embed_Test::$oembed_url * @var string */ - protected $oembed_response = '{"version":1.0,"type":"rich","provider_name":"SoundCloud","provider_url":"http://soundcloud.com","height":400,"width":500,"title":"Mozart - Requiem in D minor Complete Full by Jack Villano Villano","description":"mass in D Minor ","thumbnail_url":"http://i1.sndcdn.com/artworks-000046826426-o7i9ki-t500x500.jpg","html":"\u003Ciframe width=\"500\" height=\"400\" scrolling=\"no\" frameborder=\"no\" src=\"https://w.soundcloud.com/player/?visual=true\u0026url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F90097394\u0026show_artwork=true\u0026maxwidth=500\u0026maxheight=750\u0026dnt=1\"\u003E\u003C/iframe\u003E","author_name":"Jack Villano Villano","author_url":"https://soundcloud.com/jack-villano-villano"}'; + protected $playlist_url = 'https://soundcloud.com/classical-music-playlist/sets/classical-music-essential-collection'; + + /** + * Response for track oEmbed request. + * + * @see AMP_SoundCloud_Embed_Test::$track_url + * @var string + */ + protected $track_oembed_response = '{"version":1.0,"type":"rich","provider_name":"SoundCloud","provider_url":"http://soundcloud.com","height":400,"width":500,"title":"Mozart - Requiem in D minor Complete Full by Jack Villano Villano","description":"mass in D Minor ","thumbnail_url":"http://i1.sndcdn.com/artworks-000046826426-o7i9ki-t500x500.jpg","html":"\u003Ciframe width=\"500\" height=\"400\" scrolling=\"no\" frameborder=\"no\" src=\"https://w.soundcloud.com/player/?visual=true\u0026url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F90097394\u0026show_artwork=true\u0026maxwidth=500\u0026maxheight=750\u0026dnt=1\"\u003E\u003C/iframe\u003E","author_name":"Jack Villano Villano","author_url":"https://soundcloud.com/jack-villano-villano"}'; + + /** + * Response for playlist oEmbed request. + * + * @see AMP_SoundCloud_Embed_Test::$playlist_url + * @var string + */ + protected $playlist_oembed_response = '{"version":1.0,"type":"rich","provider_name":"SoundCloud","provider_url":"http://soundcloud.com","height":450,"width":500,"title":"Classical Music - The Essential Collection by Classical Music","description":"Classical Music - The Essential Collection features 50 of the finest Classical Masterpieces ever written. Definitely not to working to! ","thumbnail_url":"http://i1.sndcdn.com/artworks-000083473866-mno23j-t500x500.jpg","html":"\u003Ciframe width=\"500\" height=\"450\" scrolling=\"no\" frameborder=\"no\" src=\"https://w.soundcloud.com/player/?visual=true\u0026url=https%3A%2F%2Fapi.soundcloud.com%2Fplaylists%2F40936190\u0026show_artwork=true\u0026maxwidth=500\u0026maxheight=750\u0026dnt=1\"\u003E\u003C/iframe\u003E","author_name":"Classical Music","author_url":"https://soundcloud.com/classical-music-playlist"}'; /** * Set up. @@ -46,6 +61,7 @@ public function setUp() { $post = $this->factory()->post->create_and_get(); } + // @todo This should be moved to Jetpack. if ( function_exists( 'soundcloud_shortcode' ) ) { add_shortcode( 'soundcloud', 'soundcloud_shortcode' ); } @@ -70,20 +86,27 @@ public function tearDown() { * @return array Response data. */ public function mock_http_request( $preempt, $r, $url ) { + if ( false === strpos( $url, 'soundcloud.com' ) ) { + return $preempt; + } unset( $r ); - if ( false !== strpos( $url, 'soundcloud.com' ) ) { - return array( - 'body' => $this->oembed_response, - 'headers' => array(), - 'response' => array( - 'code' => 200, - 'message' => 'ok', - ), - 'cookies' => array(), - 'http_response' => null, - ); + + if ( false !== strpos( $url, 'sets' ) ) { + $body = $this->playlist_oembed_response; + } else { + $body = $this->track_oembed_response; } - return $preempt; + + return array( + 'body' => $body, + 'headers' => array(), + 'response' => array( + 'code' => 200, + 'message' => 'ok', + ), + 'cookies' => array(), + 'http_response' => null, + ); } /** @@ -93,35 +116,59 @@ public function mock_http_request( $preempt, $r, $url ) { */ public function get_conversion_data() { $data = array( - 'no_embed' => array( + 'no_embed' => array( '<p>Hello world.</p>', '<p>Hello world.</p>' . PHP_EOL, ), - 'url_simple' => array( - $this->oembed_url . PHP_EOL, - '<p><amp-soundcloud data-trackid="90097394" layout="fixed-height" height="200"></amp-soundcloud></p>' . PHP_EOL, + 'track_simple' => array( + $this->track_url . PHP_EOL, + '<p><amp-soundcloud data-trackid="90097394" data-visual="true" height="400" layout="fixed-height">' . ( function_exists( 'wp_filter_oembed_iframe_title_attribute' ) ? '<a fallback href="https://soundcloud.com/jack-villano-villano/mozart-requiem-in-d-minor">Mozart – Requiem in D minor Complete Full by Jack Villano Villano</a>' : '' ) . '</amp-soundcloud></p>' . PHP_EOL, + ), + + 'playlist_simple' => array( + $this->playlist_url . PHP_EOL, + '<p><amp-soundcloud data-playlistid="40936190" data-visual="true" height="450" layout="fixed-height">' . ( function_exists( 'wp_filter_oembed_iframe_title_attribute' ) ? '<a fallback href="https://soundcloud.com/classical-music-playlist/sets/classical-music-essential-collection">Classical Music – The Essential Collection by Classical Music</a>' : '' ) . '</amp-soundcloud></p>' . PHP_EOL, ), ); + // @todo All the following should be moved to Jetpack. if ( defined( 'JETPACK__PLUGIN_DIR' ) ) { require_once JETPACK__PLUGIN_DIR . 'modules/shortcodes/soundcloud.php'; } - if ( function_exists( 'soundcloud_shortcode' ) ) { $data = array_merge( $data, array( - // This is supported by Jetpack. - 'shortcode_unnamed_attr_as_url' => array( + 'shortcode_with_bare_track_api_url' => array( + '[soundcloud https://api.soundcloud.com/tracks/89299804]' . PHP_EOL, + '<amp-soundcloud data-trackid="89299804" data-visual="false" height="166" layout="fixed-height"></amp-soundcloud>' . PHP_EOL, + ), + + 'shortcode_with_track_api_url' => array( '[soundcloud url=https://api.soundcloud.com/tracks/89299804]' . PHP_EOL, - '<amp-soundcloud data-trackid="89299804" layout="fixed-height" height="200"></amp-soundcloud>' . PHP_EOL, + '<amp-soundcloud data-trackid="89299804" data-visual="false" height="166" layout="fixed-height"></amp-soundcloud>' . PHP_EOL, + ), + + 'shortcode_with_track_permalink' => array( + "[soundcloud url=$this->track_url]", + '<amp-soundcloud data-trackid="90097394" data-visual="true" height="400" layout="fixed-height">' . ( function_exists( 'wp_filter_oembed_iframe_title_attribute' ) ? '<a fallback href="https://soundcloud.com/jack-villano-villano/mozart-requiem-in-d-minor">Mozart - Requiem in D minor Complete Full by Jack Villano Villano</a>' : '' ) . '</amp-soundcloud>' . PHP_EOL, + ), + + 'shortcode_with_bare_track_permalink' => array( + "[soundcloud $this->track_url]", + '<amp-soundcloud data-trackid="90097394" data-visual="true" height="400" layout="fixed-height">' . ( function_exists( 'wp_filter_oembed_iframe_title_attribute' ) ? '<a fallback href="https://soundcloud.com/jack-villano-villano/mozart-requiem-in-d-minor">Mozart - Requiem in D minor Complete Full by Jack Villano Villano</a>' : '' ) . '</amp-soundcloud>' . PHP_EOL, + ), + + 'shortcode_with_playlist_permalink' => array( + "[soundcloud url=$this->playlist_url]", + '<amp-soundcloud data-playlistid="40936190" data-visual="true" height="450" layout="fixed-height">' . ( function_exists( 'wp_filter_oembed_iframe_title_attribute' ) ? '<a fallback href="https://soundcloud.com/classical-music-playlist/sets/classical-music-essential-collection">Classical Music - The Essential Collection by Classical Music</a>' : '' ) . '</amp-soundcloud>' . PHP_EOL, ), // This apparently only works on WordPress.com. - 'shortcode_with_id' => array( + 'shortcode_with_id' => array( '[soundcloud id=89299804]' . PHP_EOL, - '<amp-soundcloud data-trackid="89299804" layout="fixed-height" height="200"></amp-soundcloud>' . PHP_EOL, + '<amp-soundcloud data-trackid="89299804" data-visual="false" height="166" layout="fixed-height"></amp-soundcloud>' . PHP_EOL, ), ) ); @@ -156,12 +203,16 @@ public function test__conversion( $source, $expected ) { */ public function get_scripts_data() { return array( - 'not_converted' => array( + 'not_converted' => array( '<p>Hello World.</p>', array(), ), - 'converted' => array( - $this->oembed_url . PHP_EOL, + 'converted_track' => array( + $this->track_url . PHP_EOL, + array( 'amp-soundcloud' => true ), + ), + 'converted_playlist' => array( + $this->playlist_url . PHP_EOL, array( 'amp-soundcloud' => true ), ), ); diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php index d733f939986..d7f5a15e185 100644 --- a/tests/test-class-amp-theme-support.php +++ b/tests/test-class-amp-theme-support.php @@ -1379,7 +1379,7 @@ protected function get_etag_header_value( $headers ) { * @covers \amp_render_scripts() */ public function test_prepare_response() { - remove_action( 'wp_print_scripts', 'wp_print_service_workers', 9 ); + add_theme_support( 'amp' ); add_filter( 'home_url', From f4aca84a7db772ff0bbe59521c74fd1393af421d Mon Sep 17 00:00:00 2001 From: Ryan Kienstra <kienstraryan@gmail.com> Date: Tue, 2 Jul 2019 04:45:18 -0500 Subject: [PATCH 087/434] Add support for portrait featured images in non-AMP Story posts (#2711) --- assets/src/block-editor/index.js | 4 +- .../featured-image-select-media-frame.js | 2 +- .../components/with-cropped-featured-image.js | 38 +++++++++++++---- assets/src/common/constants.js | 1 + assets/src/common/helpers/index.js | 41 ++++++++++++++++++- .../common/helpers/test/getAspectRatioType.js | 19 +++++++++ .../test/getMinimumFeaturedImageDimensions.js | 2 +- ...tMinimumPortraitFeaturedImageDimensions.js | 10 +++++ 8 files changed, 104 insertions(+), 13 deletions(-) create mode 100644 assets/src/common/helpers/test/getAspectRatioType.js create mode 100644 assets/src/common/helpers/test/getMinimumPortraitFeaturedImageDimensions.js diff --git a/assets/src/block-editor/index.js b/assets/src/block-editor/index.js index b50f7b51030..4f5c429939d 100644 --- a/assets/src/block-editor/index.js +++ b/assets/src/block-editor/index.js @@ -11,7 +11,7 @@ import { select } from '@wordpress/data'; */ import { withCroppedFeaturedImage, withFeaturedImageNotice } from '../common/components'; import { addAMPAttributes, addAMPExtraProps, filterBlocksEdit, filterBlocksSave } from './helpers'; -import { getMinimumFeaturedImageDimensions } from '../common/helpers'; +import { getMinimumFeaturedImageDimensions, getMinimumPortraitFeaturedImageDimensions } from '../common/helpers'; import './store'; const { @@ -37,7 +37,7 @@ if ( isWebsiteEnabled() ) { addFilter( 'editor.BlockEdit', 'ampEditorBlocks/filterEdit', filterBlocksEdit, 20 ); addFilter( 'blocks.getSaveContent.extraProps', 'ampEditorBlocks/addExtraAttributes', addAMPExtraProps ); addFilter( 'editor.PostFeaturedImage', 'ampEditorBlocks/withFeaturedImageNotice', withFeaturedImageNotice ); - addFilter( 'editor.MediaUpload', 'ampEditorBlocks/addCroppedFeaturedImage', ( InitialMediaUpload ) => withCroppedFeaturedImage( InitialMediaUpload, getMinimumFeaturedImageDimensions() ) ); + addFilter( 'editor.MediaUpload', 'ampEditorBlocks/addCroppedFeaturedImage', ( InitialMediaUpload ) => withCroppedFeaturedImage( InitialMediaUpload, getMinimumFeaturedImageDimensions(), getMinimumPortraitFeaturedImageDimensions() ) ); } /* diff --git a/assets/src/common/components/featured-image-select-media-frame.js b/assets/src/common/components/featured-image-select-media-frame.js index 4b9c4626cf0..d96e7e38f39 100644 --- a/assets/src/common/components/featured-image-select-media-frame.js +++ b/assets/src/common/components/featured-image-select-media-frame.js @@ -72,7 +72,7 @@ const FeaturedImageToolbarSelect = wp.media.view.Toolbar.Select.extend( { const minWidth = state.collection.get( 'library' ).get( 'suggestedWidth' ); const minHeight = state.collection.get( 'library' ).get( 'suggestedHeight' ); - if ( ! attachment || ( attachment.get( 'width' ) >= minWidth && attachment.get( 'height' ) >= minHeight ) ) { + if ( ! attachment || ! attachment.get( 'width' ) || ( attachment.get( 'width' ) >= minWidth && attachment.get( 'height' ) >= minHeight ) ) { this.secondary.unset( 'select-error' ); } else { this.secondary.set( diff --git a/assets/src/common/components/with-cropped-featured-image.js b/assets/src/common/components/with-cropped-featured-image.js index caadb72803d..a24f2b594fc 100644 --- a/assets/src/common/components/with-cropped-featured-image.js +++ b/assets/src/common/components/with-cropped-featured-image.js @@ -14,6 +14,7 @@ import { dispatch } from '@wordpress/data'; */ import FeaturedImageSelectMediaFrame from './featured-image-select-media-frame'; import FeaturedImageCropper from './featured-image-cropper'; +import { getAspectRatioType } from '../helpers'; const { wp } = window; @@ -23,13 +24,19 @@ const { wp } = window; * Only applies to the MediaUpload in the Featured Image component, PostFeaturedImage. * Suggests cropping of the featured image if it's not 696 x 928. * Mostly copied from customize-controls.js. + * The optional alternateMinImageDimensions are used for the crop size when they are the same aspect ratio type as the actual image dimensions. + * For example, if the selected image has a portrait aspect ratio, and the alternateMinImageDimensions are also portrait, + * this will use the alternate dimensions as long as the selected image is big enough. + * Otherwise, this will use the minImageDimensions. * - * @param {Function} InitialMediaUpload The MediaUpload component, passed from the filter. - * @param {Object} minImageDimensions Minimum required image dimensions. + * @param {Function} InitialMediaUpload The MediaUpload component, passed from the filter. + * @param {Object} minImageDimensions Minimum required image dimensions. + * @param {Object} alternateMinImageDimensions Alternate required image dimensions, like portrait dimensions (optional). * @return {Function} The wrapped component. */ -export default ( InitialMediaUpload, minImageDimensions ) => { +export default ( InitialMediaUpload, minImageDimensions, alternateMinImageDimensions = {} ) => { const { width: EXPECTED_WIDTH, height: EXPECTED_HEIGHT } = minImageDimensions; + const { width: ALTERNATE_EXPECTED_WIDTH, height: ALTERNATE_EXPECTED_HEIGHT } = alternateMinImageDimensions; /** * Mostly copied from customize-controls.js, with slight changes. @@ -111,8 +118,20 @@ export default ( InitialMediaUpload, minImageDimensions ) => { const realWidth = attachment.get( 'width' ), realHeight = attachment.get( 'height' ); - let xInit = parseInt( EXPECTED_WIDTH, 10 ), - yInit = parseInt( EXPECTED_HEIGHT, 10 ); + /* + * Only use the alternate dimensions if the image is big enough, and if they have the same aspect ratio type. + * For example, if they are portrait dimensions, the real image must also have portrait dimensions. + * This allows having an alternative crop size, for example, a portrait crop in addition to a landscape crop. + */ + const shouldUseAlternateWidthAndHeight = ( + ALTERNATE_EXPECTED_WIDTH && + realWidth >= ALTERNATE_EXPECTED_WIDTH && + realHeight >= ALTERNATE_EXPECTED_HEIGHT && + getAspectRatioType( realWidth, realHeight ) === getAspectRatioType( ALTERNATE_EXPECTED_WIDTH, ALTERNATE_EXPECTED_HEIGHT ) + ); + + let xInit = shouldUseAlternateWidthAndHeight ? parseInt( ALTERNATE_EXPECTED_WIDTH, 10 ) : parseInt( EXPECTED_WIDTH, 10 ), + yInit = shouldUseAlternateWidthAndHeight ? parseInt( ALTERNATE_EXPECTED_HEIGHT, 10 ) : parseInt( EXPECTED_HEIGHT, 10 ); const ratio = xInit / yInit, xImg = xInit, @@ -121,10 +140,10 @@ export default ( InitialMediaUpload, minImageDimensions ) => { // Allow cropping to be skipped because the image is at least the required dimensions, so skipping crop will auto crop. controller.set( 'canSkipCrop', true ); - if ( realWidth / realHeight > ratio ) { + if ( realWidth / realHeight > ratio ) { // This is wider than the expected ratio. yInit = realHeight; xInit = yInit * ratio; - } else { + } else { // This is either the expected ratio or taller. xInit = realWidth; yInit = xInit / ratio; } @@ -157,7 +176,10 @@ export default ( InitialMediaUpload, minImageDimensions ) => { */ onSelectImage() { const attachment = this.frame.state().get( 'selection' ).first().toJSON(); - if ( EXPECTED_WIDTH === attachment.width && EXPECTED_HEIGHT === attachment.height ) { + if ( + ( EXPECTED_WIDTH === attachment.width && EXPECTED_HEIGHT === attachment.height ) || + ( ALTERNATE_EXPECTED_WIDTH && ALTERNATE_EXPECTED_WIDTH === attachment.width && ALTERNATE_EXPECTED_HEIGHT === attachment.height ) + ) { this.setImageFromURL( attachment.url, attachment.id, attachment.width, attachment.height ); this.frame.close(); } else { diff --git a/assets/src/common/constants.js b/assets/src/common/constants.js index 9373c45aff0..bb3f3e7b8ce 100644 --- a/assets/src/common/constants.js +++ b/assets/src/common/constants.js @@ -1,3 +1,4 @@ // See https://github.com/ampproject/amphtml/blob/e7a1b3ff97645ec0ec482192205134bd0735943c/extensions/amp-fit-text/0.1/amp-fit-text.js#L81-L85 export const MIN_FONT_SIZE = 6; export const MAX_FONT_SIZE = 72; +export const MINIMUM_FEATURED_IMAGE_WIDTH = 1200; diff --git a/assets/src/common/helpers/index.js b/assets/src/common/helpers/index.js index 2f1acbca5d1..b13d4a578ad 100644 --- a/assets/src/common/helpers/index.js +++ b/assets/src/common/helpers/index.js @@ -4,6 +4,11 @@ import { __, sprintf } from '@wordpress/i18n'; import { getColorObjectByAttributeValues, getColorObjectByColorValue } from '@wordpress/block-editor'; +/** + * Internal dependencies + */ +import { MINIMUM_FEATURED_IMAGE_WIDTH } from '../constants'; + /** * Determines whether whether the image has the minimum required dimensions. * @@ -46,13 +51,26 @@ export const hasMinimumDimensions = ( media, dimensions ) => { * @return {Object} Minimum dimensions including width and height. */ export const getMinimumFeaturedImageDimensions = () => { - const width = 1200; + const width = MINIMUM_FEATURED_IMAGE_WIDTH; const height = width * ( 9 / 16 ); return { width, height }; }; +/** + * Get minimum dimensions for a portrait featured image, but not for an AMP Story. + * + * @return {Object} Minimum dimensions including width and height. + */ +export const getMinimumPortraitFeaturedImageDimensions = () => { + const width = MINIMUM_FEATURED_IMAGE_WIDTH; + + const height = Math.floor( width * ( 16 / 9 ) ); + + return { width, height }; +}; + /** * Validates the an image based on requirements. * @@ -160,3 +178,24 @@ export const getBackgroundColorWithOpacity = ( colors, backgroundColor, customBa return undefined; }; + +/** + * Gets The aspect ratio type, either 'landscape', 'portrait', or 'square'. + * + * @param {number} width The image width. + * @param {number} height The image height. + * @return {string|null} The aspect ratio type: 'landscape', 'portrait', or 'square'. + */ +export const getAspectRatioType = ( width, height ) => { + if ( ! width || ! height ) { + return null; + } + + if ( width > height ) { + return 'landscape'; + } else if ( height > width ) { + return 'portrait'; + } else if ( height === width ) { + return 'square'; + } +}; diff --git a/assets/src/common/helpers/test/getAspectRatioType.js b/assets/src/common/helpers/test/getAspectRatioType.js new file mode 100644 index 00000000000..b9c66c26377 --- /dev/null +++ b/assets/src/common/helpers/test/getAspectRatioType.js @@ -0,0 +1,19 @@ +/** + * Internal dependencies + */ +import { getAspectRatioType } from '../'; + +describe( 'getAspectRatioType', () => { + it( 'should return landscape when the aspect ratio is landscape', () => { + expect( getAspectRatioType( 1400, 1000 ) ).toEqual( 'landscape' ); + } ); + it( 'should return portrait when the aspect ratio is portrait', () => { + expect( getAspectRatioType( 1400, 1800 ) ).toEqual( 'portrait' ); + } ); + it( 'should return square when the aspect ratio is square', () => { + expect( getAspectRatioType( 1200, 1200 ) ).toEqual( 'square' ); + } ); + it( 'should return null when the arguments are null', () => { + expect( getAspectRatioType( null, null ) ).toEqual( null ); + } ); +} ); diff --git a/assets/src/common/helpers/test/getMinimumFeaturedImageDimensions.js b/assets/src/common/helpers/test/getMinimumFeaturedImageDimensions.js index 84d3b9501d7..dc08233987e 100644 --- a/assets/src/common/helpers/test/getMinimumFeaturedImageDimensions.js +++ b/assets/src/common/helpers/test/getMinimumFeaturedImageDimensions.js @@ -4,7 +4,7 @@ import { getMinimumFeaturedImageDimensions } from '../'; describe( 'getMinimumFeaturedImageDimensions', () => { - it( 'should return size with correct aspect ration', () => { + it( 'should return size with correct aspect ratio', () => { expect( getMinimumFeaturedImageDimensions() ).toEqual( { width: 1200, height: 675 } ); } ); } ); diff --git a/assets/src/common/helpers/test/getMinimumPortraitFeaturedImageDimensions.js b/assets/src/common/helpers/test/getMinimumPortraitFeaturedImageDimensions.js new file mode 100644 index 00000000000..6d2c5876a5f --- /dev/null +++ b/assets/src/common/helpers/test/getMinimumPortraitFeaturedImageDimensions.js @@ -0,0 +1,10 @@ +/** + * Internal dependencies + */ +import { getMinimumPortraitFeaturedImageDimensions } from '../'; + +describe( 'getMinimumPortraitFeaturedImageDimensions', () => { + it( 'should return size with correct portrait aspect ratio', () => { + expect( getMinimumPortraitFeaturedImageDimensions() ).toEqual( { width: 1200, height: 2133 } ); + } ); +} ); From c4b95ebe03997244d48f29d842ec2bbe09e2f662 Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Tue, 2 Jul 2019 12:29:25 +0200 Subject: [PATCH 088/434] Fix and consolidate some of the i18n strings (#2695) --- assets/src/block-editor/blocks/amp-brid-player/edit.js | 6 +++--- assets/src/block-editor/blocks/amp-ima-video/edit.js | 6 +++--- assets/src/block-editor/blocks/amp-jwplayer/edit.js | 2 +- .../src/block-editor/blocks/amp-latest-stories/index.js | 6 +++--- assets/src/block-editor/blocks/amp-o2-player/edit.js | 2 +- assets/src/block-editor/blocks/amp-ooyala-player/edit.js | 2 +- assets/src/block-editor/blocks/amp-reach-player/edit.js | 4 ++-- .../block-editor/blocks/amp-springboard-player/edit.js | 4 ++-- assets/src/block-editor/blocks/amp-timeago/edit.js | 2 +- assets/src/block-editor/helpers/index.js | 2 +- .../higher-order/with-validation-error-notice.js | 2 +- assets/src/stories-editor/blocks/amp-story-cta/index.js | 5 ++++- assets/src/stories-editor/blocks/amp-story-page/edit.js | 8 ++++---- .../stories-editor/blocks/amp-story-post-date/index.js | 3 --- assets/src/stories-editor/blocks/amp-story-text/index.js | 2 +- .../components/higher-order/with-amp-story-settings.js | 2 +- assets/src/stories-editor/components/inserter/index.js | 4 ++-- assets/src/stories-editor/components/inserter/menu.js | 4 ++-- includes/admin/class-amp-admin-pointers.php | 2 +- includes/class-amp-story-post-type.php | 2 +- includes/sanitizers/class-amp-form-sanitizer.php | 2 +- .../validation/class-amp-validation-error-taxonomy.php | 2 +- 22 files changed, 37 insertions(+), 37 deletions(-) diff --git a/assets/src/block-editor/blocks/amp-brid-player/edit.js b/assets/src/block-editor/blocks/amp-brid-player/edit.js index baa879dceea..00f8cfaabd5 100644 --- a/assets/src/block-editor/blocks/amp-brid-player/edit.js +++ b/assets/src/block-editor/blocks/amp-brid-player/edit.js @@ -20,7 +20,7 @@ const BlockEdit = ( props ) => { const { autoPlay, dataPartner, dataPlayer, dataVideo, dataPlaylist, dataOutstream } = attributes; const ampLayoutOptions = [ { value: 'responsive', label: __( 'Responsive', 'amp' ) }, - { value: 'fixed-height', label: __( 'Fixed height', 'amp' ) }, + { value: 'fixed-height', label: __( 'Fixed Height', 'amp' ) }, { value: 'fixed', label: __( 'Fixed', 'amp' ) }, { value: 'fill', label: __( 'Fill', 'amp' ) }, { value: 'flex-item', label: __( 'Flex-item', 'amp' ) }, @@ -36,12 +36,12 @@ const BlockEdit = ( props ) => { <InspectorControls> <PanelBody title={ __( 'Brid Player Settings', 'amp' ) }> <TextControl - label={ __( 'Brid.tv partner ID (required)', 'amp' ) } + label={ __( 'Partner ID (required)', 'amp' ) } value={ dataPartner } onChange={ ( value ) => ( setAttributes( { dataPartner: value } ) ) } /> <TextControl - label={ __( 'Brid.tv player ID (required)', 'amp' ) } + label={ __( 'Player ID (required)', 'amp' ) } value={ dataPlayer } onChange={ ( value ) => ( setAttributes( { dataPlayer: value } ) ) } /> diff --git a/assets/src/block-editor/blocks/amp-ima-video/edit.js b/assets/src/block-editor/blocks/amp-ima-video/edit.js index 084c99d7a9e..cac3211d58d 100644 --- a/assets/src/block-editor/blocks/amp-ima-video/edit.js +++ b/assets/src/block-editor/blocks/amp-ima-video/edit.js @@ -32,17 +32,17 @@ const BlockEdit = ( props ) => { <InspectorControls> <PanelBody title={ __( 'IMA Video Settings', 'amp' ) }> <TextControl - label={ __( 'Https URL for your VAST ad document (required)', 'amp' ) } + label={ __( 'HTTPS URL for your VAST ad document (required)', 'amp' ) } value={ dataTag } onChange={ ( value ) => ( setAttributes( { dataTag: value } ) ) } /> <TextControl - label={ __( 'Https URL of your video content (required)', 'amp' ) } + label={ __( 'HTTPS URL of your video content (required)', 'amp' ) } value={ dataSrc } onChange={ ( value ) => ( setAttributes( { dataSrc: value } ) ) } /> <TextControl - label={ __( 'Https URL to preview image', 'amp' ) } + label={ __( 'HTTPS URL to preview image', 'amp' ) } value={ dataPoster } onChange={ ( value ) => ( setAttributes( { dataPoster: value } ) ) } /> diff --git a/assets/src/block-editor/blocks/amp-jwplayer/edit.js b/assets/src/block-editor/blocks/amp-jwplayer/edit.js index 2ba6216c0f3..4ea46e0b4fa 100644 --- a/assets/src/block-editor/blocks/amp-jwplayer/edit.js +++ b/assets/src/block-editor/blocks/amp-jwplayer/edit.js @@ -20,7 +20,7 @@ const BlockEdit = ( props ) => { const { dataPlayerId, dataMediaId, dataPlaylistId } = attributes; const ampLayoutOptions = [ { value: 'responsive', label: __( 'Responsive', 'amp' ) }, - { value: 'fixed-height', label: __( 'Fixed height', 'amp' ) }, + { value: 'fixed-height', label: __( 'Fixed Height', 'amp' ) }, { value: 'fixed', label: __( 'Fixed', 'amp' ) }, { value: 'fill', label: __( 'Fill', 'amp' ) }, { value: 'flex-item', label: __( 'Flex-item', 'amp' ) }, diff --git a/assets/src/block-editor/blocks/amp-latest-stories/index.js b/assets/src/block-editor/blocks/amp-latest-stories/index.js index e7af99b221d..48f87e29ebd 100644 --- a/assets/src/block-editor/blocks/amp-latest-stories/index.js +++ b/assets/src/block-editor/blocks/amp-latest-stories/index.js @@ -12,12 +12,12 @@ export const name = 'amp/amp-latest-stories'; export const settings = { title: __( 'Latest Stories', 'amp' ), - description: __( 'See the latest AMP stories', 'amp' ), + description: __( 'Display your most recent stories.', 'amp' ), icon: 'list-view', category: 'widgets', keywords: [ - __( 'Recent stories', 'amp' ), - __( 'AMP stories', 'amp' ), + __( 'recent stories', 'amp' ), + __( 'AMP Stories', 'amp' ), ], supports: { diff --git a/assets/src/block-editor/blocks/amp-o2-player/edit.js b/assets/src/block-editor/blocks/amp-o2-player/edit.js index 0a395b943d3..9cd723f45b7 100644 --- a/assets/src/block-editor/blocks/amp-o2-player/edit.js +++ b/assets/src/block-editor/blocks/amp-o2-player/edit.js @@ -25,7 +25,7 @@ const BlockEdit = ( props ) => { const { autoPlay, dataPid, dataVid, dataBcid, dataBid } = attributes; const ampLayoutOptions = [ { value: 'responsive', label: __( 'Responsive', 'amp' ) }, - { value: 'fixed-height', label: __( 'Fixed height', 'amp' ) }, + { value: 'fixed-height', label: __( 'Fixed Height', 'amp' ) }, { value: 'fixed', label: __( 'Fixed', 'amp' ) }, { value: 'fill', label: __( 'Fill', 'amp' ) }, { value: 'flex-item', label: __( 'Flex-item', 'amp' ) }, diff --git a/assets/src/block-editor/blocks/amp-ooyala-player/edit.js b/assets/src/block-editor/blocks/amp-ooyala-player/edit.js index 19013f78c5c..49b2a9fe7b8 100644 --- a/assets/src/block-editor/blocks/amp-ooyala-player/edit.js +++ b/assets/src/block-editor/blocks/amp-ooyala-player/edit.js @@ -37,7 +37,7 @@ const BlockEdit = ( props ) => { return ( <> <InspectorControls> - <PanelBody title={ __( 'Ooyala settings', 'amp' ) }> + <PanelBody title={ __( 'Ooyala Settings', 'amp' ) }> <TextControl label={ __( 'Video embed code (required)', 'amp' ) } value={ dataEmbedCode } diff --git a/assets/src/block-editor/blocks/amp-reach-player/edit.js b/assets/src/block-editor/blocks/amp-reach-player/edit.js index c7a03ecd0e1..48c02f2a488 100644 --- a/assets/src/block-editor/blocks/amp-reach-player/edit.js +++ b/assets/src/block-editor/blocks/amp-reach-player/edit.js @@ -33,9 +33,9 @@ const BlockEdit = ( props ) => { return ( <> <InspectorControls> - <PanelBody title={ __( 'Reach settings', 'amp' ) }> + <PanelBody title={ __( 'Reach Settings', 'amp' ) }> <TextControl - label={ __( 'The Reach player embed id (required)', 'amp' ) } + label={ __( 'Embed ID (required)', 'amp' ) } value={ dataEmbedId } onChange={ ( value ) => ( setAttributes( { dataEmbedId: value } ) ) } /> diff --git a/assets/src/block-editor/blocks/amp-springboard-player/edit.js b/assets/src/block-editor/blocks/amp-springboard-player/edit.js index e25ef9e0e36..9f39ee4af18 100644 --- a/assets/src/block-editor/blocks/amp-springboard-player/edit.js +++ b/assets/src/block-editor/blocks/amp-springboard-player/edit.js @@ -39,12 +39,12 @@ const BlockEdit = ( props ) => { <InspectorControls> <PanelBody title={ __( 'Springboard Player Settings', 'amp' ) }> <TextControl - label={ __( 'SprintBoard site ID (required)', 'amp' ) } + label={ __( 'Site ID (required)', 'amp' ) } value={ dataSiteId } onChange={ ( value ) => ( setAttributes( { dataSiteId: value } ) ) } /> <TextControl - label={ __( 'Player content ID (required)', 'amp' ) } + label={ __( 'Content ID (required)', 'amp' ) } value={ dataContentId } onChange={ ( value ) => ( setAttributes( { dataContentId: value } ) ) } /> diff --git a/assets/src/block-editor/blocks/amp-timeago/edit.js b/assets/src/block-editor/blocks/amp-timeago/edit.js index c0ff9fa5582..bf44ef264f2 100644 --- a/assets/src/block-editor/blocks/amp-timeago/edit.js +++ b/assets/src/block-editor/blocks/amp-timeago/edit.js @@ -39,7 +39,7 @@ const BlockEdit = ( props ) => { const ampLayoutOptions = [ { value: '', label: __( 'Responsive', 'amp' ) }, { value: 'fixed', label: __( 'Fixed', 'amp' ) }, - { value: 'fixed-height', label: __( 'Fixed height', 'amp' ) }, + { value: 'fixed-height', label: __( 'Fixed Height', 'amp' ) }, ]; return ( diff --git a/assets/src/block-editor/helpers/index.js b/assets/src/block-editor/helpers/index.js index 777cd70d16b..142a9481771 100644 --- a/assets/src/block-editor/helpers/index.js +++ b/assets/src/block-editor/helpers/index.js @@ -48,7 +48,7 @@ const ampLayoutOptions = [ }, { value: 'fixed-height', - label: __( 'Fixed height', 'amp' ), + label: __( 'Fixed Height', 'amp' ), notAvailable: [], }, { diff --git a/assets/src/block-validation/components/higher-order/with-validation-error-notice.js b/assets/src/block-validation/components/higher-order/with-validation-error-notice.js index 6f96af80f0a..7be42f50691 100644 --- a/assets/src/block-validation/components/higher-order/with-validation-error-notice.js +++ b/assets/src/block-validation/components/higher-order/with-validation-error-notice.js @@ -38,7 +38,7 @@ export default createHigherOrderComponent( const actions = [ { - label: __( 'Remove Block', 'amp' ), + label: __( 'Remove Element', 'amp' ), onClick: () => onReplace( [] ), }, ]; diff --git a/assets/src/stories-editor/blocks/amp-story-cta/index.js b/assets/src/stories-editor/blocks/amp-story-cta/index.js index 0d2cae0ae78..ab75ecb0ead 100644 --- a/assets/src/stories-editor/blocks/amp-story-cta/index.js +++ b/assets/src/stories-editor/blocks/amp-story-cta/index.js @@ -49,7 +49,10 @@ export const settings = { category: 'layout', - keywords: [ __( 'call to action', 'amp' ), __( 'cta', 'amp' ), __( 'button', 'amp' ) ], + keywords: [ + __( 'cta', 'amp' ), + __( 'button', 'amp' ), + ], attributes: schema, diff --git a/assets/src/stories-editor/blocks/amp-story-page/edit.js b/assets/src/stories-editor/blocks/amp-story-page/edit.js index 84c07f6479b..c20170d8765 100644 --- a/assets/src/stories-editor/blocks/amp-story-page/edit.js +++ b/assets/src/stories-editor/blocks/amp-story-page/edit.js @@ -8,7 +8,7 @@ import { has } from 'lodash'; /** * WordPress dependencies */ -import { __, sprintf } from '@wordpress/i18n'; +import { __, _x, sprintf } from '@wordpress/i18n'; import { InnerBlocks, PanelColorSettings, @@ -338,7 +338,7 @@ class PageEdit extends Component { { !! mediaId && <MediaUploadCheck> <Button onClick={ () => setAttributes( { mediaUrl: undefined, mediaId: undefined, mediaType: undefined } ) } isLink isDestructive> - { VIDEO_BACKGROUND_TYPE === mediaType ? __( 'Remove Video', 'amp' ) : __( 'Remove image', 'amp' ) } + { _x( 'Remove', 'background media', 'amp' ) } </Button> </MediaUploadCheck> } @@ -399,7 +399,7 @@ class PageEdit extends Component { { poster && ( <Button onClick={ () => setAttributes( { poster: undefined } ) } isLink isDestructive> - { __( 'Remove Poster Image', 'amp' ) } + { __( 'Remove Image', 'amp' ) } </Button> ) } @@ -439,7 +439,7 @@ class PageEdit extends Component { onChange={ ( value ) => setAttributes( { autoAdvanceAfterDuration: value } ) } min={ Math.max( totalAnimationDuration, 1 ) } initialPosition={ totalAnimationDuration } - help={ totalAnimationDuration > 1 ? __( 'A minimum time is enforced because there are animated blocks on this page', 'amp' ) : undefined } + help={ totalAnimationDuration > 1 ? __( 'A minimum time is enforced because there are animated blocks on this page.', 'amp' ) : undefined } /> ) } </PanelBody> diff --git a/assets/src/stories-editor/blocks/amp-story-post-date/index.js b/assets/src/stories-editor/blocks/amp-story-post-date/index.js index f819dcf42a7..cdb46f8fff4 100644 --- a/assets/src/stories-editor/blocks/amp-story-post-date/index.js +++ b/assets/src/stories-editor/blocks/amp-story-post-date/index.js @@ -17,10 +17,7 @@ export const settings = { category: 'common', icon: 'clock', keywords: [ - __( 'post', 'amp' ), __( 'publish date', 'amp' ), - __( 'published date', 'amp' ), - __( 'date', 'amp' ), ], ...getMetaBlockSettings( { tagName: 'div', diff --git a/assets/src/stories-editor/blocks/amp-story-text/index.js b/assets/src/stories-editor/blocks/amp-story-text/index.js index cba6359031a..ed82fff3759 100644 --- a/assets/src/stories-editor/blocks/amp-story-text/index.js +++ b/assets/src/stories-editor/blocks/amp-story-text/index.js @@ -44,7 +44,7 @@ const schema = { export const settings = { title: __( 'Text', 'amp' ), - description: __( 'Add free-form text to your story', 'amp' ), + description: __( 'Add free-form text to your story.', 'amp' ), icon: <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11 5v7H9.5C7.6 12 6 10.4 6 8.5S7.6 5 9.5 5H11m8-2H9.5C6.5 3 4 5.5 4 8.5S6.5 14 9.5 14H11v7h2V5h2v16h2V5h2V3z" /></svg>, diff --git a/assets/src/stories-editor/components/higher-order/with-amp-story-settings.js b/assets/src/stories-editor/components/higher-order/with-amp-story-settings.js index 8564c74bf4d..8331a48092f 100644 --- a/assets/src/stories-editor/components/higher-order/with-amp-story-settings.js +++ b/assets/src/stories-editor/components/higher-order/with-amp-story-settings.js @@ -513,7 +513,7 @@ export default createHigherOrderComponent( } } /> <RangeControl - label={ __( 'Background Opacity', 'amp' ) } + label={ __( 'Opacity', 'amp' ) } value={ opacity } onChange={ ( value ) => setAttributes( { opacity: value } ) } min={ 5 } diff --git a/assets/src/stories-editor/components/inserter/index.js b/assets/src/stories-editor/components/inserter/index.js index cc3fb1529c6..9a6fa410e8f 100644 --- a/assets/src/stories-editor/components/inserter/index.js +++ b/assets/src/stories-editor/components/inserter/index.js @@ -29,7 +29,7 @@ import InserterMenu from './menu'; const defaultRenderToggle = ( { onToggle, disabled, isOpen } ) => ( <IconButton icon="insert" - label={ __( 'Add block', 'amp' ) } + label={ __( 'Add element', 'amp' ) } labelPosition="bottom" onClick={ onToggle } className="editor-inserter__toggle block-editor-inserter__toggle" @@ -112,7 +112,7 @@ class Inserter extends Component { position={ position } onToggle={ this.onToggle } expandOnMobile - headerTitle={ __( 'Add a block', 'amp' ) } + headerTitle={ __( 'Add element', 'amp' ) } renderToggle={ this.renderToggle } renderContent={ this.renderContent } /> diff --git a/assets/src/stories-editor/components/inserter/menu.js b/assets/src/stories-editor/components/inserter/menu.js index 8a561a19182..2faba81cc9c 100644 --- a/assets/src/stories-editor/components/inserter/menu.js +++ b/assets/src/stories-editor/components/inserter/menu.js @@ -280,12 +280,12 @@ export class InserterMenu extends Component { onKeyDown={ this.onKeyDown } > <label htmlFor={ `block-editor-inserter__search-${ instanceId }` } className="screen-reader-text"> - { __( 'Search for a block', 'amp' ) } + { __( 'Search for an element', 'amp' ) } </label> <input id={ `block-editor-inserter__search-${ instanceId }` } type="search" - placeholder={ __( 'Search for a block', 'amp' ) } + placeholder={ __( 'Search for an element', 'amp' ) } className="editor-inserter__search block-editor-inserter__search" autoFocus onChange={ this.onChangeSearchInput } diff --git a/includes/admin/class-amp-admin-pointers.php b/includes/admin/class-amp-admin-pointers.php index 77f2b4b1918..d04e0bf9bf4 100644 --- a/includes/admin/class-amp-admin-pointers.php +++ b/includes/admin/class-amp-admin-pointers.php @@ -96,7 +96,7 @@ private function get_pointers() { array( 'selector' => '#menu-posts-' . AMP_Story_Post_Type::POST_TYPE_SLUG, 'heading' => __( 'AMP', 'amp' ), - 'description' => __( 'Head over here to create your first AMP story.', 'amp' ), + 'description' => __( 'Head over here to create your first story.', 'amp' ), 'position' => array( 'align' => 'middle', ), diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php index 3cad43787ad..6d274b3984f 100644 --- a/includes/class-amp-story-post-type.php +++ b/includes/class-amp-story-post-type.php @@ -159,7 +159,7 @@ public static function register() { 'items_list_navigation' => __( 'Stories list navigation', 'amp' ), 'items_list' => __( 'Stories list', 'amp' ), 'item_published' => __( 'Story published.', 'amp' ), - 'item_published_privately' => __( 'SStory published privately.', 'amp' ), + 'item_published_privately' => __( 'Story published privately.', 'amp' ), 'item_reverted_to_draft' => __( 'Story reverted to draft.', 'amp' ), 'item_scheduled' => __( 'Story scheduled', 'amp' ), 'item_updated' => __( 'Story updated.', 'amp' ), diff --git a/includes/sanitizers/class-amp-form-sanitizer.php b/includes/sanitizers/class-amp-form-sanitizer.php index 35968819671..44ca4b947ab 100644 --- a/includes/sanitizers/class-amp-form-sanitizer.php +++ b/includes/sanitizers/class-amp-form-sanitizer.php @@ -186,7 +186,7 @@ public function ensure_response_message_elements( $form ) { $link = $this->dom->createElement( 'a' ); $link->setAttribute( 'href', 'https://amp-wp.org/?p=5463' ); $link->setAttribute( 'target', '_blank' ); - $link->appendChild( $this->dom->createTextNode( __( 'Learn more', 'amp' ) ) ); + $link->appendChild( $this->dom->createTextNode( __( 'Learn More', 'amp' ) ) ); $small->appendChild( $link ); $p->appendChild( $small ); diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php index a705c5321bc..8c0fb4c873b 100644 --- a/includes/validation/class-amp-validation-error-taxonomy.php +++ b/includes/validation/class-amp-validation-error-taxonomy.php @@ -1882,7 +1882,7 @@ public static function filter_manage_custom_columns( $content, $column_name, $te __( 'F j, Y g:i a', 'amp' ) ) ), - /* translators: %s: human readable timestamp */ + /* translators: %s: the human-readable time difference. */ esc_html( sprintf( __( '%s ago', 'amp' ), human_time_diff( $created_datetime->getTimestamp() ) ) ) ); } From bdab263673af9b73b9727cd4f75bf2d7f4e91b8c Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Tue, 2 Jul 2019 14:37:16 +0200 Subject: [PATCH 089/434] Begin with some E2E Tests (#2708) --- .eslintrc | 16 +- .travis.yml | 16 +- bin/bootstrap-env.sh | 12 - bin/local-env/docker-compose.yml | 43 ++ bin/{ => local-env}/includes.sh | 0 bin/local-env/install-composer.sh | 41 ++ bin/{ => local-env}/install-node-nvm.sh | 10 +- bin/{ => local-env}/install-wordpress.sh | 58 +-- .../launch-containers.sh} | 18 +- bin/local-env/start.sh | 65 ++++ bin/local-env/stop.sh | 26 ++ bin/reset-e2e-tests.sh | 7 - bin/setup-local-env.sh | 39 -- contributing.md | 211 ++++++++-- docker-compose.yml | 95 ----- includes/class-amp-autoloader.php | 4 +- jest-puppeteer.config.js | 7 + package.json | 12 +- tests/e2e/config/bootstrap.js | 142 +++++++ tests/e2e/jest.config.js | 22 +- tests/e2e/specs/amp-options.test.js | 134 +++++++ tests/e2e/specs/demo.test.js | 45 --- tests/e2e/specs/hello.test.js | 14 + tests/e2e/specs/stories-admin-pointer.test.js | 14 + tests/{unit => js}/jest.config.js | 2 +- tests/{unit => js}/setup-globals.js | 0 tests/{ => php}/assets/1024x768.png | Bin tests/{ => php}/assets/350x150.png | Bin tests/{ => php}/assets/wordpress-logo.png | Bin tests/{ => php}/benchmark/run-benchmark.sh | 0 tests/{ => php}/stubs.php | 0 .../{ => php}/test-amp-analytics-options.php | 0 tests/{ => php}/test-amp-audio-converter.php | 0 .../test-amp-crowdsignal-embed-handler.php | 0 .../{ => php}/test-amp-dailymotion-embed.php | 0 tests/{ => php}/test-amp-facebook-embed.php | 0 tests/{ => php}/test-amp-form-sanitizer.php | 0 tests/{ => php}/test-amp-helper-functions.php | 0 tests/{ => php}/test-amp-iframe-sanitizer.php | 0 .../test-amp-image-dimension-extractor.php | 0 tests/{ => php}/test-amp-img-sanitizer.php | 0 tests/{ => php}/test-amp-instagram-embed.php | 0 .../test-amp-o2-player-sanitizer.php | 0 tests/{ => php}/test-amp-pinterest-embed.php | 0 .../{ => php}/test-amp-playbuzz-sanitizer.php | 0 tests/{ => php}/test-amp-render-post.php | 0 tests/{ => php}/test-amp-script-sanitizer.php | 0 tests/{ => php}/test-amp-soundcloud-embed.php | 0 tests/{ => php}/test-amp-story-sanitizer.php | 0 tests/{ => php}/test-amp-style-sanitizer.php | 0 ...nd-attribute-sanitizer-private-methods.php | 0 tests/{ => php}/test-amp-twitter-embed.php | 0 tests/{ => php}/test-amp-video-sanitizer.php | 0 tests/{ => php}/test-amp-vimeo-embed.php | 0 tests/{ => php}/test-amp-vine-embed.php | 0 tests/{ => php}/test-amp-youtube-embed.php | 0 tests/{ => php}/test-amp.php | 0 .../test-class-amp-admin-pointer.php | 0 .../test-class-amp-base-sanitizer.php | 0 .../test-class-amp-block-sanitizer.php | 0 tests/{ => php}/test-class-amp-cli.php | 0 .../test-class-amp-comments-sanitizer.php | 0 .../test-class-amp-content-sanitizer.php | 0 .../test-class-amp-core-block-handler.php | 0 tests/{ => php}/test-class-amp-dom-utils.php | 0 .../test-class-amp-editor-blocks.php | 0 ...test-class-amp-gallery-block-sanitizer.php | 0 .../test-class-amp-gfycat-embed-handler.php | 0 tests/{ => php}/test-class-amp-http.php | 0 .../test-class-amp-hulu-embed-handler.php | 0 .../test-class-amp-imgur-embed-handler.php | 0 tests/{ => php}/test-class-amp-meta-box.php | 0 ...st-class-amp-nav-menu-toggle-sanitizer.php | 0 .../test-class-amp-options-manager.php | 0 .../{ => php}/test-class-amp-options-menu.php | 0 .../test-class-amp-playlist-embed-handler.php | 0 .../test-class-amp-post-type-support.php | 0 .../test-class-amp-service-worker.php | 0 .../test-class-amp-story-post-type.php | 0 .../test-class-amp-story-templates.php | 0 .../test-class-amp-theme-support.php | 0 .../test-class-amp-vimeo-embed-handler.php | 0 .../test-class-amp-widget-archives.php | 0 .../test-class-amp-widget-categories.php | 0 .../{ => php}/test-class-amp-widget-text.php | 0 .../test-class-amp-youtube-embed-handler.php | 0 .../test-tag-and-attribute-sanitizer.php | 368 +++++++++--------- ...test-class-amp-validated-url-post-type.php | 0 ...st-class-amp-validation-error-taxonomy.php | 0 .../test-class-amp-validation-manager.php | 0 90 files changed, 932 insertions(+), 489 deletions(-) delete mode 100755 bin/bootstrap-env.sh create mode 100644 bin/local-env/docker-compose.yml rename bin/{ => local-env}/includes.sh (100%) create mode 100755 bin/local-env/install-composer.sh rename bin/{ => local-env}/install-node-nvm.sh (90%) rename bin/{ => local-env}/install-wordpress.sh (71%) rename bin/{install-docker.sh => local-env/launch-containers.sh} (55%) create mode 100755 bin/local-env/start.sh create mode 100755 bin/local-env/stop.sh delete mode 100755 bin/reset-e2e-tests.sh delete mode 100755 bin/setup-local-env.sh delete mode 100644 docker-compose.yml create mode 100644 jest-puppeteer.config.js create mode 100644 tests/e2e/config/bootstrap.js create mode 100644 tests/e2e/specs/amp-options.test.js delete mode 100644 tests/e2e/specs/demo.test.js create mode 100644 tests/e2e/specs/hello.test.js create mode 100644 tests/e2e/specs/stories-admin-pointer.test.js rename tests/{unit => js}/jest.config.js (92%) rename tests/{unit => js}/setup-globals.js (100%) rename tests/{ => php}/assets/1024x768.png (100%) rename tests/{ => php}/assets/350x150.png (100%) rename tests/{ => php}/assets/wordpress-logo.png (100%) rename tests/{ => php}/benchmark/run-benchmark.sh (100%) rename tests/{ => php}/stubs.php (100%) rename tests/{ => php}/test-amp-analytics-options.php (100%) rename tests/{ => php}/test-amp-audio-converter.php (100%) rename tests/{ => php}/test-amp-crowdsignal-embed-handler.php (100%) rename tests/{ => php}/test-amp-dailymotion-embed.php (100%) rename tests/{ => php}/test-amp-facebook-embed.php (100%) rename tests/{ => php}/test-amp-form-sanitizer.php (100%) rename tests/{ => php}/test-amp-helper-functions.php (100%) rename tests/{ => php}/test-amp-iframe-sanitizer.php (100%) rename tests/{ => php}/test-amp-image-dimension-extractor.php (100%) rename tests/{ => php}/test-amp-img-sanitizer.php (100%) rename tests/{ => php}/test-amp-instagram-embed.php (100%) rename tests/{ => php}/test-amp-o2-player-sanitizer.php (100%) rename tests/{ => php}/test-amp-pinterest-embed.php (100%) rename tests/{ => php}/test-amp-playbuzz-sanitizer.php (100%) rename tests/{ => php}/test-amp-render-post.php (100%) rename tests/{ => php}/test-amp-script-sanitizer.php (100%) rename tests/{ => php}/test-amp-soundcloud-embed.php (100%) rename tests/{ => php}/test-amp-story-sanitizer.php (100%) rename tests/{ => php}/test-amp-style-sanitizer.php (100%) rename tests/{ => php}/test-amp-tag-and-attribute-sanitizer-private-methods.php (100%) rename tests/{ => php}/test-amp-twitter-embed.php (100%) rename tests/{ => php}/test-amp-video-sanitizer.php (100%) rename tests/{ => php}/test-amp-vimeo-embed.php (100%) rename tests/{ => php}/test-amp-vine-embed.php (100%) rename tests/{ => php}/test-amp-youtube-embed.php (100%) rename tests/{ => php}/test-amp.php (100%) rename tests/{ => php}/test-class-amp-admin-pointer.php (100%) rename tests/{ => php}/test-class-amp-base-sanitizer.php (100%) rename tests/{ => php}/test-class-amp-block-sanitizer.php (100%) rename tests/{ => php}/test-class-amp-cli.php (100%) rename tests/{ => php}/test-class-amp-comments-sanitizer.php (100%) rename tests/{ => php}/test-class-amp-content-sanitizer.php (100%) rename tests/{ => php}/test-class-amp-core-block-handler.php (100%) rename tests/{ => php}/test-class-amp-dom-utils.php (100%) rename tests/{ => php}/test-class-amp-editor-blocks.php (100%) rename tests/{ => php}/test-class-amp-gallery-block-sanitizer.php (100%) rename tests/{ => php}/test-class-amp-gfycat-embed-handler.php (100%) rename tests/{ => php}/test-class-amp-http.php (100%) rename tests/{ => php}/test-class-amp-hulu-embed-handler.php (100%) rename tests/{ => php}/test-class-amp-imgur-embed-handler.php (100%) rename tests/{ => php}/test-class-amp-meta-box.php (100%) rename tests/{ => php}/test-class-amp-nav-menu-toggle-sanitizer.php (100%) rename tests/{ => php}/test-class-amp-options-manager.php (100%) rename tests/{ => php}/test-class-amp-options-menu.php (100%) rename tests/{ => php}/test-class-amp-playlist-embed-handler.php (100%) rename tests/{ => php}/test-class-amp-post-type-support.php (100%) rename tests/{ => php}/test-class-amp-service-worker.php (100%) rename tests/{ => php}/test-class-amp-story-post-type.php (100%) rename tests/{ => php}/test-class-amp-story-templates.php (100%) rename tests/{ => php}/test-class-amp-theme-support.php (100%) rename tests/{ => php}/test-class-amp-vimeo-embed-handler.php (100%) rename tests/{ => php}/test-class-amp-widget-archives.php (100%) rename tests/{ => php}/test-class-amp-widget-categories.php (100%) rename tests/{ => php}/test-class-amp-widget-text.php (100%) rename tests/{ => php}/test-class-amp-youtube-embed-handler.php (100%) rename tests/{ => php}/test-tag-and-attribute-sanitizer.php (87%) rename tests/{ => php}/validation/test-class-amp-validated-url-post-type.php (100%) rename tests/{ => php}/validation/test-class-amp-validation-error-taxonomy.php (100%) rename tests/{ => php}/validation/test-class-amp-validation-manager.php (100%) diff --git a/.eslintrc b/.eslintrc index fb606190908..d469eeec916 100644 --- a/.eslintrc +++ b/.eslintrc @@ -9,11 +9,23 @@ }, "globals": { "browser": true, - "page": true, "wp": true, "Set": true }, "rules": { "react/prop-types": 2 - } + }, + "overrides": [ + { + "files": [ "tests/e2e/**/*.js" ], + "env": { + "browser": true + }, + "globals": { + "browser": true, + "page": true, + "wp": true + } + } + ] } diff --git a/.travis.yml b/.travis.yml index 7962e2b6606..f4f18d536cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ notifications: cache: directories: - $HOME/.composer/cache + - $HOME/.jest-cache - $HOME/.npm - $HOME/.nvm/.cache - $HOME/phpunit-bin @@ -76,7 +77,20 @@ jobs: env: WP_VERSION=latest DEV_LIB_SKIP=phpcs,eslint,xmllint,phpsyntax,phpunit script: - source "$DEV_LIB_PATH/travis.script.sh" - - npm run test:js -- --ci + - npm run test:js -- --ci --cacheDirectory="$HOME/.jest-cache" + + - name: E2E tests + php: "7.3" + env: WP_VERSION=latest DEV_LIB_SKIP=phpcs,eslint,xmllint,phpsyntax,phpunit PUPPETEER_SKIP_CHROMIUM_DOWNLOAD= + install: + - nvm install + - composer install + # npm is handled by `npm run env:start` + script: + - npm run env:start + - npm run build:js # after npm dependencies have been installed + - npm run env:reset-site + - npm run test:e2e - name: PHP unit tests w/ external-http (7.3, WordPress latest) php: "7.3" diff --git a/bin/bootstrap-env.sh b/bin/bootstrap-env.sh deleted file mode 100755 index 3055a49b513..00000000000 --- a/bin/bootstrap-env.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -WP_VERSION=${WP_VERSION-latest} -WP_DEBUG=${WP_DEBUG-true} -SCRIPT_DEBUG=${SCRIPT_DEBUG-true} -DOCKER=${DOCKER-false} -DOCKER_ENV=${DOCKER_ENV-ci} -DOCKER_COMPOSE_FILE_OPTIONS="-f docker-compose.yml" - -if [ "$DOCKER_ENV" == "localwpdev" ]; then - DOCKER_COMPOSE_FILE_OPTIONS="${DOCKER_COMPOSE_FILE_OPTIONS} -f docker-compose-localdev.yml" -fi diff --git a/bin/local-env/docker-compose.yml b/bin/local-env/docker-compose.yml new file mode 100644 index 00000000000..929b5ae2eb4 --- /dev/null +++ b/bin/local-env/docker-compose.yml @@ -0,0 +1,43 @@ +version: '3.1' + +services: + wordpress: + image: wordpress + restart: always + ports: + - 8890:80 + environment: + WORDPRESS_DB_HOST: mysql + WORDPRESS_DB_PASSWORD: example + ABSPATH: /usr/src/wordpress/ + WORDPRESS_DEBUG: 1 + WORDPRESS_CONFIG_EXTRA: | + define( 'SCRIPT_DEBUG', true ); + volumes: + - wordpress_data:/var/www/html + - ../../:/var/www/html/wp-content/plugins/amp + - ../../node_modules/@wordpress/e2e-tests/plugins:/var/www/html/wp-content/plugins/gutenberg-test-plugins + - ../../node_modules/@wordpress/e2e-tests/mu-plugins:/var/www/html/wp-content/mu-plugins + depends_on: + - mysql + + cli: + image: wordpress:cli + restart: always + user: xfs + volumes: + - wordpress_data:/var/www/html + - ../../:/var/www/html/wp-content/plugins/amp + depends_on: + - mysql + - wordpress + + mysql: + image: mysql:5.7 + restart: always + environment: + MYSQL_ROOT_PASSWORD: example + MYSQL_DATABASE: wordpress_test + +volumes: + wordpress_data: diff --git a/bin/includes.sh b/bin/local-env/includes.sh similarity index 100% rename from bin/includes.sh rename to bin/local-env/includes.sh diff --git a/bin/local-env/install-composer.sh b/bin/local-env/install-composer.sh new file mode 100755 index 00000000000..f55530115a9 --- /dev/null +++ b/bin/local-env/install-composer.sh @@ -0,0 +1,41 @@ +#!/bin/bash +COMPOSER_VERSION=`curl -Ls -w %{url_effective} -o /dev/null https://github.com/composer/composer/releases/latest | rev | cut -d '/' -f 1 | rev` + +# Exit if any command fails +set -e + +# Include useful functions +. "$(dirname "$0")/includes.sh" + + +# Change to the expected directory +cd "$(dirname "$0")/../.." + +# Check if composer is installed +if [ "$TRAVIS" != "true" ] && ! command_exists "composer"; then + if ask "$(error_message "Composer isn't installed, would you like to download and install it automatically?")" Y; then + echo -en $(status_message "Installing Composer..." ) + download "https://getcomposer.org/installer" | bash >/dev/null 2>&1 + mkdir -p /usr/local/bin + mv composer.phar /usr/local/bin/composer + echo ' done!' + else + echo -e $(error_message "") + echo -e $(error_message "Please install Composer manually, then re-run the setup script to continue.") + echo -e $(error_message "Composer installation instructions can be found here: $(action_format "https://getcomposer.org/doc/00-intro.md")") + fi + + exit 1 +fi + +# Check if the current Composer version is up to date. +if [ "$TRAVIS" != "true" ] && ! [[ "$(composer --version)" == "Composer version $COMPOSER_VERSION "* ]]; then + echo -en $(status_message "Updating Composer..." ) + composer self-update + echo ' done!' +fi + + +# Install/update packages +echo -e $(status_message "Installing and updating Composer packages..." ) +composer install diff --git a/bin/install-node-nvm.sh b/bin/local-env/install-node-nvm.sh similarity index 90% rename from bin/install-node-nvm.sh rename to bin/local-env/install-node-nvm.sh index 9edc083833d..f4c29240ce5 100755 --- a/bin/install-node-nvm.sh +++ b/bin/local-env/install-node-nvm.sh @@ -1,5 +1,5 @@ #!/bin/bash -NVM_VERSION=`curl -Ls -w %{url_effective} -o /dev/null https://github.com/creationix/nvm/releases/latest | rev | cut -d '/' -f 1 | rev` +NVM_VERSION=`curl -Ls -w %{url_effective} -o /dev/null https://github.com/nvm-sh/nvm/releases/latest | rev | cut -d '/' -f 1 | rev` # Exit if any command fails set -e @@ -19,7 +19,7 @@ if [ -n "$NVM_DIR" ]; then fi # Change to the expected directory -cd "$(dirname "$0")/.." +cd "$(dirname "$0")/../.." # Check if nvm is installed if [ "$TRAVIS" != "true" ] && ! command_exists "nvm"; then @@ -30,7 +30,7 @@ if [ "$TRAVIS" != "true" ] && ! command_exists "nvm"; then fi echo -en $(status_message "Installing NVM..." ) - download "https://raw.githubusercontent.com/creationix/nvm/$NVM_VERSION/install.sh" | bash >/dev/null 2>&1 + download "https://raw.githubusercontent.com/nvm-sh/nvm/$NVM_VERSION/install.sh" | bash >/dev/null 2>&1 echo ' done!' echo -e $(warning_message "NVM was updated, please run this command to reload it:" ) @@ -39,7 +39,7 @@ if [ "$TRAVIS" != "true" ] && ! command_exists "nvm"; then else echo -e $(error_message "") echo -e $(error_message "Please install NVM manually, then re-run the setup script to continue.") - echo -e $(error_message "NVM installation instructions can be found here: $(action_format "https://github.com/creationix/nvm")") + echo -e $(error_message "NVM installation instructions can be found here: $(action_format "https://github.com/nvm-sh/nvm")") fi exit 1 @@ -48,7 +48,7 @@ fi # Check if the current nvm version is up to date. if [ "$TRAVIS" != "true" ] && [ $NVM_VERSION != "v$(nvm --version)" ]; then echo -en $(status_message "Updating NVM..." ) - download "https://raw.githubusercontent.com/creationix/nvm/$NVM_VERSION/install.sh" | bash >/dev/null 2>&1 + download "https://raw.githubusercontent.com/nvm-sh/nvm/$NVM_VERSION/install.sh" | bash >/dev/null 2>&1 echo ' done!' echo -e $(warning_message "NVM was updated, please run this command to reload it:" ) diff --git a/bin/install-wordpress.sh b/bin/local-env/install-wordpress.sh similarity index 71% rename from bin/install-wordpress.sh rename to bin/local-env/install-wordpress.sh index 5b3b8b83c0d..bb8d05efe30 100755 --- a/bin/install-wordpress.sh +++ b/bin/local-env/install-wordpress.sh @@ -3,32 +3,19 @@ # Exit if any command fails. set -e -# Gutenberg script includes. -. "$(dirname "$0")/includes.sh" +# Common variables. +DOCKER_COMPOSE_FILE_OPTIONS="-f $(dirname "$0")/docker-compose.yml" +WP_DEBUG=${WP_DEBUG-true} +SCRIPT_DEBUG=${SCRIPT_DEBUG-true} -# Set up environment variables -. "$(dirname "$0")/bootstrap-env.sh" +# Include useful functions +. "$(dirname "$0")/includes.sh" # These are the containers and values for the development site. CLI='cli' CONTAINER='wordpress' SITE_TITLE='AMP Dev' -# If we're installing/re-installing the test site, change the containers used. -if [ "$1" == '--e2e_tests' ]; then - CLI="${CLI}_e2e_tests" - CONTAINER="${CONTAINER}_e2e_tests" - SITE_TITLE='AMP Testing' - - if ! docker ps | grep -q $CONTAINER; then - echo -e $(error_message "WordPress e2e tests run in their own Docker container, but that container wasn't found.") - echo "Please restart your Docker containers by running 'docker-compose $DOCKER_COMPOSE_FILE_OPTIONS down && docker-compose $DOCKER_COMPOSE_FILE_OPTIONS up -d' or" - echo "by running './bin/setup-local-env.sh' again." - echo "" - exit 1 - fi -fi - # Get the host port for the WordPress container. HOST_PORT=$(docker-compose $DOCKER_COMPOSE_FILE_OPTIONS port $CONTAINER 80 | awk -F : '{printf $2}') @@ -43,7 +30,7 @@ echo '' # If this is the test site, we reset the database so no posts/comments/etc. # dirty up the tests. -if [ "$1" == '--e2e_tests' ]; then +if [ "$1" == '--reset-site' ]; then echo -e $(status_message "Resetting test database...") docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI db reset --yes --quiet fi @@ -64,13 +51,8 @@ fi # Make sure the uploads and upgrade folders exist and we have permissions to add files. echo -e $(status_message "Ensuring that files can be uploaded...") -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER chmod 767 /var/www/html/wp-content/plugins -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER chmod 767 /var/www/html/wp-config.php -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER chmod 767 /var/www/html/wp-settings.php -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER mkdir -p /var/www/html/wp-content/uploads -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER chmod -v 767 /var/www/html/wp-content/uploads -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER mkdir -p /var/www/html/wp-content/upgrade -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER chmod 767 /var/www/html/wp-content/upgrade +docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER mkdir -p /var/www/html/wp-content/uploads /var/www/html/wp-content/upgrade +docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER chmod 767 /var/www/html/wp-content/plugins /var/www/html/wp-config.php /var/www/html/wp-settings.php /var/www/html/wp-content/uploads /var/www/html/wp-content/upgrade CURRENT_WP_VERSION=$(docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run -T --rm $CLI core version) echo -e $(status_message "Current WordPress version: $CURRENT_WP_VERSION...") @@ -91,31 +73,31 @@ if [ "$CURRENT_URL" != "http://localhost:$HOST_PORT" ]; then docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI option update siteurl "http://localhost:$HOST_PORT" --quiet fi +# Install a dummy favicon to avoid 404 errors. +echo -e $(status_message "Installing a dummy favicon...") +docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER touch /var/www/html/favicon.ico + # Activate AMP plugin. echo -e $(status_message "Activating AMP plugin...") docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI plugin activate amp --quiet -if [ "$POPULAR_PLUGINS" == "true" ]; then - echo -e $(status_message "Activating popular plugins...") - docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI plugin install advanced-custom-fields --activate --quiet - docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI plugin install jetpack --activate --quiet - docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI plugin install wpforms-lite --activate --quiet -fi -# Install a dummy favicon to avoid 404 errors. -echo -e $(status_message "Installing a dummy favicon...") -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm $CONTAINER touch /var/www/html/favicon.ico +# Install & activate Gutenberg plugin. +echo -e $(status_message "Installing and activating Gutenberg plugin...") +# todo: Use `wp plugin install --activate` once WP-CLI is updated, see https://github.com/wp-cli/extension-command/issues/176. +docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI plugin install gutenberg --activate --quiet +docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI plugin activate gutenberg --quiet # Configure site constants. echo -e $(status_message "Configuring site constants...") WP_DEBUG_CURRENT=$(docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run -T --rm -u 33 $CLI config get --type=constant --format=json WP_DEBUG) -if [ $WP_DEBUG != $WP_DEBUG_CURRENT ]; then +if [ "$WP_DEBUG" != $WP_DEBUG_CURRENT ]; then docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI config set WP_DEBUG $WP_DEBUG --raw --type=constant --quiet WP_DEBUG_RESULT=$(docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run -T --rm -u 33 $CLI config get --type=constant --format=json WP_DEBUG) echo -e $(status_message "WP_DEBUG: $WP_DEBUG_RESULT...") fi SCRIPT_DEBUG_CURRENT=$(docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run -T --rm -u 33 $CLI config get --type=constant --format=json SCRIPT_DEBUG) -if [ $SCRIPT_DEBUG != $SCRIPT_DEBUG_CURRENT ]; then +if [ "$SCRIPT_DEBUG" != $SCRIPT_DEBUG_CURRENT ]; then docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm -u 33 $CLI config set SCRIPT_DEBUG $SCRIPT_DEBUG --raw --type=constant --quiet SCRIPT_DEBUG_RESULT=$(docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run -T --rm -u 33 $CLI config get --type=constant --format=json SCRIPT_DEBUG) echo -e $(status_message "SCRIPT_DEBUG: $SCRIPT_DEBUG_RESULT...") diff --git a/bin/install-docker.sh b/bin/local-env/launch-containers.sh similarity index 55% rename from bin/install-docker.sh rename to bin/local-env/launch-containers.sh index 56bb4ad3ef1..dae82775f16 100755 --- a/bin/install-docker.sh +++ b/bin/local-env/launch-containers.sh @@ -3,14 +3,15 @@ # Exit if any command fails. set -e -. "$(dirname "$0")/bootstrap-env.sh" +# Common variables. +DOCKER_COMPOSE_FILE_OPTIONS="-f $(dirname "$0")/docker-compose.yml" # Include useful functions. . "$(dirname "$0")/includes.sh" # Check that Docker is installed. if ! command_exists "docker"; then - echo -e $(error_message "Docker doesn't seem to be installed. Please head on over to the Docker site to download it: $(action_format "https://www.docker.com/community-edition#/download")") + echo -e $(error_message "Docker doesn't seem to be installed. Please head on over to the Docker site to download it: $(action_format "https://www.docker.com/products/docker-desktop")") exit 1 fi @@ -31,16 +32,3 @@ docker-compose $DOCKER_COMPOSE_FILE_OPTIONS pull # Launch the containers. echo -e $(status_message "Starting Docker containers...") docker-compose $DOCKER_COMPOSE_FILE_OPTIONS up -d >/dev/null - -# Set up WordPress Development site. -# Note: we don't bother installing the test site right now, because that's -# done on every time `npm run test-e2e` is run. -. "$(dirname "$0")/install-wordpress.sh" - -# Install the PHPUnit test scaffolding. -echo -e $(status_message "Installing PHPUnit test scaffolding...") -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm wordpress_phpunit /app/bin/install-wp-tests.sh wordpress_test root example mysql $WP_VERSION false > /dev/null - -# Install Composer. This is only used to run WordPress Coding Standards checks. -echo -e $(status_message "Installing and updating Composer modules...") -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run --rm composer install diff --git a/bin/local-env/start.sh b/bin/local-env/start.sh new file mode 100755 index 00000000000..64272b8cc44 --- /dev/null +++ b/bin/local-env/start.sh @@ -0,0 +1,65 @@ +#!/bin/bash + +# Exit if any command fails +set -e + +# Include useful functions +. "$(dirname "$0")/includes.sh" + +# Change to the expected directory +cd "$(dirname "$0")/../.." + +# Check whether Node and NVM are installed +. "$(dirname "$0")/install-node-nvm.sh" + +# Check whether Composer installed +. "$(dirname "$0")/install-composer.sh" + +# Check whether Docker is installed and running +. "$(dirname "$0")/launch-containers.sh" + +# Set up WordPress Development site. +# Note: we don't bother installing the test site right now, because that's +# done on every time `npm run test-e2e` is run. +. "$(dirname "$0")/install-wordpress.sh" + +! read -d '' AMP <<"EOT" +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMWNXK0OOkkkkOO0KXNWMMMMMMMMMMMMMMMM +MMMMMMMMMMMMWX0kdlc:::::::::::ccodk0NWMMMMMMMMMMMM +MMMMMMMMMWXOdl::::::::::::::::::::::lx0NMMMMMMMMMM +MMMMMMMWKxl::::::::::::::::::::::::::::oOXWMMMMMMM +MMMMMMXkl:::::::::::::::::col::::::::::::oONMMMMMM +MMMMW0o:::::::::::::::::ox0Xk:::::::::::::cxXWMMMM +MMMW0l:::::::::::::::::dKWWXd:::::::::::::::dXMMMM +MMW0l::::::::::::::::cxXWMM0l::::::::::::::::dXMMM +MMXd::::::::::::::::ckNMMMWkc::::::::::::::::ckWMM +MWOc:::::::::::::::lONMMMMNkooool:::::::::::::oXMM +MWk:::::::::::::::l0WMMMMMMWNWNNOc::::::::::::l0MM +MNx::::::::::::::oKWMMMMMMMMMMW0l:::::::::::::cOWM +MNx:::::::::::::oKWWWMMMMMMMMNOl::::::::::::::c0MM +MWOc::::::::::::cddddxKWMMMMNkc:::::::::::::::oKMM +MMXd:::::::::::::::::l0MMMMXdc:::::::::::::::ckWMM +MMW0l::::::::::::::::dXMWWKd:::::::::::::::::oXMMM +MMMWOl:::::::::::::::kWW0xo:::::::::::::::::oKWMMM +MMMMW0l:::::::::::::l0NOl::::::::::::::::::dKWMMMM +MMMMMWKdc:::::::::::cooc:::::::::::::::::lkNMMMMMM +MMMMMMMN0dc::::::::::::::::::::::::::::lxKWMMMMMMM +MMMMMMMMMWKxoc::::::::::::::::::::::coOXWMMMMMMMMM +MMMMMMMMMMMWNKkdoc:::::::::::::cloxOKWMMMMMMMMMMMM +MMMMMMMMMMMMMMMWNX0OkkxxxxxxkO0KXWWMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM + +EOT + +CURRENT_URL=$(docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run -T --rm cli option get siteurl) + +echo -e "\nWelcome to...\n" +echo -e "\033[95m$AMP\033[0m" + +# Give the user more context to what they should do next: Build the plugin and start testing! +echo -e "\nRun $(action_format "npm run dev") to build the latest version of the AMP plugin," +echo -e "then open $(action_format "$CURRENT_URL") to get started!" + +echo -e "\n\nAccess the above install using the following credentials:" +echo -e "Default username: $(action_format "admin"), password: $(action_format "password")" diff --git a/bin/local-env/stop.sh b/bin/local-env/stop.sh new file mode 100755 index 00000000000..51c2bdc5c3b --- /dev/null +++ b/bin/local-env/stop.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# Exit if any command fails. +set -e + +# Common variables. +DOCKER_COMPOSE_FILE_OPTIONS="-f $(dirname "$0")/docker-compose.yml" + +# Include useful functions. +. "$(dirname "$0")/includes.sh" + +# Check that Docker is installed. +if ! command_exists "docker"; then + echo -e $(error_message "Docker doesn't seem to be installed. Please head on over to the Docker site to download it: $(action_format "https://www.docker.com/products/docker-desktop")") + exit 1 +fi + +# Check that Docker is running. +if ! docker info >/dev/null 2>&1; then + echo -e $(error_message "Docker isn't running. Please check that you've started your Docker app, and see it in your system tray.") + exit 1 +fi + +# Stop existing containers. +echo -e $(status_message "Stopping Docker containers...") +docker-compose $DOCKER_COMPOSE_FILE_OPTIONS down --remove-orphans >/dev/null 2>&1 diff --git a/bin/reset-e2e-tests.sh b/bin/reset-e2e-tests.sh deleted file mode 100755 index fb1e080f9da..00000000000 --- a/bin/reset-e2e-tests.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# Exit if any command fails. -set -e - -# Set up WordPress site used for end-to-end (e2e) tests. -. "$(dirname "$0")/install-wordpress.sh" --e2e_tests diff --git a/bin/setup-local-env.sh b/bin/setup-local-env.sh deleted file mode 100755 index dcc86df34a2..00000000000 --- a/bin/setup-local-env.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# Exit if any command fails -set -e - -# Set up environment variables -. "$(dirname "$0")/bootstrap-env.sh" - -# Include useful functions -. "$(dirname "$0")/includes.sh" - -# Change to the expected directory -cd "$(dirname "$0")/.." - -# Check Node and NVM are installed -. "$(dirname "$0")/install-node-nvm.sh" - -# Check Docker is installed and running -. "$(dirname "$0")/install-docker.sh" - -! read -d '' GUTENBERG <<"EOT" -,⁻⁻⁻· . | -| ،⁓’. . |--- ,---. ,---. |---. ,---. ,---. ,---. -| | | | | |---' | | | | |---' | | | -`---' `---' `---’ `---’ ' ` `---' `---’ ` `---| - `---' -EOT - -CURRENT_URL=$(docker-compose $DOCKER_COMPOSE_FILE_OPTIONS run -T --rm cli option get siteurl) - -echo -e "\nWelcome to...\n" -echo -e "\033[95m$GUTENBERG\033[0m" - -# Give the user more context to what they should do next: Build Gutenberg and start testing! -echo -e "\nRun $(action_format "npm run dev") to build the latest Gutenberg packages," -echo -e "then open $(action_format "$CURRENT_URL") to get started!" - -echo -e "\n\nAccess the above install using the following credentials:" -echo -e "Default username: $(action_format "admin"), password: $(action_format "password")" diff --git a/contributing.md b/contributing.md index 91954ef4b2f..2bd8fb0ace0 100644 --- a/contributing.md +++ b/contributing.md @@ -44,9 +44,96 @@ The AMP Project accepts responsible security disclosures through the [Google App In addition to the Community Guidelines, this project follows an explicit [Code of Conduct](https://github.com/ampproject/amp-wp/blob/develop/code_of_conduct.md). -## Dev Setup +## Getting Started -To start, clone this repository into your WordPress install being used for development: +### Requirements + +To contribute to this plugin, you need the following tools installed on your computer: + +* [Composer](https://getcomposer.org/) - to install PHP dependencies. +* [Node.js](https://nodejs.org/en/) - to install JavaScript dependencies. +* [WordPress](https://wordpress.org/download/) - to run the actual plugin. + +You should be running a Node version matching the [current active LTS release](https://github.com/nodejs/Release#release-schedule) or newer for this plugin to work correctly. You can check your Node.js version by typing node -v in the Terminal prompt. + +If you have an incompatible version of Node in your development environment, you can use [nvm](https://github.com/creationix/nvm) to change node versions on the command line: + +```bash +nvm install +``` + +## Local Environment + +Since you need a WordPress environment to run the plugin in, the quickest way to get up and running is to use the provided Docker setup. Install [Docker](https://www.docker.com/products/docker-desktop) and [Docker Compose](https://docs.docker.com/compose/install/) by following the instructions on their website. + +You can then clone this project somewhere on your computer: + +```bash +git clone git@github.com:ampproject/amp-wp.git amp +cd amp +``` + +After that, run a script to set up the local environment. It will automatically verify whether Docker, Composer and Node.js are configured properly and start the local WordPress instance. You may need to run this script multiple times if prompted. + +```bash +./bin/local-env/start.sh +``` + +If everything was successful, you'll see this on your screen: + +``` +Welcome to... + +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMWNXK0OOkkkkOO0KXNWMMMMMMMMMMMMMMMM +MMMMMMMMMMMMWX0kdlc:::::::::::ccodk0NWMMMMMMMMMMMM +MMMMMMMMMWXOdl::::::::::::::::::::::lx0NMMMMMMMMMM +MMMMMMMWKxl::::::::::::::::::::::::::::oOXWMMMMMMM +MMMMMMXkl:::::::::::::::::col::::::::::::oONMMMMMM +MMMMW0o:::::::::::::::::ox0Xk:::::::::::::cxXWMMMM +MMMW0l:::::::::::::::::dKWWXd:::::::::::::::dXMMMM +MMW0l::::::::::::::::cxXWMM0l::::::::::::::::dXMMM +MMXd::::::::::::::::ckNMMMWkc::::::::::::::::ckWMM +MWOc:::::::::::::::lONMMMMNkooool:::::::::::::oXMM +MWk:::::::::::::::l0WMMMMMMWNWNNOc::::::::::::l0MM +MNx::::::::::::::oKWMMMMMMMMMMW0l:::::::::::::cOWM +MNx:::::::::::::oKWWWMMMMMMMMNOl::::::::::::::c0MM +MWOc::::::::::::cddddxKWMMMMNkc:::::::::::::::oKMM +MMXd:::::::::::::::::l0MMMMXdc:::::::::::::::ckWMM +MMW0l::::::::::::::::dXMWWKd:::::::::::::::::oXMMM +MMMWOl:::::::::::::::kWW0xo:::::::::::::::::oKWMMM +MMMMW0l:::::::::::::l0NOl::::::::::::::::::dKWMMMM +MMMMMWKdc:::::::::::cooc:::::::::::::::::lkNMMMMMM +MMMMMMMN0dc::::::::::::::::::::::::::::lxKWMMMMMMM +MMMMMMMMMWKxoc::::::::::::::::::::::coOXWMMMMMMMMM +MMMMMMMMMMMWNKkdoc:::::::::::::cloxOKWMMMMMMMMMMMM +MMMMMMMMMMMMMMMWNX0OkkxxxxxxkO0KXWWMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +``` + +The WordPress installation should be available at http://localhost:8890 (**Username**: admin, **Password**: password). + +To later turn off the local environment, you can run: + +```bash +npm run env:stop +``` + +To bring it back later, run: + +```bash +npm run env:start +``` + +Also, if you need to reset the local environment's database, you can run: + +```bash +npm run env:reset-site +``` + +### Custom Environment + +Alternatively, you can use your own local WordPress environment and clone this repository right into your `wp-content/plugins` directory. ```bash cd wp-content/plugins && git clone git@github.com:ampproject/amp-wp.git amp @@ -62,30 +149,112 @@ npm install And lastly, do a build of the JavaScript: ```bash -npm run build +npm run build:js ``` Lastly, to get the plugin running in your WordPress install, run `composer install` and then activate the plugin via the WordPress dashboard or `wp plugin activate amp`. -To install the `pre-commit` hook, do `bash vendor/xwp/wp-dev-lib/scripts/install-pre-commit-hook.sh`. +## Developing the Plugin -Note that pull requests will be checked against [WordPress-Coding-Standards](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards) with PHPCS, and for JavaScript linting is done with ESLint and (for now) JSCS and JSHint. +Whether you use the pre-existing local environment or a custom one, any PHP code changes will be directly visible during development. -## Modifying JavaScript for Blocks +However, for JavaScript this involves a build process. To watch for any JavaScript file changes and re-build it when needed, you can run the following command: -To edit JavaScript code which is built/complied, run `npm run dev` to watch the files which Webpack will build. These complied files are excluded from version control but they are included in the release packages. +```bash +npm run dev +``` + +This way you will get a development build of the JavaScript, which makes debugging easier. + +To get a production build, run: + +```bash +npm run build:js +``` -## Creating a Plugin Build +### Creating a Plugin Build -To create a build of the plugin for installing in WordPress as a ZIP package, do: +To create a build of the plugin for installing in WordPress as a ZIP package, run: ```bash -composer install # (if you haven't done so yet) -npm install # (if you haven't done so yet) npm run build ``` -This will create an `amp.zip` in the plugin directory which you can install. The contents of this ZIP are also located in the `build` directory which you can `rsync` somewhere as well. +This will create an `amp.zip` in the plugin directory which you can install. The contents of this ZIP are also located in the `build` directory which you can `rsync` somewhere as well if needed. + +### Writing Tests + +#### PHP Unit Tests + +The AMP plugin uses the [PHPUnit](https://phpunit.de/) testing framework to write unit and integration tests for the PHP part. + +To run the full test suite, you can use the following command: + +```bash +npm run test:php +``` + +You can also just run test for a specific function or class by using something like this: + +```bash +npm run test:php -- --filter=AMP_Theme_Support +``` + +See `npm run test:php:help` to see all the possible options. + +#### JavaScript Unit Tests + +[Jest](https://jestjs.io/) is used as the JavaScript unit testing framework. + +To run the full test suite, you can use the following command: + +```bash +npm run test:js +``` + +You can also watch for any file changes and only run tests that failed or have been modified: + +```bash +npm run test:js:watch +``` + +See `npm run test:js:help` to get a list of additional options that can be passed to the test runner. + +#### End-to-End Tests + +This project leverages the local Docker-based environment to facilitate end-to-end (e2e) testing using Puppeteer. + +To run the full test suite, you can use the following command: + +```bash +npm run test:e2e +``` + +You can also watch for any file changes and only run tests that failed or have been modified: + +```bash +npm run test:e2e:watch +``` + +Not using the built-in local environment? You can also pass any other URL to run the tests against. Example: + +```bash +npm run test:e2e -- --wordpress-base-url=https://my-amp-dev-site.local +``` + +For debugging purposes, you can also run the E2E tests in non-headless mode: + +```bash +HEADLESS=false npm run test:e2e +``` + +### Coding Standards + +All contributions to this project will be checked against [WordPress-Coding-Standards](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards) with PHPCS, and for JavaScript linting is done with ESLint. + +To verify your code meets the requirements, you can run `npm run lint`. + +You can also install a `pre-commit` hook by running `bash vendor/xwp/wp-dev-lib/scripts/install-pre-commit-hook.sh`. This way, your code will be checked automatically before committing any changes. ## Updating Allowed Tags And Attributes @@ -136,24 +305,6 @@ The following script creates a post with all core Gutenberg blocks. To run it: 3. run `bash bin/create-gutenberge-test-post.sh` 4. go to the URL that is output in the command line -## PHPUnit Testing - -Please run these tests in an environment with WordPress unit tests installed, like [VVV](https://github.com/Varying-Vagrant-Vagrants/VVV). - -Run tests: - -``` bash -$ phpunit -``` - -Run tests with an HTML coverage report: - -``` bash -$ phpunit --coverage-html /tmp/report -``` - -When you push a commit to your PR, Travis CI will run the PHPUnit tests and sniffs against the WordPress Coding Standards. - ## Creating a Prerelease 1. Create changelog draft on [Wiki page](https://github.com/ampproject/amp-wp/wiki/Release-Changelog-Draft). diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 33c043e6822..00000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,95 +0,0 @@ -version: '3.1' - -services: - - wordpress: - image: wordpress - restart: always - ports: - - 8888:80 - environment: - WORDPRESS_DB_HOST: mysql - WORDPRESS_DB_PASSWORD: example - ABSPATH: /usr/src/wordpress/ - WORDPRESS_DEBUG: 1 - WORDPRESS_CONFIG_EXTRA: | - define( 'SCRIPT_DEBUG', true ); - volumes: - - wordpress_data:/var/www/html - - .:/var/www/html/wp-content/plugins/amp - - ./node_modules/@wordpress/e2e-tests/plugins:/var/www/html/wp-content/plugins/gutenberg-test-plugins - - ./node_modules/@wordpress/e2e-tests/mu-plugins:/var/www/html/wp-content/mu-plugins - depends_on: - - mysql - - cli: - image: wordpress:cli - restart: always - user: xfs - volumes: - - wordpress_data:/var/www/html - - .:/var/www/html/wp-content/plugins/amp - depends_on: - - mysql - - wordpress - - mysql: - image: mysql:5.7 - restart: always - environment: - MYSQL_ROOT_PASSWORD: example - MYSQL_DATABASE: wordpress_test - - wordpress_phpunit: - image: chriszarate/wordpress-phpunit - restart: always - environment: - PHPUNIT_DB_HOST: mysql - volumes: - - .:/app - - testsuite:/tmp - depends_on: - - mysql - - composer: - image: composer - restart: always - volumes: - - .:/app - - wordpress_e2e_tests: - image: wordpress - restart: always - ports: - - 8889:80 - environment: - WORDPRESS_DB_HOST: mysql - WORDPRESS_DB_NAME: wordpress_e2e_tests - WORDPRESS_DB_PASSWORD: example - ABSPATH: /usr/src/wordpress/ - WORDPRESS_DEBUG: 1 - WORDPRESS_CONFIG_EXTRA: | - define( 'SCRIPT_DEBUG', true ); - volumes: - - wordpress_e2e_tests_data:/var/www/html - - .:/var/www/html/wp-content/plugins/amp - - ./node_modules/@wordpress/e2e-tests/plugins:/var/www/html/wp-content/plugins/gutenberg-test-plugins - - ./node_modules/@wordpress/e2e-tests/mu-plugins:/var/www/html/wp-content/mu-plugins - depends_on: - - mysql - - cli_e2e_tests: - image: wordpress:cli - restart: always - user: xfs - volumes: - - wordpress_e2e_tests_data:/var/www/html - - .:/var/www/html/wp-content/plugins/amp - depends_on: - - mysql - - wordpress_e2e_tests - -volumes: - testsuite: - wordpress_data: - wordpress_e2e_tests_data: diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php index ee2575c5c43..dfabb4f8f16 100644 --- a/includes/class-amp-autoloader.php +++ b/includes/class-amp-autoloader.php @@ -107,8 +107,8 @@ class AMP_Autoloader { 'AMP_Widget_Archives' => 'includes/widgets/class-amp-widget-archives', 'AMP_Widget_Categories' => 'includes/widgets/class-amp-widget-categories', 'AMP_Widget_Text' => 'includes/widgets/class-amp-widget-text', - 'AMP_Test_Stub_Sanitizer' => 'tests/stubs', - 'AMP_Test_World_Sanitizer' => 'tests/stubs', + 'AMP_Test_Stub_Sanitizer' => 'tests/php/stubs', + 'AMP_Test_World_Sanitizer' => 'tests/php/stubs', ); /** diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js new file mode 100644 index 00000000000..ce1e29f057f --- /dev/null +++ b/jest-puppeteer.config.js @@ -0,0 +1,7 @@ +module.exports = { + launch: { + dumpio: true, + headless: process.env.HEADLESS !== 'false', + }, + browserContext: 'default', +}; diff --git a/package.json b/package.json index 5b7720152e8..f760e761cda 100644 --- a/package.json +++ b/package.json @@ -101,6 +101,9 @@ "check-licenses": "wp-scripts check-licenses --production", "deploy": "grunt deploy", "dev": "wp-scripts start", + "env:start": "./bin/local-env/start.sh", + "env:stop": "./bin/local-env/stop.sh", + "env:reset-site": "./bin/local-env/install-wordpress.sh --reset-site", "lint": "npm-run-all --parallel lint:*", "lint:css": "wp-scripts lint-style 'assets/**/*.css'", "lint:css:fix": "npm run lint:css -- --fix", @@ -111,13 +114,14 @@ "lint:pkg-json": "wp-scripts lint-pkg-json . --ignorePath .gitignore", "start": "wp-scripts start", "test": "npm-run-all --parallel test:*", - "pretest:e2e": "cross-env SCRIPT_DEBUG=false ./bin/reset-e2e-tests.sh", - "test:e2e": "wp-scripts test-e2e --config=tests/e2e/jest.config.js", + "test:e2e": "WP_BASE_URL=http://localhost:8890 wp-scripts test-e2e --config=tests/e2e/jest.config.js", + "test:e2e:help": "npm run test:e2e -- --help", "test:e2e:watch": "npm run test:e2e -- --watch", - "test:js": "wp-scripts test-unit-js --config=tests/unit/jest.config.js", + "test:js": "wp-scripts test-unit-js --config=tests/js/jest.config.js", "test:js:help": "wp-scripts test-unit-js --help", "test:js:watch": "npm run test:js -- --watch", - "test:php": "phpunit" + "test:php": "phpunit", + "test:php:help": "npm run test:php -- --help" }, "npmPackageJsonLintConfig": { "extends": "@wordpress/npm-package-json-lint-config", diff --git a/tests/e2e/config/bootstrap.js b/tests/e2e/config/bootstrap.js new file mode 100644 index 00000000000..101dd2560d9 --- /dev/null +++ b/tests/e2e/config/bootstrap.js @@ -0,0 +1,142 @@ +/** + * External dependencies + */ +import { get } from 'lodash'; + +/** + * WordPress dependencies + */ +import { + clearLocalStorage, + enablePageDialogAccept, + setBrowserViewport, +} from '@wordpress/e2e-test-utils'; + +/** + * Environment variables + */ +const { PUPPETEER_TIMEOUT } = process.env; + +/** + * Set of console logging types observed to protect against unexpected yet + * handled (i.e. not catastrophic) errors or warnings. Each key corresponds + * to the Puppeteer ConsoleMessage type, its value the corresponding function + * on the console global object. + * + * @type {Object<string,string>} + */ +const OBSERVED_CONSOLE_MESSAGE_TYPES = { + warning: 'warn', + error: 'error', +}; + +/** + * Array of page event tuples of [ eventName, handler ]. + * + * @type {Array} + */ +const pageEvents = []; + +// The Jest timeout is increased because these tests are a bit slow +jest.setTimeout( PUPPETEER_TIMEOUT || 100000 ); + +/** + * Adds an event listener to the page to handle additions of page event + * handlers, to assure that they are removed at test teardown. + */ +function capturePageEventsForTearDown() { + page.on( 'newListener', ( eventName, listener ) => { + pageEvents.push( [ eventName, listener ] ); + } ); +} + +/** + * Removes all bound page event handlers. + */ +function removePageEvents() { + pageEvents.forEach( ( [ eventName, handler ] ) => { + page.removeListener( eventName, handler ); + } ); +} + +/** + * Adds a page event handler to emit uncaught exception to process if one of + * the observed console logging types is encountered. + */ +function observeConsoleLogging() { + page.on( 'console', ( message ) => { + const type = message.type(); + if ( ! OBSERVED_CONSOLE_MESSAGE_TYPES.hasOwnProperty( type ) ) { + return; + } + + let text = message.text(); + + // An exception is made for _blanket_ deprecation warnings: Those + // which log regardless of whether a deprecated feature is in use. + if ( text.includes( 'This is a global warning' ) ) { + return; + } + + // Viewing posts on the front end can result in this error, which + // has nothing to do with Gutenberg. + if ( text.includes( 'net::ERR_UNKNOWN_URL_SCHEME' ) ) { + return; + } + + // A bug present in WordPress 5.2 will produce console warnings when + // loading the Dashicons font. These can be safely ignored, as they do + // not otherwise regress on application behavior. This logic should be + // removed once the associated ticket has been closed. + // + // See: https://core.trac.wordpress.org/ticket/47183 + if ( + text.startsWith( 'Failed to decode downloaded font:' ) || + text.startsWith( 'OTS parsing error:' ) + ) { + return; + } + + const logFunction = OBSERVED_CONSOLE_MESSAGE_TYPES[ type ]; + + // As of Puppeteer 1.6.1, `message.text()` wrongly returns an object of + // type JSHandle for error logging, instead of the expected string. + // + // See: https://github.com/GoogleChrome/puppeteer/issues/3397 + // + // The recommendation there to asynchronously resolve the error value + // upon a console event may be prone to a race condition with the test + // completion, leaving a possibility of an error not being surfaced + // correctly. Instead, the logic here synchronously inspects the + // internal object shape of the JSHandle to find the error text. If it + // cannot be found, the default text value is used instead. + text = get( message.args(), [ 0, '_remoteObject', 'description' ], text ); + + // Disable reason: We intentionally bubble up the console message + // which, unless the test explicitly anticipates the logging via + // @wordpress/jest-console matchers, will cause the intended test + // failure. + + // eslint-disable-next-line no-console + console[ logFunction ]( text ); + } ); +} + +// Before every test suite run, delete all content created by the test. This ensures +// other posts/comments/etc. aren't dirtying tests and tests don't depend on +// each other's side-effects. +beforeAll( async () => { + capturePageEventsForTearDown(); + enablePageDialogAccept(); + observeConsoleLogging(); + await setBrowserViewport( 'large' ); +} ); + +afterEach( async () => { + await clearLocalStorage(); + await setBrowserViewport( 'large' ); +} ); + +afterAll( () => { + removePageEvents(); +} ); diff --git a/tests/e2e/jest.config.js b/tests/e2e/jest.config.js index bfeca49f2ac..1ac91d4cbf0 100644 --- a/tests/e2e/jest.config.js +++ b/tests/e2e/jest.config.js @@ -1,17 +1,21 @@ module.exports = { - rootDir: '../../', ...require( '@wordpress/scripts/config/jest-e2e.config' ), + setupFilesAfterEnv: [ + '<rootDir>/config/bootstrap.js', + ], + testMatch: [ + '<rootDir>/specs/**/__tests__/**/*.js', + '<rootDir>/specs/**/?(*.)(spec|test).js', + '<rootDir>/specs/**/test/*.js', + ], transform: { - '^.+\\.[jt]sx?$': '<rootDir>/node_modules/@wordpress/scripts/config/babel-transform', + '^.+\\.[jt]sx?$': '<rootDir>/../../node_modules/@wordpress/scripts/config/babel-transform', }, - setupFilesAfterEnv: [ - '<rootDir>/node_modules/@wordpress/jest-preset-default/scripts/setup-test-framework.js', - 'expect-puppeteer', + transformIgnorePatterns: [ + 'node_modules', ], testPathIgnorePatterns: [ - '<rootDir>/.git', - '<rootDir>/node_modules', - '<rootDir>/build', - '.*/e2e/.*', + '.git', + 'node_modules', ], }; diff --git a/tests/e2e/specs/amp-options.test.js b/tests/e2e/specs/amp-options.test.js new file mode 100644 index 00000000000..94ee9ac376d --- /dev/null +++ b/tests/e2e/specs/amp-options.test.js @@ -0,0 +1,134 @@ +/** + * WordPress dependencies + */ +import { visitAdminPage, switchUserToAdmin, switchUserToTest } from '@wordpress/e2e-test-utils'; + +/** + * Deactivates an active plugin. + * + * Not using the provided deactivatePlugin() utility because it uses page.click(), + * which does not work if the element is not in the view or obscured by another element + * like an admin pointer. + * + * @param {string} slug Plugin slug. + */ +async function deactivatePlugin( slug ) { + await switchUserToAdmin(); + await visitAdminPage( 'plugins.php' ); + + await page.evaluate( ( plugin ) => { + const disableLink = document.querySelector( `tr[data-slug="${ plugin }"] .deactivate a` ); + + if ( disableLink ) { + disableLink.scrollIntoView(); + disableLink.click(); + } + }, slug ); + + await page.waitForSelector( `tr[data-slug="${ slug }"] .delete a` ); + await switchUserToTest(); +} + +/** + * Activates an installed plugin. + * + * Not using the provided activatePlugin() utility because it uses page.click(), + * which does not work if the element is not in the view or obscured by another element + * like an admin pointer. + * + * @param {string} slug Plugin slug. + */ +async function activatePlugin( slug ) { + await switchUserToAdmin(); + await visitAdminPage( 'plugins.php' ); + + const disableLink = await page.$( `tr[data-slug="${ slug }"] .deactivate a` ); + if ( disableLink ) { + return; + } + + await page.evaluate( ( plugin ) => { + const enableLink = document.querySelector( `tr[data-slug="${ plugin }"] .activate a` ); + + if ( enableLink ) { + enableLink.scrollIntoView(); + enableLink.click(); + } + }, slug ); + + await page.waitForSelector( `tr[data-slug="${ slug }"] .deactivate a` ); + await switchUserToTest(); +} + +describe( 'AMP Settings Screen', () => { + it( 'Should display a welcome notice', async () => { + await visitAdminPage( 'admin.php', 'page=amp-options' ); + const nodes = await page.$x( + '//*[contains(@class,"amp-welcome-notice")]//h1[contains(text(), "Welcome to AMP for WordPress")]' + ); + expect( nodes.length ).not.toEqual( 0 ); + } ); + + it( 'Should display a warning about missing object cache', async () => { + await visitAdminPage( 'admin.php', 'page=amp-options' ); + const nodes = await page.$x( + '//*[contains(@class,"notice-warning")]//p[contains(text(), "The AMP plugin performs at its best when persistent object cache is enabled")]' + ); + expect( nodes.length ).not.toEqual( 0 ); + } ); + + it( 'Should display a message about theme compatibility', async () => { + await visitAdminPage( 'admin.php', 'page=amp-options' ); + const nodes = await page.$x( + '//*[contains(@class,"notice-success")]//p[contains(text(), "Your active theme is known to work well in standard or transitional mode.")]' + ); + expect( nodes.length ).not.toEqual( 0 ); + } ); + + it( 'Should toggle Website Mode section', async () => { + await visitAdminPage( 'admin.php', 'page=amp-options' ); + + await page.evaluate( () => { + document.querySelector( 'tr.amp-website-mode' ).scrollIntoView(); + } ); + + const websiteModeSection = await page.$( 'tr.amp-website-mode' ); + + expect( await websiteModeSection.isIntersectingViewport() ).toBe( true ); + + await page.click( '#website_experience' ); + + expect( await websiteModeSection.isIntersectingViewport() ).toBe( false ); + } ); + + it( 'Requires at least one AMP experience to be selected', async () => { + await visitAdminPage( 'admin.php', 'page=amp-options' ); + + expect( await page.$eval( '#amp-settings', ( el ) => el.matches( `:invalid` ) ) ).toBe( false ); + + await page.click( '#website_experience' ); + + expect( await page.$eval( '#amp-settings', ( el ) => el.matches( `:invalid` ) ) ).toBe( true ); + } ); + + it( 'Should not allow AMP Stories to be enabled when Gutenberg is not active', async () => { + await deactivatePlugin( 'gutenberg' ); + + await visitAdminPage( 'admin.php', 'page=amp-options' ); + + expect( await page.$eval( '#stories_experience', ( el ) => el.matches( `:disabled` ) ) ).toBe( true ); + + const nodes = await page.$x( + '//*[contains(@class,"notice-info")]//p[contains(text(), "To use stories, you currently must have the latest version")]' + ); + expect( nodes.length ).not.toEqual( 0 ); + + await activatePlugin( 'gutenberg' ); + } ); + + it( 'Should allow AMP Stories to be enabled when Gutenberg is active', async () => { + await visitAdminPage( 'admin.php', 'page=amp-options' ); + + expect( await page.$eval( '#stories_experience', ( el ) => el.matches( `:disabled` ) ) ).toBe( false ); + } ); +} ); diff --git a/tests/e2e/specs/demo.test.js b/tests/e2e/specs/demo.test.js deleted file mode 100644 index 80d3fbfeb29..00000000000 --- a/tests/e2e/specs/demo.test.js +++ /dev/null @@ -1,45 +0,0 @@ -/** - * WordPress dependencies - */ -import { visitAdminPage, createURLMatcher, setUpResponseMocking, mockOrTransform } from '@wordpress/e2e-test-utils'; - -const MOCK_VIMEO_RESPONSE = { - url: 'https://vimeo.com/22439234', - html: '<iframe width="16" height="9"></iframe>', - type: 'video', - provider_name: 'Vimeo', - provider_url: 'https://vimeo.com', - version: '1.0', -}; - -const couldNotBePreviewed = ( embedObject ) => { - return 'Embed Handler' === embedObject.provider_name; -}; - -const stripIframeFromEmbed = ( embedObject ) => { - return { ...embedObject, html: embedObject.html.replace( /src=[^\s]+/, '' ) }; -}; - -describe( 'new editor state', () => { - beforeAll( async () => { - setUpResponseMocking( [ - { - match: createURLMatcher( 'oembed%2F1.0%2Fproxy' ), - onRequestMatch: mockOrTransform( couldNotBePreviewed, MOCK_VIMEO_RESPONSE, stripIframeFromEmbed ), - }, - ] ); - await visitAdminPage( 'post-new.php', 'gutenberg-demo' ); - } ); - - it( 'content should load without making the post dirty', async () => { - const isDirty = await page.evaluate( () => { - const { select } = window.wp.data; - return select( 'core/editor' ).isEditedPostDirty(); - } ); - expect( isDirty ).toBeFalsy(); - } ); - - it( 'should be immediately saveable', async () => { - expect( await page.$( 'button.editor-post-save-draft' ) ).toBeTruthy(); - } ); -} ); diff --git a/tests/e2e/specs/hello.test.js b/tests/e2e/specs/hello.test.js new file mode 100644 index 00000000000..1ab0e02223d --- /dev/null +++ b/tests/e2e/specs/hello.test.js @@ -0,0 +1,14 @@ +/** + * WordPress dependencies + */ +import { visitAdminPage } from '@wordpress/e2e-test-utils'; + +describe( 'Hello World', () => { + it( 'Should load properly', async () => { + await visitAdminPage( '/' ); + const nodes = await page.$x( + '//h2[contains(text(), "Welcome to WordPress!")]' + ); + expect( nodes.length ).not.toEqual( 0 ); + } ); +} ); diff --git a/tests/e2e/specs/stories-admin-pointer.test.js b/tests/e2e/specs/stories-admin-pointer.test.js new file mode 100644 index 00000000000..e2ec7553145 --- /dev/null +++ b/tests/e2e/specs/stories-admin-pointer.test.js @@ -0,0 +1,14 @@ +/** + * WordPress dependencies + */ +import { visitAdminPage } from '@wordpress/e2e-test-utils'; + +describe( 'AMP Stories Admin Pointer', () => { + it( 'Should be displayed', async () => { + await visitAdminPage( '/' ); + const nodes = await page.$x( + '//*[contains(@class,"wp-amp-pointer")]//p[contains(text(), "You can now enable Stories")]' + ); + expect( nodes.length ).not.toEqual( 0 ); + } ); +} ); diff --git a/tests/unit/jest.config.js b/tests/js/jest.config.js similarity index 92% rename from tests/unit/jest.config.js rename to tests/js/jest.config.js index b4b04e5a7e6..feae25af707 100644 --- a/tests/unit/jest.config.js +++ b/tests/js/jest.config.js @@ -5,7 +5,7 @@ module.exports = { '^.+\\.[jt]sx?$': '<rootDir>/node_modules/@wordpress/scripts/config/babel-transform', }, setupFiles: [ - '<rootDir>/tests/unit/setup-globals', + '<rootDir>/tests/js/setup-globals', ], testPathIgnorePatterns: [ '<rootDir>/.git', diff --git a/tests/unit/setup-globals.js b/tests/js/setup-globals.js similarity index 100% rename from tests/unit/setup-globals.js rename to tests/js/setup-globals.js diff --git a/tests/assets/1024x768.png b/tests/php/assets/1024x768.png similarity index 100% rename from tests/assets/1024x768.png rename to tests/php/assets/1024x768.png diff --git a/tests/assets/350x150.png b/tests/php/assets/350x150.png similarity index 100% rename from tests/assets/350x150.png rename to tests/php/assets/350x150.png diff --git a/tests/assets/wordpress-logo.png b/tests/php/assets/wordpress-logo.png similarity index 100% rename from tests/assets/wordpress-logo.png rename to tests/php/assets/wordpress-logo.png diff --git a/tests/benchmark/run-benchmark.sh b/tests/php/benchmark/run-benchmark.sh similarity index 100% rename from tests/benchmark/run-benchmark.sh rename to tests/php/benchmark/run-benchmark.sh diff --git a/tests/stubs.php b/tests/php/stubs.php similarity index 100% rename from tests/stubs.php rename to tests/php/stubs.php diff --git a/tests/test-amp-analytics-options.php b/tests/php/test-amp-analytics-options.php similarity index 100% rename from tests/test-amp-analytics-options.php rename to tests/php/test-amp-analytics-options.php diff --git a/tests/test-amp-audio-converter.php b/tests/php/test-amp-audio-converter.php similarity index 100% rename from tests/test-amp-audio-converter.php rename to tests/php/test-amp-audio-converter.php diff --git a/tests/test-amp-crowdsignal-embed-handler.php b/tests/php/test-amp-crowdsignal-embed-handler.php similarity index 100% rename from tests/test-amp-crowdsignal-embed-handler.php rename to tests/php/test-amp-crowdsignal-embed-handler.php diff --git a/tests/test-amp-dailymotion-embed.php b/tests/php/test-amp-dailymotion-embed.php similarity index 100% rename from tests/test-amp-dailymotion-embed.php rename to tests/php/test-amp-dailymotion-embed.php diff --git a/tests/test-amp-facebook-embed.php b/tests/php/test-amp-facebook-embed.php similarity index 100% rename from tests/test-amp-facebook-embed.php rename to tests/php/test-amp-facebook-embed.php diff --git a/tests/test-amp-form-sanitizer.php b/tests/php/test-amp-form-sanitizer.php similarity index 100% rename from tests/test-amp-form-sanitizer.php rename to tests/php/test-amp-form-sanitizer.php diff --git a/tests/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php similarity index 100% rename from tests/test-amp-helper-functions.php rename to tests/php/test-amp-helper-functions.php diff --git a/tests/test-amp-iframe-sanitizer.php b/tests/php/test-amp-iframe-sanitizer.php similarity index 100% rename from tests/test-amp-iframe-sanitizer.php rename to tests/php/test-amp-iframe-sanitizer.php diff --git a/tests/test-amp-image-dimension-extractor.php b/tests/php/test-amp-image-dimension-extractor.php similarity index 100% rename from tests/test-amp-image-dimension-extractor.php rename to tests/php/test-amp-image-dimension-extractor.php diff --git a/tests/test-amp-img-sanitizer.php b/tests/php/test-amp-img-sanitizer.php similarity index 100% rename from tests/test-amp-img-sanitizer.php rename to tests/php/test-amp-img-sanitizer.php diff --git a/tests/test-amp-instagram-embed.php b/tests/php/test-amp-instagram-embed.php similarity index 100% rename from tests/test-amp-instagram-embed.php rename to tests/php/test-amp-instagram-embed.php diff --git a/tests/test-amp-o2-player-sanitizer.php b/tests/php/test-amp-o2-player-sanitizer.php similarity index 100% rename from tests/test-amp-o2-player-sanitizer.php rename to tests/php/test-amp-o2-player-sanitizer.php diff --git a/tests/test-amp-pinterest-embed.php b/tests/php/test-amp-pinterest-embed.php similarity index 100% rename from tests/test-amp-pinterest-embed.php rename to tests/php/test-amp-pinterest-embed.php diff --git a/tests/test-amp-playbuzz-sanitizer.php b/tests/php/test-amp-playbuzz-sanitizer.php similarity index 100% rename from tests/test-amp-playbuzz-sanitizer.php rename to tests/php/test-amp-playbuzz-sanitizer.php diff --git a/tests/test-amp-render-post.php b/tests/php/test-amp-render-post.php similarity index 100% rename from tests/test-amp-render-post.php rename to tests/php/test-amp-render-post.php diff --git a/tests/test-amp-script-sanitizer.php b/tests/php/test-amp-script-sanitizer.php similarity index 100% rename from tests/test-amp-script-sanitizer.php rename to tests/php/test-amp-script-sanitizer.php diff --git a/tests/test-amp-soundcloud-embed.php b/tests/php/test-amp-soundcloud-embed.php similarity index 100% rename from tests/test-amp-soundcloud-embed.php rename to tests/php/test-amp-soundcloud-embed.php diff --git a/tests/test-amp-story-sanitizer.php b/tests/php/test-amp-story-sanitizer.php similarity index 100% rename from tests/test-amp-story-sanitizer.php rename to tests/php/test-amp-story-sanitizer.php diff --git a/tests/test-amp-style-sanitizer.php b/tests/php/test-amp-style-sanitizer.php similarity index 100% rename from tests/test-amp-style-sanitizer.php rename to tests/php/test-amp-style-sanitizer.php diff --git a/tests/test-amp-tag-and-attribute-sanitizer-private-methods.php b/tests/php/test-amp-tag-and-attribute-sanitizer-private-methods.php similarity index 100% rename from tests/test-amp-tag-and-attribute-sanitizer-private-methods.php rename to tests/php/test-amp-tag-and-attribute-sanitizer-private-methods.php diff --git a/tests/test-amp-twitter-embed.php b/tests/php/test-amp-twitter-embed.php similarity index 100% rename from tests/test-amp-twitter-embed.php rename to tests/php/test-amp-twitter-embed.php diff --git a/tests/test-amp-video-sanitizer.php b/tests/php/test-amp-video-sanitizer.php similarity index 100% rename from tests/test-amp-video-sanitizer.php rename to tests/php/test-amp-video-sanitizer.php diff --git a/tests/test-amp-vimeo-embed.php b/tests/php/test-amp-vimeo-embed.php similarity index 100% rename from tests/test-amp-vimeo-embed.php rename to tests/php/test-amp-vimeo-embed.php diff --git a/tests/test-amp-vine-embed.php b/tests/php/test-amp-vine-embed.php similarity index 100% rename from tests/test-amp-vine-embed.php rename to tests/php/test-amp-vine-embed.php diff --git a/tests/test-amp-youtube-embed.php b/tests/php/test-amp-youtube-embed.php similarity index 100% rename from tests/test-amp-youtube-embed.php rename to tests/php/test-amp-youtube-embed.php diff --git a/tests/test-amp.php b/tests/php/test-amp.php similarity index 100% rename from tests/test-amp.php rename to tests/php/test-amp.php diff --git a/tests/test-class-amp-admin-pointer.php b/tests/php/test-class-amp-admin-pointer.php similarity index 100% rename from tests/test-class-amp-admin-pointer.php rename to tests/php/test-class-amp-admin-pointer.php diff --git a/tests/test-class-amp-base-sanitizer.php b/tests/php/test-class-amp-base-sanitizer.php similarity index 100% rename from tests/test-class-amp-base-sanitizer.php rename to tests/php/test-class-amp-base-sanitizer.php diff --git a/tests/test-class-amp-block-sanitizer.php b/tests/php/test-class-amp-block-sanitizer.php similarity index 100% rename from tests/test-class-amp-block-sanitizer.php rename to tests/php/test-class-amp-block-sanitizer.php diff --git a/tests/test-class-amp-cli.php b/tests/php/test-class-amp-cli.php similarity index 100% rename from tests/test-class-amp-cli.php rename to tests/php/test-class-amp-cli.php diff --git a/tests/test-class-amp-comments-sanitizer.php b/tests/php/test-class-amp-comments-sanitizer.php similarity index 100% rename from tests/test-class-amp-comments-sanitizer.php rename to tests/php/test-class-amp-comments-sanitizer.php diff --git a/tests/test-class-amp-content-sanitizer.php b/tests/php/test-class-amp-content-sanitizer.php similarity index 100% rename from tests/test-class-amp-content-sanitizer.php rename to tests/php/test-class-amp-content-sanitizer.php diff --git a/tests/test-class-amp-core-block-handler.php b/tests/php/test-class-amp-core-block-handler.php similarity index 100% rename from tests/test-class-amp-core-block-handler.php rename to tests/php/test-class-amp-core-block-handler.php diff --git a/tests/test-class-amp-dom-utils.php b/tests/php/test-class-amp-dom-utils.php similarity index 100% rename from tests/test-class-amp-dom-utils.php rename to tests/php/test-class-amp-dom-utils.php diff --git a/tests/test-class-amp-editor-blocks.php b/tests/php/test-class-amp-editor-blocks.php similarity index 100% rename from tests/test-class-amp-editor-blocks.php rename to tests/php/test-class-amp-editor-blocks.php diff --git a/tests/test-class-amp-gallery-block-sanitizer.php b/tests/php/test-class-amp-gallery-block-sanitizer.php similarity index 100% rename from tests/test-class-amp-gallery-block-sanitizer.php rename to tests/php/test-class-amp-gallery-block-sanitizer.php diff --git a/tests/test-class-amp-gfycat-embed-handler.php b/tests/php/test-class-amp-gfycat-embed-handler.php similarity index 100% rename from tests/test-class-amp-gfycat-embed-handler.php rename to tests/php/test-class-amp-gfycat-embed-handler.php diff --git a/tests/test-class-amp-http.php b/tests/php/test-class-amp-http.php similarity index 100% rename from tests/test-class-amp-http.php rename to tests/php/test-class-amp-http.php diff --git a/tests/test-class-amp-hulu-embed-handler.php b/tests/php/test-class-amp-hulu-embed-handler.php similarity index 100% rename from tests/test-class-amp-hulu-embed-handler.php rename to tests/php/test-class-amp-hulu-embed-handler.php diff --git a/tests/test-class-amp-imgur-embed-handler.php b/tests/php/test-class-amp-imgur-embed-handler.php similarity index 100% rename from tests/test-class-amp-imgur-embed-handler.php rename to tests/php/test-class-amp-imgur-embed-handler.php diff --git a/tests/test-class-amp-meta-box.php b/tests/php/test-class-amp-meta-box.php similarity index 100% rename from tests/test-class-amp-meta-box.php rename to tests/php/test-class-amp-meta-box.php diff --git a/tests/test-class-amp-nav-menu-toggle-sanitizer.php b/tests/php/test-class-amp-nav-menu-toggle-sanitizer.php similarity index 100% rename from tests/test-class-amp-nav-menu-toggle-sanitizer.php rename to tests/php/test-class-amp-nav-menu-toggle-sanitizer.php diff --git a/tests/test-class-amp-options-manager.php b/tests/php/test-class-amp-options-manager.php similarity index 100% rename from tests/test-class-amp-options-manager.php rename to tests/php/test-class-amp-options-manager.php diff --git a/tests/test-class-amp-options-menu.php b/tests/php/test-class-amp-options-menu.php similarity index 100% rename from tests/test-class-amp-options-menu.php rename to tests/php/test-class-amp-options-menu.php diff --git a/tests/test-class-amp-playlist-embed-handler.php b/tests/php/test-class-amp-playlist-embed-handler.php similarity index 100% rename from tests/test-class-amp-playlist-embed-handler.php rename to tests/php/test-class-amp-playlist-embed-handler.php diff --git a/tests/test-class-amp-post-type-support.php b/tests/php/test-class-amp-post-type-support.php similarity index 100% rename from tests/test-class-amp-post-type-support.php rename to tests/php/test-class-amp-post-type-support.php diff --git a/tests/test-class-amp-service-worker.php b/tests/php/test-class-amp-service-worker.php similarity index 100% rename from tests/test-class-amp-service-worker.php rename to tests/php/test-class-amp-service-worker.php diff --git a/tests/test-class-amp-story-post-type.php b/tests/php/test-class-amp-story-post-type.php similarity index 100% rename from tests/test-class-amp-story-post-type.php rename to tests/php/test-class-amp-story-post-type.php diff --git a/tests/test-class-amp-story-templates.php b/tests/php/test-class-amp-story-templates.php similarity index 100% rename from tests/test-class-amp-story-templates.php rename to tests/php/test-class-amp-story-templates.php diff --git a/tests/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php similarity index 100% rename from tests/test-class-amp-theme-support.php rename to tests/php/test-class-amp-theme-support.php diff --git a/tests/test-class-amp-vimeo-embed-handler.php b/tests/php/test-class-amp-vimeo-embed-handler.php similarity index 100% rename from tests/test-class-amp-vimeo-embed-handler.php rename to tests/php/test-class-amp-vimeo-embed-handler.php diff --git a/tests/test-class-amp-widget-archives.php b/tests/php/test-class-amp-widget-archives.php similarity index 100% rename from tests/test-class-amp-widget-archives.php rename to tests/php/test-class-amp-widget-archives.php diff --git a/tests/test-class-amp-widget-categories.php b/tests/php/test-class-amp-widget-categories.php similarity index 100% rename from tests/test-class-amp-widget-categories.php rename to tests/php/test-class-amp-widget-categories.php diff --git a/tests/test-class-amp-widget-text.php b/tests/php/test-class-amp-widget-text.php similarity index 100% rename from tests/test-class-amp-widget-text.php rename to tests/php/test-class-amp-widget-text.php diff --git a/tests/test-class-amp-youtube-embed-handler.php b/tests/php/test-class-amp-youtube-embed-handler.php similarity index 100% rename from tests/test-class-amp-youtube-embed-handler.php rename to tests/php/test-class-amp-youtube-embed-handler.php diff --git a/tests/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php similarity index 87% rename from tests/test-tag-and-attribute-sanitizer.php rename to tests/php/test-tag-and-attribute-sanitizer.php index 9ee79d00202..3fd5ba482f0 100644 --- a/tests/test-tag-and-attribute-sanitizer.php +++ b/tests/php/test-tag-and-attribute-sanitizer.php @@ -20,82 +20,82 @@ class AMP_Tag_And_Attribute_Sanitizer_Test extends WP_UnitTestCase { */ public function get_body_data() { return array( - 'empty_doc' => array( + 'empty_doc' => array( '', '', ), - 'a-test' => array( + 'a-test' => array( '<a on="tap:see-image-lightbox" role="button" class="button button-secondary play" tabindex="0">Show Image</a>', ), - 'a4a' => array( + 'a4a' => array( '<amp-ad width="300" height="400" type="fake" data-use-a4a="true" data-vars-analytics-var="bar" src="fake_amp.json"><div placeholder=""></div><div fallback=""></div></amp-ad>', null, // No change. array( 'amp-ad' ), ), - 'ads' => array( + 'ads' => array( '<amp-ad width="300" height="250" type="a9" data-aax_size="300x250" data-aax_pubname="test123" data-aax_src="302"><div placeholder=""></div><div fallback=""></div></amp-ad>', null, // No change. array( 'amp-ad' ), ), - 'adsense' => array( + 'adsense' => array( '<amp-ad width="300" height="250" type="adsense" data-ad-client="ca-pub-2005682797531342" data-ad-slot="7046626912"><div placeholder=""></div><div fallback=""></div></amp-ad>', null, // No change. array( 'amp-ad' ), ), - 'amp-3q-player' => array( + 'amp-3q-player' => array( '<amp-3q-player data-id="c8dbe7f4-7f7f-11e6-a407-0cc47a188158" layout="responsive" width="480" height="270"></amp-3q-player>', null, array( 'amp-3q-player' ), ), - 'amp-ad' => array( + 'amp-ad' => array( '<amp-ad width="300" height="250" type="foo"></amp-ad>', null, // No change. array( 'amp-ad' ), ), - 'amp-sticky-ad' => array( + 'amp-sticky-ad' => array( '<amp-sticky-ad layout="nodisplay"><amp-ad width="320" height="50" type="doubleclick" data-slot="/35096353/amptesting/formats/sticky"></amp-ad></amp-sticky-ad>', null, array( 'amp-ad', 'amp-sticky-ad' ), ), - 'amp-sticky-ad-bad-children' => array( + 'amp-sticky-ad-bad-children' => array( '<amp-sticky-ad layout="nodisplay"><span>not allowed</span><amp-ad width="320" height="50" type="doubleclick" data-slot="/35096353/amptesting/formats/sticky"></amp-ad><i>not ok</i></amp-sticky-ad>', '', array(), ), - 'amp-animation' => array( + 'amp-animation' => array( '<amp-animation layout="nodisplay"><span>bad</span><script type="application/json">{}</script><strong>very bad</strong></amp-animation>', '<amp-animation layout="nodisplay"><script type="application/json">{}</script></amp-animation>', array( 'amp-animation' ), ), - 'amp-call-tracking' => array( + 'amp-call-tracking' => array( '<amp-call-tracking config="https://example.com/calltracking.json"><b>bad</b>--and not great: <a href="tel:123456789">+1 (23) 456-789</a><i>more bad</i>not great</amp-call-tracking>', '<amp-call-tracking config="https://example.com/calltracking.json">--and not great: <a href="tel:123456789">+1 (23) 456-789</a>not great</amp-call-tracking>', array( 'amp-call-tracking' ), ), - 'amp-call-tracking_blacklisted_config' => array( + 'amp-call-tracking_blacklisted_config' => array( '<amp-call-tracking config="__amp_source_origin"><a href="tel:123456789">+1 (23) 456-789</a></amp-call-tracking>', '', array(), // Important: This needs to be empty because the amp-call-tracking is stripped. ), - 'amp-embed' => array( + 'amp-embed' => array( '<amp-embed type="taboola" width="400" height="300" layout="responsive"></amp-embed>', null, // No change. array( 'amp-ad' ), ), - 'amp-facebook-comments' => array( + 'amp-facebook-comments' => array( '<amp-facebook-comments width="486" height="657" data-href="http://example.com/baz" layout="responsive" data-numposts="5"></amp-facebook-comments>', null, // No change. array( 'amp-facebook-comments' ), @@ -107,7 +107,7 @@ public function get_body_data() { array(), // Empty because invalid. ), - 'amp-facebook-like' => array( + 'amp-facebook-like' => array( '<amp-facebook-like width="90" height="20" data-href="http://example.com/baz" layout="fixed" data-layout="button_count"></amp-facebook-like>', null, // No change. array( 'amp-facebook-like' ), @@ -119,37 +119,37 @@ public function get_body_data() { array(), // Empty because invalid. ), - 'amp-fit-text' => array( + 'amp-fit-text' => array( '<amp-fit-text width="300" height="200" layout="responsive">Lorem ipsum</amp-fit-text>', null, // No change. array( 'amp-fit-text' ), ), - 'amp-gist' => array( + 'amp-gist' => array( '<amp-gist layout="fixed-height" data-gistid="a19" height="1613"></amp-gist>', null, // No change. array( 'amp-gist' ), ), - 'amp-gist_missing_mandatory_attribute' => array( + 'amp-gist_missing_mandatory_attribute' => array( '<amp-gist layout="fixed-height" height="1613"></amp-gist>', '', array(), ), - 'amp-iframe' => array( + 'amp-iframe' => array( '<amp-iframe width="600" height="200" sandbox="allow-scripts allow-same-origin" layout="responsive" frameborder="0" src="https://www.example.com"></amp-iframe>', null, // No change. array( 'amp-iframe' ), ), - 'amp-iframe_incorrect_protocol' => array( + 'amp-iframe_incorrect_protocol' => array( '<amp-iframe width="600" height="200" sandbox="allow-scripts allow-same-origin" layout="responsive" frameborder="0" src="masterprotocol://www.example.com"></amp-iframe>', '<amp-iframe width="600" height="200" sandbox="allow-scripts allow-same-origin" layout="responsive" frameborder="0"></amp-iframe>', array( 'amp-iframe' ), ), - 'amp-ima-video' => array( + 'amp-ima-video' => array( ' <amp-ima-video width="640" height="360" data-tag="https://example.com/foo" layout="responsive" data-src="https://example.com/bar"> <source src="https://example.com/foo.mp4" type="video/mp4"> @@ -162,86 +162,86 @@ public function get_body_data() { array( 'amp-ima-video' ), ), - 'amp-ima-video_missing_required_attribute' => array( + 'amp-ima-video_missing_required_attribute' => array( '<amp-ima-video width="640" height="360" layout="responsive" data-src="https://example.com/bar"></amp-ima-video>', '', ), - 'amp-imgur' => array( + 'amp-imgur' => array( '<amp-imgur data-imgur-id="54321" layout="responsive" width="540" height="663"></amp-imgur>', null, // No change. array( 'amp-imgur' ), ), - 'amp-install-serviceworker' => array( + 'amp-install-serviceworker' => array( '<amp-install-serviceworker src="https://www.emample.com/worker.js" data-iframe-src="https://www.example.com/serviceworker.html" layout="nodisplay"></amp-install-serviceworker>', null, // No change. array( 'amp-install-serviceworker' ), ), - 'amp-izlesene' => array( + 'amp-izlesene' => array( '<amp-izlesene data-videoid="4321" layout="responsive" width="432" height="123"></amp-izlesene>', null, // No change. array( 'amp-izlesene' ), ), - 'amp-mathml' => array( + 'amp-mathml' => array( '<amp-mathml layout="container" inline data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"></amp-mathml>', null, // No change. array( 'amp-mathml' ), ), - 'amp-riddle-quiz' => array( + 'amp-riddle-quiz' => array( '<amp-riddle-quiz layout="responsive" width="600" height="400" data-riddle-id="25799"></amp-riddle-quiz>', null, // No change. array( 'amp-riddle-quiz' ), ), - 'amp-wistia-player' => array( + 'amp-wistia-player' => array( '<amp-wistia-player data-media-hashed-id="u8p9wq6mq8" width="512" height="360"></amp-wistia-player>', null, // No change. array( 'amp-wistia-player' ), ), - 'amp-byside-content' => array( + 'amp-byside-content' => array( '<amp-byside-content data-webcare-id="D6604AE5D0" data-channel="" data-lang="pt" data-fid="" data-label="amp-number" layout="fixed" width="120" height="40"></amp-byside-content>', null, // No change. array( 'amp-byside-content' ), ), - 'amp-bind-macro' => array( + 'amp-bind-macro' => array( '<amp-bind-macro id="circleArea" arguments="radius" expression="3.14 * radius * radius"></amp-bind-macro>', null, // No change. array( 'amp-bind' ), ), - 'amp-nexxtv-player' => array( + 'amp-nexxtv-player' => array( '<amp-nexxtv-player data-mediaid="123ABC" data-client="4321"></amp-nexxtv-player>', null, // No change. array( 'amp-nexxtv-player' ), ), - 'amp-playbuzz' => array( + 'amp-playbuzz' => array( '<amp-playbuzz src="id-from-the-content-here" height="500" data-item-info="true" data-share-buttons="true" data-comments="true"></amp-playbuzz>', null, // No change. array( 'amp-playbuzz' ), ), - 'amp-playbuzz_no_src' => array( + 'amp-playbuzz_no_src' => array( '<amp-playbuzz height="500" data-item-info="true"></amp-playbuzz>', null, // @todo This actually should be stripped because . array( 'amp-playbuzz' ), ), // AMP-NEXT-PAGE > [separator]. - 'reference-point-amp-next-page-separator' => array( + 'reference-point-amp-next-page-separator' => array( '<amp-next-page src="https://example.com/config.json"><div separator><h1>Keep reading</h1></div></amp-next-page>', null, array( 'amp-next-page' ), ), // amp-next-page extension .json configuration. - 'reference-point-amp-next-page-json-config' => array( + 'reference-point-amp-next-page-json-config' => array( '<amp-next-page><script type="application/json">{"pages": []}</script></amp-next-page>', null, array( 'amp-next-page' ), @@ -253,25 +253,25 @@ public function get_body_data() { array( 'amp-carousel', 'amp-lightbox-gallery' ), ), - 'reference-point-lightbox-thumbnail-id' => array( + 'reference-point-lightbox-thumbnail-id' => array( '<amp-img src="/awesome.png" width="300" height="300" lightbox lightbox-thumbnail-id="a"></amp-img>', null, array( 'amp-lightbox-gallery' ), ), - 'lightbox-with-amp-carousel' => array( + 'lightbox-with-amp-carousel' => array( '<amp-carousel lightbox width="1600" height="900" layout="responsive" type="slides"><amp-img src="image1" width="200" height="100"></amp-img><amp-img src="image1" width="200" height="100"></amp-img><amp-img src="image1" width="200" height="100"></amp-img></amp-carousel>', null, array( 'amp-lightbox-gallery', 'amp-carousel' ), ), - 'reference-points-amp-live-list' => array( + 'reference-points-amp-live-list' => array( '<amp-live-list id="my-live-list" data-poll-interval="15000" data-max-items-per-page="20"><button update on="tap:my-live-list.update">You have updates!</button><div items></div><div pagination></div></amp-live-list>', null, array( 'amp-live-list' ), ), - 'reference-points-amp-story' => call_user_func( + 'reference-points-amp-story' => call_user_func( function () { $html = str_replace( array( "\n", "\t" ), @@ -331,96 +331,96 @@ function () { } ), - 'reference-points-bad' => array( + 'reference-points-bad' => array( '<div lightbox-thumbnail-id update items pagination separator option selected disabled>BAD REFERENCE POINTS</div>', '<div>BAD REFERENCE POINTS</div>', array(), ), - 'amp-position-observer' => array( + 'amp-position-observer' => array( '<amp-position-observer intersection-ratios="1"></amp-position-observer>', null, // No change. array( 'amp-position-observer' ), ), - 'amp-twitter' => array( + 'amp-twitter' => array( '<amp-twitter width="321" height="543" layout="responsive" data-tweetid="98765"></amp-twitter>', null, // No change. array( 'amp-twitter' ), ), - 'amp-user-notification' => array( + 'amp-user-notification' => array( '<amp-user-notification layout="nodisplay" id="amp-user-notification1" data-show-if-href="https://example.com/api/show?timestamp=TIMESTAMP" data-dismiss-href="https://example.com/api/echo/post">This site uses cookies to personalize content.<a class="btn" on="tap:amp-user-notification1.dismiss">I accept</a></amp-user-notification>', '<amp-user-notification layout="nodisplay" id="amp-user-notification1" data-show-if-href="https://example.com/api/show?timestamp=TIMESTAMP" data-dismiss-href="https://example.com/api/echo/post">This site uses cookies to personalize content.<a class="btn" on="tap:amp-user-notification1.dismiss">I accept</a></amp-user-notification>', array( 'amp-user-notification' ), ), - 'amp-video' => array( + 'amp-video' => array( '<amp-video width="432" height="987" src="/video/location.mp4"></amp-video>', null, // No change. array( 'amp-video' ), ), - 'amp_video_children' => array( + 'amp_video_children' => array( '<amp-video width="432" height="987"><track kind="subtitles" src="https://example.com/sampleChapters.vtt" srclang="en"><source src="foo.webm" type="video/webm"><source src="foo.ogg" type="video/ogg"><div placeholder>Placeholder</div><span fallback>Fallback</span></amp-video>', null, // No change. array( 'amp-video' ), ), - 'amp_audio_children' => array( + 'amp_audio_children' => array( '<amp-audio><track kind="subtitles" src="https://example.com/sampleChapters.vtt" srclang="en"><source src="foo.mp3" type="audio/mp3"><source src="foo.wav" type="audio/wav"><div placeholder>Placeholder</div><span fallback>Fallback</span></amp-audio>', null, // No change. array( 'amp-audio' ), ), - 'amp-vk' => array( + 'amp-vk' => array( '<amp-vk width="500" height="300" data-embedtype="post" layout="responsive"></amp-vk>', null, // No change. array( 'amp-vk' ), ), - 'amp-apester-media' => array( + 'amp-apester-media' => array( '<amp-apester-media height="444" data-apester-media-id="57a336dba187a2ca3005e826" layout="fixed-height"></amp-apester-media>', '<amp-apester-media height="444" data-apester-media-id="57a336dba187a2ca3005e826" layout="fixed-height"></amp-apester-media>', array( 'amp-apester-media' ), ), - 'button' => array( + 'button' => array( '<button on="tap:AMP.setState(foo=\'foo\', isButtonDisabled=true, textClass=\'redBackground\', imgSrc=\'https://ampbyexample.com/img/Shetland_Sheepdog.jpg\', imgSize=200, imgAlt=\'Sheepdog\', videoSrc=\'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerJoyrides.mp4\')">Click me</button>', null, ), - 'brid-player' => array( + 'brid-player' => array( '<amp-brid-player data-dynamic="abc" data-partner="264" data-player="4144" data-video="13663" layout="responsive" width="480" height="270"></amp-brid-player>', null, array( 'amp-brid-player' ), ), - 'brightcove' => array( + 'brightcove' => array( '<amp-brightcove data-account="906043040001" data-video-id="1401169490001" data-player="180a5658-8be8-4f33-8eba-d562ab41b40c" layout="responsive" width="480" height="270"></amp-brightcove>', '<amp-brightcove data-account="906043040001" data-video-id="1401169490001" data-player="180a5658-8be8-4f33-8eba-d562ab41b40c" layout="responsive" width="480" height="270"></amp-brightcove>', array( 'amp-brightcove' ), ), - 'carousel_slides' => array( + 'carousel_slides' => array( '<amp-carousel width="400" height="300" layout="responsive" type="slides" controls=""><div>hello world</div><amp-img src="https://lh3.googleusercontent.com/pSECrJ82R7-AqeBCOEPGPM9iG9OEIQ_QXcbubWIOdkY=w400-h300-no-n" layout="fill"></amp-img><amp-img src="https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-Rf78IofLb9QjS5_0mqsY1zEFc=w400-h300-no-n" width="400" height="300" layout="responsive"></amp-img><amp-img src="https://lh3.googleusercontent.com/Z4gtm5Bkxyv21Z2PtbTf95Clb9AE4VTR6olbBKYrenM=w400-h300-no-n" width="400" height="300" layout="responsive"></amp-img><amp-soundcloud height="300" layout="fixed-height" data-trackid="243169232"></amp-soundcloud><amp-youtube data-videoid="mGENRKrdoGY" width="400" height="300"></amp-youtube><amp-anim src="https://lh3.googleusercontent.com/qNn8GDz8Jfd-s9lt3Nc4lJeLjVyEaqGJTk1vuCUWazCmAeOBVjSWDD0SMTU7x0zhVe5UzOTKR0n-kN4SXx7yElvpKYvCMaRyS_g-jydhJ_cEVYmYPiZ_j1Y9de43mlKxU6s06uK1NAlpbSkL_046amEKOdgIACICkuWfOBwlw2hUDfjPOWskeyMrcTu8XOEerCLuVqXugG31QC345hz3lUyOlkdT9fMYVUynSERGNzHba7bXMOxKRe3izS5DIWUgJs3oeKYqA-V8iqgCvneD1jj0Ff68V_ajm4BDchQubBJU0ytXVkoWh27ngeEHubpnApOS6fcGsjPxeuMjnzAUtoTsiXz2FZi1mMrxrblJ-kZoAq1DJ95cnoqoa2CYq3BTgq2E8BRe2paNxLJ5GXBCTpNdXMpVJc6eD7ceijQyn-2qanilX-iK3ChbOq0uBHMvsdoC_LsFOu5KzbbNH71vM3DPkvDGmHJmF67Vj8sQ6uBrLnzpYlCyN4-Y9frR8zugDcqX5Q=w400-h300-no" width="400" height="300"><amp-img placeholder="" src="https://lh3.googleusercontent.com/qNn8GDz8Jfd-s9lt3Nc4lJeLjVyEaqGJTk1vuCUWazCmAeOBVjSWDD0SMTU7x0zhVe5UzOTKR0n-kN4SXx7yElvpKYvCMaRyS_g-jydhJ_cEVYmYPiZ_j1Y9de43mlKxU6s06uK1NAlpbSkL_046amEKOdgIACICkuWfOBwlw2hUDfjPOWskeyMrcTu8XOEerCLuVqXugG31QC345hz3lUyOlkdT9fMYVUynSERGNzHba7bXMOxKRe3izS5DIWUgJs3oeKYqA-V8iqgCvneD1jj0Ff68V_ajm4BDchQubBJU0ytXVkoWh27ngeEHubpnApOS6fcGsjPxeuMjnzAUtoTsiXz2FZi1mMrxrblJ-kZoAq1DJ95cnoqoa2CYq3BTgq2E8BRe2paNxLJ5GXBCTpNdXMpVJc6eD7ceijQyn-2qanilX-iK3ChbOq0uBHMvsdoC_LsFOu5KzbbNH71vM3DPkvDGmHJmF67Vj8sQ6uBrLnzpYlCyN4-Y9frR8zugDcqX5Q=w400-h300-no-k" width="400" height="300"></amp-img></amp-anim><amp-audio src="https://ia801402.us.archive.org/16/items/EDIS-SRP-0197-06/EDIS-SRP-0197-06.mp3"></amp-audio><amp-brightcove data-account="906043040001" data-video-id="1401169490001" data-player="180a5658-8be8-4f33-8eba-d562ab41b40c" layout="responsive" width="480" height="270"></amp-brightcove><amp-vimeo data-videoid="27246366" width="500" height="281"></amp-vimeo><amp-dailymotion data-videoid="x3rdtfy" width="500" height="281"></amp-dailymotion><amp-vine data-vineid="MdKjXez002d" width="381" height="381" layout="responsive"></amp-vine><amp-video src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerJoyrides.mp4" width="358" height="204" layout="responsive" controls=""></amp-video></amp-carousel><amp-carousel width="auto" height="300" controls=""><div>hello world</div><amp-img src="https://lh3.googleusercontent.com/pSECrJ82R7-AqeBCOEPGPM9iG9OEIQ_QXcbubWIOdkY=w400-h300-no-n" width="400" height="300"></amp-img><amp-img src="https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-Rf78IofLb9QjS5_0mqsY1zEFc=w400-h300-no-n" width="400" height="300"></amp-img><amp-img src="https://lh3.googleusercontent.com/Z4gtm5Bkxyv21Z2PtbTf95Clb9AE4VTR6olbBKYrenM=w400-h300-no-n" width="400" height="300"></amp-img><amp-soundcloud height="300" layout="fixed-height" data-trackid="243169232"></amp-soundcloud><amp-youtube data-videoid="mGENRKrdoGY" width="400" height="300"></amp-youtube><amp-anim src="https://lh3.googleusercontent.com/qNn8GDz8Jfd-s9lt3Nc4lJeLjVyEaqGJTk1vuCUWazCmAeOBVjSWDD0SMTU7x0zhVe5UzOTKR0n-kN4SXx7yElvpKYvCMaRyS_g-jydhJ_cEVYmYPiZ_j1Y9de43mlKxU6s06uK1NAlpbSkL_046amEKOdgIACICkuWfOBwlw2hUDfjPOWskeyMrcTu8XOEerCLuVqXugG31QC345hz3lUyOlkdT9fMYVUynSERGNzHba7bXMOxKRe3izS5DIWUgJs3oeKYqA-V8iqgCvneD1jj0Ff68V_ajm4BDchQubBJU0ytXVkoWh27ngeEHubpnApOS6fcGsjPxeuMjnzAUtoTsiXz2FZi1mMrxrblJ-kZoAq1DJ95cnoqoa2CYq3BTgq2E8BRe2paNxLJ5GXBCTpNdXMpVJc6eD7ceijQyn-2qanilX-iK3ChbOq0uBHMvsdoC_LsFOu5KzbbNH71vM3DPkvDGmHJmF67Vj8sQ6uBrLnzpYlCyN4-Y9frR8zugDcqX5Q=w400-h300-no" width="400" height="300"><amp-img placeholder="" src="https://lh3.googleusercontent.com/qNn8GDz8Jfd-s9lt3Nc4lJeLjVyEaqGJTk1vuCUWazCmAeOBVjSWDD0SMTU7x0zhVe5UzOTKR0n-kN4SXx7yElvpKYvCMaRyS_g-jydhJ_cEVYmYPiZ_j1Y9de43mlKxU6s06uK1NAlpbSkL_046amEKOdgIACICkuWfOBwlw2hUDfjPOWskeyMrcTu8XOEerCLuVqXugG31QC345hz3lUyOlkdT9fMYVUynSERGNzHba7bXMOxKRe3izS5DIWUgJs3oeKYqA-V8iqgCvneD1jj0Ff68V_ajm4BDchQubBJU0ytXVkoWh27ngeEHubpnApOS6fcGsjPxeuMjnzAUtoTsiXz2FZi1mMrxrblJ-kZoAq1DJ95cnoqoa2CYq3BTgq2E8BRe2paNxLJ5GXBCTpNdXMpVJc6eD7ceijQyn-2qanilX-iK3ChbOq0uBHMvsdoC_LsFOu5KzbbNH71vM3DPkvDGmHJmF67Vj8sQ6uBrLnzpYlCyN4-Y9frR8zugDcqX5Q=w400-h300-no-k" width="400" height="300"></amp-img></amp-anim><amp-audio src="https://ia801402.us.archive.org/16/items/EDIS-SRP-0197-06/EDIS-SRP-0197-06.mp3"></amp-audio><amp-brightcove data-account="906043040001" data-video-id="1401169490001" data-player="180a5658-8be8-4f33-8eba-d562ab41b40c" layout="responsive" width="300" height="300"></amp-brightcove><amp-vimeo data-videoid="27246366" width="300" height="300"></amp-vimeo><amp-dailymotion data-videoid="x3rdtfy" width="300" height="300"></amp-dailymotion><amp-vine data-vineid="MdKjXez002d" width="300" height="300"></amp-vine><amp-video src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerJoyrides.mp4" width="300" height="300" controls=""></amp-video></amp-carousel>', '<amp-carousel width="400" height="300" layout="responsive" type="slides" controls=""><div>hello world</div><amp-img src="https://lh3.googleusercontent.com/pSECrJ82R7-AqeBCOEPGPM9iG9OEIQ_QXcbubWIOdkY=w400-h300-no-n" layout="fill"></amp-img><amp-img src="https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-Rf78IofLb9QjS5_0mqsY1zEFc=w400-h300-no-n" width="400" height="300" layout="responsive"></amp-img><amp-img src="https://lh3.googleusercontent.com/Z4gtm5Bkxyv21Z2PtbTf95Clb9AE4VTR6olbBKYrenM=w400-h300-no-n" width="400" height="300" layout="responsive"></amp-img><amp-soundcloud height="300" layout="fixed-height" data-trackid="243169232"></amp-soundcloud><amp-youtube data-videoid="mGENRKrdoGY" width="400" height="300"></amp-youtube><amp-anim src="https://lh3.googleusercontent.com/qNn8GDz8Jfd-s9lt3Nc4lJeLjVyEaqGJTk1vuCUWazCmAeOBVjSWDD0SMTU7x0zhVe5UzOTKR0n-kN4SXx7yElvpKYvCMaRyS_g-jydhJ_cEVYmYPiZ_j1Y9de43mlKxU6s06uK1NAlpbSkL_046amEKOdgIACICkuWfOBwlw2hUDfjPOWskeyMrcTu8XOEerCLuVqXugG31QC345hz3lUyOlkdT9fMYVUynSERGNzHba7bXMOxKRe3izS5DIWUgJs3oeKYqA-V8iqgCvneD1jj0Ff68V_ajm4BDchQubBJU0ytXVkoWh27ngeEHubpnApOS6fcGsjPxeuMjnzAUtoTsiXz2FZi1mMrxrblJ-kZoAq1DJ95cnoqoa2CYq3BTgq2E8BRe2paNxLJ5GXBCTpNdXMpVJc6eD7ceijQyn-2qanilX-iK3ChbOq0uBHMvsdoC_LsFOu5KzbbNH71vM3DPkvDGmHJmF67Vj8sQ6uBrLnzpYlCyN4-Y9frR8zugDcqX5Q=w400-h300-no" width="400" height="300"><amp-img placeholder="" src="https://lh3.googleusercontent.com/qNn8GDz8Jfd-s9lt3Nc4lJeLjVyEaqGJTk1vuCUWazCmAeOBVjSWDD0SMTU7x0zhVe5UzOTKR0n-kN4SXx7yElvpKYvCMaRyS_g-jydhJ_cEVYmYPiZ_j1Y9de43mlKxU6s06uK1NAlpbSkL_046amEKOdgIACICkuWfOBwlw2hUDfjPOWskeyMrcTu8XOEerCLuVqXugG31QC345hz3lUyOlkdT9fMYVUynSERGNzHba7bXMOxKRe3izS5DIWUgJs3oeKYqA-V8iqgCvneD1jj0Ff68V_ajm4BDchQubBJU0ytXVkoWh27ngeEHubpnApOS6fcGsjPxeuMjnzAUtoTsiXz2FZi1mMrxrblJ-kZoAq1DJ95cnoqoa2CYq3BTgq2E8BRe2paNxLJ5GXBCTpNdXMpVJc6eD7ceijQyn-2qanilX-iK3ChbOq0uBHMvsdoC_LsFOu5KzbbNH71vM3DPkvDGmHJmF67Vj8sQ6uBrLnzpYlCyN4-Y9frR8zugDcqX5Q=w400-h300-no-k" width="400" height="300"></amp-img></amp-anim><amp-audio src="https://ia801402.us.archive.org/16/items/EDIS-SRP-0197-06/EDIS-SRP-0197-06.mp3"></amp-audio><amp-brightcove data-account="906043040001" data-video-id="1401169490001" data-player="180a5658-8be8-4f33-8eba-d562ab41b40c" layout="responsive" width="480" height="270"></amp-brightcove><amp-vimeo data-videoid="27246366" width="500" height="281"></amp-vimeo><amp-dailymotion data-videoid="x3rdtfy" width="500" height="281"></amp-dailymotion><amp-vine data-vineid="MdKjXez002d" width="381" height="381" layout="responsive"></amp-vine><amp-video src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerJoyrides.mp4" width="358" height="204" layout="responsive" controls=""></amp-video></amp-carousel><amp-carousel width="auto" height="300" controls=""><div>hello world</div><amp-img src="https://lh3.googleusercontent.com/pSECrJ82R7-AqeBCOEPGPM9iG9OEIQ_QXcbubWIOdkY=w400-h300-no-n" width="400" height="300"></amp-img><amp-img src="https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-Rf78IofLb9QjS5_0mqsY1zEFc=w400-h300-no-n" width="400" height="300"></amp-img><amp-img src="https://lh3.googleusercontent.com/Z4gtm5Bkxyv21Z2PtbTf95Clb9AE4VTR6olbBKYrenM=w400-h300-no-n" width="400" height="300"></amp-img><amp-soundcloud height="300" layout="fixed-height" data-trackid="243169232"></amp-soundcloud><amp-youtube data-videoid="mGENRKrdoGY" width="400" height="300"></amp-youtube><amp-anim src="https://lh3.googleusercontent.com/qNn8GDz8Jfd-s9lt3Nc4lJeLjVyEaqGJTk1vuCUWazCmAeOBVjSWDD0SMTU7x0zhVe5UzOTKR0n-kN4SXx7yElvpKYvCMaRyS_g-jydhJ_cEVYmYPiZ_j1Y9de43mlKxU6s06uK1NAlpbSkL_046amEKOdgIACICkuWfOBwlw2hUDfjPOWskeyMrcTu8XOEerCLuVqXugG31QC345hz3lUyOlkdT9fMYVUynSERGNzHba7bXMOxKRe3izS5DIWUgJs3oeKYqA-V8iqgCvneD1jj0Ff68V_ajm4BDchQubBJU0ytXVkoWh27ngeEHubpnApOS6fcGsjPxeuMjnzAUtoTsiXz2FZi1mMrxrblJ-kZoAq1DJ95cnoqoa2CYq3BTgq2E8BRe2paNxLJ5GXBCTpNdXMpVJc6eD7ceijQyn-2qanilX-iK3ChbOq0uBHMvsdoC_LsFOu5KzbbNH71vM3DPkvDGmHJmF67Vj8sQ6uBrLnzpYlCyN4-Y9frR8zugDcqX5Q=w400-h300-no" width="400" height="300"><amp-img placeholder="" src="https://lh3.googleusercontent.com/qNn8GDz8Jfd-s9lt3Nc4lJeLjVyEaqGJTk1vuCUWazCmAeOBVjSWDD0SMTU7x0zhVe5UzOTKR0n-kN4SXx7yElvpKYvCMaRyS_g-jydhJ_cEVYmYPiZ_j1Y9de43mlKxU6s06uK1NAlpbSkL_046amEKOdgIACICkuWfOBwlw2hUDfjPOWskeyMrcTu8XOEerCLuVqXugG31QC345hz3lUyOlkdT9fMYVUynSERGNzHba7bXMOxKRe3izS5DIWUgJs3oeKYqA-V8iqgCvneD1jj0Ff68V_ajm4BDchQubBJU0ytXVkoWh27ngeEHubpnApOS6fcGsjPxeuMjnzAUtoTsiXz2FZi1mMrxrblJ-kZoAq1DJ95cnoqoa2CYq3BTgq2E8BRe2paNxLJ5GXBCTpNdXMpVJc6eD7ceijQyn-2qanilX-iK3ChbOq0uBHMvsdoC_LsFOu5KzbbNH71vM3DPkvDGmHJmF67Vj8sQ6uBrLnzpYlCyN4-Y9frR8zugDcqX5Q=w400-h300-no-k" width="400" height="300"></amp-img></amp-anim><amp-audio src="https://ia801402.us.archive.org/16/items/EDIS-SRP-0197-06/EDIS-SRP-0197-06.mp3"></amp-audio><amp-brightcove data-account="906043040001" data-video-id="1401169490001" data-player="180a5658-8be8-4f33-8eba-d562ab41b40c" layout="responsive" width="300" height="300"></amp-brightcove><amp-vimeo data-videoid="27246366" width="300" height="300"></amp-vimeo><amp-dailymotion data-videoid="x3rdtfy" width="300" height="300"></amp-dailymotion><amp-vine data-vineid="MdKjXez002d" width="300" height="300"></amp-vine><amp-video src="https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerJoyrides.mp4" width="300" height="300" controls=""></amp-video></amp-carousel>', array( 'amp-anim', 'amp-audio', 'amp-brightcove', 'amp-carousel', 'amp-dailymotion', 'amp-soundcloud', 'amp-video', 'amp-vimeo', 'amp-vine', 'amp-youtube' ), ), - 'carousel_simple' => array( + 'carousel_simple' => array( '<amp-carousel width="450" height="300"></amp-carousel>', null, array( 'amp-carousel' ), ), - 'carousel_lightbox' => array( + 'carousel_lightbox' => array( '<amp-carousel width="450" height="300" delay="100" arrows [slide]="foo" autoplay loop lightbox></amp-carousel>', null, array( 'amp-bind', 'amp-carousel', 'amp-lightbox-gallery' ), ), - 'base_carousel' => array( + 'base_carousel' => array( ' <amp-base-carousel width="4" height="3" auto-advance="true" layout="responsive" heights="(min-width: 600px) calc(100% * 4 * 3 / 2), calc(100% * 3 * 3 / 2)" visible-count="(min-width: 600px) 4, 3" advance-count="(min-width: 600px) 4, 3"> <div lightbox-thumbnail-id="food">first slide</div> @@ -431,75 +431,75 @@ function () { array( 'amp-base-carousel' ), ), - 'amp-dailymotion' => array( + 'amp-dailymotion' => array( '<amp-dailymotion data-videoid="x3rdtfy" width="500" height="281" dock></amp-dailymotion><h4>Default (responsive)</h4><amp-dailymotion data-videoid="x3rdtfy" width="500" height="281" layout="responsive"></amp-dailymotion><h4>Custom</h4><amp-dailymotion data-videoid="x3rdtfy" data-endscreen-enable="false" data-sharing-enable="false" data-ui-highlight="444444" data-ui-logo="false" data-info="false" width="640" height="360"></amp-dailymotion>', null, array( 'amp-dailymotion', 'amp-video-docking' ), ), // Try to test for NAME_VALUE_PARENT_DISPATCH. - 'amp_ima_video' => array( + 'amp_ima_video' => array( '<amp-ima-video width="640" height="360" layout="responsive" data-tag="ads.xml" data-poster="poster.png"><source src="foo.mp4" type="video/mp4"><source src="foo.webm" type="video/webm"><track label="English subtitles" kind="subtitles" srclang="en" src="https://example.com/subtitles.vtt"><script type="application/json">{"locale": "en", "numRedirects": 4}</script></amp-ima-video>', null, // No change. array( 'amp-ima-video' ), ), // Try to test for NAME_VALUE_DISPATCH. - 'doubleclick-1' => array( + 'doubleclick-1' => array( '<amp-ad width="480" height="75" type="doubleclick" data-slot="/4119129/mobile_ad_banner" data-multi-size="320x50" class="dashedborder"></amp-ad>', '<amp-ad width="480" height="75" type="doubleclick" data-slot="/4119129/mobile_ad_banner" data-multi-size="320x50" class="dashedborder"></amp-ad>', array( 'amp-ad' ), ), // Try to test for NAME_DISPATCH. - 'nav_dispatch_key' => array( + 'nav_dispatch_key' => array( '<nav><a href="https://example.com">Example</a></nav>', null, ), - 'json_linked_data' => array( + 'json_linked_data' => array( '<script type="application/ld+json">{"@context":"http:\/\/schema.org"}</script>', null, // No Change. ), - 'json_linked_data_with_bad_cdata' => array( + 'json_linked_data_with_bad_cdata' => array( '<script type="application/ld+json"></script>', '', ), - 'facebook' => array( + 'facebook' => array( '<amp-facebook width="552" height="303" layout="responsive" data-href="https://www.facebook.com/zuck/posts/10102593740125791"></amp-facebook><h1>More Posts</h1>', '<amp-facebook width="552" height="303" layout="responsive" data-href="https://www.facebook.com/zuck/posts/10102593740125791"></amp-facebook><h1>More Posts</h1>', array( 'amp-facebook' ), ), - 'font' => array( + 'font' => array( '<amp-font layout="nodisplay" font-family="Comic AMP" timeout="2000"></amp-font><amp-font layout="nodisplay" font-family="Comic AMP Bold" timeout="3000" font-weight="bold"></amp-font>', '<amp-font layout="nodisplay" font-family="Comic AMP" timeout="2000"></amp-font><amp-font layout="nodisplay" font-family="Comic AMP Bold" timeout="3000" font-weight="bold"></amp-font>', array( 'amp-font' ), ), - 'form' => array( + 'form' => array( '<form method="get" action="/form/search-html/get" target="_blank"><fieldset><label><span>Search for</span><input type="search" placeholder="test" name="term" required></label><input type="submit" value="Search"></fieldset></form>', '<form method="get" action="/form/search-html/get" target="_blank"><fieldset><label><span>Search for</span><input type="search" placeholder="test" name="term" required></label><input type="submit" value="Search"></fieldset></form>', array( 'amp-form' ), ), - 'gfycat' => array( + 'gfycat' => array( '<amp-gfycat data-gfyid="BareSecondaryFlamingo" width="225" height="400"></amp-gfycat>', '<amp-gfycat data-gfyid="BareSecondaryFlamingo" width="225" height="400"></amp-gfycat>', array( 'amp-gfycat' ), ), - 'h2' => array( + 'h2' => array( '<h2>Example Text</h2>', ), - 'empty_element' => array( + 'empty_element' => array( '<br>', ), - 'merge_two_attr_specs' => array( + 'merge_two_attr_specs' => array( '<div submit-success>Whatever</div>', '<div>Whatever</div>', ), @@ -509,15 +509,15 @@ function () { '<a href="">Click me.</a>', ), - 'host_relative_url_allowed' => array( + 'host_relative_url_allowed' => array( '<a href="/path/to/content">Click me.</a>', ), - 'protocol_relative_url_allowed' => array( + 'protocol_relative_url_allowed' => array( '<a href="//example.com/path/to/content">Click me.</a>', ), - 'node_with_whiteilsted_protocol_http_allowed' => array( + 'node_with_whiteilsted_protocol_http_allowed' => array( '<a href="http://example.com/path/to/content">Click me.</a>', ), @@ -537,20 +537,20 @@ function () { ), ), - 'attribute_value_valid' => array( + 'attribute_value_valid' => array( '<template type="amp-mustache">Hello {{world}}! <a href="{{user_url}}" title="{{user_name}}">Homepage</a> User content: {{{some_formatting}}} A guy with Mustache: :-{). {{#returning}}Welcome back!{{/returning}} {{^returning}}Welcome for the first time!{{/returning}} </template>', null, array( 'amp-mustache' ), ), - 'attribute_value_invalid' => array( + 'attribute_value_invalid' => array( // type is mandatory, so the node is removed. '<template type="bad-type">Template Data</template>', '', array(), // No scripts because removed. ), - 'attribute_amp_accordion_value' => call_user_func( + 'attribute_amp_accordion_value' => call_user_func( function() { $html = str_replace( array( "\n", "\t" ), @@ -599,7 +599,7 @@ function() { '<a>Click me.</a>', ), - 'attribute_value_with_required_regex' => array( + 'attribute_value_with_required_regex' => array( '<a target="_blank">Click me.</a>', ), @@ -644,13 +644,13 @@ function() { array( 'amp-dailymotion' ), ), - 'attribute_bad_attr_with_no_value_removed' => array( + 'attribute_bad_attr_with_no_value_removed' => array( '<amp-ad type="adsense" bad-attr-no-value><div fallback>something here</div></amp-ad>', '<amp-ad type="adsense"><div fallback>something here</div></amp-ad>', array( 'amp-ad' ), ), - 'attribute_bad_attr_with_value_removed' => array( + 'attribute_bad_attr_with_value_removed' => array( '<amp-ad type="adsense" bad-attr="some-value">something here</amp-ad>', '<amp-ad type="adsense">something here</amp-ad>', array( 'amp-ad' ), @@ -662,22 +662,22 @@ function() { '', ), - 'remove_node_without_mandatory_attribute' => array( + 'remove_node_without_mandatory_attribute' => array( '<script>console.log()</script>', '', ), - 'remove_script_with_async_attribute' => array( + 'remove_script_with_async_attribute' => array( '<script async src="//cdn.someecards.com/assets/embed/embed-v1.07.min.js" charset="utf-8"></script>', // phpcs:ignore '', ), - 'remove_invalid_json_script' => array( + 'remove_invalid_json_script' => array( '<script type="application/json" class="wp-playlist-script">{}</script>', '', ), - 'allow_node_with_valid_mandatory_attribute' => array( + 'allow_node_with_valid_mandatory_attribute' => array( '<amp-analytics><script type="application/json"></script></amp-analytics>', null, // No change. array( 'amp-analytics' ), @@ -698,7 +698,7 @@ function() { '<div><span><span class="not-empty"></span></span></div>', ), - 'replace_non_whitelisted_node_with_children' => array( + 'replace_non_whitelisted_node_with_children' => array( '<p>This is some text <invalid_tag>with a disallowed tag</invalid_tag> in the middle of it.</p>', '<p>This is some text with a disallowed tag in the middle of it.</p>', ), @@ -714,13 +714,13 @@ function() { array( 'amp-form' ), ), - 'disallowed_empty_attr_removed' => array( + 'disallowed_empty_attr_removed' => array( '<amp-user-notification data-dismiss-href></amp-user-notification>', '<amp-user-notification></amp-user-notification>', array( 'amp-user-notification' ), ), - 'allowed_empty_attr' => array( + 'allowed_empty_attr' => array( '<a border=""></a>', ), @@ -730,7 +730,7 @@ function() { array( 'amp-sidebar' ), ), - 'amp_story_with_amp_sidebar' => array( + 'amp_story_with_amp_sidebar' => array( str_replace( array( "\n", "\t" ), '', @@ -756,7 +756,7 @@ function() { array( 'amp-sidebar', 'amp-story' ), ), - 'amp_sidebar_with_autoscroll' => array( + 'amp_sidebar_with_autoscroll' => array( str_replace( array( "\n", "\t" ), '', @@ -780,12 +780,12 @@ function() { array( 'amp-sidebar' ), ), - 'remove_node_without_mandatory_ancestor' => array( + 'remove_node_without_mandatory_ancestor' => array( '<div>All I have is this div, when all you want is a noscript tag.<audio>Sweet tunes</audio></div>', '<div>All I have is this div, when all you want is a noscript tag.</div>', ), - 'amp-img_with_good_protocols' => array( + 'amp-img_with_good_protocols' => array( '<amp-img src="https://example.com/resource1" srcset="https://example.com/resource1 320w, https://example.com/resource2 480w"></amp-img>', ), @@ -793,44 +793,44 @@ function() { '<amp-img src="/winning:yes.jpg" width="100" height="200"></amp-img>', ), - 'allowed_tag_only' => array( + 'allowed_tag_only' => array( '<p>Text</p><img src="/path/to/file.jpg">', '<p>Text</p>', ), - 'disallowed_attributes' => array( + 'disallowed_attributes' => array( '<a href="/path/to/file.jpg" style="border: 1px solid red !important;">Link</a>', '<a href="/path/to/file.jpg">Link</a>', ), - 'onclick_attribute' => array( + 'onclick_attribute' => array( '<a href="/path/to/file.jpg" onclick="alert(e);">Link</a>', '<a href="/path/to/file.jpg">Link</a>', ), - 'on_attribute' => array( + 'on_attribute' => array( '<button on="tap:my-lightbox">Tap Me</button>', ), - 'multiple_disallowed_attributes' => array( + 'multiple_disallowed_attributes' => array( '<a href="/path/to/file.jpg" style="border: 1px solid red !important;" onclick="alert(e);">Link</a>', '<a href="/path/to/file.jpg">Link</a>', ), - 'attribute_recursive' => array( + 'attribute_recursive' => array( '<div style="border: 1px solid red !important;"><a href="/path/to/file.jpg" onclick="alert(e);">Hello World</a></div>', '<div><a href="/path/to/file.jpg">Hello World</a></div>', ), - 'no_strip_amp_tags' => array( + 'no_strip_amp_tags' => array( '<amp-img src="http://example.com/path/to/file.jpg" width="300" height="300"></amp-img>', ), - 'a_with_attachment_rel' => array( + 'a_with_attachment_rel' => array( '<a href="http://example.com" rel="wp-att-1686">Link</a>', ), - 'a_with_invalid_name' => array( + 'a_with_invalid_name' => array( '<a name=shadowRoot>Shadow Root!</a>', '<a>Shadow Root!</a>', ), @@ -839,66 +839,66 @@ function() { '<a href="http://example.com" rel="attachment wp-att-1686">Link</a>', ), - 'a_with_rev' => array( + 'a_with_rev' => array( '<a href="http://example.com" rev="footnote">Link</a>', ), - 'a_with_target_blank' => array( + 'a_with_target_blank' => array( '<a href="http://example.com" target="_blank">Link</a>', ), - 'a_with_target_uppercase_blank' => array( + 'a_with_target_uppercase_blank' => array( '<a href="http://example.com" target="_BLANK">Link</a>', '<a href="http://example.com">Link</a>', ), - 'a_with_target_new' => array( + 'a_with_target_new' => array( '<a href="http://example.com" target="_new">Link</a>', '<a href="http://example.com">Link</a>', ), - 'a_with_target_self' => array( + 'a_with_target_self' => array( '<a href="http://example.com" target="_self">Link</a>', ), - 'a_with_target_invalid' => array( + 'a_with_target_invalid' => array( '<a href="http://example.com" target="boom">Link</a>', '<a href="http://example.com">Link</a>', ), - 'a_with_href_invalid' => array( + 'a_with_href_invalid' => array( '<a href="some%20random%20text">Link</a>', ), - 'a_with_href_scheme_tel' => array( + 'a_with_href_scheme_tel' => array( '<a href="tel:4166669999">Call Me, Maybe</a>', ), - 'a_with_href_scheme_sms' => array( + 'a_with_href_scheme_sms' => array( '<a href="sms:4166669999">SMS Me, Maybe</a>', ), - 'a_with_href_scheme_mailto' => array( + 'a_with_href_scheme_mailto' => array( '<a href="mailto:email@example.com">Email Me, Maybe</a>', ), - 'a_with_href_relative' => array( + 'a_with_href_relative' => array( '<a href="/home">Home</a>', ), - 'a_with_anchor' => array( + 'a_with_anchor' => array( '<a href="#section2">Home</a>', ), - 'a_is_anchor' => array( + 'a_is_anchor' => array( '<a name="section2"></a>', ), - 'a_is_achor_with_id' => array( + 'a_is_achor_with_id' => array( '<a id="section3"></a>', ), - 'a_empty' => array( + 'a_empty' => array( '<a>Hello World</a>', ), @@ -907,85 +907,85 @@ function() { '<a><span>Red</span>&<span>Orange</span></a>', ), - 'spans_with_xml_namespaced_attributes' => array( + 'spans_with_xml_namespaced_attributes' => array( '<p><span lang="es" xml:lang="es">hola</span><span xml:space="preserve">mundo</span></p>', '<p><span lang="es">hola</span><span>mundo</span></p>', ), - 'h1_with_size' => array( + 'h1_with_size' => array( '<h1 size="1">Headline</h1>', '<h1>Headline</h1>', ), - 'font_tag' => array( + 'font_tag' => array( '<font size="1">Headline</font>', 'Headline', ), - 'span_with_custom_attr' => array( + 'span_with_custom_attr' => array( '<span class="foo" custom="not-allowed">value</span>', '<span class="foo">value</span>', ), - 'a_with_custom_protocol' => array( + 'a_with_custom_protocol' => array( '<a class="foo" href="custom:bad">value</a>', '<a class="foo" href="">value</a>', ), - 'a_with_wrong_host' => array( + 'a_with_wrong_host' => array( '<a class="foo" href="http://foo bar">value</a>', '<a class="foo" href="">value</a>', ), - 'a_with_encoded_host' => array( + 'a_with_encoded_host' => array( '<a class="foo" href="http://%65%78%61%6d%70%6c%65%2e%63%6f%6d/foo/">value</a>', null, ), - 'a_with_wrong_schemeless_host' => array( + 'a_with_wrong_schemeless_host' => array( '<a class="foo" href="//bad domain with a space.com/foo">value</a>', '<a class="foo" href="">value</a>', ), - 'a_with_mail_host' => array( + 'a_with_mail_host' => array( '<a class="foo" href="mail to:foo@bar.com">value</a>', '<a class="foo" href="">value</a>', ), // font is removed so we should check that other elements are checked as well. - 'font_with_other_bad_elements' => array( + 'font_with_other_bad_elements' => array( '<font size="1">Headline</font><span style="color: blue !important">Span</span>', 'Headline<span>Span</span>', ), - 'amp_bind_attr' => array( + 'amp_bind_attr' => array( '<p [text]="\'Hello \' + foo">Hello World</p><button on="tap:AMP.setState({foo: \'amp-bind\'})">Update</button>', null, // No change. array( 'amp-bind' ), ), - 'amp_bind_with_greater_than_symbol' => array( + 'amp_bind_with_greater_than_symbol' => array( '<div class="home page-template-default page page-id-7 logged-in wp-custom-logo group-blog" [class]="minnow.bodyClasses.concat( minnow.navMenuExpanded ? \'sidebar-open\' : \'\' ).filter( className => \'\' != className )">hello</div>', '<div class="home page-template-default page page-id-7 logged-in wp-custom-logo group-blog" [class]="minnow.bodyClasses.concat( minnow.navMenuExpanded ? \'sidebar-open\' : \'\' ).filter( className => \'\' != className )">hello</div>', array( 'amp-bind' ), ), - 'amp_bad_bind_attr' => array( + 'amp_bad_bind_attr' => array( '<a [href]=\'/\' [hidden]>test</a><p [text]="\'Hello \' + name" [unrecognized] title="Foo"><button [disabled]="" [type]=\'\'>Hello World</button></p>', '<a [href]="/" [hidden]>test</a><p [text]="\'Hello \' + name" title="Foo"><button [disabled]="" [type]="">Hello World</button></p>', array( 'amp-bind' ), ), - 'amp-state' => array( + 'amp-state' => array( '<amp-state id="someNumber"><script type="application/json">4</script></amp-state>', null, array( 'amp-bind' ), ), - 'amp-state-bad' => array( + 'amp-state-bad' => array( '<amp-state id="someNumber"><i>bad</i><script type="application/json">4</script></amp-state>', '', array(), ), - 'amp-state-src' => array( + 'amp-state-src' => array( '<amp-state id="myRemoteState" src="https://data.com/articles.json"></amp-state>', null, array( 'amp-bind' ), @@ -1037,37 +1037,37 @@ function() { array( 'amp-selector', 'amp-form', 'amp-carousel' ), ), - 'amp_live_list_sort' => array( + 'amp_live_list_sort' => array( '<amp-live-list sort="ascending" data-poll-interval="15000" data-max-items-per-page="5" id="amp-live-list-insert-blog"><button update on="tap:amp-live-list-insert-blog.update" class="ampstart-btn ml1 caps">You have updates</button><div items><div id="A green landscape with trees." data-sort-time="20180317225019">Hello</div></div></amp-live-list>', null, // No change. array( 'amp-live-list' ), ), - 'amp_consent' => array( + 'amp_consent' => array( '<amp-consent media="all" noloading></amp-consent>', null, // No change. array( 'amp-consent' ), ), - 'amp_date_picker' => array( + 'amp_date_picker' => array( '<amp-date-picker id="simple-date-picker" type="single" mode="overlay" layout="container" on="select:AMP.setState({date1: event.date, dateType1: event.id})" format="Y-MM-DD" open-after-select input-selector="[name=date1]" class="mr1 ml1 flex picker"><div class="ampstart-input inline-block mt1"><input class="border-none p0" name="date1" placeholder="Pick a date"></div><button class="ampstart-btn m1 caps" on="tap: simple-date-picker.clear">Clear</button></amp-date-picker>', null, // No change. array( 'amp-date-picker' ), ), - 'amp_date_picker_range' => array( + 'amp_date_picker_range' => array( '<amp-date-picker type="range" minimum-nights="2" maximum-nights="4" mode="overlay" id="range-date-picker" on=" select: AMP.setState({ dates: event.dates, startDate: event.start, endDate: event.end })" format="YYYY-MM-DD" open-after-select min="2017-10-26" start-input-selector="#range-start" end-input-selector="#range-end" class="example-picker space-between"><div class="ampstart-input"><input class="border-none p0" id="range-start" placeholder="Start date"></div><div class="ampstart-input"><input class="border-none p0" id="range-end" placeholder="End date"></div><button class="ampstart-btn caps" on="tap:range-date-picker.clear">Clear</button><template type="amp-mustache" info-template><span [text]="(startDate && endDate ? \'You picked \' + startDate.date + \' as start date and \' + endDate.date + \' as end date.\' : \'You will see your chosen dates here.\')"> You will see your chosen dates here.</span></template></amp-date-picker>', null, // No change. array( 'amp-date-picker', 'amp-bind', 'amp-mustache' ), ), - 'amp-delight-player' => array( + 'amp-delight-player' => array( '<amp-delight-player data-content-id="-987521" layout="responsive" width="400" height="300"></amp-delight-player>', null, // No change. array( 'amp-delight-player' ), ), - 'amp-img-layout-allowed' => array( + 'amp-img-layout-allowed' => array( implode( '', array( @@ -1084,43 +1084,43 @@ function() { array(), ), - 'amp-img-layout-illegal' => array( + 'amp-img-layout-illegal' => array( '<amp-img src="/img1.png" width="50" height="50" layout="container"></amp-img>', '<amp-img src="/img1.png" width="50" height="50"></amp-img>', array(), ), - 'amp-img-layout-unknown' => array( + 'amp-img-layout-unknown' => array( '<amp-img src="/img1.png" width="50" height="50" layout="bogus-value"></amp-img>', '<amp-img src="/img1.png" width="50" height="50"></amp-img>', array(), ), - 'non-layout-span-element-attrs' => array( + 'non-layout-span-element-attrs' => array( '<span id="test" width="1" height="1" heights="(min-width:500px) 200px, 80%" sizes="(min-width: 650px) 50vw, 100vw" layout="nodisplay" [height]="1" [width]="1">Test</span>', '<span id="test">Test</span>', array(), ), - 'non-layout-col-element-attrs' => array( + 'non-layout-col-element-attrs' => array( '<table><col class="foo" width="123" style="background:red !important;"><col class="bar" style="background:green !important;" width="12%"><col class="baz" style="background:blue !important;" width="2*"><tr><td>1</td><td>2</td><td>3</td></tr></table>', '<table><col class="foo"><col class="bar"><col class="baz"><tr><td>1</td><td>2</td><td>3</td></tr></table>', array(), ), - 'amp-geo' => array( + 'amp-geo' => array( '<amp-geo layout="nodisplay"><script type="application/json">{ "AmpBind": true, "ISOCountryGroups": { "nafta": [ "ca", "mx", "us", "unknown" ], "waldo": [ "unknown" ], "anz": [ "au", "nz" ] } }</script></amp-geo>', null, array( 'amp-geo' ), ), - 'amp-geo-bad-children' => array( + 'amp-geo-bad-children' => array( '<amp-geo layout="nodisplay"><div>bad</div><script type="application/json">{ "AmpBind": true, "ISOCountryGroups": { "nafta": [ "ca", "mx", "us", "unknown" ], "waldo": [ "unknown" ], "anz": [ "au", "nz" ] } }</script></amp-geo>', '', array(), ), - 'amp-addthis-valid' => array( + 'amp-addthis-valid' => array( ' <amp-addthis width="320" @@ -1133,7 +1133,7 @@ function() { array( 'amp-addthis' ), ), - 'amp-addthis-responsive-layout' => array( + 'amp-addthis-responsive-layout' => array( ' <amp-addthis width="320" @@ -1147,7 +1147,7 @@ function() { array( 'amp-addthis' ), ), - 'amp-addthis-custom-share-attributes' => array( + 'amp-addthis-custom-share-attributes' => array( ' <amp-addthis width="320" @@ -1164,7 +1164,7 @@ function() { array( 'amp-addthis' ), ), - 'amp-addthis-wordpress-mode' => array( + 'amp-addthis-wordpress-mode' => array( '  <amp-addthis @@ -1193,7 +1193,7 @@ function() { array( 'amp-addthis' ), ), - 'amp-addthis-inline-using-widget-id' => array( + 'amp-addthis-inline-using-widget-id' => array( ' <amp-addthis width="320" @@ -1206,7 +1206,7 @@ function() { array( 'amp-addthis' ), ), - 'amp-addthis-inline-using-product-code' => array( + 'amp-addthis-inline-using-product-code' => array( ' <amp-addthis width="320" @@ -1219,7 +1219,7 @@ function() { array( 'amp-addthis' ), ), - 'amp-addthis-floating-using-product-code' => array( + 'amp-addthis-floating-using-product-code' => array( ' <amp-addthis width="320" @@ -1233,73 +1233,73 @@ function() { array( 'amp-addthis' ), ), - 'amp-addthis-with-invalid-attribute' => array( + 'amp-addthis-with-invalid-attribute' => array( '<amp-addthis width="320" height="240" data-pub-id="ra-5adf5f2869f63c7c" data-product-code="shin" data-share-url="mailto:foo@example.com"></amp-addthis>', '<amp-addthis width="320" height="240" data-pub-id="ra-5adf5f2869f63c7c" data-product-code="shin" data-share-url=""></amp-addthis>', array( 'amp-addthis' ), ), - 'amp-3d-gltf' => array( + 'amp-3d-gltf' => array( '<amp-3d-gltf layout="responsive" width="320" height="240" alpha="true" antialiasing="true" src="path/to/model.glb"></amp-3d-gltf>', null, array( 'amp-3d-gltf' ), ), - 'amp-date-countdown' => array( + 'amp-date-countdown' => array( '<amp-date-countdown timestamp-seconds="2147483648" layout="fixed-height" height="50"><template type="amp-mustache"><p class="p1"> {{d}} days, {{h}} hours, {{m}} minutes and {{s}} seconds until <a href="https://en.wikipedia.org/wiki/Year_2038_problem">Y2K38</a>.</p></template></amp-date-countdown>', null, array( 'amp-date-countdown', 'amp-mustache' ), ), - 'amp-google-document-embed' => array( + 'amp-google-document-embed' => array( '<amp-google-document-embed src="https://www.example.com/document.pdf" width="800" height="600" layout="responsive"></amp-google-document-embed>', null, array( 'amp-google-document-embed' ), ), - 'amp-orientation-observer' => array( + 'amp-orientation-observer' => array( '<amp-orientation-observer on="beta:clockAnim1.seekTo(percent=event.percent)" layout="nodisplay"></amp-orientation-observer>', null, array( 'amp-orientation-observer' ), ), - 'amp-pan-zoom' => array( + 'amp-pan-zoom' => array( '<amp-layout layout="responsive" width="4" height="3"><amp-pan-zoom layout="fill" disable-double-tap><svg focusable="false"> ... </svg></amp-pan-zoom></amp-layout>', null, array( 'amp-pan-zoom' ), ), - 'amp-yotpo' => array( + 'amp-yotpo' => array( '<amp-yotpo width="550" height="700" layout="responsive" data-app-key="liSBkl621ZZsb88tsckAs6Bzx6jQeTJTv8CDf8y5" data-widget-type="MainWidget" data-product-id="9408616206" data-name="hockey skates" data-url="https://ranabram.myshopify.com/products/hockey-skates" data-image-url="https://ichef.bbci.co.uk/news/320/media/images/83351000/jpg/_83351965_explorer273lincolnshirewoldssouthpicturebynicholassilkstone.jpg" data-descriptipn="skates" data-yotpo-element-id="1"></amp-yotpo>', null, array( 'amp-yotpo' ), ), - 'amp-embedly' => array( + 'amp-embedly' => array( '<amp-embedly-key value="12af2e3543ee432ca35ac30a4b4f656a" layout="nodisplay"></amp-embedly-key><amp-embedly-card data-url="https://twitter.com/AMPhtml/status/986750295077040128" layout="responsive" width="150" height="80" data-card-theme="dark" data-card-controls="0"></amp-embedly-card>', null, array( 'amp-embedly-card' ), ), - 'amp-lightbox' => array( + 'amp-lightbox' => array( '<amp-lightbox id="my-lightbox" [open]="true" animate-in="fly-in-top" layout="nodisplay"><div class="lightbox" on="tap:my-lightbox.close" role="button" tabindex="0"><h1>Hello World!</h1></div></amp-lightbox>', null, array( 'amp-lightbox', 'amp-bind' ), ), - 'amp-form-messages' => array( + 'amp-form-messages' => array( '<form action-xhr="https://example.com/" method="post"><fieldset><input type="text" name="do-not-verify" no-verify><input type="text" name="firstName"></fieldset><div verify-error=""><template type="amp-mustache">There is a mistake in the form!{{#verifyErrors}}{{message}}{{/verifyErrors}}</template></div><div submitting=""><template type="amp-mustache">Form submitting... Thank you for waiting {{name}}.</template></div><div submit-success=""><template type="amp-mustache">Success! Thanks {{name}} for subscribing! Please make sure to check your email {{email}}to confirm! After that we\'ll start sending you weekly articles on {{#interests}}<b>{{name}}</b> {{/interests}}.</template></div><div submit-error><template type="amp-mustache">Oops! {{name}}, {{message}}.</template></div></form>', null, array( 'amp-form', 'amp-mustache' ), ), - 'amp-input-mask' => array( + 'amp-input-mask' => array( '<form method="post" class="p2" action-xhr="/components/amp-inputmask/postal" target="_top"><label>Postal code: <input name="code" mask="L0L_0L0" mask-trim-zeros="3" placeholder="A1A 1A1"></label><input type="submit"><div submit-success><template type="amp-mustache"><p>You submitted: {{code}}</p></template></div></form>', null, array( 'amp-form', 'amp-inputmask', 'amp-mustache' ), ), - 'amp_textarea_without_autoexpand' => array( + 'amp_textarea_without_autoexpand' => array( '<textarea name="without-autoexpand"></textarea>', null, array(), @@ -1311,43 +1311,43 @@ function() { array( 'amp-form', 'amp-bind' ), ), - 'amp-viqeo-player' => array( + 'amp-viqeo-player' => array( '<amp-viqeo-player data-profileid="184" data-videoid="b51b70cdbb06248f4438" width="640" height="360" layout="responsive"></amp-viqeo-player>', null, array( 'amp-viqeo-player' ), ), - 'amp-image-slider' => array( + 'amp-image-slider' => array( '<amp-image-slider layout="responsive" width="100" height="200"><span>Not allowed</span><amp-img src="/green-apple.jpg" alt="A green apple"></amp-img><i>forbidden</i><amp-img src="/red-apple.jpg" alt="A red apple"></amp-img><div first>This apple is green</div><strong>not allowed</strong><div second>This apple is red</div><i>not</i> <span>ok</span></amp-image-slider>', '<amp-image-slider layout="responsive" width="100" height="200"><amp-img src="/green-apple.jpg" alt="A green apple"></amp-img><amp-img src="/red-apple.jpg" alt="A red apple"></amp-img><div first>This apple is green</div><div second>This apple is red</div></amp-image-slider>', array( 'amp-image-slider' ), ), - 'amp-image-slider-bad-children' => array( + 'amp-image-slider-bad-children' => array( '<amp-image-slider layout="responsive" width="100" height="200"><amp-img src="/green-apple.jpg" alt="A green apple"></amp-img></amp-image-slider>', '', array(), ), - 'amp-fx-collection' => array( + 'amp-fx-collection' => array( '<h1 amp-fx="parallax" data-parallax-factor="1.5">A title that moves faster than other content.</h1>', null, array( 'amp-fx-collection' ), ), - 'amp-date-display' => array( + 'amp-date-display' => array( '<amp-date-display datetime="2017-08-02T15:05:05.000" layout="fixed" width="360" height="20"><template type="amp-mustache"><div>{{dayName}} {{day}} {{monthName}} {{year}} {{hourTwoDigit}}:{{minuteTwoDigit}}:{{secondTwoDigit}}</div></template></amp-date-display>', null, array( 'amp-date-display', 'amp-mustache' ), ), - 'amp-list' => array( + 'amp-list' => array( '<amp-list credentials="include" src="https://example.com/json/product.json?clientId=CLIENT_ID(myCookieId)"><template type="amp-mustache">Your personal offer: ${{price}}</template></amp-list>', null, array( 'amp-list', 'amp-mustache' ), ), - 'amp-list-load-more' => array( + 'amp-list-load-more' => array( str_replace( array( "\n", "\t" ), '', @@ -1375,38 +1375,38 @@ function() { array( 'amp-list', 'amp-mustache' ), ), - 'amp-recaptcha-input' => array( + 'amp-recaptcha-input' => array( '<form action-xhr="/" target="_top" method="post"><amp-recaptcha-input layout="nodisplay" name="reCAPTCHA_body_key" data-sitekey="reCAPTCHA_site_key" data-action="reCAPTCHA_example_action"></amp-recaptcha-input></form>', null, array( 'amp-form', 'amp-recaptcha-input' ), ), // @todo The poster should not be allowed if there is a placeholder. - 'amp-video-iframe' => array( + 'amp-video-iframe' => array( '<amp-video-iframe src="https://example.com/video/" width="500" height="500" poster="https://example.com/poster.jpg" autoplay dock implements-media-session implements-rotate-to-fullscreen referrerpolicy></amp-video-iframe>', null, array( 'amp-video-iframe', 'amp-video-docking' ), ), - 'amp-youtube' => array( + 'amp-youtube' => array( '<amp-youtube id="myLiveChannel" data-live-channelid="UCB8Kb4pxYzsDsHxzBfnid4Q" width="358" height="204" layout="responsive" dock><amp-img src="https://i.ytimg.com/vi/Wm1fWz-7nLQ/hqdefault_live.jpg" placeholder layout="fill"></amp-img></amp-youtube>', null, array( 'amp-youtube', 'amp-video-docking' ), ), - 'details' => array( + 'details' => array( '<details open [open]="foo.state"><summary>Learn more</summary><p>You are educated</p></details>', null, array( 'amp-bind' ), ), - 'amp-plain-text-script-template' => array( + 'amp-plain-text-script-template' => array( '<script type="text/plain" template="amp-mustache">Hello {{world}}!</script>', null, array( 'amp-mustache' ), ), - 'amp-action-macro' => array( + 'amp-action-macro' => array( // @todo Should calling AMP.setState() automatically cause the amp-bind extension to be added? ' <amp-action-macro id="closeNavigations" execute="AMP.setState({nav1: \'close\', nav2: \'close})"></amp-action-macro> @@ -1417,18 +1417,18 @@ function() { array( 'amp-action-macro' ), ), - 'amp-smart-links' => array( + 'amp-smart-links' => array( '<amp-smartlinks layout="nodisplay" nrtv-account-name="examplepublisher" linkmate exclusive-links link-attribute="href" link-selector="a"></amp-smartlinks>', null, array( 'amp-smartlinks' ), ), - 'amp-script-1' => array( + 'amp-script-1' => array( '<amp-script layout="container" src="https://example.com/hello-world.js"><button id="hello">Insert Hello World!</button></amp-script>', null, array( 'amp-script' ), ), - 'amp-script-2' => array( + 'amp-script-2' => array( ' <amp-script layout="container" src="https://example.com/examples/amp-script/hello-world.js"> <div class="root"> @@ -1443,7 +1443,7 @@ function() { null, array( 'amp-script' ), ), - 'amp-script-3' => array( + 'amp-script-3' => array( ' <amp-script src="https://example.com/examples/amp-script/todomvc.ssr.js" layout="container"> <div><header class="header"><h1>todos</h1><input class="new-todo" placeholder="What needs to be done?" autofocus="true"></header></div> @@ -1453,7 +1453,7 @@ function() { array( 'amp-script' ), ), - 'amp-script-4' => array( + 'amp-script-4' => array( ' <amp-script layout="container" src="https://example.com/examples/amp-script/empty.js"> <div class="root">should be empty</div> @@ -1463,26 +1463,26 @@ function() { array( 'amp-script' ), ), - 'amp_img_with_object_fit_position' => array( + 'amp_img_with_object_fit_position' => array( '<amp-img src="http://placehold.it/400x500" width="300" height="300" object-fit="none" object-position="right top" layout="intrinsic"></amp-img>', null, array(), ), - 'amp_link_rewriter' => array( + 'amp_link_rewriter' => array( '<amp-link-rewriter layout="nodisplay"><script type="application/json">{}</script></amp-link-rewriter>', null, array( 'amp-link-rewriter' ), ), - 'unique_constraint' => array( + 'unique_constraint' => array( str_repeat( '<amp-geo layout="nodisplay"><script type="application/json">{}</script></amp-geo>', 2 ), '<amp-geo layout="nodisplay"><script type="application/json">{}</script></amp-geo>', array( 'amp-geo' ), array( 'duplicate_element' ), ), - 'amp-autocomplete' => array( + 'amp-autocomplete' => array( ' <form method="post" action-xhr="/form/echo-json/post" target="_blank" on="submit-success:AMP.setState({result: event.response})"> <amp-autocomplete id="autocomplete" filter="substring" min-characters="0"> @@ -1497,13 +1497,13 @@ function() { array( 'amp-form', 'amp-autocomplete' ), ), - 'amp-connatix-player' => array( + 'amp-connatix-player' => array( '<amp-connatix-player data-player-id="03ef71d8-0941-4bff-94f2-74ca3580b497" layout="responsive" width="16" height="9"></amp-connatix-player>', null, array( 'amp-connatix-player' ), ), - 'amp-truncate-text' => array( + 'amp-truncate-text' => array( ' <amp-truncate-text layout="fixed" height="3em" width="20em"> Some text that may get truncated. @@ -1515,7 +1515,7 @@ function() { array( 'amp-truncate-text' ), ), - 'amp-user-location' => array( + 'amp-user-location' => array( ' <button on="tap: location.request()">Use my location</button> <amp-user-location id="location" on="approve:AMP.setState({located: true})" layout="nodisplay"> diff --git a/tests/validation/test-class-amp-validated-url-post-type.php b/tests/php/validation/test-class-amp-validated-url-post-type.php similarity index 100% rename from tests/validation/test-class-amp-validated-url-post-type.php rename to tests/php/validation/test-class-amp-validated-url-post-type.php diff --git a/tests/validation/test-class-amp-validation-error-taxonomy.php b/tests/php/validation/test-class-amp-validation-error-taxonomy.php similarity index 100% rename from tests/validation/test-class-amp-validation-error-taxonomy.php rename to tests/php/validation/test-class-amp-validation-error-taxonomy.php diff --git a/tests/validation/test-class-amp-validation-manager.php b/tests/php/validation/test-class-amp-validation-manager.php similarity index 100% rename from tests/validation/test-class-amp-validation-manager.php rename to tests/php/validation/test-class-amp-validation-manager.php From ad2b40875431eb42d84cf037593154196bd12ad6 Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Tue, 2 Jul 2019 15:02:28 +0200 Subject: [PATCH 090/434] Increase specificity of [data-block] selector Needed after upstream change in https://github.com/WordPress/gutenberg/pull/16207. --- assets/src/stories-editor/blocks/amp-story-page/edit.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/stories-editor/blocks/amp-story-page/edit.css b/assets/src/stories-editor/blocks/amp-story-page/edit.css index 7a59b839928..123b24404d3 100644 --- a/assets/src/stories-editor/blocks/amp-story-page/edit.css +++ b/assets/src/stories-editor/blocks/amp-story-page/edit.css @@ -94,7 +94,7 @@ height: 553px; } -[data-block] { +.editor-styles-wrapper [data-block] { margin-top: 0; margin-bottom: 0; } From 23121d05d4c7f03ab4bc8982af53c602a3de2e45 Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Tue, 2 Jul 2019 15:26:58 +0200 Subject: [PATCH 091/434] Make image placeholders draggable --- .../components/higher-order/with-amp-story-settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/stories-editor/components/higher-order/with-amp-story-settings.js b/assets/src/stories-editor/components/higher-order/with-amp-story-settings.js index 8331a48092f..80c56d9c363 100644 --- a/assets/src/stories-editor/components/higher-order/with-amp-story-settings.js +++ b/assets/src/stories-editor/components/higher-order/with-amp-story-settings.js @@ -271,7 +271,7 @@ export default createHigherOrderComponent( return ( <> - { ( ! isMovableBlock || isEmptyImageBlock ) && ( <BlockEdit { ...props } /> ) } + { ( ! isMovableBlock ) && ( <BlockEdit { ...props } /> ) } { isMovableBlock && ! isEmptyImageBlock && needsResizing && ( <ResizableBox isSelected={ isSelected } @@ -318,7 +318,7 @@ export default createHigherOrderComponent( </RotatableBox> </ResizableBox> ) } - { isMovableBlock && ! needsResizing && ( + { isMovableBlock && ( ! needsResizing || isEmptyImageBlock ) && ( <RotatableBox blockElementId={ `block-${ clientId }` } initialAngle={ rotationAngle } From 8d05988cc0485f76e79fb9c669ec1af9eae93eb8 Mon Sep 17 00:00:00 2001 From: Weston Ruter <westonruter@google.com> Date: Tue, 2 Jul 2019 06:38:07 -0700 Subject: [PATCH 092/434] Exclude jest-puppeteer.config.js from build --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 02df5e65c0a..b15f34994a6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -88,7 +88,7 @@ module.exports = function( grunt ) { const versionAppend = new Date().toISOString().replace( /\.\d+/, '' ).replace( /-|:/g, '' ) + '-' + commitHash; const paths = lsOutput.trim().split( /\n/ ).filter( function( file ) { - return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|postcss\.config\.js|tests|wp-assets|readme\.md|composer\..*|patches|webpack.*|assets\/src|docker-compose\.yml|babel\.config\.js|codecov\.yml)/.test( file ); + return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|readme\.md|composer\..*|patches|webpack.*|assets\/src|docker-compose\.yml|.*\.config\.js|codecov\.yml)/.test( file ); } ); paths.push( 'vendor/autoload.php' ); From 68941db7e145ed115ee91fe235481c12d681c552 Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Wed, 3 Jul 2019 15:35:20 +0200 Subject: [PATCH 093/434] Try without completely removing KSES --- includes/class-amp-story-post-type.php | 39 +++++++++++++++++++++----- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php index 74dc61a0b56..d5441f03096 100644 --- a/includes/class-amp-story-post-type.php +++ b/includes/class-amp-story-post-type.php @@ -383,11 +383,10 @@ public static function filter_safe_style_css( $attr ) { /** * Filters the response before executing any REST API callbacks. * - * Temporarily removes KSES on post content for authors in order for them being able to use AMP Stories properly. + * Temporarily modifies post content during saving in a way that KSES + * does not strip actually valid CSS from post content, making block content invalid. * - * Otherwise KSES strips valid CSS from post content, making block content invalid. - * - * This is not ideal and should be removed once core has better CSS parsing. + * @todo Remove once core has better CSS parsing. * * @link https://core.trac.wordpress.org/ticket/37134 * @@ -414,9 +413,35 @@ public static function filter_rest_request_for_kses( $response, $handler, $reque return $response; } - remove_filter( 'content_save_pre', 'wp_filter_post_kses' ); - remove_filter( 'excerpt_save_pre', 'wp_filter_post_kses' ); - remove_filter( 'content_filtered_save_pre', 'wp_filter_post_kses' ); + $style_attr_values = []; + + // Replace inline styles before KSES... + add_filter( + 'pre_post_content', + static function ( $post_content ) use ( &$style_attr_values ) { + $post_content = preg_replace_callback( + '|style=\\\"([^"]*)\\\"|', // Because the post data is slashed. + static function ( $matches ) use ( &$style_attr_values ) { + $hash = md5( $matches[1] ); + $style_attr_values[ $hash ] = $matches[1]; + + return str_replace( $matches[1], $hash, $matches[0] ); + }, + $post_content + ); + + return $post_content; + } + ); + + // ...And bring it back afterwards. + add_filter( + 'content_save_pre', + static function ( $post_content ) use ( &$style_attr_values ) { + return str_replace( array_keys( $style_attr_values ), array_values( $style_attr_values ), $post_content ); + }, + 20 + ); return $response; } From 2e54b5ca00fecefca6d004afa3b9e3d618894029 Mon Sep 17 00:00:00 2001 From: Weston Ruter <westonruter@google.com> Date: Wed, 3 Jul 2019 17:06:25 -0700 Subject: [PATCH 094/434] Guard against infinite recursion when matching a theme source Fixes #2547 --- .../class-amp-validation-manager.php | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php index dbb26d9f181..ac3f0565b3a 100644 --- a/includes/validation/class-amp-validation-manager.php +++ b/includes/validation/class-amp-validation-manager.php @@ -138,17 +138,35 @@ class AMP_Validation_Manager { /** * Cached template directory to prevent infinite recursion. * + * @see get_template_directory() * @var string */ protected static $template_directory; + /** + * Cached template slug to prevent infinite recursion. + * + * @see get_template() + * @var string + */ + protected static $template_slug; + /** * Cached stylesheet directory to prevent infinite recursion. * + * @see get_stylesheet_directory() * @var string */ protected static $stylesheet_directory; + /** + * Cached stylesheet slug to prevent infinite recursion. + * + * @see get_stylesheet() + * @var string + */ + protected static $stylesheet_slug; + /** * Add the actions. * @@ -506,8 +524,10 @@ public static function add_validation_error_sourcing() { } } - self::$template_directory = get_template_directory(); - self::$stylesheet_directory = get_stylesheet_directory(); + self::$template_directory = wp_normalize_path( get_template_directory() ); + self::$template_slug = get_template(); + self::$stylesheet_directory = wp_normalize_path( get_stylesheet_directory() ); + self::$stylesheet_slug = get_stylesheet(); add_action( 'wp', array( __CLASS__, 'wrap_widget_callbacks' ) ); @@ -1434,15 +1454,12 @@ public static function get_source( $callback ) { if ( preg_match( ':' . preg_quote( trailingslashit( wp_normalize_path( WP_PLUGIN_DIR ) ), ':' ) . $slug_pattern . ':s', $file, $matches ) ) { $source['type'] = 'plugin'; $source['name'] = $matches[1]; - } elseif ( preg_match( ':' . preg_quote( trailingslashit( wp_normalize_path( self::$template_directory ) ), ':' ) . ':s', $file ) ) { - $source['type'] = 'theme'; - $source['name'] = get_template(); - } elseif ( preg_match( ':' . preg_quote( trailingslashit( wp_normalize_path( self::$stylesheet_directory ) ), ':' ) . ':s', $file ) ) { + } elseif ( preg_match( ':' . preg_quote( trailingslashit( self::$template_directory ), ':' ) . $slug_pattern . ':s', $file ) ) { $source['type'] = 'theme'; - $source['name'] = get_stylesheet(); - } elseif ( preg_match( ':' . preg_quote( trailingslashit( wp_normalize_path( get_theme_root() ) ), ':' ) . $slug_pattern . ':s', $file, $matches ) ) { + $source['name'] = self::$template_slug; + } elseif ( preg_match( ':' . preg_quote( trailingslashit( self::$stylesheet_directory ), ':' ) . $slug_pattern . ':s', $file ) ) { $source['type'] = 'theme'; - $source['name'] = $matches[1]; + $source['name'] = self::$stylesheet_slug; } elseif ( preg_match( ':' . preg_quote( trailingslashit( wp_normalize_path( WPMU_PLUGIN_DIR ) ), ':' ) . $slug_pattern . ':s', $file, $matches ) ) { $source['type'] = 'mu-plugin'; $source['name'] = $matches[1]; From a46dc757c89f2a8cf1a21a437c90de30b6c167ba Mon Sep 17 00:00:00 2001 From: Weston Ruter <westonruter@google.com> Date: Wed, 3 Jul 2019 21:34:00 -0700 Subject: [PATCH 095/434] Preserve ability to access array callback parts after wrapping --- includes/class-amp-autoloader.php | 1 + .../class-amp-validation-callback-wrapper.php | 152 ++++++++++++++++++ .../class-amp-validation-manager.php | 58 +------ .../test-class-amp-validation-manager.php | 15 +- 4 files changed, 164 insertions(+), 62 deletions(-) create mode 100644 includes/validation/class-amp-validation-callback-wrapper.php diff --git a/includes/class-amp-autoloader.php b/includes/class-amp-autoloader.php index dfabb4f8f16..f257d28f571 100644 --- a/includes/class-amp-autoloader.php +++ b/includes/class-amp-autoloader.php @@ -99,6 +99,7 @@ class AMP_Autoloader { 'AMP_HTML_Utils' => 'includes/utils/class-amp-html-utils', 'AMP_Image_Dimension_Extractor' => 'includes/utils/class-amp-image-dimension-extractor', 'AMP_Validation_Manager' => 'includes/validation/class-amp-validation-manager', + 'AMP_Validation_Callback_Wrapper' => 'includes/validation/class-amp-validation-callback-wrapper', 'AMP_Validated_URL_Post_Type' => 'includes/validation/class-amp-validated-url-post-type', 'AMP_Validation_Error_Taxonomy' => 'includes/validation/class-amp-validation-error-taxonomy', 'AMP_CLI' => 'includes/class-amp-cli', diff --git a/includes/validation/class-amp-validation-callback-wrapper.php b/includes/validation/class-amp-validation-callback-wrapper.php new file mode 100644 index 00000000000..86bfa6ec636 --- /dev/null +++ b/includes/validation/class-amp-validation-callback-wrapper.php @@ -0,0 +1,152 @@ +<?php +/** + * Class AMP_Validation_Callback_Wrapper + * + * @package AMP + */ + +/** + * Class AMP_Validation_Callback_Wrapper + * + * @since 1.2.1 + */ +class AMP_Validation_Callback_Wrapper implements ArrayAccess { + + /** + * Callback data. + * + * @var array + */ + protected $callback; + + /** + * AMP_Validation_Callback_Wrapper constructor. + * + * @param array $callback { + * The callback data. + * + * @type callable $function + * @type int $accepted_args + * @type array $source + * } + */ + public function __construct( $callback ) { + $this->callback = $callback; + } + + /** + * Invoke wrapped callback. + * + * @return mixed + */ + public function __invoke() { + global $wp_styles, $wp_scripts; + + $function = $this->callback['function']; + $accepted_args = $this->callback['accepted_args']; + $args = func_get_args(); + + $before_styles_enqueued = array(); + if ( isset( $wp_styles ) && isset( $wp_styles->queue ) ) { + $before_styles_enqueued = $wp_styles->queue; + } + $before_scripts_enqueued = array(); + if ( isset( $wp_scripts ) && isset( $wp_scripts->queue ) ) { + $before_scripts_enqueued = $wp_scripts->queue; + } + + $is_filter = isset( $callback['source']['hook'] ) && ! did_action( $this->callback['source']['hook'] ); + + // Wrap the markup output of (action) hooks in source comments. + AMP_Validation_Manager::$hook_source_stack[] = $this->callback['source']; + $has_buffer_started = false; + if ( ! $is_filter && AMP_Validation_Manager::can_output_buffer() ) { + $has_buffer_started = ob_start( array( 'AMP_Validation_Manager', 'wrap_buffer_with_source_comments' ) ); + } + $result = call_user_func_array( $function, array_slice( $args, 0, intval( $accepted_args ) ) ); + if ( $has_buffer_started ) { + ob_end_flush(); + } + array_pop( AMP_Validation_Manager::$hook_source_stack ); + + // Keep track of which source enqueued the styles. + if ( isset( $wp_styles ) && isset( $wp_styles->queue ) ) { + foreach ( array_diff( $wp_styles->queue, $before_styles_enqueued ) as $handle ) { + AMP_Validation_Manager::$enqueued_style_sources[ $handle ][] = array_merge( $this->callback['source'], compact( 'handle' ) ); + } + } + + // Keep track of which source enqueued the scripts, and immediately report validity. + if ( isset( $wp_scripts ) && isset( $wp_scripts->queue ) ) { + foreach ( array_diff( $wp_scripts->queue, $before_scripts_enqueued ) as $queued_handle ) { + $handles = array( $queued_handle ); + + // Account for case where registered script is a placeholder for a set of scripts (e.g. jquery). + if ( isset( $wp_scripts->registered[ $queued_handle ] ) && false === $wp_scripts->registered[ $queued_handle ]->src ) { + $handles = array_merge( $handles, $wp_scripts->registered[ $queued_handle ]->deps ); + } + + foreach ( $handles as $handle ) { + AMP_Validation_Manager::$enqueued_script_sources[ $handle ][] = array_merge( $this->callback['source'], compact( 'handle' ) ); + } + } + } + + return $result; + } + + /** + * Offset set. + * + * @param mixed $offset Offset. + * @param mixed $value Value. + */ + public function offsetSet( $offset, $value ) { + if ( ! is_array( $this->callback['function'] ) ) { + return; + } + if ( is_null( $offset ) ) { + $this->callback['function'][] = $value; + } else { + $this->callback['function'][ $offset ] = $value; + } + } + + /** + * Offset exists. + * + * @param mixed $offset Offset. + * @return bool Exists. + */ + public function offsetExists( $offset ) { + if ( ! is_array( $this->callback['function'] ) ) { + return false; + } + return isset( $this->callback['function'][ $offset ] ); + } + + /** + * Offset unset. + * + * @param mixed $offset Offset. + */ + public function offsetUnset( $offset ) { + if ( ! is_array( $this->callback['function'] ) ) { + return; + } + unset( $this->callback['function'][ $offset ] ); + } + + /** + * Offset get. + * + * @param mixed $offset Offset. + * @return mixed|null Value. + */ + public function offsetGet( $offset ) { + if ( is_array( $this->callback['function'] ) && isset( $this->callback['function'][ $offset ] ) ) { + return $this->callback['function'][ $offset ]; + } + return null; + } +} diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php index ac3f0565b3a..7a8c09bfa1b 100644 --- a/includes/validation/class-amp-validation-manager.php +++ b/includes/validation/class-amp-validation-manager.php @@ -1531,64 +1531,10 @@ public static function can_output_buffer() { * @type int $accepted_args * @type array $source * } - * @return closure $wrapped_callback The callback, wrapped in comments. + * @return AMP_Validation_Callback_Wrapper $wrapped_callback The callback, wrapped in comments. */ public static function wrapped_callback( $callback ) { - return function() use ( $callback ) { - global $wp_styles, $wp_scripts; - - $function = $callback['function']; - $accepted_args = $callback['accepted_args']; - $args = func_get_args(); - - $before_styles_enqueued = array(); - if ( isset( $wp_styles ) && isset( $wp_styles->queue ) ) { - $before_styles_enqueued = $wp_styles->queue; - } - $before_scripts_enqueued = array(); - if ( isset( $wp_scripts ) && isset( $wp_scripts->queue ) ) { - $before_scripts_enqueued = $wp_scripts->queue; - } - - $is_filter = isset( $callback['source']['hook'] ) && ! did_action( $callback['source']['hook'] ); - - // Wrap the markup output of (action) hooks in source comments. - AMP_Validation_Manager::$hook_source_stack[] = $callback['source']; - $has_buffer_started = false; - if ( ! $is_filter && AMP_Validation_Manager::can_output_buffer() ) { - $has_buffer_started = ob_start( array( __CLASS__, 'wrap_buffer_with_source_comments' ) ); - } - $result = call_user_func_array( $function, array_slice( $args, 0, intval( $accepted_args ) ) ); - if ( $has_buffer_started ) { - ob_end_flush(); - } - array_pop( AMP_Validation_Manager::$hook_source_stack ); - - // Keep track of which source enqueued the styles. - if ( isset( $wp_styles ) && isset( $wp_styles->queue ) ) { - foreach ( array_diff( $wp_styles->queue, $before_styles_enqueued ) as $handle ) { - AMP_Validation_Manager::$enqueued_style_sources[ $handle ][] = array_merge( $callback['source'], compact( 'handle' ) ); - } - } - - // Keep track of which source enqueued the scripts, and immediately report validity. - if ( isset( $wp_scripts ) && isset( $wp_scripts->queue ) ) { - foreach ( array_diff( $wp_scripts->queue, $before_scripts_enqueued ) as $queued_handle ) { - $handles = array( $queued_handle ); - - // Account for case where registered script is a placeholder for a set of scripts (e.g. jquery). - if ( isset( $wp_scripts->registered[ $queued_handle ] ) && false === $wp_scripts->registered[ $queued_handle ]->src ) { - $handles = array_merge( $handles, $wp_scripts->registered[ $queued_handle ]->deps ); - } - - foreach ( $handles as $handle ) { - AMP_Validation_Manager::$enqueued_script_sources[ $handle ][] = array_merge( $callback['source'], compact( 'handle' ) ); - } - } - } - - return $result; - }; + return new AMP_Validation_Callback_Wrapper( $callback ); } /** diff --git a/tests/php/validation/test-class-amp-validation-manager.php b/tests/php/validation/test-class-amp-validation-manager.php index d601e52bf9f..34b24d4bfcf 100644 --- a/tests/php/validation/test-class-amp-validation-manager.php +++ b/tests/php/validation/test-class-amp-validation-manager.php @@ -895,9 +895,12 @@ public function test_wrap_widget_callbacks() { $this->assertArrayHasKey( $widget_id, $wp_registered_widgets ); $this->assertInternalType( 'array', $wp_registered_widgets[ $widget_id ]['callback'] ); $this->assertInstanceOf( 'WP_Widget_Search', $wp_registered_widgets[ $widget_id ]['callback'][0] ); + $this->assertSame( 'display_callback', $wp_registered_widgets[ $widget_id ]['callback'][1] ); AMP_Validation_Manager::wrap_widget_callbacks(); - $this->assertInstanceOf( 'Closure', $wp_registered_widgets[ $widget_id ]['callback'] ); + $this->assertInstanceOf( 'AMP_Validation_Callback_Wrapper', $wp_registered_widgets[ $widget_id ]['callback'] ); + $this->assertInstanceOf( 'WP_Widget', $wp_registered_widgets[ $widget_id ]['callback'][0] ); + $this->assertSame( 'display_callback', $wp_registered_widgets[ $widget_id ]['callback'][1] ); $sidebar_id = 'amp-sidebar'; register_sidebar( @@ -1150,7 +1153,7 @@ public function test_filter_wrapped_callback() { $value = 'Some Value'; apply_filters( 'foo', $value ); $wrapped_callback = AMP_Validation_Manager::wrapped_callback( $filter_callback ); - $this->assertTrue( $wrapped_callback instanceof Closure ); + $this->assertTrue( $wrapped_callback instanceof AMP_Validation_Callback_Wrapper ); AMP_Theme_Support::start_output_buffering(); $filtered_value = call_user_func( $wrapped_callback, $value ); $output = ob_get_clean(); @@ -1179,12 +1182,12 @@ public function test_action_wrapped_callback() { do_action( 'bar' ); // So that output buffering will be done. $wrapped_callback = AMP_Validation_Manager::wrapped_callback( $action_callback ); - $this->assertTrue( $wrapped_callback instanceof Closure ); + $this->assertTrue( $wrapped_callback instanceof AMP_Validation_Callback_Wrapper ); AMP_Theme_Support::start_output_buffering(); call_user_func( $wrapped_callback ); $output = ob_get_clean(); - $this->assertEquals( 'Closure', get_class( $wrapped_callback ) ); + $this->assertEquals( 'AMP_Validation_Callback_Wrapper', get_class( $wrapped_callback ) ); $this->assertContains( $test_string, $output ); $this->assertContains( ' +<amp-story-page style="background-color:#ffffff" id="1371b14f-c7c3-4b9a-bd47-e24f2b8a1f11" class="wp-block-amp-amp-story-page"><amp-story-grid-layer template="fill" style="background-image:linear-gradient(to bottom, #abb8c3, transparent);opacity:1"></amp-story-grid-layer> +<amp-story-grid-layer template="vertical" data-block-name="amp/amp-story-text"><div class="amp-story-block-wrapper" style="position:absolute;top:10%;left:5%;width:76.22%;height:10.85%"><h1 style="background-color:rgba(207, 46, 46, 1);color:#ffffff;display:flex;transform:rotate(-27deg)" class="wp-block-amp-amp-story-text has-text-color has-background has-vivid-red-background-color" id="ccf08639-cb18-4c65-b35d-8cf2347c700b"><amp-fit-text layout="flex-item" class="amp-text-content">Hello World</amp-fit-text></h1></div></amp-story-grid-layer> +</amp-story-page>'; + + $expected = ' +<amp-story-page style="background-color:#ffffff" id="1371b14f-c7c3-4b9a-bd47-e24f2b8a1f11" class="wp-block-amp-amp-story-page"><amp-story-grid-layer template="fill" style="background-image:linear-gradient(to bottom, #abb8c3, transparent)"></amp-story-grid-layer> +<amp-story-grid-layer template="vertical" data-block-name="amp/amp-story-text"><div class="amp-story-block-wrapper" style="position:absolute;top:10%;left:5%;width:76.22%;height:10.85%"><h1 style="background-color:rgba(207, 46, 46, 1);color:#ffffff;display:flex;transform:rotate(-27deg)" class="wp-block-amp-amp-story-text has-text-color has-background has-vivid-red-background-color" id="ccf08639-cb18-4c65-b35d-8cf2347c700b"><amp-fit-text layout="flex-item" class="amp-text-content">Hello World</amp-fit-text></h1></div></amp-story-grid-layer> +</amp-story-page>'; + + $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/%s/%d', AMP_Story_Post_Type::POST_TYPE_SLUG, $story ) ); + $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); + $request->set_body_params( [ + 'content' => $unsanitized_content, + ] ); + + $response = rest_get_server()->dispatch( $request ); + $new_data = $response->get_data(); + + $this->assertEquals( $expected, $new_data['content']['raw'] ); + } } From 1c16dcf6665ef94901a5ce0cba36ed7fbdf5286f Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Mon, 8 Jul 2019 19:39:11 +0200 Subject: [PATCH 128/434] Lint fixes --- tests/php/test-class-amp-story-post-type.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/php/test-class-amp-story-post-type.php b/tests/php/test-class-amp-story-post-type.php index 8d15bba5d6e..0924f11e03c 100644 --- a/tests/php/test-class-amp-story-post-type.php +++ b/tests/php/test-class-amp-story-post-type.php @@ -424,9 +424,11 @@ public function test_filter_rest_request_for_kses() { $author_id = self::factory()->user->create( array( 'role' => 'author' ) ); wp_set_current_user( $author_id ); - $story = self::factory()->post->create( [ - 'post_type' => AMP_Story_Post_Type::POST_TYPE_SLUG, - ] ); + $story = self::factory()->post->create( + [ + 'post_type' => AMP_Story_Post_Type::POST_TYPE_SLUG, + ] + ); $unsanitized_content = ' <amp-story-page style="background-color:#ffffff" id="1371b14f-c7c3-4b9a-bd47-e24f2b8a1f11" class="wp-block-amp-amp-story-page"><amp-story-grid-layer template="fill" style="background-image:linear-gradient(to bottom, #abb8c3, transparent);opacity:1"></amp-story-grid-layer> @@ -440,9 +442,11 @@ public function test_filter_rest_request_for_kses() { $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/%s/%d', AMP_Story_Post_Type::POST_TYPE_SLUG, $story ) ); $request->add_header( 'content-type', 'application/x-www-form-urlencoded' ); - $request->set_body_params( [ - 'content' => $unsanitized_content, - ] ); + $request->set_body_params( + [ + 'content' => $unsanitized_content, + ] + ); $response = rest_get_server()->dispatch( $request ); $new_data = $response->get_data(); From 788617b89072ba743b7dccf8f5d45812d601b77c Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Mon, 8 Jul 2019 19:42:47 +0200 Subject: [PATCH 129/434] Fix since annotations --- includes/sanitizers/trait-amp-noscript-fallback.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/sanitizers/trait-amp-noscript-fallback.php b/includes/sanitizers/trait-amp-noscript-fallback.php index a69c9d1d2fe..0b13c7f66fa 100644 --- a/includes/sanitizers/trait-amp-noscript-fallback.php +++ b/includes/sanitizers/trait-amp-noscript-fallback.php @@ -20,6 +20,7 @@ trait AMP_Noscript_Fallback { * This is used to prevent duplicated validation errors. * * @since 1.1 + * * @var array */ private $noscript_fallback_allowed_attributes = array(); @@ -44,10 +45,11 @@ protected function initialize_noscript_allowed_attributes( $tag ) { /** * Checks whether the given node is within an AMP-specific <noscript> element. * + * @since 1.1 + * * @param DOMNode $node DOM node to check. * * @return bool True if in an AMP noscript element, false otherwise. - * @since 1.1 */ protected function is_inside_amp_noscript( DOMNode $node ) { return 'noscript' === $node->parentNode->nodeName && $node->parentNode->parentNode && 'amp-' === substr( $node->parentNode->parentNode->nodeName, 0, 4 ); @@ -56,11 +58,11 @@ protected function is_inside_amp_noscript( DOMNode $node ) { /** * Appends the given old node in a <noscript> element to the new node. * + * @since 1.1 + * * @param DOMNode $new_node New node to append a noscript with the old node to. * @param DOMNode $old_node Old node to append in a noscript. * @param DOMDocument $dom DOM document instance. - * - * @since 1.1 */ protected function append_old_node_noscript( DOMNode $new_node, DOMNode $old_node, DOMDocument $dom ) { $noscript = $dom->createElement( 'noscript' ); From 953295bd8b11055101c3454a383423882415f6e4 Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Mon, 8 Jul 2019 19:48:33 +0200 Subject: [PATCH 130/434] Update regex as per suggestion --- includes/class-amp-story-post-type.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php index 1466d1d0d6f..333d50a55a4 100644 --- a/includes/class-amp-story-post-type.php +++ b/includes/class-amp-story-post-type.php @@ -577,7 +577,7 @@ public static function filter_rest_request_for_kses( $response, $handler, $reque 'content_save_pre', static function ( $post_content ) use ( &$style_attr_values ) { $post_content = preg_replace_callback( - '|style=\\\"([^"]*)\\\"|', // Because the post data is slashed. + '|<\w+(?:-\w+)*\s[^>]*?style=\\\"([^"]*)\\\"[^>]+?>|', // Because the post data is slashed. static function ( $matches ) use ( &$style_attr_values ) { $hash = md5( $matches[1] ); $style_attr_values[ $hash ] = self::safecss_filter_attr( $matches[1] ); From 5ca4b86f758f3d463caa91dfe8c2bcaa0c5016e4 Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Mon, 8 Jul 2019 19:57:15 +0200 Subject: [PATCH 131/434] Use yoda conditions --- includes/class-amp-story-post-type.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php index 9ac475433f9..52c30a8b371 100644 --- a/includes/class-amp-story-post-type.php +++ b/includes/class-amp-story-post-type.php @@ -479,7 +479,7 @@ private static function safecss_filter_attr( $css ) { $css = ''; foreach ( $css_array as $css_item ) { - if ( $css_item === '' ) { + if ( '' === $css_item ) { continue; } @@ -515,7 +515,7 @@ private static function safecss_filter_attr( $css ) { $url = trim( $url_pieces[2] ); - if ( empty( $url ) || $url !== wp_kses_bad_protocol( $url, $allowed_protocols ) ) { + if ( empty( $url ) || wp_kses_bad_protocol( $url, $allowed_protocols ) !== $url ) { $found = false; break; } else { @@ -526,7 +526,7 @@ private static function safecss_filter_attr( $css ) { } if ( $found ) { - if ( $css !== '' ) { + if ( '' !== $css ) { $css .= ';'; } From f61374e1ed81065473dcfdc0901dacd91e125a7c Mon Sep 17 00:00:00 2001 From: Pascal Birchler <pascalb@google.com> Date: Mon, 8 Jul 2019 20:48:19 +0200 Subject: [PATCH 132/434] Use short array syntax throughout the project This is a bit of a follow-up to #2493. The main plugin file, `amp.php`, is left untouched as it still should be parseable on PHP 5.2. Also does not change `includes/sanitizers/class-amp-allowed-tags-generated.php` as it is auto-generated. --- back-compat/templates-v0-3/meta-author.php | 4 +- back-compat/templates-v0-3/single.php | 6 +- bin/add-test-widgets-to-sidebar.php | 206 +-- bin/create-comments-on-test-post.php | 14 +- bin/create-embed-test-post.php | 216 +-- bin/create-gutenberg-test-post.php | 56 +- bin/verify-version-consistency.php | 2 +- includes/admin/class-amp-admin-pointer.php | 14 +- includes/admin/class-amp-admin-pointers.php | 30 +- includes/admin/class-amp-customizer.php | 38 +- includes/admin/class-amp-editor-blocks.php | 18 +- includes/admin/class-amp-post-meta-box.php | 52 +- includes/admin/class-amp-story-templates.php | 92 +- includes/admin/functions.php | 16 +- includes/amp-helper-functions.php | 196 +-- includes/amp-post-template-functions.php | 8 +- includes/class-amp-autoloader.php | 6 +- includes/class-amp-cli.php | 48 +- includes/class-amp-comment-walker.php | 4 +- includes/class-amp-http.php | 60 +- includes/class-amp-post-type-support.php | 18 +- includes/class-amp-service-worker.php | 76 +- includes/class-amp-story-post-type.php | 442 ++--- includes/class-amp-theme-support.php | 304 ++-- .../embeds/class-amp-base-embed-handler.php | 10 +- .../embeds/class-amp-core-block-handler.php | 8 +- .../class-amp-crowdsignal-embed-handler.php | 4 +- .../embeds/class-amp-dailymotion-embed.php | 26 +- includes/embeds/class-amp-facebook-embed.php | 18 +- includes/embeds/class-amp-gallery-embed.php | 58 +- .../embeds/class-amp-gfycat-embed-handler.php | 6 +- .../embeds/class-amp-hulu-embed-handler.php | 6 +- .../embeds/class-amp-imgur-embed-handler.php | 18 +- includes/embeds/class-amp-instagram-embed.php | 28 +- .../embeds/class-amp-issuu-embed-handler.php | 8 +- .../embeds/class-amp-meetup-embed-handler.php | 4 +- includes/embeds/class-amp-pinterest-embed.php | 12 +- .../class-amp-playlist-embed-handler.php | 20 +- .../embeds/class-amp-reddit-embed-handler.php | 12 +- .../embeds/class-amp-soundcloud-embed.php | 28 +- .../embeds/class-amp-tumblr-embed-handler.php | 8 +- includes/embeds/class-amp-twitter-embed.php | 24 +- includes/embeds/class-amp-vimeo-embed.php | 30 +- includes/embeds/class-amp-vine-embed.php | 18 +- includes/embeds/class-amp-youtube-embed.php | 30 +- .../class-amp-analytics-options-submenu.php | 4 +- .../options/class-amp-options-manager.php | 66 +- includes/options/class-amp-options-menu.php | 56 +- ...ass-amp-analytics-options-submenu-page.php | 2 +- .../sanitizers/class-amp-audio-sanitizer.php | 18 +- .../sanitizers/class-amp-base-sanitizer.php | 34 +- .../class-amp-blacklist-sanitizer.php | 26 +- .../class-amp-comments-sanitizer.php | 22 +- .../sanitizers/class-amp-embed-sanitizer.php | 4 +- .../sanitizers/class-amp-form-sanitizer.php | 6 +- .../sanitizers/class-amp-iframe-sanitizer.php | 18 +- .../class-amp-nav-menu-dropdown-sanitizer.php | 8 +- .../class-amp-o2-player-sanitizer.php | 10 +- .../class-amp-playbuzz-sanitizer.php | 8 +- includes/sanitizers/class-amp-rule-spec.php | 20 +- .../sanitizers/class-amp-style-sanitizer.php | 306 ++-- .../class-amp-tag-and-attribute-sanitizer.php | 156 +- .../sanitizers/class-amp-video-sanitizer.php | 22 +- .../class-amp-customizer-design-settings.php | 98 +- .../class-amp-customizer-settings.php | 2 +- .../templates/class-amp-content-sanitizer.php | 14 +- includes/templates/class-amp-content.php | 10 +- .../templates/class-amp-post-template.php | 42 +- includes/templates/embed-amp-story.php | 4 +- includes/templates/single-amp_story.php | 2 +- includes/utils/class-amp-dom-utils.php | 22 +- includes/utils/class-amp-html-utils.php | 4 +- .../class-amp-image-dimension-extractor.php | 28 +- includes/utils/class-amp-wp-utils.php | 4 +- .../class-amp-validated-url-post-type.php | 252 +-- .../class-amp-validation-callback-wrapper.php | 8 +- .../class-amp-validation-error-taxonomy.php | 202 +-- .../class-amp-validation-manager.php | 210 +-- .../widgets/class-amp-widget-archives.php | 8 +- .../widgets/class-amp-widget-categories.php | 6 +- templates/header.php | 2 +- templates/html-start.php | 2 +- templates/meta-author.php | 2 +- templates/page.php | 10 +- templates/single.php | 14 +- tests/php/stubs.php | 4 +- tests/php/test-amp-analytics-options.php | 20 +- tests/php/test-amp-audio-converter.php | 98 +- .../test-amp-crowdsignal-embed-handler.php | 36 +- tests/php/test-amp-dailymotion-embed.php | 40 +- tests/php/test-amp-facebook-embed.php | 92 +- tests/php/test-amp-form-sanitizer.php | 54 +- tests/php/test-amp-helper-functions.php | 202 +-- tests/php/test-amp-iframe-sanitizer.php | 154 +- .../test-amp-image-dimension-extractor.php | 120 +- tests/php/test-amp-img-sanitizer.php | 266 +-- tests/php/test-amp-instagram-embed.php | 72 +- tests/php/test-amp-o2-player-sanitizer.php | 24 +- tests/php/test-amp-pinterest-embed.php | 32 +- tests/php/test-amp-playbuzz-sanitizer.php | 42 +- tests/php/test-amp-render-post.php | 12 +- tests/php/test-amp-script-sanitizer.php | 24 +- tests/php/test-amp-soundcloud-embed.php | 82 +- tests/php/test-amp-story-sanitizer.php | 20 +- tests/php/test-amp-style-sanitizer.php | 1176 ++++++------- ...nd-attribute-sanitizer-private-methods.php | 1478 ++++++++--------- tests/php/test-amp-twitter-embed.php | 96 +- tests/php/test-amp-video-sanitizer.php | 102 +- tests/php/test-amp-vimeo-embed.php | 40 +- tests/php/test-amp-vine-embed.php | 28 +- tests/php/test-amp-youtube-embed.php | 44 +- tests/php/test-amp.php | 16 +- tests/php/test-class-amp-admin-pointer.php | 2 +- tests/php/test-class-amp-base-sanitizer.php | 222 +-- tests/php/test-class-amp-block-sanitizer.php | 24 +- tests/php/test-class-amp-cli.php | 142 +- .../php/test-class-amp-comments-sanitizer.php | 26 +- .../php/test-class-amp-content-sanitizer.php | 8 +- .../php/test-class-amp-core-block-handler.php | 4 +- tests/php/test-class-amp-dom-utils.php | 130 +- tests/php/test-class-amp-editor-blocks.php | 10 +- ...test-class-amp-gallery-block-sanitizer.php | 52 +- .../test-class-amp-gfycat-embed-handler.php | 36 +- tests/php/test-class-amp-http.php | 180 +- .../php/test-class-amp-hulu-embed-handler.php | 40 +- .../test-class-amp-imgur-embed-handler.php | 44 +- tests/php/test-class-amp-meta-box.php | 92 +- ...st-class-amp-nav-menu-toggle-sanitizer.php | 52 +- tests/php/test-class-amp-options-manager.php | 240 +-- tests/php/test-class-amp-options-menu.php | 10 +- .../test-class-amp-playlist-embed-handler.php | 86 +- .../php/test-class-amp-post-type-support.php | 34 +- tests/php/test-class-amp-service-worker.php | 54 +- tests/php/test-class-amp-story-post-type.php | 126 +- tests/php/test-class-amp-story-templates.php | 24 +- tests/php/test-class-amp-theme-support.php | 320 ++-- .../test-class-amp-vimeo-embed-handler.php | 14 +- tests/php/test-class-amp-widget-archives.php | 10 +- .../php/test-class-amp-widget-categories.php | 10 +- tests/php/test-class-amp-widget-text.php | 6 +- .../test-class-amp-youtube-embed-handler.php | 14 +- .../php/test-tag-and-attribute-sanitizer.php | 1340 +++++++-------- ...test-class-amp-validated-url-post-type.php | 606 +++---- ...st-class-amp-validation-error-taxonomy.php | 414 ++--- .../test-class-amp-validation-manager.php | 406 ++--- 145 files changed, 6593 insertions(+), 6593 deletions(-) diff --git a/back-compat/templates-v0-3/meta-author.php b/back-compat/templates-v0-3/meta-author.php index c28a77d4a1d..8497572988b 100644 --- a/back-compat/templates-v0-3/meta-author.php +++ b/back-compat/templates-v0-3/meta-author.php @@ -8,9 +8,9 @@ $post_author = $this->get( 'post_author' ); $avatar_url = get_avatar_url( $post_author->user_email, - array( + [ 'size' => 24, - ) + ] ); ?> <li class="amp-wp-byline"> diff --git a/back-compat/templates-v0-3/single.php b/back-compat/templates-v0-3/single.php index bf383f77fa6..a19858e6322 100644 --- a/back-compat/templates-v0-3/single.php +++ b/back-compat/templates-v0-3/single.php @@ -14,16 +14,16 @@ <?php do_action( 'amp_post_template_head', $this ); ?> <style amp-custom> - <?php $this->load_parts( array( 'style' ) ); ?> + <?php $this->load_parts( [ 'style' ] ); ?> <?php do_action( 'amp_post_template_css', $this ); ?> </style> </head> <body> -<?php $this->load_parts( array( 'header-bar' ) ); ?> +<?php $this->load_parts( [ 'header-bar' ] ); ?> <div class="amp-wp-content"> <h1 class="amp-wp-title"><?php echo wp_kses_data( $this->get( 'post_title' ) ); ?></h1> <ul class="amp-wp-meta"> - <?php $this->load_parts( apply_filters( 'amp_post_template_meta_parts', array( 'meta-author', 'meta-time', 'meta-taxonomy' ) ) ); ?> + <?php $this->load_parts( apply_filters( 'amp_post_template_meta_parts', [ 'meta-author', 'meta-time', 'meta-taxonomy' ] ) ); ?> </ul> <?php echo $this->get( 'post_amp_content' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> </div> diff --git a/bin/add-test-widgets-to-sidebar.php b/bin/add-test-widgets-to-sidebar.php index 153ff9a4593..68580abc2ca 100644 --- a/bin/add-test-widgets-to-sidebar.php +++ b/bin/add-test-widgets-to-sidebar.php @@ -15,7 +15,7 @@ function amp_populate_sidebar() { global $wp_registered_sidebars; $widgets = amp_get_widgets(); $sidebar = amp_get_first_sidebar(); - $created_widgets = array(); + $created_widgets = []; foreach ( $widgets as $widget ) { if ( ! amp_widget_already_in_sidebar( $widget, $sidebar ) ) { amp_create_widget( $widget ); @@ -32,89 +32,89 @@ function amp_populate_sidebar() { * @return array $widgets Data for the widgets. */ function amp_get_widgets() { - return array( - array( + return [ + [ 'widget' => 'media_audio', 'settings' => array_merge( amp_media_widget( 'audio' ), - array( + [ 'title' => 'Test Audio Widget: No Loop or Preload', - ) + ] ), - ), - array( + ], + [ 'widget' => 'media_audio', 'settings' => array_merge( amp_media_widget( 'audio' ), - array( + [ 'title' => 'Test Audio Widget: With Loop, Preload', 'loop' => true, 'preload' => 'auto', - ) + ] ), - ), - array( + ], + [ 'widget' => 'archives', - 'settings' => array( + 'settings' => [ 'title' => 'Test Archives Widget: No Dropdown or Count', - ), - ), - array( + ], + ], + [ 'widget' => 'archives', - 'settings' => array( + 'settings' => [ 'title' => 'Test Archives Widget: With Dropdown, Count', 'count' => 1, 'dropdown' => 1, - ), - ), - array( + ], + ], + [ 'widget' => 'calendar', - ), - array( + ], + [ 'widget' => 'categories', - 'settings' => array( + 'settings' => [ 'title' => 'Test Categories Widget: No Count, Dropdown, or Hierarchical', - ), - ), - array( + ], + ], + [ 'widget' => 'categories', - 'settings' => array( + 'settings' => [ 'title' => 'Test Categories Widget: With Count', 'count' => 1, - ), - ), - array( + ], + ], + [ 'widget' => 'categories', - 'settings' => array( + 'settings' => [ 'title' => 'Test Categories Widget: With Count, Dropdown, And Hierarchical', 'count' => 1, 'dropdown' => 1, 'hierarchical' => 1, - ), - ), - array( + ], + ], + [ 'widget' => 'custom_html', - 'settings' => array( + 'settings' => [ 'title' => 'Test Custom HTML Widget', 'content' => '<h2>Example Custom HTML widget</h2><article>Here is some custom HTML with a <a href="http://example.com/m">link</a></article>', - ), - ), - array( + ], + ], + [ 'widget' => 'media_gallery', 'settings' => array_merge( amp_gallery_widget(), - array( + [ 'link_type' => 'post', 'orderby_random' => false, 'size' => 'thumbnail', - ) + ] ), - ), - array( + ], + [ 'widget' => 'media_image', 'settings' => array_merge( amp_image_widget(), - array( + [ 'alt' => 'Example alt value', 'caption' => 'Example caption', 'image_classes' => 'foo bar', @@ -125,97 +125,97 @@ function amp_get_widgets() { 'link_type' => 'custom', 'link_url' => 'http://example.com/amp-test', 'size' => 'full', - ) + ] ), - ), - array( + ], + [ 'widget' => 'meta', - ), - array( + ], + [ 'widget' => 'nav_menu', - 'settings' => array( + 'settings' => [ 'nav_menu' => amp_menu(), - ), - ), - array( + ], + ], + [ 'widget' => 'pages', - ), - array( + ], + [ 'widget' => 'recent-comments', - ), - array( + ], + [ 'widget' => 'recent-posts', - 'settings' => array( + 'settings' => [ 'show_date' => true, - ), - ), - array( + ], + ], + [ 'widget' => 'rss', - 'settings' => array( + 'settings' => [ 'title' => 'Test RSS Widget: No Content, Author, or Date', 'url' => 'https://amphtml.wordpress.com/feed/', 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0, - ), - ), - array( + ], + ], + [ 'widget' => 'rss', - 'settings' => array( + 'settings' => [ 'title' => 'Test RSS Widget: With Content, Author, Date', 'url' => 'https://amphtml.wordpress.com/feed/', 'show_author' => 1, 'show_date' => 1, 'show_summary' => 1, - ), - ), - array( + ], + ], + [ 'widget' => 'search', - ), - array( + ], + [ 'widget' => 'tag_cloud', - 'settings' => array( + 'settings' => [ 'title' => 'Test Tag Widget, No Count', - ), - ), - array( + ], + ], + [ 'widget' => 'tag_cloud', - 'settings' => array( + 'settings' => [ 'title' => 'Test Tag Widget, With Count', 'count' => 1, - ), - ), - array( + ], + ], + [ 'widget' => 'text', - 'settings' => array( + 'settings' => [ 'filter' => true, 'text' => '<strong>Example Headline</strong><ul><li>This is to test possible text</li><li>This should display as expected</li></ul>', 'visual' => true, - ), - ), - array( + ], + ], + [ 'widget' => 'media_video', 'settings' => array_merge( amp_media_widget( 'video' ), - array( + [ 'title' => 'Test Video Widget: No Loop or Preload', 'loop' => false, 'preload' => 'none', - ) + ] ), - ), - array( + ], + [ 'widget' => 'media_video', 'settings' => array_merge( amp_media_widget( 'video' ), - array( + [ 'title' => 'Test Video Widget: With Loop, Preload', 'loop' => true, 'preload' => 'metadata', - ) + ] ), - ), - ); + ], + ]; } /** @@ -231,10 +231,10 @@ function amp_get_widgets() { function amp_media_widget( $type ) { $all_media = amp_media( $type, 1 ); $media = reset( $all_media ); - return array( + return [ 'attachment_id' => $media->ID, 'url' => $media->guid, - ); + ]; } /** @@ -244,9 +244,9 @@ function amp_media_widget( $type ) { */ function amp_gallery_widget() { $images = amp_media( 'image', 3 ); - return array( + return [ 'ids' => wp_list_pluck( $images, 'ID' ), - ); + ]; } /** @@ -259,12 +259,12 @@ function amp_image_widget() { $image = reset( $all_images ); $metadata = wp_get_attachment_metadata( $image->ID ); $default_dimension = 100; - return array( + return [ 'attachment_id' => $image->ID, 'height' => isset( $metadata['height'] ) ? $metadata['height'] : $default_dimension, 'width' => isset( $metadata['width'] ) ? $metadata['width'] : $default_dimension, 'url' => wp_get_attachment_url( $image->ID ), - ); + ]; } /** @@ -277,12 +277,12 @@ function amp_image_widget() { */ function amp_media( $type, $count = 3 ) { $query = new WP_Query( - array( + [ 'post_type' => 'attachment', 'post_mime_type' => $type, 'post_status' => 'inherit', 'posts_per_page' => $count, - ) + ] ); if ( $query->post_count < $count ) { throw new Exception( @@ -335,7 +335,7 @@ function amp_widget_already_in_sidebar( $widget, $sidebar ) { } $id_base = $widget['widget']; - $all_widget_data = get_option( 'widget_' . $id_base, array() ); + $all_widget_data = get_option( 'widget_' . $id_base, [] ); foreach ( $sidebars[ $sidebar ] as $possible_widget ) { if ( false !== strpos( $possible_widget, $id_base ) ) { @@ -356,7 +356,7 @@ function amp_widget_already_in_sidebar( $widget, $sidebar ) { } // Find if all of the settings in $widget['settings'] are present in the widget that's already in the sidebar. - if ( array() === array_diff_assoc( array_map( 'serialize', $widget['settings'] ), array_map( 'serialize', $widget_data ) ) ) { + if ( [] === array_diff_assoc( array_map( 'serialize', $widget['settings'] ), array_map( 'serialize', $widget_data ) ) ) { return true; } } @@ -377,11 +377,11 @@ function amp_create_widget( $widget ) { $id_base = $widget['widget']; $option_key = 'widget_' . $id_base; - $widgets = get_option( $option_key, array() ); - $settings = isset( $widget['settings'] ) ? $widget['settings'] : array(); + $widgets = get_option( $option_key, [] ); + $settings = isset( $widget['settings'] ) ? $widget['settings'] : []; if ( ! isset( $settings['title'] ) ) { - $title = str_replace( array( '_', '-' ), ' ', $id_base ); + $title = str_replace( [ '_', '-' ], ' ', $id_base ); $settings['title'] = sprintf( 'Test %s Widget', ucwords( $title ) ); } @@ -421,7 +421,7 @@ function amp_get_first_sidebar() { * @return string $widget_id The ID of the widget, like 'text-2'. */ function amp_get_widget_id( $id_base ) { - $settings = get_option( "widget_{$id_base}", array() ); + $settings = get_option( "widget_{$id_base}", [] ); if ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) { $settings = $settings->getArrayCopy(); } diff --git a/bin/create-comments-on-test-post.php b/bin/create-comments-on-test-post.php index 218687356be..0c26fae50ea 100644 --- a/bin/create-comments-on-test-post.php +++ b/bin/create-comments-on-test-post.php @@ -13,19 +13,19 @@ * @return int Post ID. */ function amp_create_comments_test_post() { - $q = new WP_Query( array( 'name' => 'amp-test-comments' ) ); + $q = new WP_Query( [ 'name' => 'amp-test-comments' ] ); if ( $q->have_posts() ) { $post = $q->next_post(); $post_id = $post->ID; } else { $post_id = wp_insert_post( - array( + [ 'post_name' => 'amp-test-comments', 'post_title' => 'AMP Test Comments', 'post_type' => 'post', 'post_status' => 'publish', 'post_content' => amp_get_test_random_content( 200 ), - ) + ] ); if ( ! $post_id || is_wp_error( $post_id ) ) { @@ -49,7 +49,7 @@ function amp_create_comments_test_post() { */ function amp_add_comments( $post_id ) { $data = amp_get_test_comment_entries(); - $ids = array(); + $ids = []; foreach ( $data as $comment ) { $comment['comment_post_ID'] = $post_id; $yes_no = rand( 0, 1 ); @@ -71,14 +71,14 @@ function amp_add_comments( $post_id ) { * @return array Data entries. */ function amp_get_test_comment_entries() { - $comments = array(); + $comments = []; $time = strtotime( 'now' ); for ( $i = 0; $i < 30; $i++ ) { $author = preg_replace( '/[^\w ]+/', '', amp_get_test_random_content( 2, '' ) ); $time = strtotime( '+3 minutes', $time ); // Add comment. - $comments[] = array( + $comments[] = [ 'comment_author' => ucwords( $author ), 'comment_author_email' => strtolower( implode( '@', explode( ' ', $author ) ) ) . '.com', 'comment_author_url' => strtolower( implode( '.', explode( ' ', $author ) ) ) . '.com', @@ -89,7 +89,7 @@ function amp_get_test_comment_entries() { 'comment_agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36', 'comment_date' => date( 'Y-m-d H:i:s', $time ), 'comment_approved' => '1', - ); + ]; } return $comments; diff --git a/bin/create-embed-test-post.php b/bin/create-embed-test-post.php index 6fa2925d972..752b0ea147f 100644 --- a/bin/create-embed-test-post.php +++ b/bin/create-embed-test-post.php @@ -14,208 +14,208 @@ */ function amp_get_test_data_entries() { list( $img_src ) = wp_get_attachment_image_src( amp_get_media_items_ids( 'image', 1 ) ); - return array( - array( + return [ + [ 'heading' => 'Media Gallery', 'content' => sprintf( '[gallery ids="%s"]', amp_get_media_items_ids( 'image' ) ), - ), - array( + ], + [ 'heading' => 'Media Image', 'content' => wp_get_attachment_image( amp_get_media_items_ids( 'image', 1 ) ), - ), - array( + ], + [ 'heading' => 'Media Caption', 'content' => sprintf( '[caption width=150]%sExample image caption[/caption]', wp_get_attachment_image( amp_get_media_items_ids( 'image', 1 ) ) ), - ), - array( + ], + [ 'heading' => 'Media Video', 'content' => sprintf( '[video poster="%s" src=https://videos.files.wordpress.com/DK5mLrbr/video-ca6dc0ab4a_hd.mp4]', $img_src ), - ), - array( + ], + [ 'heading' => 'Media Audio', 'content' => '[audio src=https://wptavern.com/wp-content/uploads/2017/11/EPISODE-296-Gutenberg-Telemetry-Calypso-and-More-With-Matt-Mullenweg.mp3]', - ), - array( + ], + [ 'heading' => 'Video Playlist', 'content' => sprintf( '[playlist type="video" ids="%s"]', amp_get_media_items_ids( 'video' ) ), - ), - array( + ], + [ 'heading' => 'Audio Playlist', 'content' => sprintf( '[playlist ids="%s"]', amp_get_media_items_ids( 'audio' ) ), - ), - array( + ], + [ 'heading' => 'WordPress Post Embed', 'content' => 'https://make.wordpress.org/core/2017/12/11/whats-new-in-gutenberg-11th-december/', - ), - array( + ], + [ 'heading' => 'Amazon Com Smile Embed', 'content' => 'https://smile.amazon.com/dp/B00DPM7TIG', - ), - array( + ], + [ 'heading' => 'Amazon Co Smile Embed', 'content' => 'https://smile.amazon.co.uk/dp/B00DPM7TIG', - ), - array( + ], + [ 'heading' => 'Amazon Read CN Embed', 'content' => 'https://read.amazon.cn/kp/embed?asin=B00DPM7TIG', - ), - array( + ], + [ 'heading' => 'Animoto Embed', 'content' => 'https://animoto.com/play/TDfViXkPqIwYj5EjamYjnw', - ), - array( + ], + [ 'heading' => 'CloudUp Image Embed', 'content' => 'https://cloudup.com/iWn3EIpgjev', - ), - array( + ], + [ 'heading' => 'CloudUp Video Embed', 'content' => 'https://cloudup.com/ioyW8a_Tjme', - ), - array( + ], + [ 'heading' => 'CloudUp Gallery Embed', 'content' => 'https://cloudup.com/cQNdYtQLO5U', - ), - array( + ], + [ 'heading' => 'CollegeHumor Embed', 'content' => 'http://www.collegehumor.com/video/40002823/how-to-actually-finish-something-for-once', - ), - array( + ], + [ 'heading' => 'DailyMotion Embed', 'content' => 'http://www.dailymotion.com/video/x6bacgf', - ), - array( + ], + [ 'heading' => 'Facebook Post Embed', 'content' => 'https://www.facebook.com/WordPress/posts/10155651799877911', - ), - array( + ], + [ 'heading' => 'Facebook Video Embed', 'content' => 'https://www.facebook.com/WordPress/videos/10154702401472911/', - ), - array( + ], + [ 'heading' => 'Flickr Image Embed', 'content' => 'https://www.flickr.com/photos/sylvainmessier/38089894895/in/explore-2017-12-11/', - ), - array( + ], + [ 'heading' => 'Flickr Video Embed', 'content' => 'https://flic.kr/p/5TPDWa', - ), - array( + ], + [ 'heading' => 'Funny Or Die Video Embed', 'content' => 'http://www.funnyordie.com/videos/2977012a20/i-still-haven-t-found-the-droids-i-m-looking-for', - ), - array( + ], + [ 'heading' => 'Hulu Embed', 'content' => 'https://www.hulu.com/watch/807443', - ), - array( + ], + [ 'heading' => 'Instagram Embed', 'content' => 'https://www.instagram.com/p/bNd86MSFv6/', - ), - array( + ], + [ 'heading' => 'Issuu Embed', 'content' => 'https://issuu.com/ajcwfu/docs/seatatthetablefinal', - ), - array( + ], + [ 'heading' => 'Kickstarter Embed', 'content' => 'https://www.kickstarter.com/projects/iananderson/save-froots-magazine', - ), - array( + ], + [ 'heading' => 'Meetup Embed', 'content' => 'https://www.meetup.com/WordPress-Mexico', - ), - array( + ], + [ 'heading' => 'Mixcloud Embed', 'content' => 'https://www.mixcloud.com/TheWireMagazine/adventures-in-sound-and-music-hosted-by-derek-walmsley-7-december-2017/', - ), - array( + ], + [ 'heading' => 'Photobucket Embed', 'content' => 'http://i1259.photobucket.com/albums/ii543/iamnotpeterpan/EditPostlsaquoDennisDoesCricketmdashWordPress_zpsf72cc13d.png', - ), - array( + ], + [ 'heading' => 'Crowdsingal Poll Embed', 'content' => 'https://poll.fm/7012505', - ), - array( + ], + [ 'heading' => 'Polldaddy Survey Embed', 'content' => 'https://rydk.survey.fm/test-survey', - ), - array( + ], + [ 'heading' => 'Reddit Embed', 'content' => 'https://www.reddit.com/r/Android/comments/7jbkub/google_maps_will_soon_tell_you_when_its_time_to/?ref=share&ref_source=link', - ), - array( + ], + [ 'heading' => 'Reverb Nation Embed', 'content' => 'https://www.reverbnation.com/fernandotorresleiva/song/28755694-breve-amor-new-version', - ), - array( + ], + [ 'heading' => 'Screencast Embed', 'content' => 'http://www.screencast.com/t/nMCYr3N3uF', - ), - array( + ], + [ 'heading' => 'Scribd Embed', 'content' => 'http://www.scribd.com/doc/110799637/Synthesis-of-Knowledge-Effects-of-Fire-and-Thinning-Treatments-on-Understory-Vegetation-in-Dry-U-S-Forests', - ), - array( + ], + [ 'heading' => 'SlideShare Embed', 'content' => 'https://www.slideshare.net/slideshow/embed_code/key/u6WNbsR5worSzC', - ), - array( + ], + [ 'heading' => 'SmugMug Embed', 'content' => 'https://stuckincustoms.smugmug.com/Portfolio/i-GnwtS8R/A', - ), - array( + ], + [ 'heading' => 'Someecards Embed', 'content' => 'https://www.someecards.com/usercards/viewcard/mjaxmi1jmgy2y2exm2m2ngu2ntfi/?tagSlug=christmas', - ), - array( + ], + [ 'heading' => 'Someecards Short URL Embed', 'content' => 'https://some.ly/V3RZUq/', - ), - array( + ], + [ 'heading' => 'SoundCloud Embed', 'content' => 'https://soundcloud.com/jack-villano-villano/mozart-requiem-in-d-minor', - ), - array( + ], + [ 'heading' => 'Speaker Deck Embed', 'content' => 'https://speakerdeck.com/wallat/why-backbone', - ), - array( + ], + [ 'heading' => 'Spotify Embed', 'content' => 'https://open.spotify.com/track/2XULDEvijLgHttFgLzzpM5', - ), - array( + ], + [ 'heading' => 'Ted Embed', 'content' => 'https://www.ted.com/talks/derek_sivers_how_to_start_a_movement', - ), - array( + ], + [ 'heading' => 'Tumblr Post Embed', 'content' => 'http://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930', - ), - array( + ], + [ 'heading' => 'Twitter Embed', 'content' => 'https://twitter.com/WordPress/status/936550699336437760', - ), - array( + ], + [ 'heading' => 'VideoPress Embed', 'content' => 'https://videopress.com/v/kUJmAcSf', - ), - array( + ], + [ 'heading' => 'Vimeo Embed', 'content' => 'https://vimeo.com/59172123', - ), - array( + ], + [ 'heading' => 'WordPress Plugin Directory Embed', 'content' => 'https://wordpress.org/plugins/amp/', - ), - array( + ], + [ 'heading' => 'WordPress TV Embed', 'content' => 'https://videopress.com/v/DK5mLrbr', - ), - array( + ], + [ 'heading' => 'YouTube Embed', 'content' => 'https://www.youtube.com/watch?v=XOY3ZUO6P0k', - ), - ); + ], + ]; } /** @@ -228,13 +228,13 @@ function amp_get_test_data_entries() { */ function amp_get_media_items_ids( $type, $image_count = 3 ) { $query = new WP_Query( - array( + [ 'post_type' => 'attachment', 'post_mime_type' => $type, 'post_status' => 'inherit', 'posts_per_page' => $image_count, 'fields' => 'ids', - ) + ] ); if ( $query->post_count < $image_count ) { throw new Exception( @@ -263,11 +263,11 @@ function amp_create_embed_test_post( $data_entries ) { $page_id = $page->ID; } else { $page_id = wp_insert_post( - array( + [ 'post_name' => 'amp-test-embeds', 'post_title' => 'AMP Test Embeds', 'post_type' => 'page', - ) + ] ); if ( ! $page_id || is_wp_error( $page_id ) ) { @@ -289,10 +289,10 @@ function amp_create_embed_test_post( $data_entries ) { $update = wp_update_post( wp_slash( - array( + [ 'ID' => $page_id, 'post_content' => $content, - ) + ] ) ); diff --git a/bin/create-gutenberg-test-post.php b/bin/create-gutenberg-test-post.php index f27b7938bc3..5caa5c0a735 100644 --- a/bin/create-gutenberg-test-post.php +++ b/bin/create-gutenberg-test-post.php @@ -55,48 +55,48 @@ function get_test_block_fixtures() { * @return string $content The blocks as HTML. */ function get_test_block_permutations() { - $blocks = array( - array( + $blocks = [ + [ 'title' => '(Reusable) Block With Video', 'content' => sprintf( '', create_test_reusable_block() ), - ), - array( + ], + [ 'title' => 'Categories With Dropdown', 'content' => '', - ), - array( + ], + [ 'title' => 'Columns, With 2 Columns', 'content' => '<div class="wp-block-columns has-2-columns"><p class="layout-column-1">Column One, Paragraph One</p><p class="layout-column-1">Column One, Paragraph Two</p><p class="layout-column-2">Column Two, Paragraph One</p></div>', - ), - array( + ], + [ 'title' => 'Cover Image With Fixed Background', 'content' => '<section class="wp-block-cover-image has-background-dim-40 has-background-dim has-parallax" style="background-image:url(https://cldup.com/uuUqE_dXzy.jpg)"><h2>Guten Berg!</h2></section>', - ), - array( + ], + [ 'title' => 'WordPress Embed', 'content' => '<figure class="wp-block-embed-wordpress wp-block-embed">https://make.wordpress.org/core/2017/12/11/whats-new-in-gutenberg-11th-december/<figcaption>Embedded content from WordPress</figcaption></figure>', - ), - array( + ], + [ 'title' => 'YouTube Embed', 'content' => '<figure class="wp-block-embed-youtube wp-block-embed">https://www.youtube.com/watch?v=GGS-tKTXw4Y<figcaption>Embedded content from youtube</figcaption></figure>', - ), - array( + ], + [ 'title' => 'Twitter Embed', 'content' => '<figure class="wp-block-embed-twitter wp-block-embed">https://twitter.com/AMPhtml/status/963443140005957632<figcaption>We are Automattic</figcaption></figure>', - ), - array( + ], + [ 'title' => 'Gallery With 3 Columns', 'content' => '<ul class="wp-block-gallery alignnone columns-3 is-cropped"><li class="blocks-gallery-item"><figure><img src="https://cldup.com/uuUqE_dXzy.jpg" alt="title" /></figure></li><li class="blocks-gallery-item"><figure><img src="https://cldup.com/-3VMmmrPm9.jpg" alt="title" /></figure></li><li class="blocks-gallery-item"><figure><img src="https://cldup.com/aMbxBM0zAi.jpg" alt="title" /></figure></li></ul>', - ), - array( + ], + [ 'title' => 'Audio Shortcode', 'content' => '[audio src=https://wptavern.com/wp-content/uploads/2017/11/EPISODE-296-Gutenberg-Telemetry-Calypso-and-More-With-Matt-Mullenweg.mp3]', - ), - array( + ], + [ 'title' => 'Caption Shortcode', 'content' => '[caption width=150]This is a caption[/caption]', - ), - ); + ], + ]; $content = ''; foreach ( $blocks as $block ) { @@ -117,12 +117,12 @@ function get_test_block_permutations() { */ function create_test_reusable_block() { return wp_insert_post( - array( + [ 'post_type' => 'wp_block', 'post_title' => 'Test Reusable Block', 'post_content' => '<figure class="wp-block-video"><video src="https://videos.files.wordpress.com/DK5mLrbr/video-ca6dc0ab4a_hd.mp4" controls=""></video></figure>', 'post_status' => 'publish', - ) + ] ); } @@ -142,11 +142,11 @@ function create_gutenberg_test_post( $content ) { $page_id = $page->ID; } else { $page_id = wp_insert_post( - array( + [ 'post_name' => $slug, 'post_title' => $title, 'post_type' => 'page', - ) + ] ); if ( ! $page_id || is_wp_error( $page_id ) ) { @@ -155,10 +155,10 @@ function create_gutenberg_test_post( $content ) { } $update = wp_update_post( - array( + [ 'ID' => $page_id, 'post_content' => $content, - ) + ] ); if ( ! $update ) { diff --git a/bin/verify-version-consistency.php b/bin/verify-version-consistency.php index a50bc5fe12d..a7d2837ddbc 100755 --- a/bin/verify-version-consistency.php +++ b/bin/verify-version-consistency.php @@ -12,7 +12,7 @@ exit( 1 ); } -$versions = array(); +$versions = []; $readme_txt = file_get_contents( dirname( __FILE__ ) . '/../readme.txt' ); if ( ! preg_match( '/Stable tag:\s+(?P<version>\S+)/i', $readme_txt, $matches ) ) { diff --git a/includes/admin/class-amp-admin-pointer.php b/includes/admin/class-amp-admin-pointer.php index 5087ac178ee..90cfc9a0d74 100644 --- a/includes/admin/class-amp-admin-pointer.php +++ b/includes/admin/class-amp-admin-pointer.php @@ -61,10 +61,10 @@ class AMP_Admin_Pointer { * } */ public function __construct( $slug, array $args ) { - $default_position = array( + $default_position = [ 'edge' => is_rtl() ? 'right' : 'left', 'align' => 'bottom', - ); + ]; if ( isset( $args['position'] ) ) { $args['position'] = wp_parse_args( (array) $args['position'], $default_position ); @@ -73,7 +73,7 @@ public function __construct( $slug, array $args ) { $this->slug = $slug; $this->args = wp_parse_args( $args, - array( + [ 'selector' => '', 'description' => '', 'heading' => '', @@ -81,7 +81,7 @@ public function __construct( $slug, array $args ) { 'position' => $default_position, 'class' => '', 'active_callback' => null, - ) + ] ); } @@ -141,7 +141,7 @@ public function enqueue() { wp_enqueue_style( 'amp-validation-tooltips', amp_get_asset_url( 'css/amp-validation-tooltips.css' ), - array( 'wp-pointer' ), + [ 'wp-pointer' ], AMP__VERSION ); @@ -169,11 +169,11 @@ private function print_js() { $content = '<h3>' . wp_kses( $this->args['heading'], 'amp_admin_pointer' ) . '</h3>' . $content; } - $args = array( + $args = [ 'content' => $content, 'position' => $this->args['position'], 'pointerClass' => 'wp-pointer wp-amp-pointer' . ( ! empty( $this->args['class'] ) ? ' ' . $this->args['class'] : '' ), - ); + ]; ?> <script type="text/javascript"> diff --git a/includes/admin/class-amp-admin-pointers.php b/includes/admin/class-amp-admin-pointers.php index 2e51b14b7b7..e0b8aca838f 100644 --- a/includes/admin/class-amp-admin-pointers.php +++ b/includes/admin/class-amp-admin-pointers.php @@ -21,7 +21,7 @@ class AMP_Admin_Pointers { public function init() { add_action( 'admin_enqueue_scripts', - array( $this, 'enqueue_scripts' ) + [ $this, 'enqueue_scripts' ] ); } @@ -57,57 +57,57 @@ public function enqueue_scripts( $hook_suffix ) { * @return array List of AMP_Admin_Pointer instances. */ private function get_pointers() { - return array( + return [ new AMP_Admin_Pointer( 'amp_template_mode_pointer_10', - array( + [ 'selector' => '#toplevel_page_amp-options', 'heading' => __( 'AMP', 'amp' ), 'subheading' => __( 'New AMP Template Modes', 'amp' ), 'description' => __( 'You can now reuse your theme\'s templates and styles in AMP responses, in both “Transitional” and “Standard” modes.', 'amp' ), - 'position' => array( + 'position' => [ 'align' => 'middle', - ), + ], 'active_callback' => static function() { return version_compare( strtok( AMP__VERSION, '-' ), '1.1', '<' ); }, - ) + ] ), new AMP_Admin_Pointer( 'amp_stories_support_pointer_12', - array( + [ 'selector' => '#toplevel_page_amp-options', 'heading' => __( 'AMP', 'amp' ), 'subheading' => __( 'Stories', 'amp' ), 'description' => __( 'You can now enable Stories, a visual storytelling format for the open web which immerses your readers in fast-loading, full-screen, and visually rich experiences.', 'amp' ), - 'position' => array( + 'position' => [ 'align' => 'middle', - ), + ], 'active_callback' => static function( $hook_suffix ) { if ( 'toplevel_page_amp-options' === $hook_suffix ) { return false; } return ! AMP_Options_Manager::is_stories_experience_enabled(); }, - ) + ] ), new AMP_Admin_Pointer( 'amp_stories_menu_pointer_12', - array( + [ 'selector' => '#menu-posts-' . AMP_Story_Post_Type::POST_TYPE_SLUG, 'heading' => __( 'AMP', 'amp' ), 'description' => __( 'Head over here to create your first story.', 'amp' ), - 'position' => array( + 'position' => [ 'align' => 'middle', - ), + ], 'active_callback' => static function( $hook_suffix ) { if ( 'edit.php' === $hook_suffix && AMP_Story_Post_Type::POST_TYPE_SLUG === filter_input( INPUT_GET, 'post_type' ) ) { return false; } return AMP_Options_Manager::is_stories_experience_enabled(); }, - ) + ] ), - ); + ]; } } diff --git a/includes/admin/class-amp-customizer.php b/includes/admin/class-amp-customizer.php index 32c267ee914..61df10acc3c 100644 --- a/includes/admin/class-amp-customizer.php +++ b/includes/admin/class-amp-customizer.php @@ -59,9 +59,9 @@ public static function init( $wp_customize ) { $self->register_settings(); $self->register_ui(); - add_action( 'customize_controls_enqueue_scripts', array( $self, 'add_customizer_scripts' ) ); - add_action( 'customize_controls_print_footer_scripts', array( $self, 'print_controls_templates' ) ); - add_action( 'customize_preview_init', array( $self, 'init_preview' ) ); + add_action( 'customize_controls_enqueue_scripts', [ $self, 'add_customizer_scripts' ] ); + add_action( 'customize_controls_print_footer_scripts', [ $self, 'print_controls_templates' ] ); + add_action( 'customize_preview_init', [ $self, 'init_preview' ] ); } /** @@ -72,15 +72,15 @@ public static function init( $wp_customize ) { */ public function init_preview() { add_action( 'amp_post_template_head', 'wp_no_robots' ); - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_preview_scripts' ) ); - add_action( 'amp_customizer_enqueue_preview_scripts', array( $this, 'enqueue_preview_scripts' ) ); + add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_preview_scripts' ] ); + add_action( 'amp_customizer_enqueue_preview_scripts', [ $this, 'enqueue_preview_scripts' ] ); // Output scripts and styles which will break AMP validation only when preview is opened with controls for manipulation. if ( $this->wp_customize->get_messenger_channel() ) { - add_action( 'amp_post_template_head', array( $this->wp_customize, 'customize_preview_loading_style' ) ); - add_action( 'amp_post_template_css', array( $this, 'add_customize_preview_styles' ) ); - add_action( 'amp_post_template_head', array( $this->wp_customize, 'remove_frameless_preview_messenger_channel' ) ); - add_action( 'amp_post_template_footer', array( $this, 'add_preview_scripts' ) ); + add_action( 'amp_post_template_head', [ $this->wp_customize, 'customize_preview_loading_style' ] ); + add_action( 'amp_post_template_css', [ $this, 'add_customize_preview_styles' ] ); + add_action( 'amp_post_template_head', [ $this->wp_customize, 'remove_frameless_preview_messenger_channel' ] ); + add_action( 'amp_post_template_footer', [ $this, 'add_preview_scripts' ] ); } } @@ -90,12 +90,12 @@ public function init_preview() { public function register_ui() { $this->wp_customize->add_panel( self::PANEL_ID, - array( + [ 'type' => 'amp', 'title' => __( 'AMP', 'amp' ), /* translators: placeholder is URL to AMP project. */ 'description' => sprintf( __( '<a href="%s" target="_blank">The AMP Project</a> is a Google-led initiative that dramatically improves loading speeds on phones and tablets. You can use the Customizer to preview changes to your AMP template before publishing them.', 'amp' ), 'https://ampproject.org' ), - ) + ] ); /** @@ -137,7 +137,7 @@ public function add_customizer_scripts() { wp_enqueue_script( 'amp-customize-controls', amp_get_asset_url( 'js/amp-customize-controls.js' ), - array( 'jquery', 'customize-controls' ), + [ 'jquery', 'customize-controls' ], AMP__VERSION, true ); @@ -147,15 +147,15 @@ public function add_customizer_scripts() { sprintf( 'ampCustomizeControls.boot( %s );', wp_json_encode( - array( + [ 'queryVar' => amp_get_slug(), 'panelId' => self::PANEL_ID, 'ampUrl' => amp_admin_get_preview_permalink(), - 'l10n' => array( + 'l10n' => [ 'unavailableMessage' => __( 'AMP is not available for the page currently being previewed.', 'amp' ), 'unavailableLinkText' => __( 'Navigate to an AMP compatible page', 'amp' ), - ), - ) + ], + ] ) ) ); @@ -195,7 +195,7 @@ public function enqueue_preview_scripts() { wp_enqueue_script( 'amp-customize-preview', amp_get_asset_url( 'js/amp-customize-preview.js' ), - array( 'jquery', 'customize-preview' ), + [ 'jquery', 'customize-preview' ], AMP__VERSION, true ); @@ -220,10 +220,10 @@ public function enqueue_preview_scripts() { sprintf( 'ampCustomizePreview.boot( %s );', wp_json_encode( - array( + [ 'available' => $available, 'enabled' => is_amp_endpoint(), - ) + ] ) ) ); diff --git a/includes/admin/class-amp-editor-blocks.php b/includes/admin/class-amp-editor-blocks.php index dcf46489541..213b71fd752 100644 --- a/includes/admin/class-amp-editor-blocks.php +++ b/includes/admin/class-amp-editor-blocks.php @@ -16,14 +16,14 @@ class AMP_Editor_Blocks { * * @var array */ - public $content_required_amp_scripts = array(); + public $content_required_amp_scripts = []; /** * AMP components that have blocks. * * @var array */ - public $amp_blocks = array( + public $amp_blocks = [ 'amp-mathml', 'amp-timeago', 'amp-o2-player', @@ -34,14 +34,14 @@ class AMP_Editor_Blocks { 'amp-brid-player', 'amp-ima-video', 'amp-fit-text', - ); + ]; /** * Init. */ public function init() { if ( function_exists( 'register_block_type' ) ) { - add_filter( 'wp_kses_allowed_html', array( $this, 'whitelist_block_atts_in_wp_kses_allowed_html' ), 10, 2 ); + add_filter( 'wp_kses_allowed_html', [ $this, 'whitelist_block_atts_in_wp_kses_allowed_html' ], 10, 2 ); /* * Dirty AMP is required when a site is in AMP-first mode but not all templates are being served @@ -55,8 +55,8 @@ public function init() { * as much as possible. For more, see <https://github.com/ampproject/amp-wp/issues/1192>. */ if ( amp_is_canonical() ) { - add_filter( 'the_content', array( $this, 'tally_content_requiring_amp_scripts' ) ); - add_action( 'wp_print_footer_scripts', array( $this, 'print_dirty_amp_scripts' ) ); + add_filter( 'the_content', [ $this, 'tally_content_requiring_amp_scripts' ] ); + add_action( 'wp_print_footer_scripts', [ $this, 'print_dirty_amp_scripts' ] ); } } } @@ -89,18 +89,18 @@ public function whitelist_block_atts_in_wp_kses_allowed_html( $tags, $context ) foreach ( $this->amp_blocks as $amp_block ) { if ( ! isset( $tags[ $amp_block ] ) ) { - $tags[ $amp_block ] = array(); + $tags[ $amp_block ] = []; } // @todo The global attributes included here should be matched up with what is actually used by each block. $tags[ $amp_block ] = array_merge( array_fill_keys( - array( + [ 'layout', 'width', 'height', 'class', - ), + ], true ), $tags[ $amp_block ] diff --git a/includes/admin/class-amp-post-meta-box.php b/includes/admin/class-amp-post-meta-box.php index bd560805036..9c479a63fe0 100644 --- a/includes/admin/class-amp-post-meta-box.php +++ b/includes/admin/class-amp-post-meta-box.php @@ -86,20 +86,20 @@ public function init() { register_meta( 'post', self::STATUS_POST_META_KEY, - array( - 'sanitize_callback' => array( $this, 'sanitize_status' ), + [ + 'sanitize_callback' => [ $this, 'sanitize_status' ], 'type' => 'string', 'description' => __( 'AMP status.', 'amp' ), 'show_in_rest' => true, 'single' => true, - ) + ] ); - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_assets' ) ); - add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_block_assets' ) ); - add_action( 'post_submitbox_misc_actions', array( $this, 'render_status' ) ); - add_action( 'save_post', array( $this, 'save_amp_status' ) ); - add_filter( 'preview_post_link', array( $this, 'preview_post_link' ) ); + add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_assets' ] ); + add_action( 'enqueue_block_editor_assets', [ $this, 'enqueue_block_assets' ] ); + add_action( 'post_submitbox_misc_actions', [ $this, 'render_status' ] ); + add_action( 'save_post', [ $this, 'save_amp_status' ] ); + add_filter( 'preview_post_link', [ $this, 'preview_post_link' ] ); } /** @@ -110,7 +110,7 @@ public function init() { */ public function sanitize_status( $status ) { $status = strtolower( trim( $status ) ); - if ( ! in_array( $status, array( self::ENABLED_STATUS, self::DISABLED_STATUS ), true ) ) { + if ( ! in_array( $status, [ self::ENABLED_STATUS, self::DISABLED_STATUS ], true ) ) { /* * In lieu of actual validation being available, clear the status entirely * so that the underlying default status will be used instead. @@ -153,7 +153,7 @@ public function enqueue_admin_assets() { $script_deps_path = AMP__DIR__ . '/assets/js/' . self::ASSETS_HANDLE . '.deps.json'; $script_dependencies = file_exists( $script_deps_path ) ? json_decode( file_get_contents( $script_deps_path ), false ) // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents - : array(); + : []; // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter wp_enqueue_script( @@ -176,16 +176,16 @@ public function enqueue_admin_assets() { sprintf( 'ampPostMetaBox.boot( %s );', wp_json_encode( - array( + [ 'previewLink' => esc_url_raw( add_query_arg( amp_get_slug(), '', get_preview_post_link( $post ) ) ), 'canonical' => amp_is_canonical(), 'enabled' => empty( $support_errors ), - 'canSupport' => 0 === count( array_diff( $support_errors, array( 'post-status-disabled' ) ) ), + 'canSupport' => 0 === count( array_diff( $support_errors, [ 'post-status-disabled' ] ) ), 'statusInputName' => self::STATUS_INPUT_NAME, - 'l10n' => array( + 'l10n' => [ 'ampPreviewBtnLabel' => __( 'Preview changes in AMP (opens in new window)', 'amp' ), - ), - ) + ], + ] ) ) ); @@ -205,14 +205,14 @@ public function enqueue_block_assets() { wp_enqueue_style( self::BLOCK_ASSET_HANDLE, amp_get_asset_url( 'css/' . self::BLOCK_ASSET_HANDLE . '.css' ), - array(), + [], AMP__VERSION ); $script_deps_path = AMP__DIR__ . '/assets/js/' . self::BLOCK_ASSET_HANDLE . '.deps.json'; $script_dependencies = file_exists( $script_deps_path ) ? json_decode( file_get_contents( $script_deps_path ), false ) // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents - : array(); + : []; wp_enqueue_script( self::BLOCK_ASSET_HANDLE, @@ -226,15 +226,15 @@ public function enqueue_block_assets() { $enabled_status = $status_and_errors['status']; $error_messages = $this->get_error_messages( $status_and_errors['status'], $status_and_errors['errors'] ); - $data = array( - 'possibleStatuses' => array( self::ENABLED_STATUS, self::DISABLED_STATUS ), + $data = [ + 'possibleStatuses' => [ self::ENABLED_STATUS, self::DISABLED_STATUS ], 'defaultStatus' => $enabled_status, 'errorMessages' => $error_messages, 'isWebsiteEnabled' => AMP_Options_Manager::is_website_experience_enabled(), 'isStoriesEnabled' => AMP_Options_Manager::is_stories_experience_enabled(), 'hasThemeSupport' => current_theme_supports( AMP_Theme_Support::SLUG ), 'isStandardMode' => amp_is_canonical(), - ); + ]; wp_localize_script( self::BLOCK_ASSET_HANDLE, @@ -280,10 +280,10 @@ public function render_status( $post ) { $errors = $status_and_errors['errors']; $error_messages = $this->get_error_messages( $status, $errors ); - $labels = array( + $labels = [ 'enabled' => __( 'Enabled', 'amp' ), 'disabled' => __( 'Disabled', 'amp' ), - ); + ]; // The preceding variables are used inside the following amp-status.php template. include AMP__DIR__ . '/templates/admin/amp-status.php'; @@ -310,14 +310,14 @@ public static function get_status_and_errors( $post ) { if ( current_theme_supports( AMP_Theme_Support::SLUG ) ) { $availability = AMP_Theme_Support::get_template_availability( $post ); $status = $availability['supported'] ? self::ENABLED_STATUS : self::DISABLED_STATUS; - $errors = array_diff( $availability['errors'], array( 'post-status-disabled' ) ); // Subtract the status which the metabox will allow to be toggled. + $errors = array_diff( $availability['errors'], [ 'post-status-disabled' ] ); // Subtract the status which the metabox will allow to be toggled. if ( true === $availability['immutable'] ) { $errors[] = 'status_immutable'; } } else { $errors = AMP_Post_Type_Support::get_support_errors( $post ); $status = empty( $errors ) ? self::ENABLED_STATUS : self::DISABLED_STATUS; - $errors = array_diff( $errors, array( 'post-status-disabled' ) ); // Subtract the status which the metabox will allow to be toggled. + $errors = array_diff( $errors, [ 'post-status-disabled' ] ); // Subtract the status which the metabox will allow to be toggled. } return compact( 'status', 'errors' ); @@ -332,7 +332,7 @@ public static function get_status_and_errors( $post ) { * @return array $error_messages The error messages, as an array of strings. */ public function get_error_messages( $status, $errors ) { - $error_messages = array(); + $error_messages = []; if ( in_array( 'status_immutable', $errors, true ) ) { if ( self::ENABLED_STATUS === $status ) { $error_messages[] = __( 'Your site does not allow AMP to be disabled.', 'amp' ); @@ -360,7 +360,7 @@ public function get_error_messages( $status, $errors ) { if ( in_array( 'skip-post', $errors, true ) ) { $error_messages[] = __( 'A plugin or theme has disabled AMP support.', 'amp' ); } - if ( count( array_diff( $errors, array( 'status_immutable', 'page-on-front', 'page-for-posts', 'password-protected', 'post-type-support', 'skip-post', 'template_unsupported', 'no_matching_template' ) ) ) > 0 ) { + if ( count( array_diff( $errors, [ 'status_immutable', 'page-on-front', 'page-for-posts', 'password-protected', 'post-type-support', 'skip-post', 'template_unsupported', 'no_matching_template' ] ) ) > 0 ) { $error_messages[] = __( 'Unavailable for an unknown reason.', 'amp' ); } diff --git a/includes/admin/class-amp-story-templates.php b/includes/admin/class-amp-story-templates.php index fad1a8a7a74..335ec1d8f59 100644 --- a/includes/admin/class-amp-story-templates.php +++ b/includes/admin/class-amp-story-templates.php @@ -36,12 +36,12 @@ public function init() { return; } - add_filter( 'rest_wp_block_query', array( $this, 'filter_rest_wp_block_query' ), 10, 2 ); - add_action( 'save_post_wp_block', array( $this, 'flag_template_as_modified' ) ); + add_filter( 'rest_wp_block_query', [ $this, 'filter_rest_wp_block_query' ], 10, 2 ); + add_action( 'save_post_wp_block', [ $this, 'flag_template_as_modified' ] ); // Temporary filters for disallowing the users to edit any templates until the feature has been implemented. - add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 3 ); - add_filter( 'pre_get_posts', array( $this, 'filter_pre_get_posts' ) ); + add_filter( 'user_has_cap', [ $this, 'filter_user_has_cap' ], 10, 3 ); + add_filter( 'pre_get_posts', [ $this, 'filter_pre_get_posts' ] ); $this->register_taxonomy(); $this->maybe_import_story_templates(); @@ -83,15 +83,15 @@ public function filter_pre_get_posts( $query ) { $tax_query = $query->get( 'tax_query' ); if ( empty( $tax_query ) ) { - $tax_query = array(); + $tax_query = []; } - $tax_query[] = array( + $tax_query[] = [ 'taxonomy' => self::TEMPLATES_TAXONOMY, 'field' => 'slug', - 'terms' => array( self::TEMPLATES_TERM ), + 'terms' => [ self::TEMPLATES_TERM ], 'operator' => 'NOT IN', - ); + ]; $query->set( 'tax_query', $tax_query ); return $query; @@ -129,13 +129,13 @@ public function import_story_templates() { $post_id = wp_insert_post( wp_slash( - array( + [ 'post_title' => $template['title'], 'post_type' => 'wp_block', 'post_status' => 'publish', 'post_content' => $post_content, 'post_name' => $template['name'], - ) + ] ) ); if ( ! $post_id ) { @@ -160,17 +160,17 @@ protected function maybe_update_template( $template_id, $template, $content ) { return; } - remove_action( 'save_post_wp_block', array( $this, 'flag_template_as_modified' ) ); + remove_action( 'save_post_wp_block', [ $this, 'flag_template_as_modified' ] ); wp_update_post( wp_slash( - array( + [ 'ID' => $template_id, 'post_content' => $content, 'post_title' => $template['title'], - ) + ] ) ); - add_action( 'save_post_wp_block', array( $this, 'flag_template_as_modified' ) ); + add_action( 'save_post_wp_block', [ $this, 'flag_template_as_modified' ] ); } /** @@ -179,48 +179,48 @@ protected function maybe_update_template( $template_id, $template, $content ) { * @return array Story templates. */ public static function get_story_templates() { - return array( - array( + return [ + [ 'title' => __( 'Template: Travel Tip', 'amp' ), 'name' => 'travel-tip', - ), - array( + ], + [ 'title' => __( 'Template: Quote', 'amp' ), 'name' => 'quote', - ), - array( + ], + [ 'title' => __( 'Template: Travel CTA', 'amp' ), 'name' => 'travel-cta', - ), - array( + ], + [ 'title' => __( 'Template: Title Page', 'amp' ), 'name' => 'title-page', - ), - array( + ], + [ 'title' => __( 'Template: Travel Vertical', 'amp' ), 'name' => 'travel-vertical', - ), - array( + ], + [ 'title' => __( 'Template: Fandom Title', 'amp' ), 'name' => 'fandom-title', - ), - array( + ], + [ 'title' => __( 'Template: Fandom CTA', 'amp' ), 'name' => 'fandom-cta', - ), - array( + ], + [ 'title' => __( 'Template: Fandom Fact', 'amp' ), 'name' => 'fandom-fact', - ), - array( + ], + [ 'title' => __( 'Template: Fandom Fact Text', 'amp' ), 'name' => 'fandom-fact-text', - ), - array( + ], + [ 'title' => __( 'Template: Fandom Intro', 'amp' ), 'name' => 'fandom-intro', - ), - ); + ], + ]; } /** @@ -234,12 +234,12 @@ private function template_exists( $slug ) { return 0; } - $args = array( + $args = [ 'name' => $slug, 'post_type' => 'wp_block', 'post_status' => 'publish', 'posts_per_page' => 1, - ); + ]; $templates = get_posts( $args ); if ( ! empty( $templates ) ) { return $templates[0]->ID; @@ -255,7 +255,7 @@ private function register_taxonomy() { register_taxonomy( self::TEMPLATES_TAXONOMY, 'wp_block', - array( + [ 'query_var' => self::TEMPLATES_TAXONOMY, 'show_admin_column' => false, 'show_in_rest' => true, @@ -268,17 +268,17 @@ private function register_taxonomy() { 'hierarchical' => false, 'show_in_menu' => false, 'meta_box_cb' => false, - ) + ] ); if ( ! term_exists( self::TEMPLATES_TERM, self::TEMPLATES_TAXONOMY ) ) { wp_insert_term( __( 'Story Template', 'amp' ), self::TEMPLATES_TAXONOMY, - array( + [ 'description' => __( 'Story Template', 'amp' ), 'slug' => self::TEMPLATES_TERM, - ) + ] ); } } @@ -308,14 +308,14 @@ public function filter_rest_wp_block_query( $args, $request ) { $edited_post = get_post( absint( $params['post'] ) ); if ( AMP_Story_Post_Type::POST_TYPE_SLUG !== $edited_post->post_type ) { if ( ! isset( $args['tax_query'] ) ) { - $args['tax_query'] = array(); + $args['tax_query'] = []; } - $args['tax_query'][] = array( + $args['tax_query'][] = [ 'taxonomy' => self::TEMPLATES_TAXONOMY, 'field' => 'slug', - 'terms' => array( self::TEMPLATES_TERM ), + 'terms' => [ self::TEMPLATES_TERM ], 'operator' => 'NOT IN', - ); + ]; } return $args; diff --git a/includes/admin/functions.php b/includes/admin/functions.php index 072181c9261..1ab48dad096 100644 --- a/includes/admin/functions.php +++ b/includes/admin/functions.php @@ -26,10 +26,10 @@ function amp_init_customizer() { } // Fire up the AMP Customizer. - add_action( 'customize_register', array( 'AMP_Template_Customizer', 'init' ), 500 ); + add_action( 'customize_register', [ 'AMP_Template_Customizer', 'init' ], 500 ); // Add some basic design settings + controls to the Customizer. - add_action( 'amp_init', array( 'AMP_Customizer_Design_Settings', 'init' ) ); + add_action( 'amp_init', [ 'AMP_Customizer_Design_Settings', 'init' ] ); // Add a link to the Customizer. add_action( 'admin_menu', 'amp_add_customizer_link' ); @@ -51,7 +51,7 @@ function amp_admin_get_preview_permalink() { // Make sure the desired post type is actually supported, and if so, prefer it. $supported_post_types = get_post_types_by_support( AMP_Post_Type_Support::SLUG ); if ( in_array( $post_type, $supported_post_types, true ) ) { - $supported_post_types = array_unique( array_merge( array( $post_type ), $supported_post_types ) ); + $supported_post_types = array_unique( array_merge( [ $post_type ], $supported_post_types ) ); } // Bail if there are no supported post types. @@ -68,7 +68,7 @@ function amp_admin_get_preview_permalink() { } $post_ids = get_posts( - array( + [ 'no_found_rows' => true, 'suppress_filters' => false, 'post_status' => 'publish', @@ -77,7 +77,7 @@ function amp_admin_get_preview_permalink() { 'posts_per_page' => 1, 'fields' => 'ids', // @todo This should eventually do a meta_query to make sure there are none that have AMP_Post_Meta_Box::STATUS_POST_META_KEY = DISABLED_STATUS. - ) + ] ); if ( empty( $post_ids ) ) { @@ -99,11 +99,11 @@ function amp_add_customizer_link() { } $menu_slug = add_query_arg( - array( + [ 'autofocus[panel]' => AMP_Template_Customizer::PANEL_ID, 'url' => rawurlencode( amp_admin_get_preview_permalink() ), 'return' => rawurlencode( admin_url() ), - ), + ], 'customize.php' ); @@ -151,7 +151,7 @@ function amp_add_options_menu() { * @param array $analytics Analytics. * @return array Analytics. */ -function amp_add_custom_analytics( $analytics = array() ) { +function amp_add_custom_analytics( $analytics = [] ) { $analytics = amp_get_analytics( $analytics ); /** diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php index b41e53c5bea..7455f84225c 100644 --- a/includes/amp-helper-functions.php +++ b/includes/amp-helper-functions.php @@ -194,7 +194,7 @@ function amp_add_amphtml_link() { // Check to see if there are known unaccepted validation errors for this URL. if ( current_theme_supports( AMP_Theme_Support::SLUG ) ) { - $validation_errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $current_url, array( 'ignore_accepted' => true ) ); + $validation_errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $current_url, [ 'ignore_accepted' => true ] ); $error_count = count( $validation_errors ); if ( $error_count > 0 ) { echo "\s*$#', '', $stylesheet_string ); - $stylesheet = array(); + $stylesheet = []; $parsed_stylesheet = $this->parse_stylesheet( $stylesheet_string, $options ); $validation_results = $parsed_stylesheet['validation_results']; if ( ! empty( $parsed_stylesheet['css_document'] ) ) { @@ -1633,9 +1633,9 @@ static function( $selector ) { $declaration = $split_stylesheet[ ++$i ]; // @todo The following logic could be made much more robust if PHP-CSS-Parser did parsing of selectors. See <https://github.com/sabberworm/PHP-CSS-Parser/pull/138#issuecomment-418193262> and <https://github.com/ampproject/amp-wp/issues/2102>. - $selectors_parsed = array(); + $selectors_parsed = []; foreach ( $selectors as $selector ) { - $selectors_parsed[ $selector ] = array(); + $selectors_parsed[ $selector ] = []; // Remove :not() and pseudo selectors to eliminate false negatives, such as with `body:not(.title-tagline-hidden) .site-branding-text` (but not after escape character). $reduced_selector = preg_replace( '/(?<!\\\\)::?[a-zA-Z0-9_-]+(\(.+?\))?/', '', $selector ); @@ -1692,10 +1692,10 @@ static function( $matches ) use ( $selector, &$selectors_parsed ) { unset( $reduced_selector ); } - $stylesheet[] = array( + $stylesheet[] = [ $selectors_parsed, $declaration, - ); + ]; } else { $stylesheet[] = $split_stylesheet[ $i ]; } @@ -1706,9 +1706,9 @@ static function( $matches ) use ( $selector, &$selectors_parsed ) { return array_merge( compact( 'stylesheet', 'validation_results' ), - array( + [ 'imported_font_urls' => $parsed_stylesheet['imported_font_urls'], - ) + ] ); } @@ -1721,7 +1721,7 @@ static function( $matches ) use ( $selector, &$selectors_parsed ) { * @see AMP_Style_Sanitizer::should_sanitize_validation_error() * @var array */ - protected $previous_should_sanitize_validation_error_results = array(); + protected $previous_should_sanitize_validation_error_results = []; /** * Check whether or not sanitization should occur in response to validation error. @@ -1734,7 +1734,7 @@ static function( $matches ) use ( $selector, &$selectors_parsed ) { * @param array $data Data including the node. * @return bool Whether to sanitize. */ - public function should_sanitize_validation_error( $validation_error, $data = array() ) { + public function should_sanitize_validation_error( $validation_error, $data = [] ) { if ( ! isset( $data['node'] ) ) { $data['node'] = $this->current_node; } @@ -1787,7 +1787,7 @@ static function( $matches ) { * @return array Validation errors. */ private function process_css_list( CSSList $css_list, $options ) { - $results = array(); + $results = []; foreach ( $css_list->getContents() as $css_item ) { $sanitized = false; @@ -1798,11 +1798,11 @@ private function process_css_list( CSSList $css_list, $options ) { ); } elseif ( $css_item instanceof AtRuleBlockList ) { if ( ! in_array( $css_item->atRuleName(), $options['allowed_at_rules'], true ) ) { - $error = array( + $error = [ 'code' => self::ILLEGAL_AT_RULE_ERROR_CODE, 'at_rule' => $css_item->atRuleName(), 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); $results[] = compact( 'error', 'sanitized' ); } @@ -1819,11 +1819,11 @@ private function process_css_list( CSSList $css_list, $options ) { ); } elseif ( $css_item instanceof AtRuleSet ) { if ( ! in_array( $css_item->atRuleName(), $options['allowed_at_rules'], true ) ) { - $error = array( + $error = [ 'code' => self::ILLEGAL_AT_RULE_ERROR_CODE, 'at_rule' => $css_item->atRuleName(), 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); $results[] = compact( 'error', 'sanitized' ); } @@ -1836,11 +1836,11 @@ private function process_css_list( CSSList $css_list, $options ) { } } elseif ( $css_item instanceof KeyFrame ) { if ( ! in_array( 'keyframes', $options['allowed_at_rules'], true ) ) { - $error = array( + $error = [ 'code' => self::ILLEGAL_AT_RULE_ERROR_CODE, 'at_rule' => $css_item->atRuleName(), 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); $results[] = compact( 'error', 'sanitized' ); } @@ -1861,20 +1861,20 @@ private function process_css_list( CSSList $css_list, $options ) { */ $sanitized = true; } else { - $error = array( + $error = [ 'code' => self::ILLEGAL_AT_RULE_ERROR_CODE, 'at_rule' => $css_item->atRuleName(), 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); $results[] = compact( 'error', 'sanitized' ); } } else { - $error = array( + $error = [ 'code' => 'unrecognized_css', 'item' => get_class( $css_item ), 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); $results[] = compact( 'error', 'sanitized' ); } @@ -1942,7 +1942,7 @@ private function real_path_urls( $urls, $stylesheet_url ) { * @return array Validation results. */ private function process_css_declaration_block( RuleSet $ruleset, CSSList $css_list, $options ) { - $results = array(); + $results = []; if ( $ruleset instanceof DeclarationBlock ) { $this->ampify_ruleset_selectors( $ruleset ); @@ -1958,12 +1958,12 @@ private function process_css_declaration_block( RuleSet $ruleset, CSSList $css_l foreach ( $properties as $property ) { $vendorless_property_name = preg_replace( '/^-\w+-/', '', $property->getRule() ); if ( ! in_array( $vendorless_property_name, $options['property_whitelist'], true ) ) { - $error = array( + $error = [ 'code' => 'illegal_css_property', 'property_name' => $property->getRule(), 'property_value' => $property->getValue(), 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); if ( $sanitized ) { $ruleset->removeRule( $property->getRule() ); @@ -1975,12 +1975,12 @@ private function process_css_declaration_block( RuleSet $ruleset, CSSList $css_l foreach ( $options['property_blacklist'] as $illegal_property_name ) { $properties = $ruleset->getRules( $illegal_property_name ); foreach ( $properties as $property ) { - $error = array( + $error = [ 'code' => 'illegal_css_property', 'property_name' => $property->getRule(), 'property_value' => (string) $property->getValue(), 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); if ( $sanitized ) { $ruleset->removeRule( $property->getRule() ); @@ -2071,23 +2071,23 @@ private function process_font_face_at_rule( AtRuleSet $ruleset, $options ) { * * Clearly the components here are not logically grouped. So the first step is to fix the order. */ - $sources = array(); + $sources = []; foreach ( $value->getListComponents() as $component ) { if ( $component instanceof RuleValueList ) { $subcomponents = $component->getListComponents(); $subcomponent = array_shift( $subcomponents ); if ( $subcomponent ) { if ( empty( $sources ) ) { - $sources[] = array( $subcomponent ); + $sources[] = [ $subcomponent ]; } else { $sources[ count( $sources ) - 1 ][] = $subcomponent; } } foreach ( $subcomponents as $subcomponent ) { - $sources[] = array( $subcomponent ); + $sources[] = [ $subcomponent ]; } } elseif ( empty( $sources ) ) { - $sources[] = array( $component ); + $sources[] = [ $component ]; } else { $sources[ count( $sources ) - 1 ][] = $component; } @@ -2099,8 +2099,8 @@ private function process_font_face_at_rule( AtRuleSet $ruleset, $options ) { * @var string[] $source_file_urls * @var URL[] $source_data_url_objects */ - $source_file_urls = array(); - $source_data_url_objects = array(); + $source_file_urls = []; + $source_data_url_objects = []; foreach ( $sources as $i => $source ) { if ( $source[0] instanceof URL ) { $value = $source[0]->getURL()->getString(); @@ -2120,7 +2120,7 @@ private function process_font_face_at_rule( AtRuleSet $ruleset, $options ) { } $extension = preg_replace( ':.+/(.+-)?:', '', $mime_type ); - $guessed_urls = array(); + $guessed_urls = []; // Guess URLs based on any other font sources that are not using data: URLs (e.g. truetype fallback for inline woff2). foreach ( $source_file_urls as $source_file_url ) { @@ -2147,7 +2147,7 @@ private function process_font_face_at_rule( AtRuleSet $ruleset, $options ) { // Find the font file that exists, and then replace the data: URL with the external URL for the font. foreach ( $guessed_urls as $guessed_url ) { - $path = $this->get_validated_url_file_path( $guessed_url, array( 'woff', 'woff2', 'ttf', 'otf', 'svg' ) ); + $path = $this->get_validated_url_file_path( $guessed_url, [ 'woff', 'woff2', 'ttf', 'otf', 'svg' ] ); if ( ! is_wp_error( $path ) ) { $data_url->getURL()->setString( $guessed_url ); $converted_count++; @@ -2183,15 +2183,15 @@ private function process_font_face_at_rule( AtRuleSet $ruleset, $options ) { * @return array Validation results. */ private function process_css_keyframes( KeyFrame $css_list, $options ) { - $results = array(); + $results = []; if ( ! empty( $options['property_whitelist'] ) ) { foreach ( $css_list->getContents() as $rules ) { if ( ! ( $rules instanceof DeclarationBlock ) ) { - $error = array( + $error = [ 'code' => 'unrecognized_css', 'item' => get_class( $rules ), 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); if ( $sanitized ) { $css_list->remove( $rules ); @@ -2209,12 +2209,12 @@ private function process_css_keyframes( KeyFrame $css_list, $options ) { foreach ( $properties as $property ) { $vendorless_property_name = preg_replace( '/^-\w+-/', '', $property->getRule() ); if ( ! in_array( $vendorless_property_name, $options['property_whitelist'], true ) ) { - $error = array( + $error = [ 'code' => 'illegal_css_property', 'property_name' => $property->getRule(), 'property_value' => (string) $property->getValue(), 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); if ( $sanitized ) { $rules->removeRule( $property->getRule() ); @@ -2239,7 +2239,7 @@ private function process_css_keyframes( KeyFrame $css_list, $options ) { * @return array Validation results. */ private function transform_important_qualifiers( RuleSet $ruleset, CSSList $css_list ) { - $results = array(); + $results = []; // An !important only makes sense for rulesets that have selectors. $allow_transformation = ( @@ -2249,7 +2249,7 @@ private function transform_important_qualifiers( RuleSet $ruleset, CSSList $css_ ); $properties = $ruleset->getRules(); - $importants = array(); + $importants = []; foreach ( $properties as $property ) { if ( $property->getIsImportant() ) { if ( $allow_transformation ) { @@ -2257,10 +2257,10 @@ private function transform_important_qualifiers( RuleSet $ruleset, CSSList $css_ $property->setIsImportant( false ); $ruleset->removeRule( $property->getRule() ); } else { - $error = array( + $error = [ 'code' => 'illegal_css_important', 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; $sanitized = $this->should_sanitize_validation_error( $error ); if ( $sanitized ) { $property->setIsImportant( false ); @@ -2312,7 +2312,7 @@ static function( Selector $old_selector ) { $i = array_search( $ruleset, $css_list->getContents(), true ); if ( false !== $i && method_exists( $css_list, 'splice' ) ) { - $css_list->splice( $i + 1, 0, array( $important_ruleset ) ); + $css_list->splice( $i + 1, 0, [ $important_ruleset ] ); } else { $css_list->append( $important_ruleset ); } @@ -2348,22 +2348,22 @@ private function collect_inline_styles( $element ) { $processed = $this->process_stylesheet( $rule, - array( - 'allowed_at_rules' => array(), + [ + 'allowed_at_rules' => [], 'property_whitelist' => $this->style_custom_cdata_spec['css_spec']['declaration'], - ) + ] ); $element->removeAttribute( 'style' ); if ( $processed['stylesheet'] ) { - $this->pending_stylesheets[] = array( + $this->pending_stylesheets[] = [ 'group' => 'custom', 'stylesheet' => $processed['stylesheet'], 'node' => $element, 'sources' => $this->current_sources, 'priority' => $this->get_stylesheet_priority( $style_attribute ), - ); + ]; if ( $element->hasAttribute( 'class' ) ) { $element->setAttribute( 'class', $element->getAttribute( 'class' ) . ' ' . $class ); @@ -2385,24 +2385,24 @@ private function collect_inline_styles( $element ) { * @see https://www.ampproject.org/docs/fundamentals/spec#keyframes-stylesheet */ private function finalize_styles() { - $stylesheet_groups = array( - 'custom' => array( + $stylesheet_groups = [ + 'custom' => [ 'source_map_comment' => "\n\n/*# sourceURL=amp-custom.css */", 'cdata_spec' => $this->style_custom_cdata_spec, - 'pending_stylesheets' => array(), + 'pending_stylesheets' => [], 'included_count' => 0, 'import_front_matter' => '', // Extra @import statements that are prepended when fetch fails and validation error is rejected. - ), - 'keyframes' => array( + ], + 'keyframes' => [ 'source_map_comment' => "\n\n/*# sourceURL=amp-keyframes.css */", 'cdata_spec' => $this->style_keyframes_cdata_spec, - 'pending_stylesheets' => array(), + 'pending_stylesheets' => [], 'included_count' => 0, 'import_front_matter' => '', - ), - ); + ], + ]; - $imported_font_urls = array(); + $imported_font_urls = []; // Divide pending stylesheet between custom and keyframes, and calculate size of each (before tree shaking). foreach ( $this->pending_stylesheets as $i => $pending_stylesheet ) { @@ -2462,7 +2462,7 @@ private function finalize_styles() { $included_original_size = 0; $excluded_size = 0; $excluded_original_size = 0; - $included_sources = array(); + $included_sources = []; foreach ( $this->pending_stylesheets as $j => $pending_stylesheet ) { if ( 'custom' !== $pending_stylesheet['group'] || ! ( $pending_stylesheet['node'] instanceof DOMElement ) || ! empty( $pending_stylesheet['duplicate'] ) ) { continue; @@ -2597,10 +2597,10 @@ private function finalize_styles() { $body = $this->dom->getElementsByTagName( 'body' )->item( 0 ); if ( ! $body ) { $this->should_sanitize_validation_error( - array( + [ 'code' => 'missing_body_element', 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ) + ] ); } else { $css = $stylesheet_groups['keyframes']['import_front_matter']; @@ -2692,7 +2692,7 @@ private function remove_admin_bar_if_css_excluded() { * @param DeclarationBlock $ruleset Ruleset. */ private function ampify_ruleset_selectors( $ruleset ) { - $selectors = array(); + $selectors = []; $changes = 0; $language = strtolower( get_bloginfo( 'language' ) ); foreach ( $ruleset->getSelectors() as $old_selector ) { @@ -2759,7 +2759,7 @@ static function ( $selector_language ) { $before_type_selector_pattern = '(?<=^|\(|\s|>|\+|~|,|})'; $after_type_selector_pattern = '(?=$|[^a-zA-Z0-9_-])'; - $edited_selectors = array( $selector ); + $edited_selectors = [ $selector ]; foreach ( $this->selector_mappings as $html_selector => $amp_selectors ) { // Note: The $selector_mappings array contains ~6 items. $html_pattern = '/' . $before_type_selector_pattern . preg_quote( $html_selector, '/' ) . $after_type_selector_pattern . '/i'; foreach ( $edited_selectors as &$edited_selector ) { // Note: The $edited_selectors array contains only item in the normal case. @@ -2804,8 +2804,8 @@ private function finalize_stylesheet_group( $group, $group_config ) { $included_count = 0; $max_bytes = $group_config['cdata_spec']['max_bytes'] - strlen( $group_config['source_map_comment'] ); - $previously_seen_stylesheet_index = array(); - $indices_by_stylesheet_element_id = array(); + $previously_seen_stylesheet_index = []; + $indices_by_stylesheet_element_id = []; foreach ( $this->pending_stylesheets as $pending_stylesheet_index => &$pending_stylesheet ) { if ( $group !== $pending_stylesheet['group'] ) { continue; @@ -2816,7 +2816,7 @@ private function finalize_stylesheet_group( $group, $group_config ) { $indices_by_stylesheet_element_id[ $pending_stylesheet['node']->getAttribute( 'id' ) ] = $pending_stylesheet_index; } - $stylesheet_parts = array(); + $stylesheet_parts = []; $original_size = 0; foreach ( $pending_stylesheet['stylesheet'] as $stylesheet_part ) { if ( is_string( $stylesheet_part ) ) { @@ -2827,7 +2827,7 @@ private function finalize_stylesheet_group( $group, $group_config ) { list( $selectors_parsed, $declaration_block ) = $stylesheet_part; - $selectors = array(); + $selectors = []; foreach ( $selectors_parsed as $selector => $parsed_selector ) { $should_include = ( // If all class names are used in the doc. @@ -2963,15 +2963,15 @@ function( $a, $b ) { // Report validation error if size is now too big. if ( $current_concatenated_size + $this->pending_stylesheets[ $i ]['size'] > $max_bytes ) { - $validation_error = array( + $validation_error = [ 'code' => 'excessive_css', 'type' => AMP_Validation_Error_Taxonomy::CSS_ERROR_TYPE, - ); + ]; if ( isset( $this->pending_stylesheets[ $i ]['sources'] ) ) { $validation_error['sources'] = $this->pending_stylesheets[ $i ]['sources']; } - if ( $this->should_sanitize_validation_error( $validation_error, wp_array_slice_assoc( $this->pending_stylesheets[ $i ], array( 'node' ) ) ) ) { + if ( $this->should_sanitize_validation_error( $validation_error, wp_array_slice_assoc( $this->pending_stylesheets[ $i ], [ 'node' ] ) ) ) { $this->pending_stylesheets[ $i ]['included'] = false; continue; // Skip to the next stylesheet. } @@ -2998,7 +2998,7 @@ function( $a, $b ) { private function exclude_all_admin_bar_css_if_excessive( $indices_by_stylesheet_element_id ) { $excluded_count = 0; - $admin_bar_style_element_ids = array( 'admin-bar-css', 'admin-bar-inline-css' ); + $admin_bar_style_element_ids = [ 'admin-bar-css', 'admin-bar-inline-css' ]; $should_exclude_admin_bar_inline_css = false; foreach ( $admin_bar_style_element_ids as $admin_bar_style_element_id ) { if ( ! isset( $indices_by_stylesheet_element_id[ $admin_bar_style_element_id ] ) ) { diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php index 2bc6f208a02..ada07196abb 100644 --- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php +++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php @@ -58,14 +58,14 @@ class AMP_Tag_And_Attribute_Sanitizer extends AMP_Base_Sanitizer { * @since 0.7 * @var array */ - protected $rev_alternate_attr_name_lookup = array(); + protected $rev_alternate_attr_name_lookup = []; /** * Mapping of JSON-serialized tag spec to the number of instances encountered in the document. * * @var array */ - protected $visited_unique_tag_specs = array(); + protected $visited_unique_tag_specs = []; /** * Stack. @@ -74,7 +74,7 @@ class AMP_Tag_And_Attribute_Sanitizer extends AMP_Base_Sanitizer { * * @var DOMElement[] */ - private $stack = array(); + private $stack = []; /** * Default args. @@ -83,21 +83,21 @@ class AMP_Tag_And_Attribute_Sanitizer extends AMP_Base_Sanitizer { * * @var array */ - protected $DEFAULT_ARGS = array(); + protected $DEFAULT_ARGS = []; /** * AMP script components that are discovered being required through sanitization. * * @var string[] */ - protected $script_components = array(); + protected $script_components = []; /** * Keep track of nodes that should not be replaced to prevent duplicated validation errors since sanitization is rejected. * * @var array */ - protected $should_not_replace_nodes = array(); + protected $should_not_replace_nodes = []; /** * AMP_Tag_And_Attribute_Sanitizer constructor. @@ -107,73 +107,73 @@ class AMP_Tag_And_Attribute_Sanitizer extends AMP_Base_Sanitizer { * @param DOMDocument $dom DOM. * @param array $args Args. */ - public function __construct( $dom, $args = array() ) { - $this->DEFAULT_ARGS = array( + public function __construct( $dom, $args = [] ) { + $this->DEFAULT_ARGS = [ 'amp_allowed_tags' => AMP_Allowed_Tags_Generated::get_allowed_tags(), 'amp_globally_allowed_attributes' => AMP_Allowed_Tags_Generated::get_allowed_attributes(), 'amp_layout_allowed_attributes' => AMP_Allowed_Tags_Generated::get_layout_attributes(), 'amp_bind_placeholder_prefix' => AMP_DOM_Utils::get_amp_bind_placeholder_prefix(), - ); + ]; parent::__construct( $dom, $args ); if ( ! empty( $this->args['allow_dirty_styles'] ) ) { // Allow style attribute on all elements. - $this->args['amp_globally_allowed_attributes']['style'] = array(); + $this->args['amp_globally_allowed_attributes']['style'] = []; // Allow style elements. - $this->args['amp_allowed_tags']['style'][] = array( - 'attr_spec_list' => array( - 'type' => array( + $this->args['amp_allowed_tags']['style'][] = [ + 'attr_spec_list' => [ + 'type' => [ 'value_casei' => 'text/css', - ), - ), - 'cdata' => array(), - 'tag_spec' => array( + ], + ], + 'cdata' => [], + 'tag_spec' => [ 'spec_name' => 'style for Customizer preview', - ), - ); + ], + ]; // Allow stylesheet links. - $this->args['amp_allowed_tags']['link'][] = array( - 'attr_spec_list' => array( - 'async' => array(), - 'crossorigin' => array(), - 'href' => array( + $this->args['amp_allowed_tags']['link'][] = [ + 'attr_spec_list' => [ + 'async' => [], + 'crossorigin' => [], + 'href' => [ 'mandatory' => true, - ), - 'integrity' => array(), - 'media' => array(), - 'rel' => array( + ], + 'integrity' => [], + 'media' => [], + 'rel' => [ 'dispatch_key' => 2, 'mandatory' => true, 'value_casei' => 'stylesheet', - ), - 'type' => array( + ], + 'type' => [ 'value_casei' => 'text/css', - ), - ), - 'tag_spec' => array( + ], + ], + 'tag_spec' => [ 'spec_name' => 'link rel=stylesheet for Customizer preview', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet - ), - ); + ], + ]; } // Allow scripts if requested. if ( ! empty( $this->args['allow_dirty_scripts'] ) ) { - $this->args['amp_allowed_tags']['script'][] = array( - 'attr_spec_list' => array( - 'type' => array(), - 'src' => array(), - 'async' => array(), - 'defer' => array(), - ), - 'cdata' => array(), - 'tag_spec' => array( + $this->args['amp_allowed_tags']['script'][] = [ + 'attr_spec_list' => [ + 'type' => [], + 'src' => [], + 'async' => [], + 'defer' => [], + ], + 'cdata' => [], + 'tag_spec' => [ 'spec_name' => 'scripts for Customizer preview', - ), - ); + ], + ]; } // Prepare whitelists. @@ -238,7 +238,7 @@ private function process_alternate_names( $attr_spec_list ) { if ( '[' === $attr_name[0] ) { $placeholder_attr_name = $this->args['amp_bind_placeholder_prefix'] . trim( $attr_name, '[]' ); if ( ! isset( $attr_spec[ AMP_Rule_Spec::ALTERNATIVE_NAMES ] ) ) { - $attr_spec[ AMP_Rule_Spec::ALTERNATIVE_NAMES ] = array(); + $attr_spec[ AMP_Rule_Spec::ALTERNATIVE_NAMES ] = []; } $attr_spec[ AMP_Rule_Spec::ALTERNATIVE_NAMES ][] = $placeholder_attr_name; } @@ -306,29 +306,29 @@ private function get_rule_spec_list_to_validate( $node, $rule_spec ) { $extension_spec = $rule_spec[ AMP_Rule_Spec::TAG_SPEC ]['extension_spec']; $custom_attr = 'amp-mustache' === $extension_spec['name'] ? 'custom-template' : 'custom-element'; - $rule_spec[ AMP_Rule_Spec::ATTR_SPEC_LIST ][ $custom_attr ] = array( + $rule_spec[ AMP_Rule_Spec::ATTR_SPEC_LIST ][ $custom_attr ] = [ AMP_Rule_Spec::VALUE => $extension_spec['name'], AMP_Rule_Spec::MANDATORY => true, - ); + ]; $versions = array_unique( array_merge( - isset( $extension_spec['allowed_versions'] ) ? $extension_spec['allowed_versions'] : array(), - isset( $extension_spec['version'] ) ? $extension_spec['version'] : array() + isset( $extension_spec['allowed_versions'] ) ? $extension_spec['allowed_versions'] : [], + isset( $extension_spec['version'] ) ? $extension_spec['version'] : [] ) ); - $rule_spec[ AMP_Rule_Spec::ATTR_SPEC_LIST ]['src'] = array( + $rule_spec[ AMP_Rule_Spec::ATTR_SPEC_LIST ]['src'] = [ AMP_Rule_Spec::VALUE_REGEX => implode( '', - array( + [ '^', preg_quote( 'https://cdn.ampproject.org/v0/' . $extension_spec['name'] . '-' ), // phpcs:ignore WordPress.PHP.PregQuoteDelimiter.Missing '(' . implode( '|', $versions ) . ')', '\.js$', - ) + ] ), - ); + ]; } // Augment the attribute list according to the parent's reference points, if it has them. @@ -403,8 +403,8 @@ private function process_node( $node ) { * Compile a list of rule_specs to validate for this node * based on tag name of the node. */ - $rule_spec_list_to_validate = array(); - $rule_spec_list = array(); + $rule_spec_list_to_validate = []; + $rule_spec_list = []; if ( isset( $this->allowed_tags[ $node->nodeName ] ) ) { $rule_spec_list = $this->allowed_tags[ $node->nodeName ]; } @@ -421,9 +421,9 @@ private function process_node( $node ) { } // The remaining validations all have to do with attributes. - $attr_spec_list = array(); - $tag_spec = array(); - $cdata = array(); + $attr_spec_list = []; + $tag_spec = []; + $cdata = []; /* * If we have exactly one rule_spec, use it's attr_spec_list @@ -447,7 +447,7 @@ private function process_node( $node ) { * Get a score from each attr_spec_list by seeing how many * attributes and values match the node. */ - $attr_spec_scores = array(); + $attr_spec_scores = []; foreach ( $rule_spec_list_to_validate as $spec_id => $rule_spec ) { $attr_spec_scores[ $spec_id ] = $this->validate_attr_spec_list_for_node( $node, $rule_spec[ AMP_Rule_Spec::ATTR_SPEC_LIST ] ); } @@ -532,7 +532,7 @@ private function process_node( $node ) { if ( ! empty( $this->visited_unique_tag_specs[ $node->nodeName ][ $tag_spec_key ] ) ) { $removed = $this->remove_invalid_child( $node, - array( 'code' => 'duplicate_element' ) + [ 'code' => 'duplicate_element' ] ); } $this->visited_unique_tag_specs[ $node->nodeName ][ $tag_spec_key ] = true; @@ -559,9 +559,9 @@ private function process_node( $node ) { * Capture all element attributes up front so that differing validation errors result when * one invalid attribute is accepted but the others are still rejected. */ - $validation_error = array( - 'element_attributes' => array(), - ); + $validation_error = [ + 'element_attributes' => [], + ]; foreach ( $node->attributes as $attribute ) { $validation_error['element_attributes'][ $attribute->nodeName ] = $attribute->nodeValue; } @@ -956,7 +956,7 @@ private function get_disallowed_attributes_in_node( $node, $attr_spec_list ) { * If $node is only a DOMNode and not a DOMElement we can't * remove an attribute from it anyway. So bail out now. */ - return array(); + return []; } /* @@ -964,7 +964,7 @@ private function get_disallowed_attributes_in_node( $node, $attr_spec_list ) { * breaking the iteration. So we keep track of the attributes to * remove in the first loop, then remove them in the second loop. */ - $attrs_to_remove = array(); + $attrs_to_remove = []; foreach ( $node->attributes as $attr_name => $attr_node ) { if ( ! $this->is_amp_allowed_attribute( $attr_node, $attr_spec_list ) ) { $attrs_to_remove[] = $attr_node; @@ -1015,7 +1015,7 @@ private function sanitize_disallowed_attribute_values_in_node( $node, $attr_spec * @return DOMAttr[]|false Attributes to remove, or false if the element itself should be removed. */ private function delegated_sanitize_disallowed_attribute_values_in_node( $node, $attr_spec_list, $attributes_pending_removal ) { - $attrs_to_remove = array(); + $attrs_to_remove = []; foreach ( $attr_spec_list as $attr_name => $attr_val ) { if ( isset( $attr_spec_list[ $attr_name ][ AMP_Rule_Spec::ALTERNATIVE_NAMES ] ) ) { @@ -1440,7 +1440,7 @@ static function ( $srcset_part ) { ); } - return array( $attribute_node->nodeValue ); + return [ $attribute_node->nodeValue ]; } /** @@ -1607,7 +1607,7 @@ private function check_attr_spec_rule_blacklisted_value_regex( $node, $attr_name */ private function check_attr_spec_rule_value_properties( $node, $attr_name, $attr_spec_rule ) { if ( isset( $attr_spec_rule[ AMP_Rule_Spec::VALUE_PROPERTIES ] ) && $node->hasAttribute( $attr_name ) ) { - $properties = array(); + $properties = []; foreach ( explode( ',', $node->getAttribute( $attr_name ) ) as $pair ) { $pair_parts = explode( '=', $pair, 2 ); if ( 2 !== count( $pair_parts ) ) { @@ -1668,7 +1668,7 @@ private function is_amp_allowed_attribute( $attr_node, $attr_spec_list ) { 'data-' === substr( $attr_name, 0, 5 ) || // Allow the 'amp' or '⚡' attribute in <html>, like <html ⚡>. - ( 'html' === $attr_node->parentNode->nodeName && in_array( $attr_node->nodeName, array( 'amp', '⚡' ), true ) ) + ( 'html' === $attr_node->parentNode->nodeName && in_array( $attr_node->nodeName, [ 'amp', '⚡' ], true ) ) ) { return true; } @@ -1686,10 +1686,10 @@ private function is_amp_allowed_attribute( $attr_node, $attr_spec_list ) { * unique reference point, see: * https://github.com/ampproject/amphtml/blob/1526498116488/extensions/amp-selector/validator-amp-selector.protoascii#L81-L91 */ - $descendant_reference_points = array( + $descendant_reference_points = [ 'amp-selector' => AMP_Allowed_Tags_Generated::get_reference_point_spec( 'AMP-SELECTOR option' ), 'amp-story-grid-layer' => AMP_Allowed_Tags_Generated::get_reference_point_spec( 'AMP-STORY-GRID-LAYER default' ), // @todo Consider the more restrictive 'AMP-STORY-GRID-LAYER animate-in'. - ); + ]; foreach ( $descendant_reference_points as $ancestor_name => $reference_point_spec ) { if ( isset( $reference_point_spec[ AMP_Rule_Spec::ATTR_SPEC_LIST ][ $attr_name ] ) ) { $parent = $attr_node->parentNode; @@ -1786,12 +1786,12 @@ private function has_ancestor( $node, $ancestor_tag_name ) { * @return array Tag name and attributes. */ private function parse_tag_and_attributes_from_spec_name( $spec_name ) { - static $parsed_specs = array(); + static $parsed_specs = []; if ( isset( $parsed_specs[ $spec_name ] ) ) { return $parsed_specs[ $spec_name ]; } - $attributes = array(); + $attributes = []; /* * This matches spec names like: @@ -1832,7 +1832,7 @@ private function remove_disallowed_descendants( $node, $allowed_descendants ) { return; } - $child_elements = array(); + $child_elements = []; for ( $i = 0; $i < $node->childNodes->length; $i++ ) { $child = $node->childNodes->item( $i ); if ( $child instanceof DOMElement ) { @@ -1864,7 +1864,7 @@ private function remove_disallowed_descendants( $node, $allowed_descendants ) { * @return bool Whether the element satisfies the requirements, or else it should be removed. */ private function check_valid_children( $node, $child_tags ) { - $child_elements = array(); + $child_elements = []; for ( $i = 0; $i < $node->childNodes->length; $i++ ) { $child = $node->childNodes->item( $i ); if ( $child instanceof DOMElement ) { @@ -1977,7 +1977,7 @@ private function replace_node_with_children( $node ) { } // Replace node with fragment. - $should_replace = $this->should_sanitize_validation_error( array(), compact( 'node' ) ); + $should_replace = $this->should_sanitize_validation_error( [], compact( 'node' ) ); if ( $should_replace ) { $node->parentNode->replaceChild( $fragment, $node ); } else { diff --git a/includes/sanitizers/class-amp-video-sanitizer.php b/includes/sanitizers/class-amp-video-sanitizer.php index 60aaabe629c..6e334885596 100644 --- a/includes/sanitizers/class-amp-video-sanitizer.php +++ b/includes/sanitizers/class-amp-video-sanitizer.php @@ -29,9 +29,9 @@ class AMP_Video_Sanitizer extends AMP_Base_Sanitizer { * * @var array */ - protected $DEFAULT_ARGS = array( + protected $DEFAULT_ARGS = [ 'add_noscript_fallback' => true, - ); + ]; /** * Get mapping of HTML selectors to the AMP component selectors which they may be converted into. @@ -39,9 +39,9 @@ class AMP_Video_Sanitizer extends AMP_Base_Sanitizer { * @return array Mapping. */ public function get_selector_conversion_mapping() { - return array( - 'video' => array( 'amp-video', 'amp-youtube' ), - ); + return [ + 'video' => [ 'amp-video', 'amp-youtube' ], + ]; } /** @@ -78,7 +78,7 @@ public function sanitize() { $old_attributes = AMP_DOM_Utils::get_node_attributes_as_assoc_array( $node ); $old_attributes = $this->filter_data_amp_attributes( $old_attributes, $amp_data ); - $sources = array(); + $sources = []; $new_attributes = $this->filter_attributes( $old_attributes ); $layout = isset( $amp_data['layout'] ) ? $amp_data['layout'] : false; if ( isset( $new_attributes['src'] ) ) { @@ -97,7 +97,7 @@ public function sanitize() { // Gather all child nodes and supply empty video dimensions from sources. $fallback = null; - $child_nodes = array(); + $child_nodes = []; while ( $node->firstChild ) { $child_node = $node->removeChild( $node->firstChild ); if ( $child_node instanceof DOMElement && 'source' === $child_node->nodeName && $child_node->hasAttribute( 'src' ) ) { @@ -147,7 +147,7 @@ public function sanitize() { } // Make sure the updated src and poster are applied to the original. - foreach ( array( 'src', 'poster', 'artwork' ) as $attr_name ) { + foreach ( [ 'src', 'poster', 'artwork' ] as $attr_name ) { if ( $new_node->hasAttribute( $attr_name ) ) { $old_node->setAttribute( $attr_name, $new_node->getAttribute( $attr_name ) ); } @@ -194,12 +194,12 @@ protected function filter_video_dimensions( $new_attributes, $src ) { $path = wp_parse_url( $src, PHP_URL_PATH ); $ext = pathinfo( $path, PATHINFO_EXTENSION ); $name = sanitize_title( wp_basename( $path, ".$ext" ) ); - $args = array( + $args = [ 'name' => $name, 'post_type' => 'attachment', 'post_status' => 'inherit', 'numberposts' => 1, - ); + ]; $attachment = get_posts( $args ); @@ -239,7 +239,7 @@ protected function filter_video_dimensions( $new_attributes, $src ) { * @return array Returns HTML attributes; removes any not specifically declared above from input. */ private function filter_attributes( $attributes ) { - $out = array(); + $out = []; foreach ( $attributes as $name => $value ) { switch ( $name ) { diff --git a/includes/settings/class-amp-customizer-design-settings.php b/includes/settings/class-amp-customizer-design-settings.php index d8e55fcaa90..154f732fe08 100644 --- a/includes/settings/class-amp-customizer-design-settings.php +++ b/includes/settings/class-amp-customizer-design-settings.php @@ -59,10 +59,10 @@ public static function is_amp_customizer_enabled() { * Init. */ public static function init() { - add_action( 'amp_customizer_init', array( __CLASS__, 'init_customizer' ) ); + add_action( 'amp_customizer_init', [ __CLASS__, 'init_customizer' ] ); if ( self::is_amp_customizer_enabled() ) { - add_filter( 'amp_customizer_get_settings', array( __CLASS__, 'append_settings' ) ); + add_filter( 'amp_customizer_get_settings', [ __CLASS__, 'append_settings' ] ); } } @@ -71,9 +71,9 @@ public static function init() { */ public static function init_customizer() { if ( self::is_amp_customizer_enabled() ) { - add_action( 'amp_customizer_register_settings', array( __CLASS__, 'register_customizer_settings' ) ); - add_action( 'amp_customizer_register_ui', array( __CLASS__, 'register_customizer_ui' ) ); - add_action( 'amp_customizer_enqueue_preview_scripts', array( __CLASS__, 'enqueue_customizer_preview_scripts' ) ); + add_action( 'amp_customizer_register_settings', [ __CLASS__, 'register_customizer_settings' ] ); + add_action( 'amp_customizer_register_ui', [ __CLASS__, 'register_customizer_ui' ] ); + add_action( 'amp_customizer_enqueue_preview_scripts', [ __CLASS__, 'enqueue_customizer_preview_scripts' ] ); } } @@ -87,45 +87,45 @@ public static function register_customizer_settings( $wp_customize ) { // Header text color setting. $wp_customize->add_setting( 'amp_customizer[header_color]', - array( + [ 'type' => 'option', 'default' => self::DEFAULT_HEADER_COLOR, 'sanitize_callback' => 'sanitize_hex_color', 'transport' => 'postMessage', - ) + ] ); // Header background color. $wp_customize->add_setting( 'amp_customizer[header_background_color]', - array( + [ 'type' => 'option', 'default' => self::DEFAULT_HEADER_BACKGROUND_COLOR, 'sanitize_callback' => 'sanitize_hex_color', 'transport' => 'postMessage', - ) + ] ); // Background color scheme. $wp_customize->add_setting( 'amp_customizer[color_scheme]', - array( + [ 'type' => 'option', 'default' => self::DEFAULT_COLOR_SCHEME, - 'sanitize_callback' => array( __CLASS__, 'sanitize_color_scheme' ), + 'sanitize_callback' => [ __CLASS__, 'sanitize_color_scheme' ], 'transport' => 'postMessage', - ) + ] ); // Display exit link. $wp_customize->add_setting( 'amp_customizer[display_exit_link]', - array( + [ 'type' => 'option', 'default' => false, 'sanitize_callback' => 'rest_sanitize_boolean', 'transport' => 'postMessage', - ) + ] ); } @@ -137,10 +137,10 @@ public static function register_customizer_settings( $wp_customize ) { public static function register_customizer_ui( $wp_customize ) { $wp_customize->add_section( 'amp_design', - array( + [ 'title' => __( 'Design', 'amp' ), 'panel' => AMP_Template_Customizer::PANEL_ID, - ) + ] ); // Header text color control. @@ -148,12 +148,12 @@ public static function register_customizer_ui( $wp_customize ) { new WP_Customize_Color_Control( $wp_customize, 'amp_header_color', - array( + [ 'settings' => 'amp_customizer[header_color]', 'label' => __( 'Header Text Color', 'amp' ), 'section' => 'amp_design', 'priority' => 10, - ) + ] ) ); @@ -162,61 +162,61 @@ public static function register_customizer_ui( $wp_customize ) { new WP_Customize_Color_Control( $wp_customize, 'amp_header_background_color', - array( + [ 'settings' => 'amp_customizer[header_background_color]', 'label' => __( 'Header Background & Link Color', 'amp' ), 'section' => 'amp_design', 'priority' => 20, - ) + ] ) ); // Background color scheme. $wp_customize->add_control( 'amp_color_scheme', - array( + [ 'settings' => 'amp_customizer[color_scheme]', 'label' => __( 'Color Scheme', 'amp' ), 'section' => 'amp_design', 'type' => 'radio', 'priority' => 30, 'choices' => self::get_color_scheme_names(), - ) + ] ); // Display exit link. $wp_customize->add_control( 'amp_display_exit_link', - array( + [ 'settings' => 'amp_customizer[display_exit_link]', 'label' => __( 'Display link to exit reader mode?', 'amp' ), 'section' => 'amp_design', 'type' => 'checkbox', 'priority' => 40, - ) + ] ); // Header. $wp_customize->selective_refresh->add_partial( 'amp-wp-header', - array( + [ 'selector' => '.amp-wp-header', - 'settings' => array( 'blogname', 'amp_customizer[display_exit_link]' ), // @todo Site Icon. - 'render_callback' => array( __CLASS__, 'render_header_bar' ), + 'settings' => [ 'blogname', 'amp_customizer[display_exit_link]' ], // @todo Site Icon. + 'render_callback' => [ __CLASS__, 'render_header_bar' ], 'fallback_refresh' => false, - ) + ] ); // Header. $wp_customize->selective_refresh->add_partial( 'amp-wp-footer', - array( + [ 'selector' => '.amp-wp-footer', - 'settings' => array( 'blogname' ), - 'render_callback' => array( __CLASS__, 'render_footer' ), + 'settings' => [ 'blogname' ], + 'render_callback' => [ __CLASS__, 'render_footer' ], 'fallback_refresh' => false, 'container_inclusive' => true, - ) + ] ); } @@ -226,7 +226,7 @@ public static function register_customizer_ui( $wp_customize ) { public static function render_header_bar() { if ( is_singular() ) { $post_template = new AMP_Post_Template( get_post() ); - $post_template->load_parts( array( 'header-bar' ) ); + $post_template->load_parts( [ 'header-bar' ] ); } } @@ -236,7 +236,7 @@ public static function render_header_bar() { public static function render_footer() { if ( is_singular() ) { $post_template = new AMP_Post_Template( get_post() ); - $post_template->load_parts( array( 'footer' ) ); + $post_template->load_parts( [ 'footer' ] ); } } @@ -252,16 +252,16 @@ public static function enqueue_customizer_preview_scripts() { wp_enqueue_script( 'amp-customizer-design-preview', amp_get_asset_url( 'js/amp-customizer-design-preview.js' ), - array( 'amp-customize-preview' ), + [ 'amp-customize-preview' ], false, true ); wp_localize_script( 'amp-customizer-design-preview', 'amp_customizer_design', - array( + [ 'color_schemes' => self::get_color_schemes(), - ) + ] ); // Prevent a theme's registered blogname partial from causing full page refreshes. @@ -282,12 +282,12 @@ public static function enqueue_customizer_preview_scripts() { public static function append_settings( $settings ) { $settings = wp_parse_args( $settings, - array( + [ 'header_color' => self::DEFAULT_HEADER_COLOR, 'header_background_color' => self::DEFAULT_HEADER_BACKGROUND_COLOR, 'color_scheme' => self::DEFAULT_COLOR_SCHEME, 'display_exit_link' => false, - ) + ] ); $theme_colors = self::get_colors_for_color_scheme( $settings['color_scheme'] ); @@ -295,9 +295,9 @@ public static function append_settings( $settings ) { return array_merge( $settings, $theme_colors, - array( + [ 'link_color' => $settings['header_background_color'], - ) + ] ); } @@ -307,10 +307,10 @@ public static function append_settings( $settings ) { * @return array Color scheme names. */ protected static function get_color_scheme_names() { - return array( + return [ 'light' => __( 'Light', 'amp' ), 'dark' => __( 'Dark', 'amp' ), - ); + ]; } /** @@ -319,22 +319,22 @@ protected static function get_color_scheme_names() { * @return array Color schemes. */ protected static function get_color_schemes() { - return array( - 'light' => array( + return [ + 'light' => [ // Convert colors to greyscale for light theme color; see <http://goo.gl/2gDLsp>. 'theme_color' => '#fff', 'text_color' => '#353535', 'muted_text_color' => '#696969', 'border_color' => '#c2c2c2', - ), - 'dark' => array( + ], + 'dark' => [ // Convert and invert colors to greyscale for dark theme color; see <http://goo.gl/uVB2cO>. 'theme_color' => '#0a0a0a', 'text_color' => '#dedede', 'muted_text_color' => '#b1b1b1', 'border_color' => '#707070', - ), - ); + ], + ]; } /** diff --git a/includes/settings/class-amp-customizer-settings.php b/includes/settings/class-amp-customizer-settings.php index d075e78efb5..7fada7625bc 100644 --- a/includes/settings/class-amp-customizer-settings.php +++ b/includes/settings/class-amp-customizer-settings.php @@ -18,7 +18,7 @@ class AMP_Customizer_Settings { * @return array Associative array of $setting => $value pairs. */ private static function get_stored_options() { - return get_option( 'amp_customizer', array() ); + return get_option( 'amp_customizer', [] ); } /** diff --git a/includes/templates/class-amp-content-sanitizer.php b/includes/templates/class-amp-content-sanitizer.php index 110787d1396..6fca3c5e5a2 100644 --- a/includes/templates/class-amp-content-sanitizer.php +++ b/includes/templates/class-amp-content-sanitizer.php @@ -24,7 +24,7 @@ class AMP_Content_Sanitizer { * @param array $global_args Global args. * @return array Tuple containing sanitized HTML, scripts array, and styles array (or stylesheets, if return_styles=false is passed in $global_args). */ - public static function sanitize( $content, array $sanitizer_classes, $global_args = array() ) { + public static function sanitize( $content, array $sanitizer_classes, $global_args = [] ) { $dom = AMP_DOM_Utils::get_dom_from_content( $content ); // For back-compat. @@ -33,11 +33,11 @@ public static function sanitize( $content, array $sanitizer_classes, $global_arg } $results = self::sanitize_document( $dom, $sanitizer_classes, $global_args ); - return array( + return [ AMP_DOM_Utils::get_content_from_dom( $dom ), $results['scripts'], empty( $global_args['return_styles'] ) ? $results['stylesheets'] : $results['styles'], - ); + ]; } /** @@ -57,9 +57,9 @@ public static function sanitize( $content, array $sanitizer_classes, $global_arg * } */ public static function sanitize_document( &$dom, $sanitizer_classes, $args ) { - $scripts = array(); - $stylesheets = array(); - $styles = array(); + $scripts = []; + $stylesheets = []; + $styles = []; $return_styles = ! empty( $args['return_styles'] ); unset( $args['return_styles'] ); @@ -69,7 +69,7 @@ public static function sanitize_document( &$dom, $sanitizer_classes, $args ) { * * @var AMP_Base_Sanitizer[] $sanitizers */ - $sanitizers = array(); + $sanitizers = []; // Instantiate the sanitizers. foreach ( $sanitizer_classes as $sanitizer_class => $sanitizer_args ) { diff --git a/includes/templates/class-amp-content.php b/includes/templates/class-amp-content.php index 14fc86ebe04..70d3f30df3d 100644 --- a/includes/templates/class-amp-content.php +++ b/includes/templates/class-amp-content.php @@ -29,7 +29,7 @@ class AMP_Content { * * @var array */ - private $amp_scripts = array(); + private $amp_scripts = []; /** * AMP stylesheets. @@ -37,7 +37,7 @@ class AMP_Content { * @since 1.0 * @var array */ - private $amp_stylesheets = array(); + private $amp_stylesheets = []; /** * Args. @@ -68,7 +68,7 @@ class AMP_Content { * @param string[] $sanitizer_classes Sanitizer class names. * @param array $args Args. */ - public function __construct( $content, $embed_handler_classes, $sanitizer_classes, $args = array() ) { + public function __construct( $content, $embed_handler_classes, $sanitizer_classes, $args = [] ) { $this->content = $content; $this->args = $args; $this->embed_handlers = $this->register_embed_handlers( $embed_handler_classes ); @@ -105,7 +105,7 @@ public function get_amp_scripts() { */ public function get_amp_styles() { _deprecated_function( __METHOD__, '1.0', __CLASS__ . '::get_amp_stylesheets' ); - return array(); + return []; } /** @@ -160,7 +160,7 @@ private function add_stylesheets( $stylesheets ) { * @return array */ private function register_embed_handlers( $embed_handler_classes ) { - $embed_handlers = array(); + $embed_handlers = []; foreach ( $embed_handler_classes as $embed_handler_class => $args ) { $embed_handler = new $embed_handler_class( array_merge( $this->args, $args ) ); diff --git a/includes/templates/class-amp-post-template.php b/includes/templates/class-amp-post-template.php index 7b53b090920..8c34801c626 100644 --- a/includes/templates/class-amp-post-template.php +++ b/includes/templates/class-amp-post-template.php @@ -108,7 +108,7 @@ public function __construct( $post ) { } $content_max_width = apply_filters( 'amp_content_max_width', $content_max_width ); - $this->data = array( + $this->data = [ 'content_max_width' => $content_max_width, 'document_title' => function_exists( 'wp_get_document_title' ) ? wp_get_document_title() : wp_title( '', false ), // Back-compat with 4.3. @@ -116,7 +116,7 @@ public function __construct( $post ) { 'home_url' => home_url( '/' ), 'blog_name' => get_bloginfo( 'name' ), - 'html_tag_attributes' => array(), + 'html_tag_attributes' => [], 'body_class' => '', 'site_icon_url' => apply_filters( 'amp_site_icon_url', function_exists( 'get_site_icon_url' ) ? get_site_icon_url( self::SITE_ICON_SIZE ) : '' ), @@ -127,17 +127,17 @@ public function __construct( $post ) { 'comments_link_text' => false, 'amp_runtime_script' => 'https://cdn.ampproject.org/v0.js', - 'amp_component_scripts' => array(), + 'amp_component_scripts' => [], - 'customizer_settings' => array(), + 'customizer_settings' => [], - 'font_urls' => array(), + 'font_urls' => [], - 'post_amp_stylesheets' => array(), - 'post_amp_styles' => array(), // Deprecated. + 'post_amp_stylesheets' => [], + 'post_amp_styles' => [], // Deprecated. 'amp_analytics' => amp_add_custom_analytics(), - ); + ]; $this->build_post_content(); $this->build_post_data(); @@ -196,7 +196,7 @@ public function get_customizer_setting( $name, $default = null ) { public function load() { global $wp_query; $template = is_page() || $wp_query->is_posts_page ? 'page' : 'single'; - $this->load_parts( array( $template ) ); + $this->load_parts( [ $template ] ); } /** @@ -265,7 +265,7 @@ private function build_post_data() { $post_modified_timestamp = get_post_modified_time( 'U', false, $this->post ); $post_author = get_userdata( $this->post->post_author ); - $data = array( + $data = [ 'post' => $this->post, 'post_id' => $this->ID, 'post_title' => $post_title, @@ -274,7 +274,7 @@ private function build_post_data() { 'post_author' => $post_author, 'post_canonical_link_url' => '', 'post_canonical_link_text' => '', - ); + ]; $customizer_settings = AMP_Customizer_Settings::get_settings(); if ( ! empty( $customizer_settings['display_exit_link'] ) ) { @@ -310,10 +310,10 @@ private function build_post_comments_data() { : __( 'View Comments', 'amp' ); $this->add_data( - array( + [ 'comments_link_url' => $comments_link_url, 'comments_link_text' => $comments_link_text, - ) + ] ); } @@ -325,9 +325,9 @@ private function build_post_content() { $this->post->post_content, amp_get_content_embed_handlers( $this->post ), amp_get_content_sanitizers( $this->post ), - array( + [ 'content_max_width' => $this->get( 'content_max_width' ), - ) + ] ); $this->add_data_by_key( 'post_amp_content', $amp_content->get_amp_content() ); @@ -364,19 +364,19 @@ private function build_post_featured_image() { $assets = AMP_Content_Sanitizer::sanitize_document( $dom, amp_get_content_sanitizers( $this->post ), - array( + [ 'content_max_width' => $this->get( 'content_max_width' ), - ) + ] ); $sanitized_html = AMP_DOM_Utils::get_content_from_dom( $dom ); $this->add_data_by_key( 'featured_image', - array( + [ 'amp_html' => $sanitized_html, 'caption' => $featured_image->post_excerpt, - ) + ] ); if ( $assets['scripts'] ) { @@ -415,7 +415,7 @@ private function build_customizer_settings() { * Build HTML tag attributes. */ private function build_html_tag_attributes() { - $attributes = array(); + $attributes = []; if ( function_exists( 'is_rtl' ) && is_rtl() ) { $attributes['dir'] = 'rtl'; @@ -460,7 +460,7 @@ private function verify_and_include( $file, $template_type ) { */ private function locate_template( $file ) { $search_file = sprintf( 'amp/%s', basename( $file ) ); - return locate_template( array( $search_file ), false ); + return locate_template( [ $search_file ], false ); } /** diff --git a/includes/templates/embed-amp-story.php b/includes/templates/embed-amp-story.php index 7a8101f236b..d471e406d5e 100644 --- a/includes/templates/embed-amp-story.php +++ b/includes/templates/embed-amp-story.php @@ -16,10 +16,10 @@ <div class="amp-story-embed"> <?php AMP_Story_Post_Type::the_single_story_card( - array( + [ 'post' => get_post(), 'size' => AMP_Story_Post_Type::STORY_CARD_IMAGE_SIZE, - ) + ] ); ?> </div> diff --git a/includes/templates/single-amp_story.php b/includes/templates/single-amp_story.php index f1d68d316a4..f47180fe5e0 100644 --- a/includes/templates/single-amp_story.php +++ b/includes/templates/single-amp_story.php @@ -15,7 +15,7 @@ <title><?php echo esc_html( wp_get_document
