Rename converters to do not contain bugfix version number

fluxbb · Jan 31, 2012 · 59d180c · 59d180c
1 parent 3ee265d
commit 59d180c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/forums/PhpBB_3_0_9.php → forums/PhpBB_3_0.php b/forums/PhpBB_3_0_9.php → forums/PhpBB_3_0.php
@@ -13,7 +13,7 @@
 define('FORUM_SI_REVISION', 2);
 define('FORUM_PARSER_REVISION', 2);
 
-class PhpBB_3_0_9 extends Forum
+class PhpBB_3_0 extends Forum
 {
 	// Will the passwords be converted?
 	const CONVERTS_PASSWORD = false;

diff --git a/forums/PunBB_1.3_1.4.php b/forums/PunBB_1.3_1.4.php
@@ -30,7 +30,7 @@ class PunBB_1_3_1_4 extends Forum
 		'ranks'					=> array('ranks', 'id'),
 		'reports'				=> array('reports', 'id'),
 		'topic_subscriptions'	=> array('subscriptions', 'topic_id'),
-		'forum_subscriptions'	=> 0,//array('forum_subscriptions', 'forum_id'),
+		'forum_subscriptions'	=> 0,
 		'topics'				=> array('topics', 'id'),
 		'users'					=> array('users', 'id', 'id > 1'),
 	);

diff --git a/forums/SMF_1_1_11.php → forums/SMF_1_1.php b/forums/SMF_1_1_11.php → forums/SMF_1_1.php
@@ -13,7 +13,7 @@
 define('FORUM_SI_REVISION', 2);
 define('FORUM_PARSER_REVISION', 2);
 
-class SMF_1_1_11 extends Forum
+class SMF_1_1 extends Forum
 {
 	// Will the passwords be converted?
 	const CONVERTS_PASSWORD = true;

diff --git a/forums/vBulletin_4_1_5.php → forums/vBulletin_4_1.php b/forums/vBulletin_4_1_5.php → forums/vBulletin_4_1.php
@@ -13,7 +13,7 @@
 define('FORUM_SI_REVISION', 2);
 define('FORUM_PARSER_REVISION', 2);
 
-class VBulletin_4_1_5 extends Forum
+class VBulletin_4_1 extends Forum
 {
 	// Will the passwords be converted?
 	const CONVERTS_PASSWORD = false;

diff --git a/index.php b/index.php
@@ -129,7 +129,7 @@
 
 	if (!isset($step) || $step != 'results')
 	{
-		// Start the converter. When it do its work, it redirects to the next page
+		// Start the converter
 		$redirect = $converter->convert($step, $start_at);
 
 		if ($redirect === false)

diff --git a/tests/ConverterTest.php b/tests/ConverterTest.php
@@ -120,7 +120,7 @@ function testPhpFusion()
 
 	function testPhpbb3()
 	{
-		$this->convert('PhpBB_3_0_9', 'phpbb__test', 'phpbb_');
+		$this->convert('PhpBB_3_0', 'phpbb__test', 'phpbb_');
 	}
 
 	function testPunBB()
@@ -130,7 +130,7 @@ function testPunBB()
 
 	function testSmf1()
 	{
-		$this->convert('SMF_1_1_11', 'smf1__test', 'smf_');
+		$this->convert('SMF_1_1', 'smf1__test', 'smf_');
 	}
 
 	function testSmf2()