Merge pull request #98 from wp-media/branch-2.8.7

Branch 2.8.7

.travis.yml

@@ -0,0 +1,24 @@
+language: php
+
+sudo: false
+
+php:
+- 5.3
+- 5.4
+- 5.5
+- 5.6
+- 7.0
+- hhvm
+
+env:
+- WP_VERSION=latest WP_MULTISITE=0
+- WP_VERSION=4.4 WP_MULTISITE=0
+- WP_VERSION=4.3 WP_MULTISITE=0
+- WP_VERSION=4.2 WP_MULTISITE=0
+- WP_VERSION=4.1 WP_MULTISITE=0
+- WP_VERSION=4.0 WP_MULTISITE=0
+
+
+
+before_script:
+- bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION

bin/install-wp-tests.sh

@@ -0,0 +1,112 @@
+#!/usr/bin/env bash
+
+if [ $# -lt 3 ]; then
+    echo "usage: $0 <db-name> <db-user> <db-pass> [db-host] [wp-version]"
+    exit 1
+fi
+
+DB_NAME=$1
+DB_USER=$2
+DB_PASS=$3
+DB_HOST=${4-localhost}
+WP_VERSION=${5-latest}
+
+WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib}
+WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/}
+
+download() {
+    if [ `which curl` ]; then
+        curl -s "$1" > "$2";
+    elif [ `which wget` ]; then
+        wget -nv -O "$2" "$1"
+    fi
+}
+
+if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then
+    WP_TESTS_TAG="tags/$WP_VERSION"
+else
+    # http serves a single offer, whereas https serves multiple. we only want one
+    download http://api.wordpress.org/core/version-check/1.7/ /tmp/wp-latest.json
+    grep '[0-9]+\.[0-9]+(\.[0-9]+)?' /tmp/wp-latest.json
+    LATEST_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//')
+    if [[ -z "$LATEST_VERSION" ]]; then
+        echo "Latest WordPress version could not be found"
+        exit 1
+    fi
+    WP_TESTS_TAG="tags/$LATEST_VERSION"
+fi
+
+set -ex
+
+install_wp() {
+
+    if [ -d $WP_CORE_DIR ]; then
+        return;
+    fi
+
+    mkdir -p $WP_CORE_DIR
+
+    if [ $WP_VERSION == 'latest' ]; then
+        local ARCHIVE_NAME='latest'
+    else
+        local ARCHIVE_NAME="wordpress-$WP_VERSION"
+    fi
+
+    download https://wordpress.org/${ARCHIVE_NAME}.tar.gz  /tmp/wordpress.tar.gz
+    tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR
+
+    download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php
+}
+
+install_test_suite() {
+    # portable in-place argument for both GNU sed and Mac OSX sed
+    if [[ $(uname -s) == 'Darwin' ]]; then
+        local ioption='-i .bak'
+    else
+        local ioption='-i'
+    fi
+
+    # set up testing suite if it doesn't yet exist
+    if [ ! -d $WP_TESTS_DIR ]; then
+        # set up testing suite
+        mkdir -p $WP_TESTS_DIR
+        svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
+    fi
+
+    cd $WP_TESTS_DIR
+
+    if [ ! -f wp-tests-config.php ]; then
+        download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php
+        sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR':" "$WP_TESTS_DIR"/wp-tests-config.php
+        sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php
+        sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php
+        sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php
+        sed $ioption "s|localhost|${DB_HOST}|" "$WP_TESTS_DIR"/wp-tests-config.php
+    fi
+
+}
+
+install_db() {
+    # parse DB_HOST for port or socket references
+    local PARTS=(${DB_HOST//\:/ })
+    local DB_HOSTNAME=${PARTS[0]};
+    local DB_SOCK_OR_PORT=${PARTS[1]};
+    local EXTRA=""
+
+    if ! [ -z $DB_HOSTNAME ] ; then
+        if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then
+            EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp"
+        elif ! [ -z $DB_SOCK_OR_PORT ] ; then
+            EXTRA=" --socket=$DB_SOCK_OR_PORT"
+        elif ! [ -z $DB_HOSTNAME ] ; then
+            EXTRA=" --host=$DB_HOSTNAME --protocol=tcp"
+        fi
+    fi
+
+    # create database
+    mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
+}
+
+install_wp
+install_test_suite
+install_db

inc/3rd-party/hosting/wpengine.php

@@ -54,9 +54,9 @@ function __rocket_add_wpengine_cdn_cnames( $hosts ) {
 	$cdn_domain = rocket_get_wp_engine_cdn_domain();
 
 	if ( ! empty( $cdn_domain ) ) {
-		$hosts[] = $native_schema . '://' . $cdn_domain;
+		$hosts[] = $cdn_domain;
 	}
-	
+
 	return $hosts;
 }
 
@@ -118,6 +118,8 @@ function rocket_get_wp_engine_cdn_domain() {
 
     $wpengine   = WpeCommon::instance();
     $cdn_domain = $wpengine->get_cdn_domain( $domains, home_url(), $is_ssl );
+
+    $cdn_domain = $native_schema . '://' . $cdn_domain;
 
     return $cdn_domain;
 }

inc/front/cdn.php

@@ -144,7 +144,7 @@ function rocket_cdn_enqueue( $src )
 		return $src;
 	}
 
-	$src  = set_url_scheme( $src );
+	$src  = rocket_add_url_protocol( $src );
 	$zone = array( 'all', 'css_and_js' );
 
 	// Add only CSS zone

inc/functions/htaccess.php

@@ -292,7 +292,7 @@ function get_rocket_htaccess_mod_deflate()
 			$rules .= '<IfModule mod_headers.c>' . PHP_EOL;
 			$rules .= 'SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding' . PHP_EOL;
 			$rules .= 'RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding' . PHP_EOL;
-			$rules .= '# Don\'t compress images and other uncompressible content' . PHP_EOL;
+			$rules .= '# Don’t compress images and other uncompressible content' . PHP_EOL;
 			$rules .= 'SetEnvIfNoCase Request_URI \\' . PHP_EOL;
 			$rules .= '\\.(?:gif|jpe?g|png|rar|zip|exe|flv|mov|wma|mp3|avi|swf|mp?g)$ no-gzip dont-vary' . PHP_EOL;
 			$rules .= '</IfModule>' . PHP_EOL;
@@ -476,7 +476,7 @@ function get_rocket_htaccess_etag()
     $rules .= '<IfModule mod_headers.c>' . PHP_EOL;
     $rules .= 'Header unset ETag' . PHP_EOL;
     $rules .= '</IfModule>' . PHP_EOL . PHP_EOL;
-    $rules .= '# Since we\'re sending far-future expires, we don\'t need ETags for static content.' . PHP_EOL;
+    $rules .= '# Since we’re sending far-future expires, we don’t need ETags for static content.' . PHP_EOL;
     $rules .= '# developer.yahoo.com/performance/rules.html#etags' . PHP_EOL;
     $rules .= 'FileETag None' . PHP_EOL . PHP_EOL;
 

phpunit.xml

@@ -0,0 +1,14 @@
+<phpunit
+    bootstrap="./tests/bootstrap.php"
+    backupGlobals="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true">
+    <testsuites>
+        <testsuite>
+            <directory prefix="test-" suffix=".php">*</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
+

tests/bootstrap.php

@@ -0,0 +1,14 @@
+<?php
+
+$_tests_dir = getenv('WP_TESTS_DIR');
+if ( !$_tests_dir ) $_tests_dir = '/tmp/wordpress-tests-lib';
+
+require_once $_tests_dir . '/includes/functions.php';
+
+function _manually_load_environment() {
+    update_option( 'active_plugins', 'wp-rocket/wp-rocket.php' );
+
+}
+tests_add_filter( 'muplugins_loaded', '_manually_load_environment' );
+
+require $_tests_dir . '/includes/bootstrap.php';

tests/test-sample.php

@@ -0,0 +1,6 @@
+<?php
+class SampleTest extends WP_UnitTestCase {
+    function testActivation() {
+        $this->assertTrue( is_plugin_active('wp-rocket/wp-rocket.php') );
+    }
+}

wp-rocket.php

@@ -3,7 +3,7 @@
 Plugin Name: WP Rocket
 Plugin URI: http://www.wp-rocket.me
 Description: The best WordPress performance plugin.
-Version: 2.8.6
+Version: 2.8.7
 Code Name: Ilum
 Author: WP Rocket
 Contributors: Jonathan Buttigieg, Julio Potier, Remy Perona
@@ -19,7 +19,7 @@
 defined( 'ABSPATH' ) or die( 'Cheatin’ uh?' );
 
 // Rocket defines
-define( 'WP_ROCKET_VERSION'             , '2.8.6' );
+define( 'WP_ROCKET_VERSION'             , '2.8.7' );
 define( 'WP_ROCKET_PRIVATE_KEY'         , false );
 define( 'WP_ROCKET_SLUG'                , 'wp_rocket_settings' );
 define( 'WP_ROCKET_WEB_MAIN'            , 'http://support.wp-rocket.me/' );