diff --git a/.idea/caldera-forms-query.iml b/.idea/caldera-forms-query.iml
index 3c85de6..e343b67 100644
--- a/.idea/caldera-forms-query.iml
+++ b/.idea/caldera-forms-query.iml
@@ -23,7 +23,6 @@
-
diff --git a/.idea/php.xml b/.idea/php.xml
index 39cb932..0b3c7e5 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -13,7 +13,6 @@
-
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a387ac5..97f7c96 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,14 @@
-
-
-
+
+
+
+
+
+
+
+
@@ -18,91 +23,95 @@
-
-
+
+
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
@@ -121,9 +130,15 @@
collectRe
limit
LIMIT
+ 80
+ atte
+ $HOST_PORT
+ HOST_PORT
+ phpunit
$PROJECT_DIR$/Tests
+ $PROJECT_DIR$/bin
@@ -140,17 +155,18 @@
-
-
-
+
+
+
+
@@ -185,7 +201,6 @@
-
@@ -213,9 +228,9 @@
-
+
-
+
@@ -243,51 +258,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -299,7 +274,7 @@
-
+
-
+
-
+
@@ -349,13 +330,12 @@
-
-
+
+
-
-
+
@@ -364,6 +344,7 @@
+
@@ -373,327 +354,255 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
+
+
-
-
-
-
+
-
-
+
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
+
-
-
+
+
-
+
-
-
+
+
diff --git a/README.md b/README.md
index c3bb8e1..6973433 100644
--- a/README.md
+++ b/README.md
@@ -171,7 +171,7 @@ A local development environment is included, and provided. It is used for integ
* Install Local Environment And WordPress "Unit" Test Suite
- `composer wp-install`
-You should know have WordPress at http://localhost:8888/
+You should know have WordPress at http://localhost:8881
* (re)Start Server: Once server is installed, you can start it again
- `composer wp-start`
diff --git a/bin/install-docker.sh b/bin/install-docker.sh
index 7cdff98..059fc00 100755
--- a/bin/install-docker.sh
+++ b/bin/install-docker.sh
@@ -37,6 +37,7 @@ HOST_PORT=$(docker-compose port wordpress 80 | awk -F : '{printf $2}')
# Wait until the docker containers are setup properely
echo -en $(status_message "Attempting to connect to wordpress...")
+echo -en $(status_message http://localhost:$HOST_PORT)
until $(curl -L http://localhost:$HOST_PORT -so - 2>&1 | grep -q "WordPress"); do
echo -n '.'
sleep 5
diff --git a/composer.json b/composer.json
index 67a8257..3561f5e 100644
--- a/composer.json
+++ b/composer.json
@@ -31,6 +31,7 @@
"wp-install": "bash ./bin/install-docker.sh",
"wp-tests": "docker-compose run --rm wordpress_phpunit phpunit --configuration phpunit-integration.xml.dist",
"phpunit-v": "phpunit --version",
+ "wp-phpunit-v": "docker-compose run --rm wordpress_phpunit phpunit --version",
"sniffs" : "phpcs src/ && phpcs Tests/",
"fixes" : "phpcbf src/ && phpcbf Tests/",
"lints" : "parallel-lint ./src --blame --exclude vendor && parallel-lint ./tests --blame --exclude vendor"
diff --git a/composer.lock b/composer.lock
index 747123d..8a0b70c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1263,16 +1263,16 @@
},
{
"name": "sebastian/comparator",
- "version": "3.0.1",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "591a30922f54656695e59b1f39501aec513403da"
+ "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/591a30922f54656695e59b1f39501aec513403da",
- "reference": "591a30922f54656695e59b1f39501aec513403da",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+ "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
"shasum": ""
},
"require": {
@@ -1323,7 +1323,7 @@
"compare",
"equality"
],
- "time": "2018-06-14T15:05:28+00:00"
+ "time": "2018-07-12T15:12:46+00:00"
},
{
"name": "sebastian/diff",
diff --git a/docker-compose.yml b/docker-compose.yml
index a8139ca..0ea3c57 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
wordpress:
image: wordpress
ports:
- - 8888:80
+ - 8881:80
environment:
WORDPRESS_DB_PASSWORD: example
ABSPATH: /usr/src/wordpress/