Merge branch 'master' of https://github.com/tinify/wordpress-plugin

Author: Evertrotshuizen

.travis.yml

@@ -8,6 +8,10 @@ php:
 - hhvm
 matrix:
   include:
+  - dist: trusty
+    php: 7.0
+    env: WORDPRESS_VERSION=46 INTEGRATION_TESTS=true
+    script: bin/integration-tests
   - dist: trusty
     php: 7.0
     env: WORDPRESS_VERSION=45 INTEGRATION_TESTS=true

config/Dockerfile-wordpress-46

@@ -0,0 +1,15 @@
+FROM wordpress:4
+
+ENV WORDPRESS_VERSION 4.6
+ENV WORDPRESS_UPSTREAM_VERSION 4.6
+ENV WORDPRESS_SHA1 830962689f350e43cd1a069f3a4f68a44c0339c8
+
+# upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
+RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \
+  && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
+  && tar -xzf wordpress.tar.gz -C /usr/src/ \
+  && rm wordpress.tar.gz \
+  && chown -R www-data:www-data /usr/src/wordpress
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["apache2-foreground"]

src/class-tiny-compress-fopen.php

@@ -193,12 +193,12 @@ private function parse_headers( $headers ) {
 		return $res;
 	}
 
-	private function request_options( $method, $body = null ) {
+	private function request_options( $method, $body = null, $content_type = 'image/png' ) {
 		return array(
 			'http' => array(
 				'method' => $method,
 				'header' => array(
-					'Content-type: image/png',
+					'Content-type: ' . $content_type,
 					'Authorization: Basic ' . base64_encode( 'api:' . $this->api_key ),
 					'User-Agent: ' . self::identifier(),
 				 ),
@@ -226,8 +226,7 @@ private function output_request_options( $resize_opts, $preserve_opts ) {
 		}
 
 		if ( $resize_opts || $preserve_opts ) {
-			$options['http']['header'][] = 'Content-Type: application/json';
-			return $this->request_options( 'GET', json_encode( $body ) );
+			return $this->request_options( 'GET', json_encode( $body ), 'application/json' );
 		} else {
 			return $this->request_options( 'GET', null );
 		}

src/views/account-status-loading.php

@@ -4,5 +4,9 @@
 			'Retrieving account status',
 			'tiny-compress-images'
 		); ?></p>
+
+		<input type="hidden" id="<?php echo esc_attr( self::get_prefixed_name( 'api_key' ) ); ?>"
+			name="<?php echo esc_attr( self::get_prefixed_name( 'api_key' ) ); ?>" size="35" spellcheck="false"
+			value="<?php echo esc_attr( $key ); ?>">
 	</div>
 </div>

src/views/account-status-update.php

@@ -15,8 +15,8 @@
 			), $link );
 		?></p>
 
-		<input type="text" id="tinypng_api_key"
-			name="tinypng_api_key" size="35" spellcheck="false"
+		<input type="text" id="<?php echo esc_attr( self::get_prefixed_name( 'api_key' ) ); ?>"
+			name="<?php echo esc_attr( self::get_prefixed_name( 'api_key' ) ); ?>" size="35" spellcheck="false"
 			value="<?php echo esc_attr( $key ); ?>">
 
 		<button class="button button-primary" data-tiny-action="update-key"><?php