Eliminating beginPage() and endPage() in layouts

framework/yii/base/Controller.php

@@ -307,7 +307,7 @@ public function render($view, $params = [])
 		$output = $this->getView()->render($view, $params, $this);
 		$layoutFile = $this->findLayoutFile($this->getView());
 		if ($layoutFile !== false) {
-			return $this->getView()->renderFile($layoutFile, ['content' => $output], $this);
+			return $this->getView()->renderLayoutFile($layoutFile, ['content' => $output], $this);
 		} else {
 			return $output;
 		}

framework/yii/base/View.php

@@ -239,6 +239,46 @@ public function renderFile($viewFile, $params = [], $context = null)
 		return $output;
 	}
 
+	/**
+	 * Renders a layout file.
+	 * 
+	 * @param string $viewFile the layout file. This can be either a file path or a path alias.
+	 * @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file.
+	 * @param object $context the context that the view should use for rendering the view. If null,
+	 * existing [[context]] will be used.
+	 * @return string the rendering result
+	 */
+	public function renderLayoutFile($layoutFile, $params = [], $context = null)
+	{
+		ob_start();
+		ob_implicit_flush(false);
+		$this->trigger(self::EVENT_BEGIN_PAGE);
+
+		echo $this->renderFile($layoutFile, $params, $context);
+
+		$this->trigger(self::EVENT_END_PAGE);
+
+		$content = ob_get_clean();
+		foreach (array_keys($this->assetBundles) as $bundle) {
+			$this->registerAssetFiles($bundle);
+		}
+		echo strtr($content, [
+			self::PH_HEAD => $this->renderHeadHtml(),
+			self::PH_BODY_BEGIN => $this->renderBodyBeginHtml(),
+			self::PH_BODY_END => $this->renderBodyEndHtml(),
+		]);
+
+		unset(
+			$this->metaTags,
+			$this->linkTags,
+			$this->css,
+			$this->cssFiles,
+			$this->js,
+			$this->jsFiles
+		);
+		return $content;
+	}
+
 	/**
 	 * This method is invoked right before [[renderFile()]] renders a view file.
 	 * The default implementation will trigger the [[EVENT_BEFORE_RENDER]] event.
@@ -438,24 +478,4 @@ public function endCache()
 	{
 		FragmentCache::end();
 	}
-
-	/**
-	 * Marks the beginning of a page.
-	 */
-	public function beginPage()
-	{
-		ob_start();
-		ob_implicit_flush(false);
-
-		$this->trigger(self::EVENT_BEGIN_PAGE);
-	}
-
-	/**
-	 * Marks the ending of a page.
-	 */
-	public function endPage()
-	{
-		$this->trigger(self::EVENT_END_PAGE);
-		ob_end_flush();
-	}
 }

framework/yii/caching/Cache.php

@@ -71,7 +71,10 @@ abstract class Cache extends Component implements \ArrayAccess
 	 * you are using [[Dependency|cache dependency]], because it relies on data serialization.
 	 */
 	public $serializer;
-
+	/**
+	 * @var int Default number of seconds in which the cached value will expire
+	 */
+	public $expire=0;
 
 	/**
 	 * Initializes the application component.
@@ -201,8 +204,11 @@ public function mget($keys)
 	 * This parameter is ignored if [[serializer]] is false.
 	 * @return boolean whether the value is successfully stored into cache
 	 */
-	public function set($key, $value, $expire = 0, $dependency = null)
+	public function set($key, $value, $expire = null, $dependency = null)
 	{
+		if ($expire === null) {
+			$expire = abs((int)$this->expire);
+		}
 		if ($dependency !== null && $this->serializer !== false) {
 			$dependency->evaluateDependency($this);
 		}

framework/yii/web/View.php

@@ -146,33 +146,6 @@ public function setAssetManager($value)
 		$this->_assetManager = $value;
 	}
 
-	/**
-	 * Marks the ending of an HTML page.
-	 */
-	public function endPage()
-	{
-		$this->trigger(self::EVENT_END_PAGE);
-
-		$content = ob_get_clean();
-		foreach (array_keys($this->assetBundles) as $bundle) {
-			$this->registerAssetFiles($bundle);
-		}
-		echo strtr($content, [
-			self::PH_HEAD => $this->renderHeadHtml(),
-			self::PH_BODY_BEGIN => $this->renderBodyBeginHtml(),
-			self::PH_BODY_END => $this->renderBodyEndHtml(),
-		]);
-
-		unset(
-			$this->metaTags,
-			$this->linkTags,
-			$this->css,
-			$this->cssFiles,
-			$this->js,
-			$this->jsFiles
-		);
-	}
-
 	/**
 	 * Registers all files provided by an asset bundle including depending bundles files.
 	 * Removes a bundle from [[assetBundles]] once files are registered.