Merge pull request #60 from VSEphpbb/updates

Minor updates

Author: michaelcullum

composer.json

@@ -20,7 +20,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.9",
+		"php": ">=5.4.0",
 		"symfony/console": "2.8.*",
 		"symfony/finder": "2.8.*"
 	},

controller/main.php

@@ -119,17 +119,17 @@ public function handle()
 				'NAME'			=> $value,
 				'DESC'			=> $this->user->lang('SKELETON_QUESTION_' . strtoupper($value) . '_UI'),
 				'DESC_EXPLAIN'	=> array_key_exists('SKELETON_QUESTION_' . strtoupper($value) . '_EXPLAIN', $this->user->lang) ? $this->user->lang('SKELETON_QUESTION_' . strtoupper($value) . '_EXPLAIN') : '',
-				'VALUE'			=> $this->request->variable($value, (string) $default),
+				'VALUE'			=> $this->request->variable($value, (string) $default, true),
 			));
 		}
 
 		$author_values = array();
 		foreach ($dialog_questions['author'] as $value => $default)
 		{
-			$author_values[$value] = $this->request->variable($value, array((string) $default));
+			$author_values[$value] = $this->request->variable($value, array((string) $default), true);
 		}
 
-		$num_authors = max(1, sizeof($author_values['author_name']));
+		$num_authors = max(1, count($author_values['author_name']));
 		for ($i = 0; $i < $num_authors; $i++)
 		{
 			foreach ($dialog_questions['author'] as $value => $default)
@@ -182,7 +182,7 @@ protected function get_composer_data()
 			$this->data['extension'][$value] = $this->get_user_input($value, $default);
 		}
 
-		$num_authors = max(1, sizeof($this->request->variable('author_name', array(''))));
+		$num_authors = max(1, count($this->request->variable('author_name', array(''))));
 		for ($i = 0; $i < $num_authors; $i++)
 		{
 			foreach ($dialog_questions['author'] as $value => $default)
@@ -274,10 +274,10 @@ protected function get_request_variable($value, $default, $array_key = null)
 
 		if ($array_key !== null)
 		{
-			$return_value = $this->request->variable($value, array((string) $default));
+			$return_value = $this->request->variable($value, array((string) $default), true);
 			return isset($return_value[$array_key]) ? (string) $return_value[$array_key] : (string) $default;
 		}
 
-		return $this->request->variable($value, (string) $default);
+		return $this->request->variable($value, (string) $default, true);
 	}
 }

ext.php

@@ -28,14 +28,14 @@ public function is_enableable()
 	/**
 	 * Check PHP requirements
 	 *
-	 * Requires PHP 5.3.9 or greater
+	 * Requires PHP 5.4.0 or greater
 	 * Requires PHP ZipArchive binary
 	 *
 	 * @return bool
 	 */
 	protected function php_requirements()
 	{
-		return phpbb_version_compare(PHP_VERSION, '5.3.9', '>=') && class_exists('ZipArchive');
+		return phpbb_version_compare(PHP_VERSION, '5.4.0', '>=') && class_exists('ZipArchive');
 	}
 
 	/**

helper/packager.php

@@ -228,8 +228,9 @@ public function get_composer_json_from_data($data)
 			);
 		}
 
-		$body = json_encode($composer, JSON_PRETTY_PRINT + JSON_UNESCAPED_SLASHES);
+		$body = json_encode($composer, JSON_PRETTY_PRINT + JSON_UNESCAPED_SLASHES + JSON_UNESCAPED_UNICODE);
 		$body = str_replace(array('&lt;', '&gt;'), array('<', '>'), $body);
+		$body .= PHP_EOL;
 
 		return $body;
 	}

skeleton/README.md.twig

@@ -6,9 +6,10 @@ Copy the extension to phpBB/ext/{{ EXTENSION.vendor_name }}/{{ EXTENSION.extensi
 
 Go to "ACP" > "Customise" > "Extensions" and enable the "{{ EXTENSION.extension_display_name }}" extension.
 
+{% if COMPONENT.tests %}
 ## Tests and Continuous Integration
 
-We use Travis-CI as a continuous integration server and phpunit for our unit testing. See more information on the [phpBB development wiki](https://wiki.phpbb.com/Unit_Tests).
+We use Travis-CI as a continuous integration server and phpunit for our unit testing. See more information on the [phpBB Developer Docs](https://area51.phpbb.com/docs/dev/31x/testing/index.html).
 To run the tests locally, you need to install phpBB from its Git repository. Afterwards run the following command from the phpBB Git repository's root:
 
 Windows:
@@ -19,6 +20,7 @@ others:
 
     phpBB/vendor/bin/phpunit -c phpBB/ext/{{ EXTENSION.vendor_name }}/{{ EXTENSION.extension_name }}/phpunit.xml.dist
 
+{% endif %}
 ## License
 
 [GPLv2](license.txt)

skeleton/acp/main_module.php.twig

@@ -15,6 +15,8 @@ namespace {{ EXTENSION.vendor_name }}\{{ EXTENSION.extension_name }}\acp;
  */
 class main_module
 {
+	public $page_title;
+	public $tpl_name;
 	public $u_action;
 
 	public function main($id, $mode)

skeleton/build.xml.twig

@@ -9,7 +9,7 @@
 {% set destination = '${' ~ 'destination-filename}' %}
 {% set dependencies = '${' ~ 'has-dependencies}' %}
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="{{ vendor }}/{{ extension }} Build Script" description="Builds an extension.zip from a git repository" default="all">
+<project name="{{ EXTENSION.extension_display_name }} Build Script" description="Builds an extension.zip from a git repository" default="all">
 	<property name="vendor-name" value="{{ EXTENSION.vendor_name }}" />
 	<property name="extension-name" value="{{ EXTENSION.extension_name }}" />
 	<!--