Fix ValidVariableName.NotSnakeCaseMemberVar, CommentedOutCode.Found, …

…OneClassPerFile.MultipleFound
ampproject · Mar 17, 2018 · ac33200 · ac33200
1 parent 8703c29
commit ac33200
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/includes/embeds/class-amp-youtube-embed.php b/includes/embeds/class-amp-youtube-embed.php
@@ -158,7 +158,7 @@ private function get_video_id_from_url( $url ) {
 				$video_id = $parts[1];
 			}
 		} else {
-			/* ?v={id} or ?list={id} */
+			/* The query looks like ?v={id} or ?list={id} */
 			parse_str( $parsed_url['query'], $query_args );
 
 			if ( isset( $query_args['v'] ) ) {
@@ -167,7 +167,7 @@ private function get_video_id_from_url( $url ) {
 		}
 
 		if ( empty( $video_id ) ) {
-			/* /(v|e|embed)/{id} */
+			/* The path looks like /(v|e|embed)/{id} */
 			$parts = explode( '/', $parsed_url['path'] );
 
 			if ( in_array( $parts[1], array( 'v', 'e', 'embed' ), true ) ) {

diff --git a/phpcs.xml b/phpcs.xml
@@ -28,7 +28,7 @@
 	</rule>
 	<rule ref="WordPress.NamingConventions.ValidVariableName">
 		<properties>
-			<property name="customPropertiesWhitelist" value="childNodes,tagName,textContent,parentNode,nodeType,nodeName,nextSibling,firstChild,nodeValue,DEFAULT_ARGS,documentElement,removeChild,ownerDocument" />
+			<property name="customPropertiesWhitelist" value="childNodes,tagName,textContent,parentNode,nodeType,nodeName,nextSibling,firstChild,nodeValue,DEFAULT_ARGS,documentElement,removeChild,ownerDocument,DEFAULT_WIDTH,DEFAULT_HEIGHT" />
 		</properties>
 	</rule>
 

diff --git a/tests/test-amp-image-dimension-extractor.php b/tests/test-amp-image-dimension-extractor.php
@@ -56,14 +56,7 @@ public function test__should_return_original_urls() {
 
 		$this->assertEquals( $expected, $actual );
 	}
-}
 
-/**
- * Tests for AMP_Image_Dimension_Extractor_Normalize_URL.
- *
- * @covers AMP_Image_Dimension_Extractor_Normalize_URL
- */
-class AMP_Image_Dimension_Extractor_Normalize_URL_Test extends WP_UnitTestCase {
 	/**
 	 * Data strings for testing converter.
 	 *
@@ -117,20 +110,12 @@ public function test__normalize_url( $source_url, $expected_url ) {
 
 		$this->assertEquals( $expected_url, $result_url );
 	}
-}
-
-/**
- * Tests for AMP_Image_Dimension_Extractor_By_Downloading.
- *
- * @covers AMP_Image_Dimension_Extractor_By_Downloading
- *
- * TODO: tests for transients, errors, lock
- * TODO: mocked tests
- */
-class AMP_Image_Dimension_Extractor_By_Downloading_Test extends WP_UnitTestCase {
 
 	/**
 	 * Test a valid image file.
+	 *
+	 * TODO: tests for transients, errors, lock
+	 * TODO: mocked tests
 	 */
 	public function test__valid_image_file() {
 		$sources  = array(