Merge branch 'develop' into fix/manual-tokens-not-working-for-plain-permalinks

Author: jkmassel

.dev-lib

@@ -1,3 +1,3 @@
 DEFAULT_BASE_BRANCH=develop
-PHPCS_IGNORE='vendor/*,wp-includes/rest-api/auth/jwt/*,tests/wp-tests/*'
+PHPCS_IGNORE='vendor/*,wp-includes/php-jwt/*,tests/wp-tests/*'
 CHECK_SCOPE=patches

.phpcs.ruleset.xml

@@ -10,7 +10,7 @@
 	<!-- Ignoring Files and Folders:
 		https://github.com/squizlabs/PHP_CodeSniffer/wiki/Advanced-Usage#ignoring-files-and-folders -->
 	<exclude-pattern>/vendor/*</exclude-pattern>
-	<exclude-pattern>/wp-includes/rest-api/auth/jwt/*</exclude-pattern>
+	<exclude-pattern>/wp-includes/php-jwt/*</exclude-pattern>
 	<exclude-pattern>/tests/wp-tests/*</exclude-pattern>
 
 	<!-- How to scan -->

.travis.yml

@@ -1,13 +1,7 @@
-# Tell Travis CI we're using PHP
 language: php
 
-# Opt to use Travis container-based environment.
 sudo: false
 
-# Newer versions like trusty don't have PHP 5.2 or 5.3
-# https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming
-dist: precise
-
 notifications:
   email:
     on_success: never
@@ -19,6 +13,11 @@ cache:
     - vendor
     - $HOME/phpunit-bin
 
+addons:
+  apt:
+    packages:
+    - libxml2-utils
+
 php:
   - 7.2
 

composer.json

@@ -1,12 +1,12 @@
 {
-  "name": "jwt-auth",
+  "name": "wp-api/jwt-auth",
   "type": "wordpress-plugin",
   "description": "Experimental JWT Authentication plugin.",
   "homepage": "https://github.com/WP-API/jwt-auth",
   "license": "GPLv2",
   "prefer-stable" : true,
   "require": {
-    "php": ">=5.3"
+    "php": ">=5.6.20"
   },
   "require-dev": {
     "brainmaestro/composer-git-hooks": "^2.6.0",
@@ -16,7 +16,7 @@
     "php-coveralls/php-coveralls": "^2.1",
     "slowprog/composer-copy-file": "0.2.1",
     "wp-coding-standards/wpcs": "*",
-    "xwp/wp-dev-lib": "^1.0.0"
+    "xwp/wp-dev-lib": "^1.1.1"
   },
   "scripts": {
     "phpcs": [
@@ -48,7 +48,7 @@
   "extra": {
     "copy-file": {
       "tests/autoload.php": "tests/wp-tests/phpunit/wp-tests-config.php",
-      "vendor/firebase/php-jwt/src/": "wp-includes/rest-api/auth/jwt/"
+      "vendor/firebase/php-jwt/src/": "wp-includes/php-jwt/"
     },
     "hooks": {
       "pre-commit": "./vendor/xwp/wp-dev-lib/scripts/pre-commit"

jwt-auth.php

@@ -11,13 +11,13 @@
  * Plugin URI:        https://github.com/WP-API/jwt-auth
  * Description:       Feature plugin to bring JSON Web Token REST API authentication to Core
  * Version:           0.1
- * Author:            XWP, and contributors
+ * Author:            WP-API
  * Author URI:        https://github.com/WP-API/jwt-auth/graphs/contributors
  * Text Domain:       jwt-auth
  * License:           GPL-2.0+
  * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
  * GitHub Plugin URI: https://github.com/WP-API/jwt-auth
- * Requires PHP:      5.3.0
+ * Requires PHP:      5.6.20
  * Requires WP:       4.4.0
  */
 
@@ -26,16 +26,15 @@
 define( 'JWT_AUTH_VERSION', '0.1' );
 
 /**
- * Requires running PHP 5.3 or above.
+ * Requires running PHP 5.6.20 or above.
  *
  * @since 0.1
  * @codeCoverageIgnore
  */
 function jwt_auth_version_check() {
-
-	if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
+	if ( version_compare( PHP_VERSION, '5.6.20', '<' ) ) {
 		deactivate_plugins( plugin_basename( __FILE__ ) );
-		wp_die( esc_html__( 'The JWT Auth plugin requires PHP Version 5.3 or above.', 'jwt-auth' ) );
+		wp_die( esc_html__( 'The JWT Auth plugin requires PHP Version 5.6.20 or above.', 'jwt-auth' ) );
 	}
 }
 add_action( 'admin_init', 'jwt_auth_version_check' );
@@ -47,18 +46,18 @@ function jwt_auth_version_check() {
  */
 function jwt_auth_loader() {
 
-	/** JWT Classes */
-	foreach ( glob( JWT_AUTH_PLUGIN_DIR . '/wp-includes/rest-api/auth/jwt/*.php' ) as $filename ) {
+	// JWT Classes.
+	foreach ( glob( JWT_AUTH_PLUGIN_DIR . '/wp-includes/php-jwt/*.php' ) as $filename ) {
 		require_once $filename;
 	}
 
-	/** WP_REST_Token Class */
+	// WP_REST_Token Class.
 	require_once JWT_AUTH_PLUGIN_DIR . '/wp-includes/rest-api/auth/class-wp-rest-token.php';
 
-	/** WP_REST_Key_Pair Class */
+	// WP_REST_Key_Pair Class.
 	require_once JWT_AUTH_PLUGIN_DIR . '/wp-includes/rest-api/auth/class-wp-rest-key-pair.php';
 
-	/** WP_Key_Pair_List_Table Class */
+	// WP_Key_Pair_List_Table Class.
 	require_once JWT_AUTH_PLUGIN_DIR . '/wp-admin/includes/class-wp-key-pair-list-table.php';
 
 	// Initialize JSON Web Tokens.

phpunit.xml.dist

@@ -6,26 +6,20 @@
 	convertNoticesToExceptions="true"
 	convertWarningsToExceptions="true"
 	>
-	<php>
-		<const name="WP_TEST_VIP_QUICKSTART_ACTIVATED_PLUGINS" value="jetpack/jetpack.php,media-explorer/media-explorer.php,writing-helper/writing-helper.php,mrss/mrss.php,wordpress-importer/wordpress-importer.php,keyring/keyring.php,polldaddy/polldaddy.php" />
-		<const name="WPCOM_VIP_DISABLE_REMOTE_REQUEST_ERROR_REPORTING" value="1" />
-		<const name="WP_TEST_ACTIVATED_PLUGINS" value="" /> <!-- this list is used if not on VIP Quickstart -->
-	</php>
 	<testsuites>
 		<testsuite>
 			<directory prefix="class-test-" suffix=".php">./tests/</directory>
 			<directory prefix="test-" suffix=".php">./tests/</directory>
 		</testsuite>
 	</testsuites>
-
 	<filter>
 		<whitelist processUncoveredFilesFromWhitelist="false">
 			<directory suffix=".php">./</directory>
 			<exclude>
 				<directory suffix=".php">./coverage</directory>
 				<directory suffix=".php">./tests</directory>
 				<directory suffix=".php">./vendor</directory>
-				<directory suffix=".php">./wp-includes/rest-api/auth/jwt</directory>
+				<directory suffix=".php">./wp-includes/php-jwt</directory>
 			</exclude>
 		</whitelist>
 	</filter>

tests/autoload.php

@@ -8,20 +8,19 @@
 $config = getenv( 'WP_TESTS_CONFIG' );
 
 /**
- * Supports loading the wp-tests-config.php from a non VVV custom directory.
+ * Supports loading the `wp-tests-config.php` from a custom directory.
  */
 if ( file_exists( $config ) ) {
 	include_once $config;
 	return;
 }
 
-// VVV Paths.
+// Attempt to find the server Path.
 $_path  = dirname( __FILE__ );
 $config = substr( $_path, 0, strpos( $_path, 'public_html' ) + 11 ) . '/wp-tests-config.php';
 
 /**
- * Supports loading the wp-tests-config.php from the `public_html` root directory of both the
- * `wordpress-default` and `wordpress-develop` sites, and any other custom site in the www directory.
+ * Loads the `wp-tests-config.php` from the `public_html` root directory of a typical Vagrant install.
  */
 if ( file_exists( $config ) ) {
 	include_once $config;

tests/wp-includes/rest-api/auth/class-test-wp-rest-key-pair.php

@@ -312,7 +312,7 @@ public function test_payload() {
 		$time     = time();
 		$reserved = array(
 			'iat'  => $time, // Token issued at.
-			'exp'  => $time + ( DAY_IN_SECONDS * 7 ), // Token expiry.
+			'exp'  => $time + WEEK_IN_SECONDS, // Token expiry.
 			'data' => array(
 				'user' => array(
 					'type' => 'wp_user',
@@ -331,7 +331,6 @@ public function test_payload() {
 		);
 
 		$payload = $this->key_pair->payload( $reserved, $user );
-		$this->assertEquals( $reserved['iat'] + ( DAY_IN_SECONDS * 365 ), $payload['exp'] );
 		$this->assertEquals( $payload['data']['user']['api_key'], 12345 );
 	}