Skip to content

Commit

Permalink
merge release/2.2.8 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
lucatume committed May 20, 2019
2 parents 7ddecd2 + afe52b8 commit d638d8e
Show file tree
Hide file tree
Showing 77 changed files with 2,705 additions and 6,871 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ src/includes/patchwork.json
docs/node_modules
docs/_book
tests/_support/_generated
composer.lock
tags
27 changes: 17 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,24 @@ language: php
notifications:
email: false

php:
- '5.6'
- '7.0'
- '7.1'
- '7.2'
- 'nightly'

matrix:
fast_finish: true
allow_failures:
- php: nightly
include:
- php: '5.6'
env: CODECEPTION_VERSION="^2.5"
- php: '5.6'
env: CODECEPTION_VERSION="^3.0"
- php: '7.0'
env: CODECEPTION_VERSION="^2.5"
- php: '7.0'
env: CODECEPTION_VERSION="^3.0"
- php: '7.1'
env: CODECEPTION_VERSION="^2.5"
- php: '7.1'
env: CODECEPTION_VERSION="^3.0"
- php: '7.2'
env: CODECEPTION_VERSION="^2.5"
- php: '7.2'
env: CODECEPTION_VERSION="^3.0"

services:
- docker
Expand Down
12 changes: 11 additions & 1 deletion docs/changelog.md → CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [unreleased] Unreleased

## [2.2.8] 2019-05-20;
### Changed
- updated requirement of `codeception/codeception` to include version `3.0`
- updated `WPTestCase` to handle PHPUnit version `8.0+` compatibility
- internalized the classes and functions provided by the `lucatume/wp-browser-commons` package

### Fixed
- initialize the WPLoader module after all other modules initialized when `loadOnly` is `true` to avoid WordPress exiting due to a non-initialized database fixture

## [2.2.7] 2019-05-08;
### Changed
- replaced `wp-cli/wp-cli:1.1.*` dependecy with the `wp-cli/wp-cli-bundle:^2.0` one
Expand Down Expand Up @@ -866,7 +875,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- Reference to ModuleConfigException class in WPLoader class.

[unreleased]: https://github.com/lucatume/wp-browser/compare/2.2.7...HEAD
[unreleased]: https://github.com/lucatume/wp-browser/compare/2.2.8...HEAD
[2.2.8]: https://github.com/lucatume/wp-browser/compare/2.2.7...2.2.8:
[2.2.7]: https://github.com/lucatume/wp-browser/compare/2.2.6...2.2.7:
[2.2.6]: https://github.com/lucatume/wp-browser/compare/2.2.5...2.2.6:
[2.2.5]: https://github.com/lucatume/wp-browser/compare/2.2.4...2.2.5
Expand Down
15 changes: 11 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ TRAVIS_WP_SUBDOMAIN_2 ?= "test2"
TRAVIS_WP_SUBDOMAIN_2_TITLE ?= "Test Subdomain 2"
TRAVIS_WP_VERSION ?= "latest"
COMPOSE_FILE ?= docker-compose.yml
CODECEPTION_VERSION ?= "^2.5"
PROJECT := $(shell basename ${CURDIR})

.PHONY: wp_dump cs_sniff cs_fix cs_fix_n_sniff ci_before_install ci_before_script ci_docker_restart ci_install ci_local_prepare ci_run ci_script
.PHONY: wp_dump cs_sniff cs_fix cs_fix_n_sniff ci_before_install ci_before_script ci_docker_restart ci_install ci_local_prepare ci_run ci_script pre_commit

define wp_config_extra
if ( filter_has_var( INPUT_SERVER, 'HTTP_HOST' ) ) {
Expand Down Expand Up @@ -54,10 +55,13 @@ docker/parallel-lint/id:

# Lints the source files with PHP Parallel Lint, requires the parallel-lint:5.6 image to be built.
lint: docker/parallel-lint/id
docker run --rm -v ${CURDIR}:/app lucatume/parallel-lint:5.6 --colors /app/src
docker run --rm -v ${CURDIR}:/app lucatume/parallel-lint:5.6 \
--exclude /app/src/tad/WPBrowser/Compat/PHPUnit/Version8 \
--colors \
/app/src

cs_sniff:
vendor/bin/phpcs --colors -p --standard=phpcs.xml $(SRC) --ignore=src/data,src/includes,src/tad/scripts -s src
vendor/bin/phpcs --colors -p --standard=phpcs.xml $(SRC) --ignore=src/data,src/includes,src/tad/scripts,src/tad/WPBrowser/Compat -s src

cs_fix:
vendor/bin/phpcbf --colors -p --standard=phpcs.xml $(SRC) --ignore=src/data,src/includes,src/tad/scripts -s src tests
Expand Down Expand Up @@ -95,7 +99,7 @@ ci_before_install:

ci_install:
# Update Composer using the host machine PHP version.
composer update -a
composer require codeception/codeception:"${CODECEPTION_VERSION}"
# Copy over the wp-cli.yml configuration file.
docker cp docker/wp-cli.yml wpbrowser_wp:/var/www/html/wp-cli.yml
# Copy over the wp-config.php file.
Expand Down Expand Up @@ -153,6 +157,7 @@ ci_script:
codecept run wpfunctional
codecept run wploadersuite
codecept run wpmodule
codecept run wploader_wpdb_interaction

# Restarts the project containers.
ci_docker_restart:
Expand Down Expand Up @@ -240,3 +245,5 @@ sync_hosts_entries: remove_hosts_entries
wp_dump:
docker run -it --rm --volumes-from wpbrowser_wp --network container:wpbrowser_wp wordpress:cli wp db export \
/project/tests/_data/dump.sql

pre_commit: lint cs_sniff
20 changes: 12 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,24 @@
"php": ">=5.6.0",
"ext-pdo": "*",
"ext-fileinfo": "*",
"lucatume/wp-browser-commons": "^1.0",
"wp-cli/wp-cli-bundle": ">=2.0 <3.0.0",
"symfony/process": ">=2.7 <5.0",
"antecedent/patchwork": "^2.0",
"codeception/codeception": "~2.5.0",
"bacon/bacon-string-utils": "~1.0",
"codeception/codeception": "^2.5 || ^3.0",
"gumlet/php-image-resize": "^1.6",
"vlucas/phpdotenv": "^3.0"
"dg/mysql-dump": "^1.3",
"symfony/filesystem": "^3.0",
"symfony/process": ">=2.7 <5.0",
"mikemclin/laravel-wp-password": "~2.0.0",
"vlucas/phpdotenv": "^3.0",
"xamin/handlebars.php": "~0.10",
"wp-cli/wp-cli-bundle": ">=2.0 <3.0.0"
},
"require-dev": {
"mikey179/vfsstream": "^1.6",
"victorjonsson/markdowndocs": "dev-master",
"erusev/parsedown": "^1.7",
"lucatume/codeception-snapshot-assertions": "^0.1",
"mikey179/vfsstream": "^1.6",
"squizlabs/php_codesniffer": "^3.4",
"lucatume/codeception-snapshot-assertions": "^0.1"
"victorjonsson/markdowndocs": "dev-master"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit d638d8e

Please sign in to comment.