rkrx / php-view

src/Workers/FileWorker.php

Spacing +16 added lines, -16 removed lines

@@ -23,10 +23,10 @@ 
 	 * @param Delegate $parent
 	 */
 	public function __construct($basePath, $fileExt = null, array $vars = array(), WorkerConfiguration $configuration = null, Delegate $parent = null) {
-		if($fileExt === null)  {
+		if ($fileExt === null) {
 			$fileExt = '.phtml';
 		}
-		if($configuration === null) {
+		if ($configuration === null) {
 			$configuration = new FileWorkerConfiguration();
 		}
 		parent::__construct($vars, [], $configuration);
@@ -64,24 +64,24 @@ 
 		$this->setVars($vars);
 		$this->setRegions($regions);
 
-		return ViewTryFinallySimulator::tryThis(function () use ($filename, $resource, $vars) {
-			$content = $this->obRecord(function () use ($filename, $resource, $vars) {
+		return ViewTryFinallySimulator::tryThis(function() use ($filename, $resource, $vars) {
+			$content = $this->obRecord(function() use ($filename, $resource, $vars) {
 				$templateFilename = Directories::concat($this->currentWorkDir, $filename);
 				$templateFilename = $this->normalize($templateFilename);
-				$templatePath = stream_resolve_include_path($templateFilename . $this->fileExt);
-				if($templatePath === false) {
+				$templatePath = stream_resolve_include_path($templateFilename.$this->fileExt);
+				if ($templatePath === false) {
 					$templatePath = stream_resolve_include_path($templateFilename);
 				}
-				if($templatePath !== false) {
+				if ($templatePath !== false) {
 					$templateFilename = $templatePath;
-					$fn = function () use ($templateFilename) {
+					$fn = function() use ($templateFilename) {
 						/** @noinspection PhpIncludeInspection */
 						require $templateFilename;
 					};
 					$fn->bindTo(new \stdClass());
 					call_user_func($fn);
 				} else {
-					if($this->parent !== null) {
+					if ($this->parent !== null) {
 						echo $this->parent->render($resource, $vars);
 					} else {
 						throw new Exception("Resource not found: {$resource}");
@@ -89,7 +89,7 @@ 
 				}
 			});
 			return $this->generateLayoutContent($content);
-		}, function () use ($oldVars, $oldRegions) {
+		}, function() use ($oldVars, $oldRegions) {
 			$this->setVars($oldVars);
 			$this->setRegions($oldRegions);
 		});
@@ -101,7 +101,7 @@ 
 	 * @throws \Exception
 	 */
 	private function generateLayoutContent($content) {
-		if($this->getLayout() !== null) {
+		if ($this->getLayout() !== null) {
 			$regions = $this->getRegions();
 			$regions['content'] = $content;
 			$layoutResource = $this->getLayout();
@@ -133,16 +133,16 @@ 
 	 * @return string
 	 */
 	private function normalize($templateFilename) {
-		if(strpos($templateFilename, '..')) {
+		if (strpos($templateFilename, '..')) {
 			$templateFilename = strtr($templateFilename, [DIRECTORY_SEPARATOR => '/']);
 			$templateFilename = preg_replace('/\\/+/', '/', $templateFilename);
 			$parts = explode('/', $templateFilename);
 			$correctedParts = [];
-			foreach($parts as $part) {
-				if($part === '.') {
+			foreach ($parts as $part) {
+				if ($part === '.') {
 					// Skip
-				} elseif($part === '..') {
-					if(count($correctedParts)) {
+				} elseif ($part === '..') {
+					if (count($correctedParts)) {
 						array_pop($correctedParts);
 					} else {
 						// Skip