Added PHP7.3 to Travis, changed integration tests to run on 7.3 and r…

…everted change to split up ajax and other admin initializers to work with retina plugin.
tinify · Feb 27, 2019 · c6efa04 · c6efa04
1 parent 45807c6
commit c6efa04
Show file tree

Hide file tree

Showing 21 changed files with 56 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,81 +6,82 @@ php:
 - 7.0
 - 7.1
 - 7.2
+- 7.3
 matrix:
   include:
   - dist: precise
     php: 5.3
     script: bin/unit-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=51 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=50 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=49 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=48 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=47 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=46 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=45 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=44 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=43 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=42 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=41 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=40 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=39 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=38 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=37 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=36 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=35 INTEGRATION_TESTS=true
     script: bin/integration-tests
   - dist: trusty
-    php: 7.0
+    php: 7.3
     env: WORDPRESS_VERSION=34 INTEGRATION_TESTS=true
     script: bin/integration-tests
 install:

diff --git a/config/Dockerfile-wordpress-34 b/config/Dockerfile-wordpress-34
@@ -11,6 +11,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-35 b/config/Dockerfile-wordpress-35
@@ -11,6 +11,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-36 b/config/Dockerfile-wordpress-36
@@ -11,6 +11,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-37 b/config/Dockerfile-wordpress-37
@@ -11,6 +11,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-38 b/config/Dockerfile-wordpress-38
@@ -11,6 +11,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-39 b/config/Dockerfile-wordpress-39
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-40 b/config/Dockerfile-wordpress-40
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-41 b/config/Dockerfile-wordpress-41
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-42 b/config/Dockerfile-wordpress-42
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-43 b/config/Dockerfile-wordpress-43
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-44 b/config/Dockerfile-wordpress-44
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-45 b/config/Dockerfile-wordpress-45
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-46 b/config/Dockerfile-wordpress-46
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-47 b/config/Dockerfile-wordpress-47
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-48 b/config/Dockerfile-wordpress-48
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-49 b/config/Dockerfile-wordpress-49
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-50 b/config/Dockerfile-wordpress-50
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/config/Dockerfile-wordpress-51 b/config/Dockerfile-wordpress-51
@@ -9,6 +9,7 @@ RUN curl -o wordpress.tar.gz -sSL https://wordpress.org/wordpress-${WORDPRESS_UP
   && echo "$WORDPRESS_SHA1 *wordpress.tar.gz" | sha1sum -c - \
   && tar -xzf wordpress.tar.gz -C /usr/src/ \
   && rm wordpress.tar.gz \
+  && mkdir /usr/src/wordpress/wp-content/uploads \
   && chown -R www-data:www-data /usr/src/wordpress
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/src/class-tiny-plugin.php b/src/class-tiny-plugin.php
@@ -91,6 +91,23 @@ public function ajax_init() {
 		add_filter( 'wp_ajax_nopriv_tiny_rpc',
 			$this->get_method( 'process_rpc_request' )
 		);
+
+		if ( $this->settings->compress_wr2x_images() ) {
+			add_action( 'wr2x_upload_retina',
+				$this->get_method( 'compress_original_retina_image' ),
+				10, 2
+			);
+
+			add_action( 'wr2x_retina_file_added',
+				$this->get_method( 'compress_retina_image' ),
+				10, 3
+			);
+
+			add_action( 'wr2x_retina_file_removed',
+				$this->get_method( 'remove_retina_image' ),
+				10, 2
+			);
+		}
 	}
 
 	public function admin_init() {
@@ -131,23 +148,6 @@ public function admin_init() {
 			$this->get_method( 'add_plugin_links' )
 		);
 
-		if ( $this->settings->compress_wr2x_images() ) {
-			add_action( 'wr2x_upload_retina',
-				$this->get_method( 'compress_original_retina_image' ),
-				10, 2
-			);
-
-			add_action( 'wr2x_retina_file_added',
-				$this->get_method( 'compress_retina_image' ),
-				10, 3
-			);
-
-			add_action( 'wr2x_retina_file_removed',
-				$this->get_method( 'remove_retina_image' ),
-				10, 2
-			);
-		}
-
 		$this->tiny_compatibility();
 
 		add_thickbox();

diff --git a/src/class-tiny-wp-base.php b/src/class-tiny-wp-base.php
@@ -57,12 +57,11 @@ public function __construct() {
 		add_action( 'init', $this->get_method( 'init' ) );
 		if ( self::is_xmlrpc_request() ) {
 			add_action( 'init', $this->get_method( 'xmlrpc_init' ) );
+		} elseif ( self::doing_ajax_request() ) {
+			add_action( 'admin_init', $this->get_method( 'ajax_init' ) );
 		} elseif ( is_admin() ) {
 			add_action( 'admin_init', $this->get_method( 'admin_init' ) );
 			add_action( 'admin_menu', $this->get_method( 'admin_menu' ) );
-			if ( self::doing_ajax_request() ) {
-				add_action( 'admin_init', $this->get_method( 'ajax_init' ) );
-			}
 		}
 	}