Merge pull request #257 from wilsonge/patch-25

Fix unit tests
joomla · May 20, 2014 · 31739e2 · 31739e2
2 parents d62d2c2 + 33db324
commit 31739e2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/libraries/joomla/application/base.php b/libraries/joomla/application/base.php
@@ -127,4 +127,18 @@ public function loadIdentity(JUser $identity = null)
 
 		return $this;
 	}
+
+	/**
+	 * Method to run the application routines.  Most likely you will want to instantiate a controller
+	 * and execute it, or perform some sort of task directly.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4 (CMS)
+	 */
+	protected function doExecute()
+	{
+		return;
+	}
+
 }
diff --git a/libraries/joomla/application/cli.php b/libraries/joomla/application/cli.php
@@ -69,7 +69,7 @@ public function __construct(JInputCli $input = null, JRegistry $config = null, J
 		{
 			if (class_exists('JInput'))
 			{
-				$this->input = new JInputCLI;
+				$this->input = new JInputCli;
 			}
 		}
 

diff --git a/libraries/legacy/application/application.php b/libraries/legacy/application/application.php
@@ -1183,18 +1183,4 @@ public function __toString()
 
 		return JResponse::toString($compress);
 	}
-
-	/**
-	 * Method to run the application routines.  Most likely you will want to instantiate a controller
-	 * and execute it, or perform some sort of task directly.
-	 *
-	 * @return  void
-	 *
-	 * @since   3.4 (CMS)
-	 * @deprecated  4.0
-	 */
-	protected function doExecute()
-	{
-		return;
-	}
 }