mocdk / MOC.NotFound

Classes/ViewHelpers/RequestViewHelper.php

Indentation +133 added lines, -133 removed lines

@@ -21,137 +21,137 @@
  */
 class RequestViewHelper extends AbstractViewHelper
 {
-    /**
-     * @Flow\Inject
-     * @var Dispatcher
-     */
-    protected $dispatcher;
-
-    /**
-     * @Flow\Inject(lazy=false)
-     * @var Bootstrap
-     */
-    protected $bootstrap;
-
-    /**
-     * @Flow\Inject(lazy=false)
-     * @var Router
-     */
-    protected $router;
-
-    /**
-     * @Flow\Inject(lazy=false)
-     * @var SecurityContext
-     */
-    protected $securityContext;
-
-    /**
-     * @Flow\Inject
-     * @var ConfigurationManager
-     */
-    protected $configurationManager;
-
-    /**
-     * @Flow\InjectConfiguration(path="routing.supportEmptySegmentForDimensions", package="Neos.Neos")
-     * @var boolean
-     */
-    protected $supportEmptySegmentForDimensions;
-
-    /**
-     * @Flow\Inject
-     * @var ContentDimensionPresetSourceInterface
-     */
-    protected $contentDimensionPresetSource;
-
-    /**
-     * Initialize this engine
-     *
-     * @return void
-     */
-    public function initializeObject()
-    {
-        $this->router->setRoutesConfiguration($this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_ROUTES));
-    }
-
-    /**
-     * @param string $path
-     * @return string
-     * @throws \Exception
-     */
-    public function render($path = null)
-    {
-        $this->appendFirstUriPartIfValidDimension($path);
-        /** @var RequestHandler $activeRequestHandler */
-        $activeRequestHandler = $this->bootstrap->getActiveRequestHandler();
-        $parentHttpRequest = $activeRequestHandler->getHttpRequest();
-        $uri = rtrim($parentHttpRequest->getBaseUri(), '/') . '/' . $path;
-        $httpRequest = Request::create(new Uri($uri));
-        $matchingRoute = $this->router->route($httpRequest);
-        if (!$matchingRoute) {
-            $exception = new \Exception(sprintf('Uri with path "%s" could not be found.', $uri), 1426446160);
-            $exceptionHandler = set_exception_handler(null)[0];
-            $exceptionHandler->handleException($exception);
-            exit();
-        }
-        $request = new ActionRequest($parentHttpRequest);
-        foreach ($matchingRoute as $argumentName => $argumentValue) {
-            $request->setArgument($argumentName, $argumentValue);
-        }
-        $response = new Response($activeRequestHandler->getHttpResponse());
-
-        $this->securityContext->withoutAuthorizationChecks(function () use ($request, $response) {
-            $this->dispatcher->dispatch($request, $response);
-        });
-
-        return $response->getContent();
-    }
-
-    /**
-     * @param string $path
-     * @return void
-     */
-    protected function appendFirstUriPartIfValidDimension(&$path)
-    {
-        $requestPath = ltrim($this->controllerContext->getRequest()->getHttpRequest()->getUri()->getPath(), '/');
-        $matches = [];
-        preg_match(FrontendNodeRoutePartHandler::DIMENSION_REQUEST_PATH_MATCHER, $requestPath, $matches);
-        if (!isset($matches['firstUriPart']) && !isset($matches['dimensionPresetUriSegments'])) {
-            return;
-        }
-
-        $dimensionPresets = $this->contentDimensionPresetSource->getAllPresets();
-        if (count($dimensionPresets) === 0) {
-            return;
-        }
-
-        $firstUriPartExploded = explode('_', $matches['firstUriPart'] ?: $matches['dimensionPresetUriSegments']);
-        if ($this->supportEmptySegmentForDimensions) {
-            foreach ($firstUriPartExploded as $uriSegment) {
-                $uriSegmentIsValid = false;
-                foreach ($dimensionPresets as $dimensionName => $dimensionPreset) {
-                    $preset = $this->contentDimensionPresetSource->findPresetByUriSegment($dimensionName, $uriSegment);
-                    if ($preset !== null) {
-                        $uriSegmentIsValid = true;
-                        break;
-                    }
-                }
-                if (!$uriSegmentIsValid) {
-                    return;
-                }
-            }
-        } else {
-            if (count($firstUriPartExploded) !== count($dimensionPresets)) {
-                return;
-            }
-            foreach ($dimensionPresets as $dimensionName => $dimensionPreset) {
-                $uriSegment = array_shift($firstUriPartExploded);
-                $preset = $this->contentDimensionPresetSource->findPresetByUriSegment($dimensionName, $uriSegment);
-                if ($preset === null) {
-                    return;
-                }
-            }
-        }
-
-        $path = $matches['firstUriPart'] . '/' . $path;
-    }
+	/**
+	 * @Flow\Inject
+	 * @var Dispatcher
+	 */
+	protected $dispatcher;
+
+	/**
+	 * @Flow\Inject(lazy=false)
+	 * @var Bootstrap
+	 */
+	protected $bootstrap;
+
+	/**
+	 * @Flow\Inject(lazy=false)
+	 * @var Router
+	 */
+	protected $router;
+
+	/**
+	 * @Flow\Inject(lazy=false)
+	 * @var SecurityContext
+	 */
+	protected $securityContext;
+
+	/**
+	 * @Flow\Inject
+	 * @var ConfigurationManager
+	 */
+	protected $configurationManager;
+
+	/**
+	 * @Flow\InjectConfiguration(path="routing.supportEmptySegmentForDimensions", package="Neos.Neos")
+	 * @var boolean
+	 */
+	protected $supportEmptySegmentForDimensions;
+
+	/**
+	 * @Flow\Inject
+	 * @var ContentDimensionPresetSourceInterface
+	 */
+	protected $contentDimensionPresetSource;
+
+	/**
+	 * Initialize this engine
+	 *
+	 * @return void
+	 */
+	public function initializeObject()
+	{
+		$this->router->setRoutesConfiguration($this->configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_ROUTES));
+	}
+
+	/**
+	 * @param string $path
+	 * @return string
+	 * @throws \Exception
+	 */
+	public function render($path = null)
+	{
+		$this->appendFirstUriPartIfValidDimension($path);
+		/** @var RequestHandler $activeRequestHandler */
+		$activeRequestHandler = $this->bootstrap->getActiveRequestHandler();
+		$parentHttpRequest = $activeRequestHandler->getHttpRequest();
+		$uri = rtrim($parentHttpRequest->getBaseUri(), '/') . '/' . $path;
+		$httpRequest = Request::create(new Uri($uri));
+		$matchingRoute = $this->router->route($httpRequest);
+		if (!$matchingRoute) {
+			$exception = new \Exception(sprintf('Uri with path "%s" could not be found.', $uri), 1426446160);
+			$exceptionHandler = set_exception_handler(null)[0];
+			$exceptionHandler->handleException($exception);
+			exit();
+		}
+		$request = new ActionRequest($parentHttpRequest);
+		foreach ($matchingRoute as $argumentName => $argumentValue) {
+			$request->setArgument($argumentName, $argumentValue);
+		}
+		$response = new Response($activeRequestHandler->getHttpResponse());
+
+		$this->securityContext->withoutAuthorizationChecks(function () use ($request, $response) {
+			$this->dispatcher->dispatch($request, $response);
+		});
+
+		return $response->getContent();
+	}
+
+	/**
+	 * @param string $path
+	 * @return void
+	 */
+	protected function appendFirstUriPartIfValidDimension(&$path)
+	{
+		$requestPath = ltrim($this->controllerContext->getRequest()->getHttpRequest()->getUri()->getPath(), '/');
+		$matches = [];
+		preg_match(FrontendNodeRoutePartHandler::DIMENSION_REQUEST_PATH_MATCHER, $requestPath, $matches);
+		if (!isset($matches['firstUriPart']) && !isset($matches['dimensionPresetUriSegments'])) {
+			return;
+		}
+
+		$dimensionPresets = $this->contentDimensionPresetSource->getAllPresets();
+		if (count($dimensionPresets) === 0) {
+			return;
+		}
+
+		$firstUriPartExploded = explode('_', $matches['firstUriPart'] ?: $matches['dimensionPresetUriSegments']);
+		if ($this->supportEmptySegmentForDimensions) {
+			foreach ($firstUriPartExploded as $uriSegment) {
+				$uriSegmentIsValid = false;
+				foreach ($dimensionPresets as $dimensionName => $dimensionPreset) {
+					$preset = $this->contentDimensionPresetSource->findPresetByUriSegment($dimensionName, $uriSegment);
+					if ($preset !== null) {
+						$uriSegmentIsValid = true;
+						break;
+					}
+				}
+				if (!$uriSegmentIsValid) {
+					return;
+				}
+			}
+		} else {
+			if (count($firstUriPartExploded) !== count($dimensionPresets)) {
+				return;
+			}
+			foreach ($dimensionPresets as $dimensionName => $dimensionPreset) {
+				$uriSegment = array_shift($firstUriPartExploded);
+				$preset = $this->contentDimensionPresetSource->findPresetByUriSegment($dimensionName, $uriSegment);
+				if ($preset === null) {
+					return;
+				}
+			}
+		}
+
+		$path = $matches['firstUriPart'] . '/' . $path;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
         /** @var RequestHandler $activeRequestHandler */
         $activeRequestHandler = $this->bootstrap->getActiveRequestHandler();
         $parentHttpRequest = $activeRequestHandler->getHttpRequest();
-        $uri = rtrim($parentHttpRequest->getBaseUri(), '/') . '/' . $path;
+        $uri = rtrim($parentHttpRequest->getBaseUri(), '/').'/'.$path;
         $httpRequest = Request::create(new Uri($uri));
         $matchingRoute = $this->router->route($httpRequest);
         if (!$matchingRoute) {
@@ -99,7 +99,7 @@ 
         }
         $response = new Response($activeRequestHandler->getHttpResponse());
 
-        $this->securityContext->withoutAuthorizationChecks(function () use ($request, $response) {
+        $this->securityContext->withoutAuthorizationChecks(function() use ($request, $response) {
             $this->dispatcher->dispatch($request, $response);
         });
 
@@ -152,6 +152,6 @@ 
             }
         }
 
-        $path = $matches['firstUriPart'] . '/' . $path;
+        $path = $matches['firstUriPart'].'/'.$path;
     }
 }