Merge pull request #192 from wpengine/phpcompatbility-8

Update to latest PHPCompatibility.

Author: octalmage

.gitignore

@@ -1,3 +1,4 @@
-composer.lock
 vendor/
 node_modules/
+build/
+phpcompat.zip

.travis.yml

@@ -71,26 +71,9 @@ before_script:
     else
       composer install
     fi
-  - |
-    if [[ "$WP_VERSION" == "latest" ]]; then
-      curl -s http://api.wordpress.org/core/version-check/1.7/ > /tmp/wp-latest.json
-      grep '[0-9]+\.[0-9]+(\.[0-9]+)?' /tmp/wp-latest.json
-      WP_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//')
-    fi
   - |
     if [[ "$NPM_TESTS" != "1" ]]; then
-      PLUGIN_SLUG=$(basename $(pwd))
-      export WP_DEVELOP_DIR=/tmp/wordpress/
-      git clone --depth=50 --branch="$WP_VERSION" git://develop.git.wordpress.org/ /tmp/wordpress
-      cd ..
-      cp -r "$PLUGIN_SLUG" "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
-      cd /tmp/wordpress/
-      cp wp-tests-config-sample.php wp-tests-config.php
-      sed -i "s/youremptytestdbnamehere/wordpress_tests/" wp-tests-config.php
-      sed -i "s/yourusernamehere/travis/" wp-tests-config.php
-      sed -i "s/yourpasswordhere//" wp-tests-config.php
-      mysql -e "CREATE DATABASE wordpress_tests;" -uroot
-      cd "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
+      tests/install-wp-tests.sh wordpress_tests travis "" localhost $WP_VERSION false
       phpenv rehash
     fi
 script:

Dockerfile

@@ -0,0 +1,35 @@
+# Start with the latest WordPress image.
+FROM wordpress:4.9.1-php7.0-apache
+
+# Set up nodejs PPA
+RUN curl -sL https://deb.nodesource.com/setup_6.x | bash
+
+# Install server dependencies.
+RUN apt-get update && apt-get install -qq -y nodejs build-essential pkg-config libcairo2-dev libjpeg-dev libgif-dev git subversion mysql-client zip unzip vim libyaml-dev --fix-missing --no-install-recommends
+
+# Setup phpunit dependencies (needed for coverage).
+RUN pecl install xdebug && \
+		docker-php-ext-enable xdebug
+
+COPY tests/install-wp-tests.sh /
+RUN /install-wp-tests.sh wordpress root password mysql 4.9.1 true
+
+# Download wp-cli
+RUN curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && chmod 755 /usr/local/bin/wp
+
+# Speed up phpcs https://stackoverflow.com/questions/37450185/php-code-sniffer-via-grunt-is-incredibly-slow
+RUN echo "default_socket_timeout = 5\nlog_errors = On\nerror_log = /dev/stderr" > /usr/local/etc/php/php.ini
+
+# Disable PHP opcache (not great while developing)
+RUN rm -rf /usr/local/etc/php/conf.d/opcache-recommended.ini
+
+# Install composer.
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+RUN composer global require "phpunit/phpunit:^6"
+
+# Install global grunt task runner.
+RUN npm install grunt-cli -g
+
+ENV PATH="/root/.composer/vendor/bin:${PATH}"
+ENV WP_VERSION="4.9.1"

Gruntfile.js

@@ -1,4 +1,8 @@
-var phpPaths = ['wpengine-phpcompat.php', 'src/*.php'];
+var phpPaths = [
+	'wpengine-phpcompat.php',
+	'load-files.php',
+	'src/*.php',
+];
 
 module.exports = function(grunt) {
 

Makefile

@@ -0,0 +1,12 @@
+SHELL := /bin/bash
+
+# WordPress management via docker-compose
+start:
+	docker-compose -f docker-compose.yml up -d
+
+stop:
+	docker-compose -f docker-compose.yml stop
+
+# One liner to get a shell inside the WordPress container.
+shell:
+	docker-compose exec wordpress /bin/bash -c "cd /var/www/html/wp-content/plugins/phpcompat/; /bin/bash"

build.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+if [ ! -d "build" ]; then
+	svn co https://plugins.svn.wordpress.org/php-compatibility-checker build
+else
+	pushd build
+	svn up
+	popd
+fi
+
+composer install --no-dev
+rsync \
+	-avuP \
+	--delete \
+	--exclude="Tests" \
+	--include='wpengine-phpcompat.php' \
+	--include='uninstall.php' \
+	--include='load-files.php' \
+	--include='readme.txt' \
+	--include='src' \
+	--include="src/**" \
+	--include='vendor' \
+	--include='vendor/**' \
+	--include='php52' \
+	--include='php52/**' \
+	--exclude="*" \
+	./ ./build/trunk
+
+pushd ./build/trunk
+zip -r phpcompat.zip .
+popd
+rm ./phpcompat.zip
+mv ./build/trunk/phpcompat.zip ./

composer.json

@@ -7,32 +7,19 @@
 		"email": "[email protected]"
 	}],
 	"require": {
-		"squizlabs/php_codesniffer": "2.9.*",
-		"wimg/php-compatibility": "^8",
-		"simplyadmire/composer-plugins" : "@dev"
+		"squizlabs/php_codesniffer": "^2.9.1",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+		"phpcompatibility/phpcompatibility-wp": "^1"
 	},
 	"require-dev": {
-		"wp-coding-standards/wpcs": "dev-master",
-		"neronmoon/scriptsdev": "^0.1.0"
+		"wp-coding-standards/wpcs": "dev-master"
 	},
 	"scripts": {
 		"post-update-cmd": [
-			"cd php52; composer update; cd ..",
-			"vendor/bin/phpcs --config-set installed_paths ../../wimg/php-compatibility"
+			"cd php52; composer update; cd .."
 		],
 		"post-install-cmd": [
-			"cd php52; composer install; cd ..",
-			"vendor/bin/phpcs --config-set installed_paths ../../wimg/php-compatibility"
-		]
-	},
-	"scripts-dev": {
-		"post-update-cmd": [
-			"cd php52; composer update; cd ..",
-			"vendor/bin/phpcs --config-set installed_paths ../../wimg/php-compatibility,../../wp-coding-standards/wpcs"
-		],
-		"post-install-cmd": [
-			"cd php52; composer install; cd ..",
-			"vendor/bin/phpcs --config-set installed_paths ../../wimg/php-compatibility,../../wp-coding-standards/wpcs"
+			"cd php52; composer install; cd .."
 		]
 	}
 }