From 150d3d8165c33503a0d95e248e93a70467df3a23 Mon Sep 17 00:00:00 2001
From: Yahnis Elsts <whiteshadow@w-shadow.com>
Date: Thu, 16 Nov 2017 17:00:22 +0200
Subject: [PATCH] Rename Puc_v4_Factory to Puc_v4p3_Factory

This should fix the fatal error that happens when running PUC 4.3 together with an older 4.x release while Debug Bar is active.

See #152
---
 Puc/v4p3/DebugBar/Extension.php |  8 ++++----
 Puc/{v4 => v4p3}/Factory.php    |  4 ++--
 README.md                       |  8 ++++----
 plugin-update-checker.php       | 16 ++++++++--------
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename Puc/{v4 => v4p3}/Factory.php (99%)

diff --git a/Puc/v4p3/DebugBar/Extension.php b/Puc/v4p3/DebugBar/Extension.php
index 0d33e6c..c912586 100644
--- a/Puc/v4p3/DebugBar/Extension.php
+++ b/Puc/v4p3/DebugBar/Extension.php
@@ -90,11 +90,11 @@ if ( !class_exists('Puc_v4p3_DebugBar_Extension', false) ):
 			$absolutePath = realpath(dirname(__FILE__) . '/../../../' . ltrim($filePath, '/'));
 
 			//Where is the library located inside the WordPress directory structure?
-			$absolutePath = Puc_v4_Factory::normalizePath($absolutePath);
+			$absolutePath = Puc_v4p3_Factory::normalizePath($absolutePath);
 
-			$pluginDir = Puc_v4_Factory::normalizePath(WP_PLUGIN_DIR);
-			$muPluginDir = Puc_v4_Factory::normalizePath(WPMU_PLUGIN_DIR);
-			$themeDir = Puc_v4_Factory::normalizePath(get_theme_root());
+			$pluginDir = Puc_v4p3_Factory::normalizePath(WP_PLUGIN_DIR);
+			$muPluginDir = Puc_v4p3_Factory::normalizePath(WPMU_PLUGIN_DIR);
+			$themeDir = Puc_v4p3_Factory::normalizePath(get_theme_root());
 
 			if ( (strpos($absolutePath, $pluginDir) === 0) || (strpos($absolutePath, $muPluginDir) === 0) ) {
 				//It's part of a plugin.
diff --git a/Puc/v4/Factory.php b/Puc/v4p3/Factory.php
similarity index 99%
rename from Puc/v4/Factory.php
rename to Puc/v4p3/Factory.php
index 56a3351..1155e8a 100644
--- a/Puc/v4/Factory.php
+++ b/Puc/v4p3/Factory.php
@@ -1,5 +1,5 @@
 <?php
-if ( !class_exists('Puc_v4_Factory', false) ):
+if ( !class_exists('Puc_v4p3_Factory', false) ):
 
 	/**
 	 * A factory that builds update checker instances.
@@ -11,7 +11,7 @@ if ( !class_exists('Puc_v4_Factory', false) ):
 	 * At the moment it can only build instances of the UpdateChecker class. Other classes are
 	 * intended mainly for internal use and refer directly to specific implementations.
 	 */
-	class Puc_v4_Factory {
+	class Puc_v4p3_Factory {
 		protected static $classVersions = array();
 		protected static $sorted = false;
 
diff --git a/README.md b/README.md
index df2ee90..06a06da 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Getting Started
 
 	```php
 	require 'path/to/plugin-update-checker/plugin-update-checker.php';
-	$myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
+	$myUpdateChecker = Puc_v4p3_Factory::buildUpdateChecker(
 		'http://example.com/path/to/details.json',
 		__FILE__,
 		'unique-plugin-or-theme-slug'
@@ -93,7 +93,7 @@ By default, the library will check the specified URL for changes every 12 hours.
 
 	```php
 	require 'plugin-update-checker/plugin-update-checker.php';
-	$myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
+	$myUpdateChecker = Puc_v4p3_Factory::buildUpdateChecker(
 		'https://github.com/user-name/repo-name/',
 		__FILE__,
 		'unique-plugin-or-theme-slug'
@@ -167,7 +167,7 @@ The library will pull update details from the following parts of a release/tag/b
 
 	```php
 	require 'plugin-update-checker/plugin-update-checker.php';
-	$myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
+	$myUpdateChecker = Puc_v4p3_Factory::buildUpdateChecker(
 		'https://bitbucket.org/user-name/repo-name',
 		__FILE__,
 		'unique-plugin-or-theme-slug'
@@ -223,7 +223,7 @@ BitBucket doesn't have an equivalent to GitHub's releases, so the process is sli
 
 	```php
 	require 'plugin-update-checker/plugin-update-checker.php';
-	$myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
+	$myUpdateChecker = Puc_v4p3_Factory::buildUpdateChecker(
 		'https://gitlab.com/user-name/repo-name/',
 		__FILE__,
 		'unique-plugin-or-theme-slug'
diff --git a/plugin-update-checker.php b/plugin-update-checker.php
index 3094387..1bf0286 100644
--- a/plugin-update-checker.php
+++ b/plugin-update-checker.php
@@ -7,17 +7,17 @@
  * Released under the MIT license. See license.txt for details.
  */
 
-require dirname(__FILE__) . '/Puc/v4/Factory.php';
+require dirname(__FILE__) . '/Puc/v4p3/Factory.php';
 require dirname(__FILE__) . '/Puc/v4p3/Autoloader.php';
 new Puc_v4p3_Autoloader();
 
 //Register classes defined in this file with the factory.
-Puc_v4_Factory::addVersion('Plugin_UpdateChecker', 'Puc_v4p3_Plugin_UpdateChecker', '4.3');
-Puc_v4_Factory::addVersion('Theme_UpdateChecker', 'Puc_v4p3_Theme_UpdateChecker', '4.3');
+Puc_v4p3_Factory::addVersion('Plugin_UpdateChecker', 'Puc_v4p3_Plugin_UpdateChecker', '4.3');
+Puc_v4p3_Factory::addVersion('Theme_UpdateChecker', 'Puc_v4p3_Theme_UpdateChecker', '4.3');
 
-Puc_v4_Factory::addVersion('Vcs_PluginUpdateChecker', 'Puc_v4p3_Vcs_PluginUpdateChecker', '4.3');
-Puc_v4_Factory::addVersion('Vcs_ThemeUpdateChecker', 'Puc_v4p3_Vcs_ThemeUpdateChecker', '4.3');
+Puc_v4p3_Factory::addVersion('Vcs_PluginUpdateChecker', 'Puc_v4p3_Vcs_PluginUpdateChecker', '4.3');
+Puc_v4p3_Factory::addVersion('Vcs_ThemeUpdateChecker', 'Puc_v4p3_Vcs_ThemeUpdateChecker', '4.3');
 
-Puc_v4_Factory::addVersion('GitHubApi', 'Puc_v4p3_Vcs_GitHubApi', '4.3');
-Puc_v4_Factory::addVersion('BitBucketApi', 'Puc_v4p3_Vcs_BitBucketApi', '4.3');
-Puc_v4_Factory::addVersion('GitLabApi', 'Puc_v4p3_Vcs_GitLabApi', '4.3');
\ No newline at end of file
+Puc_v4p3_Factory::addVersion('GitHubApi', 'Puc_v4p3_Vcs_GitHubApi', '4.3');
+Puc_v4p3_Factory::addVersion('BitBucketApi', 'Puc_v4p3_Vcs_BitBucketApi', '4.3');
+Puc_v4p3_Factory::addVersion('GitLabApi', 'Puc_v4p3_Vcs_GitLabApi', '4.3');
\ No newline at end of file