Inspection of "add photoswipe data to a single attribute" - pryley/castor-framework - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( fd4215...3dee34 )

by Paul

created 2017-03-09 15:52 UTC

Status

Spacing +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 	public $postmeta;
 	public $theme;
 
-	public function __construct( PostMeta $postmeta, Theme $theme )
+	public function __construct(PostMeta $postmeta, Theme $theme)
 	{
 		$this->postmeta = $postmeta;
 		$this->theme    = $theme;
@@ -21,50 +21,50 @@  discard block
 block discarded – undo
 	/**
 	 * @return string
 	 */
-	public function gallery( array $args = [] )
+	public function gallery(array $args = [])
 	{
-		$gallery = $this->getGallery( $args );
+		$gallery = $this->getGallery($args);
 
-		return $this->renderGallery( $gallery ) . $this->renderGalleryPagination( $gallery );
+		return $this->renderGallery($gallery) . $this->renderGalleryPagination($gallery);
 	}
 
 	/**
 	 * @return WP_Query
 	 */
-	public function getGallery( array $args )
+	public function getGallery(array $args)
 	{
-		$args = $this->normalizeArgs( $args );
+		$args = $this->normalizeArgs($args);
 
 		return new WP_Query([
 			'orderby'        => 'post__in',
 			'paged'          => $this->getPaged(),
-			'post__in'       => $this->getMediaIds( $args ),
+			'post__in'       => $this->getMediaIds($args),
 			'post_mime_type' => 'image',
 			'post_type'      => 'attachment',
 			'post_status'    => 'inherit',
-			'posts_per_page' => $this->getImagesPerPage( $args ),
+			'posts_per_page' => $this->getImagesPerPage($args),
 		]);
 	}
 
 	/**
 	 * @return string
 	 */
-	public function renderGallery( WP_Query $gallery )
+	public function renderGallery(WP_Query $gallery)
 	{
-		$images = array_reduce( $gallery->posts, function( $images, $attachment ) {
-			return $images . $this->renderGalleryImage( $attachment );
+		$images = array_reduce($gallery->posts, function($images, $attachment) {
+			return $images . $this->renderGalleryImage($attachment);
 		});
 
-		return sprintf( '<div class="gallery-images" itemscope itemtype="http://schema.org/ImageGallery">%s</div>', $images );
+		return sprintf('<div class="gallery-images" itemscope itemtype="http://schema.org/ImageGallery">%s</div>', $images);
 	}
 
 	/**
 	 * @return null|string
 	 */
-	public function renderGalleryImage( WP_Post $attachment )
+	public function renderGalleryImage(WP_Post $attachment)
 	{
-		$image = $this->getImageSrc( $attachment->ID );
-		if( !$image )return;
+		$image = $this->getImageSrc($attachment->ID);
+		if (!$image)return;
 		return sprintf(
 			'<figure class="gallery-image" data-w="%s" data-h="%s" data-ps=\'%s\' itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">' .
 				'<a href="%s" itemprop="contentUrl"><img src="%s" data-src="%s" itemprop="thumbnail" alt="%s"/></a>' .
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
 			'</figure>',
 			$image->thumbnail['width'],
 			$image->thumbnail['height'],
-			$this->getPhotoswipeData( $image ),
-			get_attachment_link( $attachment->ID ),
-			$this->theme->imageUri( 'blank.gif' ),
+			$this->getPhotoswipeData($image),
+			get_attachment_link($attachment->ID),
+			$this->theme->imageUri('blank.gif'),
 			$image->thumbnail['url'],
 			$image->alt,
 			$image->caption,
@@ -85,14 +85,14 @@  discard block
 block discarded – undo
 	/**
 	 * @return string
 	 */
-	public function renderGalleryPagination( WP_Query $query )
+	public function renderGalleryPagination(WP_Query $query)
 	{
 		return paginate_links([
-			'before_page_number' => '<span class="screen-reader-text">' . __( 'Page', 'castor' ) . ' </span>',
+			'before_page_number' => '<span class="screen-reader-text">' . __('Page', 'castor') . ' </span>',
 			'current'            => $query->query['paged'],
 			'mid_size'           => 1,
-			'next_text'          => __( 'Next', 'castor' ),
-			'prev_text'          => __( 'Previous', 'castor' ),
+			'next_text'          => __('Next', 'castor'),
+			'prev_text'          => __('Previous', 'castor'),
 			'total'              => $query->max_num_pages,
 		]);
 	}
@@ -100,11 +100,11 @@  discard block
 block discarded – undo
 	/**
 	 * @return mixed
 	 */
-	protected function getImagesPerPage( array $args )
+	protected function getImagesPerPage(array $args)
 	{
-		$args = $this->normalizeArgs( $args );
+		$args = $this->normalizeArgs($args);
 
-		return $this->postmeta->get( $args['per_page'], [
+		return $this->postmeta->get($args['per_page'], [
 			'fallback' => -1,
 		]);
 	}
@@ -114,20 +114,20 @@  discard block
 block discarded – undo
 	 *
 	 * @return null|object
 	 */
-	protected function getImageSrc( $id )
+	protected function getImageSrc($id)
 	{
-		$thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
+		$thumbnail = wp_get_attachment_image_src($id, 'thumbnail');
 
-		if( !$thumbnail )return;
+		if (!$thumbnail)return;
 
-		$medium = $this->normalizeImageSrc( wp_get_attachment_image_src( $id, 'medium' ), $thumbnail );
-		$large = $this->normalizeImageSrc( wp_get_attachment_image_src( $id, 'large' ), $medium );
+		$medium = $this->normalizeImageSrc(wp_get_attachment_image_src($id, 'medium'), $thumbnail);
+		$large = $this->normalizeImageSrc(wp_get_attachment_image_src($id, 'large'), $medium);
 
 		return (object) [
-			'alt'       => trim( strip_tags( get_post_meta( $id, '_wp_attachment_image_alt', true ))),
-			'caption'   => wp_get_attachment_caption( $id ),
-			'copyright' => trim( strip_tags( get_post_meta( $id, '_copyright', true ))),
-			'thumbnail' => $this->normalizeImageSrc( $thumbnail ),
+			'alt'       => trim(strip_tags(get_post_meta($id, '_wp_attachment_image_alt', true))),
+			'caption'   => wp_get_attachment_caption($id),
+			'copyright' => trim(strip_tags(get_post_meta($id, '_copyright', true))),
+			'thumbnail' => $this->normalizeImageSrc($thumbnail),
 			'medium'    => $medium,
 			'large'     => $large,
 		];
@@ -136,12 +136,12 @@  discard block
 block discarded – undo
 	/**
 	 * @return array
 	 */
-	protected function getMediaIds( array $args )
+	protected function getMediaIds(array $args)
 	{
-		$args = $this->normalizeArgs( $args );
+		$args = $this->normalizeArgs($args);
 
-		return wp_parse_id_list( $this->postmeta->get( $args['media'], [
-			'ID'     => $this->postmeta->get( $args['gallery'] ),
+		return wp_parse_id_list($this->postmeta->get($args['media'], [
+			'ID'     => $this->postmeta->get($args['gallery']),
 			'single' => false,
 		]));
 	}
@@ -151,15 +151,15 @@  discard block
 block discarded – undo
 	 */
 	protected function getPaged()
 	{
-		return intval( get_query_var(( is_front_page() ? 'page' : 'paged' ))) ?: 1;
+		return intval(get_query_var((is_front_page() ? 'page' : 'paged'))) ?: 1;
 	}
 
 	/**
 	 * @return string
 	 */
-	protected function getPhotoswipeData( $image )
+	protected function getPhotoswipeData($image)
 	{
-		return sprintf( '{"o":{"src":"%s","w":%d,"h":%d},"m":{"src":"%s","w":%d,"h":%d}}',
+		return sprintf('{"o":{"src":"%s","w":%d,"h":%d},"m":{"src":"%s","w":%d,"h":%d}}',
 			$image->large['url'],
 			$image->large['width'],
 			$image->large['height'],
@@ -172,13 +172,13 @@  discard block
 block discarded – undo
 	/**
 	 * @return array
 	 */
-	protected function normalizeArgs( array $args = [] )
+	protected function normalizeArgs(array $args = [])
 	{
 		return shortcode_atts([
 			'gallery'  => 'gallery',
 			'media'    => 'media',
 			'per_page' => 'per_page',
-		], $args );
+		], $args);
 	}
 
 	/**
@@ -186,9 +186,9 @@  discard block
 block discarded – undo
 	 *
 	 * @return array
 	 */
-	protected function normalizeImageSrc( array $image, $fallback = false )
+	protected function normalizeImageSrc(array $image, $fallback = false)
 	{
-		if( is_array( $fallback ) && count( array_diff( $image, $fallback )) < 2 ) {
+		if (is_array($fallback) && count(array_diff($image, $fallback)) < 2) {
 			$image = $fallback;
 		}
 		return [

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -64,7 +64,9 @@  discard block
 block discarded – undo
 	public function renderGalleryImage( WP_Post $attachment )
 	{
 		$image = $this->getImageSrc( $attachment->ID );
-		if( !$image )return;
+		if( !$image ) {
+			return;
+		}
 		return sprintf(
 			'<figure class="gallery-image" data-w="%s" data-h="%s" data-ps=\'%s\' itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">' .
 				'<a href="%s" itemprop="contentUrl"><img src="%s" data-src="%s" itemprop="thumbnail" alt="%s"/></a>' .
@@ -118,7 +120,9 @@  discard block
 block discarded – undo
 	{
 		$thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
 
-		if( !$thumbnail )return;
+		if( !$thumbnail ) {
+			return;
+		}
 
 		$medium = $this->normalizeImageSrc( wp_get_attachment_image_src( $id, 'medium' ), $thumbnail );
 		$large = $this->normalizeImageSrc( wp_get_attachment_image_src( $id, 'large' ), $medium );

Please login to merge, or discard this patch.

		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12	public $postmeta;
13	13	public $theme;
14	14
15		- public function __construct( PostMeta $postmeta, Theme $theme )
	15	+ public function __construct(PostMeta $postmeta, Theme $theme)
16	16	{
17	17	$this->postmeta = $postmeta;
18	18	$this->theme = $theme;
		@@ -21,50 +21,50 @@ discard block
		block discarded – undo
21	21	/**
22	22	* @return string
23	23	*/
24		- public function gallery( array $args = [] )
	24	+ public function gallery(array $args = [])
25	25	{
26		- $gallery = $this->getGallery( $args );
	26	+ $gallery = $this->getGallery($args);
27	27
28		- return $this->renderGallery( $gallery ) . $this->renderGalleryPagination( $gallery );
	28	+ return $this->renderGallery($gallery) . $this->renderGalleryPagination($gallery);
29	29	}
30	30
31	31	/**
32	32	* @return WP_Query
33	33	*/
34		- public function getGallery( array $args )
	34	+ public function getGallery(array $args)
35	35	{
36		- $args = $this->normalizeArgs( $args );
	36	+ $args = $this->normalizeArgs($args);
37	37
38	38	return new WP_Query([
39	39	'orderby' => 'post__in',
40	40	'paged' => $this->getPaged(),
41		- 'post__in' => $this->getMediaIds( $args ),
	41	+ 'post__in' => $this->getMediaIds($args),
42	42	'post_mime_type' => 'image',
43	43	'post_type' => 'attachment',
44	44	'post_status' => 'inherit',
45		- 'posts_per_page' => $this->getImagesPerPage( $args ),
	45	+ 'posts_per_page' => $this->getImagesPerPage($args),
46	46	]);
47	47	}
48	48
49	49	/**
50	50	* @return string
51	51	*/
52		- public function renderGallery( WP_Query $gallery )
	52	+ public function renderGallery(WP_Query $gallery)
53	53	{
54		- $images = array_reduce( $gallery->posts, function( $images, $attachment ) {
55		- return $images . $this->renderGalleryImage( $attachment );
	54	+ $images = array_reduce($gallery->posts, function($images, $attachment) {
	55	+ return $images . $this->renderGalleryImage($attachment);
56	56	});
57	57
58		- return sprintf( '<div class="gallery-images" itemscope itemtype="http://schema.org/ImageGallery">%s</div>', $images );
	58	+ return sprintf('<div class="gallery-images" itemscope itemtype="http://schema.org/ImageGallery">%s</div>', $images);
59	59	}
60	60
61	61	/**
62	62	* @return null\|string
63	63	*/
64		- public function renderGalleryImage( WP_Post $attachment )
	64	+ public function renderGalleryImage(WP_Post $attachment)
65	65	{
66		- $image = $this->getImageSrc( $attachment->ID );
67		- if( !$image )return;
	66	+ $image = $this->getImageSrc($attachment->ID);
	67	+ if (!$image)return;
68	68	return sprintf(
69	69	'<figure class="gallery-image" data-w="%s" data-h="%s" data-ps=\'%s\' itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">' .
70	70	'<a href="%s" itemprop="contentUrl"><img src="%s" data-src="%s" itemprop="thumbnail" alt="%s"/></a>' .
		@@ -72,9 +72,9 @@ discard block
		block discarded – undo
72	72	'</figure>',
73	73	$image->thumbnail['width'],
74	74	$image->thumbnail['height'],
75		- $this->getPhotoswipeData( $image ),
76		- get_attachment_link( $attachment->ID ),
77		- $this->theme->imageUri( 'blank.gif' ),
	75	+ $this->getPhotoswipeData($image),
	76	+ get_attachment_link($attachment->ID),
	77	+ $this->theme->imageUri('blank.gif'),
78	78	$image->thumbnail['url'],
79	79	$image->alt,
80	80	$image->caption,
		@@ -85,14 +85,14 @@ discard block
		block discarded – undo
85	85	/**
86	86	* @return string
87	87	*/
88		- public function renderGalleryPagination( WP_Query $query )
	88	+ public function renderGalleryPagination(WP_Query $query)
89	89	{
90	90	return paginate_links([
91		- 'before_page_number' => '<span class="screen-reader-text">' . __( 'Page', 'castor' ) . ' </span>',
	91	+ 'before_page_number' => '<span class="screen-reader-text">' . __('Page', 'castor') . ' </span>',
92	92	'current' => $query->query['paged'],
93	93	'mid_size' => 1,
94		- 'next_text' => __( 'Next', 'castor' ),
95		- 'prev_text' => __( 'Previous', 'castor' ),
	94	+ 'next_text' => __('Next', 'castor'),
	95	+ 'prev_text' => __('Previous', 'castor'),
96	96	'total' => $query->max_num_pages,
97	97	]);
98	98	}
		@@ -100,11 +100,11 @@ discard block
		block discarded – undo
100	100	/**
101	101	* @return mixed
102	102	*/
103		- protected function getImagesPerPage( array $args )
	103	+ protected function getImagesPerPage(array $args)
104	104	{
105		- $args = $this->normalizeArgs( $args );
	105	+ $args = $this->normalizeArgs($args);
106	106
107		- return $this->postmeta->get( $args['per_page'], [
	107	+ return $this->postmeta->get($args['per_page'], [
108	108	'fallback' => -1,
109	109	]);
110	110	}
		@@ -114,20 +114,20 @@ discard block
		block discarded – undo
114	114	*
115	115	* @return null\|object
116	116	*/
117		- protected function getImageSrc( $id )
	117	+ protected function getImageSrc($id)
118	118	{
119		- $thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
	119	+ $thumbnail = wp_get_attachment_image_src($id, 'thumbnail');
120	120
121		- if( !$thumbnail )return;
	121	+ if (!$thumbnail)return;
122	122
123		- $medium = $this->normalizeImageSrc( wp_get_attachment_image_src( $id, 'medium' ), $thumbnail );
124		- $large = $this->normalizeImageSrc( wp_get_attachment_image_src( $id, 'large' ), $medium );
	123	+ $medium = $this->normalizeImageSrc(wp_get_attachment_image_src($id, 'medium'), $thumbnail);
	124	+ $large = $this->normalizeImageSrc(wp_get_attachment_image_src($id, 'large'), $medium);
125	125
126	126	return (object) [
127		- 'alt' => trim( strip_tags( get_post_meta( $id, '_wp_attachment_image_alt', true ))),
128		- 'caption' => wp_get_attachment_caption( $id ),
129		- 'copyright' => trim( strip_tags( get_post_meta( $id, '_copyright', true ))),
130		- 'thumbnail' => $this->normalizeImageSrc( $thumbnail ),
	127	+ 'alt' => trim(strip_tags(get_post_meta($id, '_wp_attachment_image_alt', true))),
	128	+ 'caption' => wp_get_attachment_caption($id),
	129	+ 'copyright' => trim(strip_tags(get_post_meta($id, '_copyright', true))),
	130	+ 'thumbnail' => $this->normalizeImageSrc($thumbnail),
131	131	'medium' => $medium,
132	132	'large' => $large,
133	133	];
		@@ -136,12 +136,12 @@ discard block
		block discarded – undo
136	136	/**
137	137	* @return array
138	138	*/
139		- protected function getMediaIds( array $args )
	139	+ protected function getMediaIds(array $args)
140	140	{
141		- $args = $this->normalizeArgs( $args );
	141	+ $args = $this->normalizeArgs($args);
142	142
143		- return wp_parse_id_list( $this->postmeta->get( $args['media'], [
144		- 'ID' => $this->postmeta->get( $args['gallery'] ),
	143	+ return wp_parse_id_list($this->postmeta->get($args['media'], [
	144	+ 'ID' => $this->postmeta->get($args['gallery']),
145	145	'single' => false,
146	146	]));
147	147	}
		@@ -151,15 +151,15 @@ discard block
		block discarded – undo
151	151	*/
152	152	protected function getPaged()
153	153	{
154		- return intval( get_query_var(( is_front_page() ? 'page' : 'paged' ))) ?: 1;
	154	+ return intval(get_query_var((is_front_page() ? 'page' : 'paged'))) ?: 1;
155	155	}
156	156
157	157	/**
158	158	* @return string
159	159	*/
160		- protected function getPhotoswipeData( $image )
	160	+ protected function getPhotoswipeData($image)
161	161	{
162		- return sprintf( '{"o":{"src":"%s","w":%d,"h":%d},"m":{"src":"%s","w":%d,"h":%d}}',
	162	+ return sprintf('{"o":{"src":"%s","w":%d,"h":%d},"m":{"src":"%s","w":%d,"h":%d}}',
163	163	$image->large['url'],
164	164	$image->large['width'],
165	165	$image->large['height'],
		@@ -172,13 +172,13 @@ discard block
		block discarded – undo
172	172	/**
173	173	* @return array
174	174	*/
175		- protected function normalizeArgs( array $args = [] )
	175	+ protected function normalizeArgs(array $args = [])
176	176	{
177	177	return shortcode_atts([
178	178	'gallery' => 'gallery',
179	179	'media' => 'media',
180	180	'per_page' => 'per_page',
181		- ], $args );
	181	+ ], $args);
182	182	}
183	183
184	184	/**
		@@ -186,9 +186,9 @@ discard block
		block discarded – undo
186	186	*
187	187	* @return array
188	188	*/
189		- protected function normalizeImageSrc( array $image, $fallback = false )
	189	+ protected function normalizeImageSrc(array $image, $fallback = false)
190	190	{
191		- if( is_array( $fallback ) && count( array_diff( $image, $fallback )) < 2 ) {
	191	+ if (is_array($fallback) && count(array_diff($image, $fallback)) < 2) {
192	192	$image = $fallback;
193	193	}
194	194	return [

		@@ -64,7 +64,9 @@ discard block
		block discarded – undo
64	64	public function renderGalleryImage( WP_Post $attachment )
65	65	{
66	66	$image = $this->getImageSrc( $attachment->ID );
67		- if( !$image )return;
	67	+ if( !$image ) {
	68	+ return;
	69	+ }
68	70	return sprintf(
69	71	'<figure class="gallery-image" data-w="%s" data-h="%s" data-ps=\'%s\' itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">' .
70	72	'<a href="%s" itemprop="contentUrl"><img src="%s" data-src="%s" itemprop="thumbnail" alt="%s"/></a>' .
		@@ -118,7 +120,9 @@ discard block
		block discarded – undo
118	120	{
119	121	$thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
120	122
121		- if( !$thumbnail )return;
	123	+ if( !$thumbnail ) {
	124	+ return;
	125	+ }
122	126
123	127	$medium = $this->normalizeImageSrc( wp_get_attachment_image_src( $id, 'medium' ), $thumbnail );
124	128	$large = $this->normalizeImageSrc( wp_get_attachment_image_src( $id, 'large' ), $medium );

pryley / castor-framework

Push — develop ( fd4215...3dee34 )

Status

Category

Spacing +45 added lines, -45 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch