Merge commit '53b33966d7d3fba607ebeaadd76cfd9d9ac3a954'

Conflicts:
	bin/.jshintrc
	bin/.travis.yml
	bin/readme.md

Author: westonruter

bin/.jshintrc

@@ -1,63 +1,20 @@
-// --------------------------------------------------------------------
-// WordPress JSHint Configuration
-// --------------------------------------------------------------------
 {
-    "bitwise"       : true,     // Prohibit bitwise operators (&, |, ^, etc.).
-    "curly"         : true,     // Require {} for every new block or scope.
-    "eqeqeq"        : true,     // Require triple equals i.e. `===`.
-    "forin"         : true,     // Tolerate `for in` loops without `hasOwnPrototype`.
-    "immed"         : true,     // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
-    "latedef"       : true,     // Prohibit variable use before definition.
-    "newcap"        : true,     // Require capitalization of all constructor functions e.g. `new F()`.
-    "noarg"         : true,     // Prohibit use of `arguments.caller` and `arguments.callee`.
-    "noempty"       : true,     // Prohibit use of empty blocks.
-    "nonew"         : true,     // Prohibit use of constructors for side-effects.
-    "plusplus"      : false,    // Prohibit use of `++` & `--`.
-    "regexp"        : false,    // Prohibit `.` and `[^...]` in regular expressions.
-    "undef"         : true,     // Require all non-global variables be declared before they are used.
-    "strict"        : true,     // Require `use strict` pragma in every file.
-    "trailing"      : true,     // Prohibit trailing whitespaces.
-    "asi"           : false,    // Tolerate Automatic Semicolon Insertion (no semicolons).
-    "boss"          : false,    // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments.
-    "debug"         : false,    // Allow debugger statements e.g. browser breakpoints.
-    "eqnull"        : false,    // Tolerate use of `== null`.
-    "es5"           : false,    // Allow EcmaScript 5 syntax.
-    "esnext"        : false,    // Allow ES.next specific features such as `const` and `let`.
-    "evil"          : false,    // Tolerate use of `eval`.
-    "expr"          : false,    // Tolerate `ExpressionStatement` as Programs.
-    "funcscope"     : false,    // Tolerate declarations of variables inside of control structures while accessing them later from the outside.
-    "globalstrict"  : false,    // Allow global "use strict" (also enables 'strict').
-    "iterator"      : false,    // Allow usage of __iterator__ property.
-    "lastsemic"     : false,    // Tolerate missing semicolons when it is omitted for the last statement in a one-line block.
-    "laxbreak"      : false,    // Tolerate unsafe line breaks e.g. `return [\n] x` without semicolons.
-    "laxcomma"      : false,    // Suppress warnings about comma-first coding style.
-    "loopfunc"      : false,    // Allow functions to be defined within loops.
-    "multistr"      : false,    // Tolerate multi-line strings.
-    "onecase"       : false,    // Tolerate switches with just one case.
-    "proto"         : false,    // Tolerate __proto__ property. This property is deprecated.
-    "regexdash"     : false,    // Tolerate unescaped last dash i.e. `[-...]`.
-    "scripturl"     : false,    // Tolerate script-targeted URLs.
-    "smarttabs"     : false,    // Tolerate mixed tabs and spaces when the latter are used for alignmnent only.
-    "shadow"        : false,    // Allows re-define variables later in code e.g. `var x=1; x=2;`.
-    "sub"           : false,    // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`.
-    "supernew"      : true,     // Tolerate `new function () { ... };` and `new Object;`.
-    "validthis"     : false,    // Tolerate strict violations when the code is running in strict mode and you use this in a non-constructor function.
-    "browser"       : true,     // Standard browser globals e.g. `window`, `document`.
-    "couch"         : false,    // Enable globals exposed by CouchDB.
-    "devel"         : false,    // Allow development statements e.g. `console.log();`.
-    "dojo"          : false,    // Enable globals exposed by Dojo Toolkit.
-    "jquery"        : true,     // Enable globals exposed by jQuery JavaScript library.
-    "mootools"      : false,    // Enable globals exposed by MooTools JavaScript framework.
-    "node"          : false,    // Enable globals available when code is running inside of the NodeJS runtime environment.
-    "nonstandard"   : false,    // Define non-standard but widely adopted globals such as escape and unescape.
-    "prototypejs"   : false,    // Enable globals exposed by Prototype JavaScript framework.
-    "rhino"         : false,    // Enable globals available when your code is running inside of the Rhino runtime environment.
-    "wsh"           : false,    // Enable globals available when your code is running as a script for the Windows Script Host.
-    "nomen"         : false,    // Prohibit use of initial or trailing underbars in names.
-    "onevar"        : false,    // Allow only one `var` statement per function.
-    "passfail"      : false,    // Stop on first error.
-    "white"         : false,    // Check against strict whitespace and indentation rules.
-    "maxerr"        : 100,      // Maximum errors before stopping.
-    "predef"        : [],       // Extra globals.
-    "indent"        : 4         // Specify indentation spacing
-}
+	"boss": true,
+	"curly": true,
+	"eqeqeq": true,
+	"eqnull": true,
+	"expr": true,
+	"immed": true,
+	"noarg": true,
+	"quotmark": "single",
+	"trailing": true,
+	"undef": true,
+	"unused": true,
+
+	"browser": true,
+
+	"globals": {
+		"jQuery": false,
+		"wp": false
+	}
+}

bin/.travis.yml

@@ -12,8 +12,8 @@ node_js:
 env:
     - WP_VERSION=master WP_MULTISITE=0
     - WP_VERSION=master WP_MULTISITE=1
-    - WP_VERSION=3.7 WP_MULTISITE=0
-    - WP_VERSION=3.7 WP_MULTISITE=1
+    - WP_VERSION=latest WP_MULTISITE=0
+    - WP_VERSION=latest WP_MULTISITE=1
 
 before_script:
     - export WP_TESTS_DIR=/tmp/wordpress-tests/

bin/class-wordpress-readme-parser.php

@@ -83,11 +83,20 @@ function __construct( $args = array() ) {
 	 */
 	function to_markdown( $params = array() ) {
 
+		$general_section_formatter = function ( $body ) use ( $params ) {
+			$body = preg_replace(
+				'#\[youtube\s+(?:http://www\.youtube\.com/watch\?v=|http://youtu\.be/)(.+?)\]#',
+				'[![Play video on YouTube](http://i1.ytimg.com/vi/$1/hqdefault.jpg)](http://www.youtube.com/watch?v=$1)',
+				$body
+			);
+			return $body;
+		};
+
 		// Parse sections
 		$section_formatters = array(
 			'Description' => function ( $body ) use ( $params ) {
 				if ( isset( $params['travis_ci_url'] ) ) {
-					$body .= sprintf( "\n\n[![Build Status](%s.png)](%s)", $params['travis_ci_url'], $params['travis_ci_url'] );
+					$body .= sprintf( "\n\n[![Build Status](%s.png?branch=master)](%s)", $params['travis_ci_url'], $params['travis_ci_url'] );
 				}
 				return $body;
 			},
@@ -170,9 +179,12 @@ function ( $tag ) {
 			$markdown .= "\n";
 
 			$body = $section['body'];
+
+			$body = call_user_func( $general_section_formatter, $body );
 			if ( isset( $section_formatters[$section['heading']] ) ) {
 				$body = trim( call_user_func( $section_formatters[$section['heading']], $body ) );
 			}
+
 			if ( $body ) {
 				$markdown .= sprintf( "%s\n", $body );
 			}

bin/install-wp-tests.sh

@@ -16,7 +16,14 @@ set -ex
 # set up a WP install
 WP_CORE_DIR=/tmp/wordpress/
 mkdir -p $WP_CORE_DIR
-wget -nv -O /tmp/wordpress.tar.gz https://github.com/WordPress/WordPress/tarball/$WP_VERSION
+
+if [ $WP_VERSION == 'latest' ]; then
+  ARCHIVE_URL='http://wordpress.org/latest.tar.gz'
+else
+  ARCHIVE_URL="https://github.com/WordPress/WordPress/tarball/$WP_VERSION"
+fi
+
+wget -nv -O /tmp/wordpress.tar.gz $ARCHIVE_URL
 tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR
 
 # set up testing suite

bin/phpcs.ruleset.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<ruleset name="WordPress Coding Standards for Plugins">
+	<description>Generally-applicable sniffs for WordPress plugins</description>
+
+	<rule ref="WordPress">
+		<exclude name="WordPress.VIP.RestrictedFunctions"/>
+		<exclude name="WordPress.VIP.SuperGlobalInputUsage"/>
+		<exclude name="WordPress.VIP.ValidatedSanitizedInput"/>
+	</rule>
+	<rule ref="WordPress.NamingConventions.ValidFunctionName">
+		<exclude-pattern>/tests/*</exclude-pattern><!-- because of PHPUnit method names -->
+	</rule>
+
+	<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
+	<rule ref="Generic.PHP.DisallowShortOpenTag"/>
+	<rule ref="Generic.Files.ByteOrderMark"/>
+	<rule ref="Generic.PHP.LowerCaseConstant"/>
+	<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
+	<rule ref="Generic.PHP.NoSilencedErrors" />
+	<rule ref="Generic.ControlStructures.InlineControlStructure" />
+	<rule ref="Generic.Files.LineEndings">
+		<properties>
+			<property name="eolChar" value="\n"/>
+		</properties>
+	</rule>
+
+</ruleset>

bin/readme.md

@@ -26,11 +26,12 @@ git subtree push --prefix bin \
   git@github.com:x-team/wp-plugin-dev-lib.git master
 ```
 
-Symlink to the `.travis.yml` and `.jshintrc` inside of the `bin/` directory you added:
+Symlink to the `.travis.yml`, `.jshintrc`, and `phpcs.ruleset.xml` inside of the `bin/` directory you added:
 
 ```bash
 ln -s bin/.travis.yml . && git add .travis.yml
 ln -s bin/.jshintrc . && git add .jshintrc
+ln -s bin/phpcs.ruleset.xml . && git add phpcs.ruleset.xml
 ```
 
 Symlink to `pre-commit` from your project's `.git/hooks/pre-commit`:

bin/svn-push

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Given a svn-url file one directory up, export the latest git commits to the specified SVN repo.
-# Create a git release tag from the verison specified in the plugin file.
+# Create a git release tag from the version specified in the plugin file.
 # Author: Weston Ruter (@westonruter)
 
 set -e
@@ -154,4 +154,4 @@ rm $svn_commit_file
 # Restore branch
 if [ $current_branch != 'master' ]; then
 	git checkout $current_branch
-fi
+fi