Merge pull request phalcon#11948 from sergeyklay/2.1.x

Code cleanup
dimak08 · Jul 3, 2016 · 5e0b084 · 5e0b084
2 parents 722d7ff + dc6c9f6
commit 5e0b084
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/phalcon/flash/session.zep b/phalcon/flash/session.zep
@@ -45,20 +45,16 @@ class Session extends FlashBase implements FlashInterface
 			messages = session->get("_flashMessages");
 
 		if typeof type == "string" {
-			if !isset messages[type] {
-				return [];
-			}
-
-			if !fetch returnMessages, messages[type] {
-				let returnMessages = [];
-			}
+			if fetch returnMessages, messages[type] {
+				if remove === true {
+					unset(messages[type]);
+					session->set("_flashMessages", messages);
+				}
 
-			if remove === true {
-				unset(messages[type]);
-				session->set("_flashMessages", messages);
+				return returnMessages;
 			}
 
-			return returnMessages;
+			return [];
 		}
 
 		if remove === true {

diff --git a/phalcon/mvc/view/simple.zep b/phalcon/mvc/view/simple.zep
@@ -59,6 +59,9 @@ class Simple extends Injectable implements ViewBaseInterface
 	 */
 	protected _engines = false;
 
+	/**
+	 * @var array|null
+	 */
 	protected _registeredEngines { get };
 
 	protected _activeRenderPath;
@@ -376,17 +379,14 @@ class Simple extends Injectable implements ViewBaseInterface
 	 * Renders a partial view
 	 *
 	 * <code>
-	 * 	//Show a partial inside another view
+	 * 	// Show a partial inside another view
 	 * 	$this->partial('shared/footer');
 	 * </code>
 	 *
 	 * <code>
-	 * 	//Show a partial inside another view with parameters
-	 * 	$this->partial('shared/footer', array('content' => $html));
+	 * 	// Show a partial inside another view with parameters
+	 * 	$this->partial('shared/footer', ['content' => $html]);
 	 * </code>
-	 *
-	 * @param string partialPath
-	 * @param array  params
 	 */
 	public function partial(string! partialPath, var params = null)
 	{