Merge branch 'trunk' into dustyf-strip-slashes

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+    - 5.2
     - 5.3
     - 5.4
 

CHANGELOG.md

@@ -3,7 +3,9 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased][unreleased]
 
-* 
+### Enhancements
+
+* Updated Timepicker utilizing the [@trentrichardson](https://github.com/trentrichardson) jQuery Timepicker add-on (https://github.com/trentrichardson/jQuery-Timepicker-Addon), and updated Datepicker styles. Props [JonMasterson](https://github.com/JonMasterson). ([#204](https://github.com/WebDevStudios/CMB2/issues/204), [#206](https://github.com/WebDevStudios/CMB2/issues/206), [#45](https://github.com/WebDevStudios/CMB2/issues/45)).
 
 ## 2.0.2 - 2015-02-15
 

Dockunit.json

@@ -0,0 +1,40 @@
+{
+	"containers": [
+		{
+			"prettyName": "PHP 5.2 on Ubuntu on Latest WP",
+			"image": "tlovett1/php-5.2-phpunit-3.5",
+			"beforeScripts": [
+				"service mysql start",
+				"bash tests/bin/install-wp-tests.sh wordpress_test root '' localhost latest"
+			],
+			"testCommand": "phpunit"
+		},
+		{
+			"prettyName": "PHP 5.2 on Ubuntu on WP 3.8",
+			"image": "tlovett1/php-5.2-phpunit-3.5",
+			"beforeScripts": [
+				"service mysql start",
+				"bash tests/bin/install-wp-tests.sh wordpress_test root '' localhost 3.8"
+			],
+			"testCommand": "phpunit"
+		},
+		{
+			"prettyName": "PHP 5.5 FPM WordPress Latest WP",
+			"image": "tlovett1/php-fpm-phpunit-wp",
+			"beforeScripts": [
+				"service mysql start",
+				"bash tests/bin/install-wp-tests.sh wordpress_test root '' localhost latest"
+			],
+			"testCommand": "phpunit"
+		},
+		{
+			"prettyName": "PHP 5.5 FPM WordPress WP 3.8",
+			"image": "tlovett1/php-fpm-phpunit-wp",
+			"beforeScripts": [
+				"service mysql start",
+				"bash tests/bin/install-wp-tests.sh wordpress_test root '' localhost 3.8"
+			],
+			"testCommand": "phpunit"
+		}
+	]
+}

bootstrap.php

@@ -1,25 +1,5 @@
 <?php
 
-/**
- * Helper function to provide directory path to CMB
- * @since  2.0.0
- * @param  string  $path Path to append
- * @return string        Directory with optional path appended
- */
-function cmb2_dir( $path = '' ) {
-	static $cmb2_dir = null;
-	if ( is_null( $cmb2_dir ) ) {
-		$cmb2_dir = trailingslashit( dirname( __FILE__ ) );
-	}
-	return $cmb2_dir . $path;
-}
-
-/**
- * Include helper functions,
- * and more importantly, the class/file autoloader
- */
-require_once cmb2_dir( 'includes/helper-functions.php' );
-
 /**
  * Fires when CMB2 is included/loaded
  *

composer.json

@@ -25,8 +25,5 @@
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*"
-    },
-    "autoload": {
-        "files": ["init.php"]
     }
 }