Merge pull request #17 from Flowpack/coding-style

TASK: Adjust Coding style to recent CGL

Author: Bastian Waidelich

Classes/Flowpack/Neos/FrontendLogin/Controller/AuthenticationController.php

@@ -8,50 +8,55 @@
 /**
  * Controller for displaying a login/logout form and authenticating/logging out "frontend users"
  */
-class AuthenticationController extends AbstractAuthenticationController {
-
-	/**
-	 * @return void
-	 */
-	public function indexAction() {
-		$this->view->assign('account', $this->securityContext->getAccount());
-	}
-
-	/**
-	 * return void
-	 */
-	public function logoutAction() {
-		parent::logoutAction();
-
-		$uri = $this->request->getInternalArgument('__redirectAfterLogoutUri');
-
-		if (empty($uri)) {
-			$this->redirect('index');
-		} else {
-			$this->redirectToUri($uri);
-		}
-	}
-
-	/**
-	 * @param ActionRequest $originalRequest The request that was intercepted by the security framework, NULL if there was none
-	 * @return string
-	 */
-	protected function onAuthenticationSuccess(ActionRequest $originalRequest = NULL) {
-		$uri = $this->request->getInternalArgument('__redirectAfterLoginUri');
-
-		if (empty($uri)) {
-			$this->redirect('index');
-		} else {
-			$this->redirectToUri($uri);
-		}
-	}
-
-	/**
-	 * Disable the technical error flash message
-	 *
-	 * @return boolean
-	 */
-	protected function getErrorFlashMessage() {
-		return FALSE;
-	}
+class AuthenticationController extends AbstractAuthenticationController
+{
+
+    /**
+     * @return void
+     */
+    public function indexAction()
+    {
+        $this->view->assign('account', $this->securityContext->getAccount());
+    }
+
+    /**
+     * return void
+     */
+    public function logoutAction()
+    {
+        parent::logoutAction();
+
+        $uri = $this->request->getInternalArgument('__redirectAfterLogoutUri');
+
+        if (empty($uri)) {
+            $this->redirect('index');
+        } else {
+            $this->redirectToUri($uri);
+        }
+    }
+
+    /**
+     * @param ActionRequest $originalRequest The request that was intercepted by the security framework, NULL if there was none
+     * @return string
+     */
+    protected function onAuthenticationSuccess(ActionRequest $originalRequest = null)
+    {
+        $uri = $this->request->getInternalArgument('__redirectAfterLoginUri');
+
+        if (empty($uri)) {
+            $this->redirect('index');
+        } else {
+            $this->redirectToUri($uri);
+        }
+    }
+
+    /**
+     * Disable the technical error flash message
+     *
+     * @return boolean
+     */
+    protected function getErrorFlashMessage()
+    {
+        return false;
+    }
 }

Classes/Flowpack/Neos/FrontendLogin/Security/NeosRequestPattern.php

@@ -8,36 +8,39 @@
 /**
  * A request pattern that can detect and match "frontend" and "backend" mode
  */
-class NeosRequestPattern implements RequestPatternInterface {
+class NeosRequestPattern implements RequestPatternInterface
+{
 
-	/**
-	 * @var array
-	 */
-	protected $options;
+    /**
+     * @var array
+     */
+    protected $options;
 
-	/**
-	 * Expects options in the form array('matchFrontend' => TRUE/FALSE)
-	 *
-	 * @param array $options
-	 */
-	public function __construct(array $options) {
-		$this->options = $options;
-	}
+    /**
+     * Expects options in the form array('matchFrontend' => TRUE/FALSE)
+     *
+     * @param array $options
+     */
+    public function __construct(array $options)
+    {
+        $this->options = $options;
+    }
 
-	/**
-	 * Matches a \Neos\Flow\Mvc\RequestInterface against its set pattern rules
-	 *
-	 * @param RequestInterface $request The request that should be matched
-	 * @return boolean TRUE if the pattern matched, FALSE otherwise
-	 */
-	public function matchRequest(RequestInterface $request) {
-		if (!$request instanceof ActionRequest) {
-			return FALSE;
-		}
-		$shouldMatchFrontend = isset($this->options['matchFrontend']) && $this->options['matchFrontend'] === true;
-		$requestPath = $request->getHttpRequest()->getUri()->getPath();
-		$requestPathMatchesBackend = substr($requestPath, 0, 5) === '/neos' || strpos($requestPath, '@') !== FALSE;
-		return $shouldMatchFrontend !== $requestPathMatchesBackend;
-	}
+    /**
+     * Matches a \Neos\Flow\Mvc\RequestInterface against its set pattern rules
+     *
+     * @param RequestInterface $request The request that should be matched
+     * @return boolean TRUE if the pattern matched, FALSE otherwise
+     */
+    public function matchRequest(RequestInterface $request)
+    {
+        if (!$request instanceof ActionRequest) {
+            return false;
+        }
+        $shouldMatchFrontend = isset($this->options['matchFrontend']) && $this->options['matchFrontend'] === true;
+        $requestPath = $request->getHttpRequest()->getUri()->getPath();
+        $requestPathMatchesBackend = substr($requestPath, 0, 5) === '/neos' || strpos($requestPath, '@') !== false;
+        return $shouldMatchFrontend !== $requestPathMatchesBackend;
+    }
 
 }

Configuration/NodeTypes.LoginForm.yaml

@@ -3,7 +3,7 @@
 #
 'Flowpack.Neos.FrontendLogin:LoginForm':
   superTypes:
-    'Neos.Neos:Plugin': TRUE
+    'Neos.Neos:Plugin': true
   ui:
     label: i18n
     icon: 'icon-key'