From 4683d2682d91a5e7428be8fc53c29964f93bea9a Mon Sep 17 00:00:00 2001
From: Alex <scionescire@gmail.com>
Date: Tue, 3 Feb 2015 10:10:12 +0100
Subject: [PATCH 1/6] Updated following the J3 MVC guide.

---
 admin/helloworld.php                   |  1 -
 helloworld.xml                         | 17 ++++++++--------
 site/controller.php                    | 13 ++++++++++---
 site/helloworld.php                    | 11 ++++++++---
 site/views/helloworld/tmpl/default.php |  8 ++++++++
 site/views/helloworld/view.html.php    | 27 +++++++++++++++++++-------
 6 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/admin/helloworld.php b/admin/helloworld.php
index 84e4380..e69de29 100644
--- a/admin/helloworld.php
+++ b/admin/helloworld.php
@@ -1 +0,0 @@
-Hello World administration
\ No newline at end of file
diff --git a/helloworld.xml b/helloworld.xml
index c40417d..f56e6cf 100644
--- a/helloworld.xml
+++ b/helloworld.xml
@@ -1,10 +1,9 @@
-<extension type="component"
-           version="2.5.0"
-           method="upgrade">
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.2" method="upgrade">
 
 	<name>Hello World!</name>
 	<!-- The following elements are optional and free of formatting constraints -->
-	<creationDate>November 2009</creationDate>
+	<creationDate>January 2014</creationDate>
 	<author>John Doe</author>
 	<authorEmail>john.doe@example.org</authorEmail>
 	<authorUrl>http://www.example.org</authorUrl>
@@ -15,7 +14,7 @@
 	<!-- The description is optional and defaults to the name -->
 	<description>Description of the Hello World component ...</description>
 
-	<update> <!-- Runs on update; New in 2.5 -->
+	<update> <!-- Runs on update; New since J2.5 -->
 		<schemas>
 			<schemapath type="mysql">sql/updates/mysql</schemapath>
 		</schemas>
@@ -23,8 +22,8 @@
 
 	<!-- Site Main File Copy Section -->
 	<!-- Note the folder attribute: This attribute describes the folder
-			to copy FROM in the package to install therefore files copied
-			in this section are copied from /site/ in the package -->
+		to copy FROM in the package to install therefore files copied
+		in this section are copied from /site/ in the package -->
 	<files folder="site">
 		<filename>index.html</filename>
 		<filename>helloworld.php</filename>
@@ -37,8 +36,8 @@
 		<menu>Hello World!</menu>
 		<!-- Administration Main File Copy Section -->
 		<!-- Note the folder attribute: This attribute describes the folder
-				to copy FROM in the package to install therefore files copied
-				in this section are copied from /admin/ in the package -->
+			to copy FROM in the package to install therefore files copied
+			in this section are copied from /admin/ in the package -->
 		<files folder="admin">
 			<!-- Admin Main File Copy Section -->
 			<filename>index.html</filename>
diff --git a/site/controller.php b/site/controller.php
index 64bef6d..eef0516 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -1,12 +1,19 @@
 <?php
+/**
+* @package Joomla.Administrator
+* @subpackage com_helloworld
+*
+* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+* @license GNU General Public License version 2 or later; see LICENSE.txt
+*/
+
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controller library
-jimport('joomla.application.component.controller');
-
 /**
  * Hello World Component Controller
+ *
+ * @since   0.0.1
  */
 class HelloWorldController extends JControllerLegacy
 {
diff --git a/site/helloworld.php b/site/helloworld.php
index 6ceaa80..bee0399 100644
--- a/site/helloworld.php
+++ b/site/helloworld.php
@@ -1,10 +1,15 @@
 <?php
+/**
+* @package Joomla.Administrator
+* @subpackage com_helloworld
+*
+* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+* @license GNU General Public License version 2 or later; see LICENSE.txt
+*/
+
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import joomla controller library
-jimport('joomla.application.component.controller');
-
 // Get an instance of the controller prefixed by HelloWorld
 $controller = JControllerLegacy::getInstance('HelloWorld');
 
diff --git a/site/views/helloworld/tmpl/default.php b/site/views/helloworld/tmpl/default.php
index 3e79da9..98f2c6e 100644
--- a/site/views/helloworld/tmpl/default.php
+++ b/site/views/helloworld/tmpl/default.php
@@ -1,4 +1,12 @@
 <?php
+/**
+* @package Joomla.Administrator
+* @subpackage com_helloworld
+*
+* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+* @license GNU General Public License version 2 or later; see LICENSE.txt
+*/
+
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 ?>
diff --git a/site/views/helloworld/view.html.php b/site/views/helloworld/view.html.php
index fe7753a..059c1e2 100644
--- a/site/views/helloworld/view.html.php
+++ b/site/views/helloworld/view.html.php
@@ -1,17 +1,30 @@
 <?php
+/**
+* @package Joomla.Administrator
+* @subpackage com_helloworld
+*
+* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+* @license GNU General Public License version 2 or later; see LICENSE.txt
+*/
+
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
- * HTML View class for the HelloWorld Component
- */
+* HTML View class for the HelloWorld Component
+*
+* @since 0.0.1
+*/
 class HelloWorldViewHelloWorld extends JViewLegacy
 {
-	// Overwriting JView display method
-	function display($tpl = null)
+	/**
+         * Display the Hello World view
+         *
+         * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+         *
+         * @return  void
+         */
+	public function display($tpl = null) 
 	{
 		// Assign data to the view
 		$this->msg = 'Hello World';

From 05e920b2a4fd513050e8d42232be64d278a95519 Mon Sep 17 00:00:00 2001
From: Alex <scionescire@gmail.com>
Date: Tue, 3 Feb 2015 10:27:32 +0100
Subject: [PATCH 2/6] Fix for menu J >= 3.2

---
 helloworld.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helloworld.xml b/helloworld.xml
index f56e6cf..828979b 100644
--- a/helloworld.xml
+++ b/helloworld.xml
@@ -33,7 +33,7 @@
 
 	<administration>
 		<!-- Administration Menu Section -->
-		<menu>Hello World!</menu>
+		<menu link='index.php?option=com_helloworld'>Hello World!</menu>
 		<!-- Administration Main File Copy Section -->
 		<!-- Note the folder attribute: This attribute describes the folder
 			to copy FROM in the package to install therefore files copied

From 7e914515510164af905f9f952e3fba8bd05fe5bc Mon Sep 17 00:00:00 2001
From: Alex <scionescire@gmail.com>
Date: Tue, 3 Feb 2015 10:40:06 +0100
Subject: [PATCH 3/6] Fix missing string in helloword.php

---
 admin/helloworld.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/helloworld.php b/admin/helloworld.php
index e69de29..84e4380 100644
--- a/admin/helloworld.php
+++ b/admin/helloworld.php
@@ -0,0 +1 @@
+Hello World administration
\ No newline at end of file

From 64842ab917a47c8d1c07ddb8a632d80db32d18c8 Mon Sep 17 00:00:00 2001
From: Alex <scionescire@gmail.com>
Date: Wed, 4 Feb 2015 13:54:57 +0100
Subject: [PATCH 4/6] Small style fix

---
 site/views/helloworld/view.html.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/site/views/helloworld/view.html.php b/site/views/helloworld/view.html.php
index 059c1e2..fe638a0 100644
--- a/site/views/helloworld/view.html.php
+++ b/site/views/helloworld/view.html.php
@@ -18,13 +18,13 @@
 class HelloWorldViewHelloWorld extends JViewLegacy
 {
 	/**
-         * Display the Hello World view
-         *
-         * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
-         *
-         * @return  void
-         */
-	public function display($tpl = null) 
+	* Display the Hello World view
+	*
+	* @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	*
+	* @return  void
+	*/
+	public function display($tpl = null)
 	{
 		// Assign data to the view
 		$this->msg = 'Hello World';

From 80062cf23d98ce2778ee632d9baed6d84f36266b Mon Sep 17 00:00:00 2001
From: Alex <scionescire@gmail.com>
Date: Wed, 4 Feb 2015 14:25:46 +0100
Subject: [PATCH 5/6] Small style fix

---
 site/views/helloworld/view.html.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/site/views/helloworld/view.html.php b/site/views/helloworld/view.html.php
index fe638a0..d5c99c2 100644
--- a/site/views/helloworld/view.html.php
+++ b/site/views/helloworld/view.html.php
@@ -18,12 +18,12 @@
 class HelloWorldViewHelloWorld extends JViewLegacy
 {
 	/**
-	* Display the Hello World view
-	*
-	* @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
-	*
-	* @return  void
-	*/
+	 * Display the Hello World view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
 	public function display($tpl = null)
 	{
 		// Assign data to the view

From 0ecb0ab53ff69019c9205c04767afb7f8223b12b Mon Sep 17 00:00:00 2001
From: Alex <scionescire@gmail.com>
Date: Sun, 8 Feb 2015 22:20:33 +0100
Subject: [PATCH 6/6] Hello world meets coding standard

Updated guide using step 10 fix as starting point
---
 helloworld.xml                         |  2 +-
 site/controller.php                    | 16 ++++++++--------
 site/helloworld.php                    | 14 +++++++-------
 site/views/helloworld/tmpl/default.php | 14 +++++++-------
 site/views/helloworld/tmpl/default.xml |  4 +---
 site/views/helloworld/view.html.php    | 24 ++++++++++++------------
 6 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/helloworld.xml b/helloworld.xml
index 828979b..eb4573f 100644
--- a/helloworld.xml
+++ b/helloworld.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension type="component" version="3.2" method="upgrade">
+<extension type="component" version="3.2.0" method="upgrade">
 
 	<name>Hello World!</name>
 	<!-- The following elements are optional and free of formatting constraints -->
diff --git a/site/controller.php b/site/controller.php
index eef0516..8044f8d 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -1,11 +1,11 @@
 <?php
 /**
-* @package Joomla.Administrator
-* @subpackage com_helloworld
-*
-* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
-* @license GNU General Public License version 2 or later; see LICENSE.txt
-*/
+ * @package     Joomla.Administrator
+ * @subpackage  com_helloworld
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
@@ -13,8 +13,8 @@
 /**
  * Hello World Component Controller
  *
- * @since   0.0.1
+ * @since  0.0.1
  */
 class HelloWorldController extends JControllerLegacy
 {
-}
\ No newline at end of file
+}
diff --git a/site/helloworld.php b/site/helloworld.php
index bee0399..293f3ca 100644
--- a/site/helloworld.php
+++ b/site/helloworld.php
@@ -1,11 +1,11 @@
 <?php
 /**
-* @package Joomla.Administrator
-* @subpackage com_helloworld
-*
-* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
-* @license GNU General Public License version 2 or later; see LICENSE.txt
-*/
+ * @package     Joomla.Administrator
+ * @subpackage  com_helloworld
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
@@ -18,4 +18,4 @@
 $controller->execute($input->getCmd('task'));
 
 // Redirect if set by the controller
-$controller->redirect();
\ No newline at end of file
+$controller->redirect();
diff --git a/site/views/helloworld/tmpl/default.php b/site/views/helloworld/tmpl/default.php
index 98f2c6e..77c6170 100644
--- a/site/views/helloworld/tmpl/default.php
+++ b/site/views/helloworld/tmpl/default.php
@@ -1,13 +1,13 @@
 <?php
 /**
-* @package Joomla.Administrator
-* @subpackage com_helloworld
-*
-* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
-* @license GNU General Public License version 2 or later; see LICENSE.txt
-*/
+ * @package     Joomla.Administrator
+ * @subpackage  com_helloworld
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 ?>
-<h1><?php echo $this->msg; ?></h1>
\ No newline at end of file
+<h1><?php echo $this->msg; ?></h1>
diff --git a/site/views/helloworld/tmpl/default.xml b/site/views/helloworld/tmpl/default.xml
index 4f15edd..98b1da7 100644
--- a/site/views/helloworld/tmpl/default.xml
+++ b/site/views/helloworld/tmpl/default.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
 	<layout title="COM_HELLOWORLD_HELLOWORLD_VIEW_DEFAULT_TITLE">
-		<message>
-			<![CDATA[COM_HELLOWORLD_HELLOWORLD_VIEW_DEFAULT_DESC]]>
-		</message>
+		<message>COM_HELLOWORLD_HELLOWORLD_VIEW_DEFAULT_DESC</message>
 	</layout>
 </metadata>
\ No newline at end of file
diff --git a/site/views/helloworld/view.html.php b/site/views/helloworld/view.html.php
index d5c99c2..a204d41 100644
--- a/site/views/helloworld/view.html.php
+++ b/site/views/helloworld/view.html.php
@@ -1,20 +1,20 @@
 <?php
 /**
-* @package Joomla.Administrator
-* @subpackage com_helloworld
-*
-* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
-* @license GNU General Public License version 2 or later; see LICENSE.txt
-*/
+ * @package     Joomla.Administrator
+ * @subpackage  com_helloworld
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
 /**
-* HTML View class for the HelloWorld Component
-*
-* @since 0.0.1
-*/
+ * HTML View class for the HelloWorld Component
+ *
+ * @since  0.0.1
+ */
 class HelloWorldViewHelloWorld extends JViewLegacy
 {
 	/**
@@ -24,7 +24,7 @@ class HelloWorldViewHelloWorld extends JViewLegacy
 	 *
 	 * @return  void
 	 */
-	public function display($tpl = null)
+	function display($tpl = null)
 	{
 		// Assign data to the view
 		$this->msg = 'Hello World';
@@ -32,4 +32,4 @@ public function display($tpl = null)
 		// Display the view
 		parent::display($tpl);
 	}
-}
\ No newline at end of file
+}