Better adherence to WordPress coding standards.

Author: rolftimmermans

composer.json

@@ -25,7 +25,7 @@
     "symfony/yaml": "~2.8",
     "squizlabs/php_codesniffer": "~2.2",
     "tinify/tinify": "dev-create-key",
-    "wp-coding-standards/wpcs": "*"
+    "wp-coding-standards/wpcs": "dev-master"
   },
   "scripts": {
     "post-install-cmd": "bin/post-install",

composer.lock

@@ -33,7 +33,7 @@ class Tiny_Compress_Client extends Tiny_Compress {
 	private $last_message = '';
 	private $proxy;
 
-	protected function __construct($api_key, $after_compress_callback) {
+	protected function __construct( $api_key, $after_compress_callback ) {
 		parent::__construct( $after_compress_callback );
 
 		$this->proxy = new WP_HTTP_Proxy();
@@ -55,7 +55,7 @@ public function get_key() {
 	}
 
 	public function limit_reached() {
-		return $this->last_error_code == 429;
+		return 429 == $this->last_error_code;
 	}
 
 	protected function validate() {
@@ -66,10 +66,10 @@ protected function validate() {
 			\Tinify\Tinify::getClient()->request( 'post', '/shrink' );
 			return true;
 
-		} catch(\Tinify\Exception $err) {
+		} catch (\Tinify\Exception $err) {
 			$this->last_error_code = $err->status;
 
-			if ( $err->status == 429 || $err->status == 400 ) {
+			if ( 429 == $err->status || 400 == $err->status ) {
 				return true;
 			}
 
@@ -81,7 +81,7 @@ protected function validate() {
 		}
 	}
 
-	protected function compress($input, $resize_opts, $preserve_opts) {
+	protected function compress( $input, $resize_opts, $preserve_opts ) {
 		try {
 			$this->last_error_code = 0;
 			$this->set_request_options( \Tinify\Tinify::getClient() );
@@ -109,13 +109,13 @@ protected function compress($input, $resize_opts, $preserve_opts) {
 					'width' => $result->width(),
 					'height' => $result->height(),
 					'ratio' => round( $result->size() / strlen( $input ), 4 ),
-				)
+				),
 			);
 
 			$buffer = $result->toBuffer();
 			return array( $buffer, $meta );
 
-		} catch(\Tinify\Exception $err) {
+		} catch (\Tinify\Exception $err) {
 			$this->last_error_code = $err->status;
 
 			throw new Tiny_Exception(
@@ -126,15 +126,15 @@ protected function compress($input, $resize_opts, $preserve_opts) {
 		}
 	}
 
-	public function create_key($email, $options) {
+	public function create_key( $email, $options ) {
 		try {
 			$this->last_error_code = 0;
 			$this->set_request_options(
 				\Tinify\Tinify::getClient( \Tinify\Tinify::ANONYMOUS )
 			);
 
 			\Tinify\createKey( $email, $options );
-		} catch(\Tinify\Exception $err) {
+		} catch (\Tinify\Exception $err) {
 			$this->last_error_code = $err->status;
 
 			throw new Tiny_Exception(
@@ -145,7 +145,7 @@ public function create_key($email, $options) {
 		}
 	}
 
-	private function set_request_options($client) {
+	private function set_request_options( $client ) {
 		/* The client does not let us override cURL properties yet, so we have
            to use a reflection property. */
 		$property = new ReflectionProperty( $client, 'options' );

src/class-tiny-compress-client.php

@@ -27,7 +27,7 @@ protected static function identifier() {
 		parent::identifier() . ' fopen';
 	}
 
-	protected function __construct($api_key, $after_compress_callback) {
+	protected function __construct( $api_key, $after_compress_callback ) {
 		parent::__construct( $after_compress_callback );
 
 		$this->api_key = $api_key;
@@ -46,14 +46,14 @@ public function get_key() {
 	}
 
 	public function limit_reached() {
-		return $this->last_error_code == 429;
+		return 429 == $this->last_error_code;
 	}
 
 	protected function validate() {
 		$params = $this->request_options( 'POST' );
 		list($details, $headers, $status_code) = $this->request( $params );
 
-		if ( $status_code == 429 || $status_code == 400 ) {
+		if ( 429 == $status_code || 400 == $status_code ) {
 			return true;
 		} else if ( is_array( $details ) && isset( $details['error'] ) ) {
 			throw new Tiny_Exception(
@@ -70,7 +70,7 @@ protected function validate() {
 		}
 	}
 
-	protected function compress($input, $resize_opts, $preserve_opts) {
+	protected function compress( $input, $resize_opts, $preserve_opts ) {
 		$params = $this->request_options( 'POST', $input );
 		list($details, $headers, $status_code) = $this->request( $params );
 
@@ -87,7 +87,7 @@ protected function compress($input, $resize_opts, $preserve_opts) {
 				'Tinify\Exception',
 				$status_code
 			);
-		} else if ( $output_url === null ) {
+		} else if ( null === $output_url ) {
 			throw new Tiny_Exception(
 				'Could not find output location',
 				'Tinify\Exception'
@@ -129,13 +129,13 @@ protected function compress($input, $resize_opts, $preserve_opts) {
 				'width' => intval( $headers['image-width'] ),
 				'height' => intval( $headers['image-height'] ),
 				'ratio' => round( strlen( $output ) / strlen( $input ), 4 ),
-			)
+			),
 		);
 
 		return array( $output, $meta );
 	}
 
-	private function request($params, $url = Tiny_Config::URL) {
+	private function request( $params, $url = Tiny_Config::URL ) {
 		$context = stream_context_create( $params );
 		$request = fopen( $url, 'rb', false, $context );
 
@@ -172,7 +172,7 @@ private function request($params, $url = Tiny_Config::URL) {
 		return array( $response, $headers, $status_code );
 	}
 
-	private function parse_status_code($headers) {
+	private function parse_status_code( $headers ) {
 		if ( $headers && count( $headers ) > 0 ) {
 			$http_code_values = explode( ' ', $headers[0] );
 			if ( count( $http_code_values ) > 1 ) {
@@ -182,7 +182,7 @@ private function parse_status_code($headers) {
 		return null;
 	}
 
-	private function parse_headers($headers) {
+	private function parse_headers( $headers ) {
 		$res = array();
 		foreach ( $headers as $header ) {
 			$split = explode( ':', $header, 2 );
@@ -193,7 +193,7 @@ private function parse_headers($headers) {
 		return $res;
 	}
 
-	private function request_options($method, $body = null) {
+	private function request_options( $method, $body = null ) {
 		return array(
 			'http' => array(
 				'method' => $method,
@@ -210,11 +210,11 @@ private function request_options($method, $body = null) {
 			'ssl' => array(
 				'cafile' => $this->get_ca_file(),
 				'verify_peer' => true,
-			)
+			),
 		);
 	}
 
-	private function output_request_options($resize_opts, $preserve_opts) {
+	private function output_request_options( $resize_opts, $preserve_opts ) {
 		$body = array();
 
 		if ( $preserve_opts ) {
@@ -237,9 +237,9 @@ private static function get_ca_file() {
 		return dirname( __FILE__ ) . '/data/cacert.pem';
 	}
 
-	private static function decode($text) {
+	private static function decode( $text ) {
 		$result = json_decode( $text, true );
-		if ( $result === null ) {
+		if ( null === $result ) {
 			$message = sprintf(
 				'JSON: %s [%d]',
 				(PHP_VERSION_ID >= 50500 ? json_last_error_msg() : 'Unknown error'),