Merge pull request #4565 from alprs/feature/optimize-compile-views

taylorotwell · taylorotwell · commit e91f016d67bf · 2014-06-06T08:48:15.000-05:00
Make OptimizeCommand compile views
diff --git a/src/Illuminate/Foundation/Console/OptimizeCommand.php b/src/Illuminate/Foundation/Console/OptimizeCommand.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Composer;
+use Illuminate\View\Engines\CompilerEngine;
 use ClassPreloader\Command\PreCompileCommand;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -64,6 +65,10 @@ public function fire()
 			$this->info('Compiling common classes');
 
 			$this->compileClasses();
+
+			$this->info('Compiling views');
+
+			$this->compileViews();
 		}
 		else
 		{
@@ -113,6 +118,32 @@ protected function registerClassPreloaderCommand()
 		$this->getApplication()->add(new PreCompileCommand);
 	}
 
+	/**
+	 * Compile all view files.
+	 *
+	 * @return void
+	 */
+	protected function compileViews()
+	{
+		$paths = $this->laravel['view']->getFinder()
+			->getPaths();
+
+		foreach ($paths as $dir)
+		{
+			$files = $this->laravel['files']->allFiles($dir);
+
+			foreach ($files as $path)
+			{
+				$engine = $this->laravel['view']->getEngineFromPath($path);
+
+				if ($engine instanceof CompilerEngine)
+				{
+					$engine->getCompiler()->compile($path);
+				}
+			}
+		}
+	}
+
 	/**
 	 * Get the console command options.
 	 *
diff --git a/src/Illuminate/View/Factory.php b/src/Illuminate/View/Factory.php
@@ -247,7 +247,7 @@ public function renderEach($view, $data, $iterator, $empty = 'raw|')
 	 * @param  string  $path
 	 * @return \Illuminate\View\Engines\EngineInterface
 	 */
-	protected function getEngineFromPath($path)
+	public function getEngineFromPath($path)
 	{
 		$engine = $this->extensions[$this->getExtension($path)];
 

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public function renderEach($view, $data, $iterator, $empty = 'raw\|')`
`247`	`247`	`* @param string $path`
`248`	`248`	`* @return \Illuminate\View\Engines\EngineInterface`
`249`	`249`	`*/`
`250`		`- protected function getEngineFromPath($path)`
	`250`	`+ public function getEngineFromPath($path)`
`251`	`251`	`{`
`252`	`252`	`$engine = $this->extensions[$this->getExtension($path)];`
`253`	`253`