Merge 3.11.1 with master

.circleci/config.yml

@@ -17,7 +17,7 @@ commands:
             sudo docker-php-ext-install mysqli
             sudo apt-get update
             sudo composer self-update
-            sudo apt-get install -y subversion mysql-client
+            sudo apt-get install -y subversion default-mysql-client
       - restore_cache:
           keys:
             - composer-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "composer.json" }}
@@ -40,7 +40,7 @@ commands:
             composer phpcbf
             composer phpcbf-tests
             composer phpcs-tests
-            composer compat
+            composer phpcs-i18n
   run-tests:
     steps:
       - run:
@@ -49,9 +49,6 @@ commands:
             dockerize -wait tcp://127.0.0.1:3306 -timeout 120s
             bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 latest
       - run: composer test-ci
-      - run:
-          command: bash <(curl -s https://codecov.io/bash)
-          when: on_success
 
 jobs:
   php_5:
@@ -63,7 +60,8 @@ jobs:
     steps:
       - prepare
       - run-tests
-      - run-formatting
+      - run:
+          command: composer compat
   php_7:
     docker:
       - image: circleci/php:7.1
@@ -74,6 +72,9 @@ jobs:
       - prepare
       - run-tests
       - run-formatting
+      - run:
+          command: bash <(curl -s https://codecov.io/bash)
+          when: on_success
   snyk:
     docker:
       - image: snyk/snyk-cli:composer

CHANGELOG.md

@@ -1,13 +1,33 @@
 # Change Log
 
-## 4.0.0-beta
-[Full Changelog](https://github.com/auth0/wp-auth0/compare/3.11.0...master)
+## 4.0.0-beta (master branch)
+[Full Changelog](https://github.com/auth0/wp-auth0/compare/3.11.1...master)
 
 **Notes on this release**
 
 - The minimum PHP version has been updated from 5.3 to 5.6. All long arrays have been converted to short arrays with a PHPCS check. 
 - The site will no longer auto-redirect paths with `auth0` in them to the callback URL. Use `/index.php?auth0=1` to use the callback URL directly. Your site may require permalinks to be refreshed manually by going to **wp-admin > Settings > Permalinks** and clicking **Save Changes**.
 
+**Closed issues**
+- Using the auth0 word in the URL path triggers an authorization code exchange [\#351](https://github.com/auth0/wp-auth0/issues/351)
+
+**Breaking changes**
+- Fix auth0 in paths triggering callback [\#697](https://github.com/auth0/wp-auth0/pull/697) ([joshcanhelp](https://github.com/joshcanhelp))
+- Bump PHP version to 5.6; auto-adjust array syntax [\#696](https://github.com/auth0/wp-auth0/pull/696) ([joshcanhelp](https://github.com/joshcanhelp))
+
+## [3.11.1](https://github.com/auth0/wp-auth0/tree/3.11.1) (2019-08-05)
+[Full Changelog](https://github.com/auth0/wp-auth0/compare/3.11.0...3.11.1)
+
+**Fixed**
+- Check state in specific global based on callback type [\#708](https://github.com/auth0/wp-auth0/pull/708) ([joshcanhelp](https://github.com/joshcanhelp))
+- Fix widget gravatar and language settings [\#706](https://github.com/auth0/wp-auth0/pull/706) ([joshcanhelp](https://github.com/joshcanhelp))
+- Change CDN URL field type [\#704](https://github.com/auth0/wp-auth0/pull/704) ([joshcanhelp](https://github.com/joshcanhelp))
+- Fix sensitive field handling; add Basic settings tab validations [\#703](https://github.com/auth0/wp-auth0/pull/703) ([joshcanhelp](https://github.com/joshcanhelp))
+- Fix embed widget documentation and validation [\#702](https://github.com/auth0/wp-auth0/pull/702) ([joshcanhelp](https://github.com/joshcanhelp))
+- Add new Auth0 IPs; do not save duplicate or whitelisted IPs [\#700](https://github.com/auth0/wp-auth0/pull/700) ([joshcanhelp](https://github.com/joshcanhelp))
+- Improve setup wizard documentation [\#699](https://github.com/auth0/wp-auth0/pull/699) ([joshcanhelp](https://github.com/joshcanhelp))
+- Fix post passwords getting redirected [\#698](https://github.com/auth0/wp-auth0/pull/698) ([joshcanhelp](https://github.com/joshcanhelp))
+
 ## [3.11.0](https://github.com/auth0/wp-auth0/tree/3.11.0) (2019-05-30)
 [Full Changelog](https://github.com/auth0/wp-auth0/compare/3.10.0...3.11.0)
 
@@ -270,6 +290,8 @@
 - Fix migration token display to allow copying [\#540](https://github.com/auth0/wp-auth0/pull/540) ([joshcanhelp](https://github.com/joshcanhelp))
 - Change and improve user profile [\#532](https://github.com/auth0/wp-auth0/pull/532) ([joshcanhelp](https://github.com/joshcanhelp))
 
+=======
+>>>>>>> d5c5c0d... Add CHANGELOG entry for 3.7.1
 ## [3.7.1](https://github.com/auth0/wp-auth0/tree/3.7.1) (2018-10-08)
 [Full Changelog](https://github.com/auth0/wp-auth0/compare/3.7.0...3.7.1)
 

composer.json

@@ -7,7 +7,7 @@
         "php": "^5.6 || ^7.0"
     },
     "require-dev": {
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.5",
         "wp-coding-standards/wpcs": "^1",
         "phpcompatibility/phpcompatibility-wp": "*",
         "phpunit/phpunit": "^5.0 || ^6.0"
@@ -32,15 +32,15 @@
     "scripts": {
         "compat": "\"vendor/bin/phpcs\" --standard=phpcs-compat-ruleset.xml .",
         "phpcs": "\"vendor/bin/phpcs\"",
-        "phpcs-i18n": "\"vendor/bin/phpcs\" --sniffs=WordPress.WP.I18n ./lib/",
+        "phpcs-i18n": "\"vendor/bin/phpcs\" --sniffs=WordPress.WP.I18n",
         "phpcs-tests": "\"vendor/bin/phpcs\" --standard=phpcs-test-ruleset.xml -s ./tests/",
         "phpcbf": "\"vendor/bin/phpcbf\"",
         "phpcbf-tests": "\"vendor/bin/phpcbf\" --standard=phpcs-test-ruleset.xml -s ./tests/",
         "sniffs": "\"vendor/bin/phpcs\" --standard=phpcs-ruleset.xml -e",
         "test": "\"vendor/bin/phpunit\" --coverage-text",
         "test-group": "\"vendor/bin/phpunit\" --coverage-text --group",
         "test-ci": "\"vendor/bin/phpunit\" --coverage-clover=coverage.xml",
-        "pre-commit-no-tests": [ "@compat", "@phpcs-i18n", "@phpcbf", "@phpcbf-tests", "@phpcs-tests" ],
+        "pre-commit-no-tests": [ "@phpcbf", "@phpcbf-tests", "@phpcs-tests", "@compat", "@phpcs-i18n" ],
         "pre-commit": [ "@phpcbf", "@phpcbf-tests", "@phpcs-tests", "@compat", "@phpcs-i18n", "@test" ]
     },
     "autoload-dev": {

functions.php

@@ -74,7 +74,7 @@ function wp_auth0_can_show_wp_login_form() {
 		return true;
 	}
 
-	if ( wp_auth0_is_current_login_action( [ 'resetpass', 'rp', 'validate_2fa' ] ) ) {
+	if ( wp_auth0_is_current_login_action( [ 'resetpass', 'rp', 'validate_2fa', 'postpass' ] ) ) {
 		return true;
 	}