Merge pull request #57 from VSEphpbb/release-prep

Some minor tweaks

Author: michaelcullum

ext.php

@@ -17,28 +17,25 @@ class ext extends \phpbb\extension\base
 {
 	/**
 	 * Check whether or not the extension can be enabled.
-	 * The current phpBB version should meet or exceed
-	 * the minimum version required by this extension:
-	 *
-	 * Requires phpBB 3.1.4
 	 *
 	 * @return bool
 	 */
 	public function is_enableable()
 	{
-		return class_exists('ZipArchive') && ($this->phpbb_legacy_compatibility() || $this->phpbb_current_compatibility());
+		return $this->php_requirements() && ($this->phpbb_31x_compatible() || $this->phpbb_current_compatible());
 	}
 
 	/**
-	 * Check phpBB 3.1 compatibility
+	 * Check PHP requirements
 	 *
-	 * Requires phpBB 3.1.4 or greater
+	 * Requires PHP 5.3.9 or greater
+	 * Requires PHP ZipArchive binary
 	 *
 	 * @return bool
 	 */
-	protected function phpbb_legacy_compatibility()
+	protected function php_requirements()
 	{
-		return phpbb_version_compare(PHPBB_VERSION, '3.1.4', '>=') && phpbb_version_compare(PHPBB_VERSION, '3.2.0-dev', '<');
+		return phpbb_version_compare(PHP_VERSION, '5.3.9', '>=') && class_exists('ZipArchive');
 	}
 
 	/**
@@ -48,9 +45,21 @@ protected function phpbb_legacy_compatibility()
 	 *
 	 * @return bool
 	 */
-	protected function phpbb_current_compatibility()
+	protected function phpbb_current_compatible()
 	{
 		return phpbb_version_compare(PHPBB_VERSION, '3.2.0-b3', '>=');
 	}
+
+	/**
+	 * Check phpBB 3.1 compatibility
+	 *
+	 * Requires phpBB 3.1.4 or greater
+	 *
+	 * @return bool
+	 */
+	protected function phpbb_31x_compatible()
+	{
+		return phpbb_version_compare(PHPBB_VERSION, '3.1.4', '>=') && phpbb_version_compare(PHPBB_VERSION, '3.2.0-dev', '<');
+	}
 }
 

helper/packager.php

@@ -67,12 +67,12 @@ public function get_composer_dialog_values()
 			),
 			'extension'    => array(
 				'vendor_name'            => null,
-				'extension_display_name' => null,
 				'extension_name'         => null,
+				'extension_display_name' => null,
 				'extension_description'  => null,
 				'extension_version'      => '1.0.0-dev',
-				'extension_homepage'     => null,
 				'extension_time'         => date('Y-m-d'),
+				'extension_homepage'     => null,
 			),
 			'requirements' => array(
 				'php_version'       => '>=5.3.3',

language/en/common.php

@@ -37,12 +37,12 @@
 	'SKELETON_QUESTION_VENDOR_NAME'				=> 'Please enter the vendor name',
 	'SKELETON_QUESTION_VENDOR_NAME_UI'			=> 'Vendor name',
 	'SKELETON_QUESTION_VENDOR_NAME_EXPLAIN'		=> 'Starting with a letter, letters and numbers only',
-	'SKELETON_QUESTION_EXTENSION_DISPLAY_NAME'	=> 'Please enter the display name (title) of the extension',
-	'SKELETON_QUESTION_EXTENSION_DISPLAY_NAME_UI'		=> 'Display name',
-	'SKELETON_QUESTION_EXTENSION_DISPLAY_NAME_EXPLAIN'	=> 'This is the name (title) of the extension',
 	'SKELETON_QUESTION_EXTENSION_NAME'			=> 'Please enter the package (folder) name of the extension',
 	'SKELETON_QUESTION_EXTENSION_NAME_UI'		=> 'Package name',
 	'SKELETON_QUESTION_EXTENSION_NAME_EXPLAIN'	=> 'Starting with a letter, letters and numbers only',
+	'SKELETON_QUESTION_EXTENSION_DISPLAY_NAME'	=> 'Please enter the display name (title) of the extension',
+	'SKELETON_QUESTION_EXTENSION_DISPLAY_NAME_UI'		=> 'Display name',
+	'SKELETON_QUESTION_EXTENSION_DISPLAY_NAME_EXPLAIN'	=> 'This is the name (title) of the extension',
 	'SKELETON_QUESTION_EXTENSION_DESCRIPTION'	=> 'Please enter the Description of the extension',
 	'SKELETON_QUESTION_EXTENSION_DESCRIPTION_UI'=> 'Description',
 	'SKELETON_QUESTION_EXTENSION_VERSION'		=> 'Please enter the version of the extension',