use vendorized version of scbFramework

scribu · Oct 25, 2015 · 90d9882 · 90d9882
1 parent 671029f
commit 90d9882
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
+build/
 vendor/
 composer.phar
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,7 @@ env:
     - WP_VERSION=3.9.8 WP_MULTISITE=0
     - WP_VERSION=3.9.8 WP_MULTISITE=1
 
-install:
-    - composer install
+install: bin/build
 
 before_script:
     - bash bin/install-wp-tests.sh wordpress_test travis '' localhost $WP_VERSION 

diff --git a/bin/build b/bin/build
@@ -1,2 +1,6 @@
+#!/usr/bin/env bash
+
 rm -rf vendor/
 composer install
+
+vendor/scribu/scb-framework/bin/vendorize P2P
diff --git a/composer.lock b/composer.lock
diff --git a/posts-to-posts.php b/posts-to-posts.php
@@ -32,9 +32,6 @@ function _p2p_load() {
 	P2P_Shortcodes::init();
 
 	register_uninstall_hook( __FILE__, array( 'P2P_Storage', 'uninstall' ) );
-
-	if ( is_admin() )
-		_p2p_load_admin();
 }
 
 function _p2p_load_admin() {
@@ -49,22 +46,19 @@ function _p2p_load_admin() {
 	new P2P_Tools_Page;
 }
 
-function _p2p_init() {
-	// Safe hook for calling p2p_register_connection_type()
-	do_action( 'p2p_init' );
+if ( is_dir( dirname( __FILE__ ) . '/vendor' ) ) {
+	require_once dirname( __FILE__ ) . '/vendor/autoload.php';
 }
 
-if ( is_dir( dirname( __FILE__ ) . '/vendor' ) ) {
-	// Not using vendor/autload.php because scb-framework/load.php has better compatibility
+_p2p_load();
 
-	if (!class_exists('Mustache_Autoloader')) {
-		require_once dirname( __FILE__ ) . '/vendor/mustache/mustache/src/Mustache/Autoloader.php';
-		Mustache_Autoloader::register();
-	}
+if ( is_admin() )
+	_p2p_load_admin();
 
-	require_once dirname( __FILE__ ) . '/vendor/scribu/scb-framework/load.php';
+function _p2p_init() {
+	// Safe hook for calling p2p_register_connection_type()
+	do_action( 'p2p_init' );
 }
 
-scb_init( '_p2p_load' );
 add_action( 'wp_loaded', '_p2p_init' );