Skip to content

Commit

Permalink
Merge pull request #180 from OSTraining/release-1.11.1
Browse files Browse the repository at this point in the history
PPRESS-368 ⁃ Release 1.11.1
  • Loading branch information
Anderson Grüdtner Martins authored Mar 19, 2018
2 parents 5ddd867 + 3e2f309 commit df2ce6e
Show file tree
Hide file tree
Showing 41 changed files with 1,900 additions and 4,310 deletions.
21 changes: 21 additions & 0 deletions .distignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# A set of files you probably don't want in your WordPress.org distribution
.distignore
.github
.git
.gitignore
.travis.yml
.DS_Store
.babelrc
build.xml
phpunit.xml
Thumbs.db
bin
dist
package.json
phpunit.xml
README.md
tests
assets_wp
*.sql
*.tar.gz
*.zip
81 changes: 46 additions & 35 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,63 @@
# Based on https://github.com/wp-cli/sample-plugin/blob/master/.travis.yml

sudo: false
language: php

services:
- mysql

cache:
directories:
- vendor
- $HOME/.composer/cache

install:
- composer install --no-dev --prefer-dist

matrix:
include:
- php: '7.1'
env: WP_VERSION=4.8 WP_MULTISITE=0
env: WP_VERSION=latest
- php: '7.1'
env: WP_VERSION=4.8 WP_MULTISITE=1
env: WP_VERSION=4.8
- php: '5.6'
env: WP_VERSION=4.8 WP_MULTISITE=0
- php: '5.6'
env: WP_VERSION=4.8 WP_MULTISITE=1
- php: '7.1'
env: WP_VERSION=4.7 WP_MULTISITE=0
- php: '7.1'
env: WP_VERSION=4.7 WP_MULTISITE=1
env: WP_VERSION=latest
- php: '5.6'
env: WP_VERSION=4.7 WP_MULTISITE=0
- php: '5.6'
env: WP_VERSION=4.7 WP_MULTISITE=1
- php: '5.6'
env: WP_VERSION=4.6 WP_MULTISITE=0
- php: '5.6'
env: WP_VERSION=4.6 WP_MULTISITE=1
- php: '7.1'
env: WP_VERSION=master WP_MULTISITE=0
- php: '5.6'
env: WP_VERSION=master WP_MULTISITE=0
env: WP_VERSION=4.8
- php: '5.4'
env: WP_VERSION=latest
- php: '5.4'
env: WP_VERSION=4.8

before_script:
- export PLUGIN_SLUG=$(basename $(pwd))
- git clone --depth=1 --branch $WP_VERSION git://develop.git.wordpress.org/ /tmp/wordpress
- cd ..
- mv $PLUGIN_SLUG "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
- cd /tmp/wordpress
- git checkout $WP_VERSION
- mysql -e "CREATE DATABASE wordpress_tests;" -uroot
- 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
- cd "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"

script: phpunit
- export PATH="$HOME/.composer/vendor/bin:$PATH"
- |
if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
phpenv config-rm xdebug.ini
else
echo "xdebug.ini does not exist"
fi
- |
if [[ ! -z "$WP_VERSION" ]] ; then
bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
composer global require "phpunit/phpunit=4.8.*|5.7.*"
fi
- |
if [[ "$WP_TRAVISCI" == "phpcs" ]] ; then
composer global require wp-coding-standards/wpcs
phpcs --config-set installed_paths $HOME/.composer/vendor/wp-coding-standards/wpcs
fi
sudo: false
script:
- |
if [[ ! -z "$WP_VERSION" ]] ; then
phpunit
WP_MULTISITE=1 phpunit
fi
- |
if [[ "$WP_TRAVISCI" == "phpcs" ]] ; then
phpcs
fi
notifications:
slack:
Expand Down
File renamed without changes.
23 changes: 23 additions & 0 deletions bin/install-addons.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

downloadPlugin () {
TMPDIR=${TMPDIR-/tmp}
TMPDIR=$(echo $TMPDIR | sed -e "s/\/$//")

REPO="https://$GITHUB_USERNAME:$GITHUB_ACCESS_TOKEN@github.com/$1/$2.git"
VERSION=$3 # tag name or the word "latest"
CLONE_DIR="$TMPDIR/wordpress/wp-content/plugins/$4"
PLUGIN_ALIAS=$4

alias errcho='>&2 echo'

# Remove cloned repo if exists
if [ -d $CLONE_DIR ]; then
rm -rf $CLONE_DIR
fi

# Clone the repository
git clone --branch $VERSION $REPO $CLONE_DIR
}

downloadPlugin OSTraining PublishPress-Permissions 1.0.4 publishpress-permissions
151 changes: 151 additions & 0 deletions bin/install-wp-tests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
#!/usr/bin/env bash

if [ $# -lt 3 ]; then
echo "usage: $0 <db-name> <db-user> <db-pass> [db-host] [wp-version] [skip-database-creation]"
exit 1
fi

DB_NAME=$1
DB_USER=$2
DB_PASS=$3
DB_HOST=${4-localhost}
WP_VERSION=${5-latest}
SKIP_DB_CREATE=${6-false}

TMPDIR=${TMPDIR-/tmp}
TMPDIR=$(echo $TMPDIR | sed -e "s/\/$//")
WP_TESTS_DIR=${WP_TESTS_DIR-$TMPDIR/wordpress-tests-lib}
WP_CORE_DIR=${WP_CORE_DIR-$TMPDIR/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]+$ ]]; then
WP_TESTS_TAG="branches/$WP_VERSION"
elif [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
if [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0] ]]; then
# version x.x.0 means the first release of the major version, so strip off the .0 and download version x.x
WP_TESTS_TAG="tags/${WP_VERSION%??}"
else
WP_TESTS_TAG="tags/$WP_VERSION"
fi
elif [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
WP_TESTS_TAG="trunk"
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 == 'nightly' || $WP_VERSION == 'trunk' ]]; then
mkdir -p $TMPDIR/wordpress-nightly
download https://wordpress.org/nightly-builds/wordpress-latest.zip $TMPDIR/wordpress-nightly/wordpress-nightly.zip
unzip -q $TMPDIR/wordpress-nightly/wordpress-nightly.zip -d $TMPDIR/wordpress-nightly/
mv $TMPDIR/wordpress-nightly/wordpress/* $WP_CORE_DIR
else
if [ $WP_VERSION == 'latest' ]; then
local ARCHIVE_NAME='latest'
elif [[ $WP_VERSION =~ [0-9]+\.[0-9]+ ]]; then
# https serves multiple offers, whereas http serves single.
download https://api.wordpress.org/core/version-check/1.7/ $TMPDIR/wp-latest.json
if [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0] ]]; then
# version x.x.0 means the first release of the major version, so strip off the .0 and download version x.x
LATEST_VERSION=${WP_VERSION%??}
else
# otherwise, scan the releases and get the most up to date minor version of the major release
local VERSION_ESCAPED=`echo $WP_VERSION | sed 's/\./\\\\./g'`
LATEST_VERSION=$(grep -o '"version":"'$VERSION_ESCAPED'[^"]*' $TMPDIR/wp-latest.json | sed 's/"version":"//' | head -1)
fi
if [[ -z "$LATEST_VERSION" ]]; then
local ARCHIVE_NAME="wordpress-$WP_VERSION"
else
local ARCHIVE_NAME="wordpress-$LATEST_VERSION"
fi
else
local ARCHIVE_NAME="wordpress-$WP_VERSION"
fi
download https://wordpress.org/${ARCHIVE_NAME}.tar.gz $TMPDIR/wordpress.tar.gz
tar --strip-components=1 -zxmf $TMPDIR/wordpress.tar.gz -C $WP_CORE_DIR
fi

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
svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
fi

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
# remove all forward slashes in the end
WP_CORE_DIR=$(echo $WP_CORE_DIR | sed "s:/\+$::")
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() {

if [ ${SKIP_DB_CREATE} = "true" ]; then
return 0
fi

# 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
10 changes: 0 additions & 10 deletions codeception.yml

This file was deleted.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"repositories": [
{
"type": "vcs",
"type": "git",
"url": "https://github.com/OSTraining/WordPress-Plugin-Builder"
}
],
Expand Down
2 changes: 1 addition & 1 deletion modules/async-notifications/library/Queue/WPCron.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function enqueueNotification($workflowPost, $actionArgs, $receivers, $con
protected function scheduleEvent($data)
{
wp_schedule_single_event(
time(),
time() + 4,
'publishpress_cron_notify',
$data
);
Expand Down
Loading

0 comments on commit df2ce6e

Please sign in to comment.