bb-drummer / my-application

module/Application/src/Application/Controller/BaseActionController.php

Indentation +18 added lines, -18 removed lines

@@ -34,10 +34,10 @@ 
  */
 class BaseActionController extends AbstractActionController implements Dispatchable
 {
-	//use ServiceLocatorAwareTrait;
-	use ControllerTranslatorTrait;
-	use ControllerActiontitlesTrait;
-	use ControllerToolbarTrait;
+    //use ServiceLocatorAwareTrait;
+    use ControllerTranslatorTrait;
+    use ControllerActiontitlesTrait;
+    use ControllerToolbarTrait;
     
     //protected $serviceLocator;
     
@@ -48,9 +48,9 @@ 
      */
     public function __construct( ServiceLocatorInterface $serviceLocator )
     {
-    	if ( $serviceLocator ) {
-    		$this->setServiceLocator($serviceLocator);
-    	}
+        if ( $serviceLocator ) {
+            $this->setServiceLocator($serviceLocator);
+        }
     }
     
     /**
@@ -147,17 +147,17 @@ 
      */
     public function isXHR()
     {
-    	/**
-    	 * @var \Zend\Http\PhpEnvironment\Request|\Zend\Http\Request $request
-    	 */
-    	$request = $this->getRequest();
-    	if ( 
-    		($request instanceof \Zend\Http\PhpEnvironment\Request) ||
-    		($request instanceof \Zend\Http\Request) 
-    	) {
-    		return ( $request->isXmlHttpRequest() );
-    	}
-    	return (false);
+        /**
+         * @var \Zend\Http\PhpEnvironment\Request|\Zend\Http\Request $request
+         */
+        $request = $this->getRequest();
+        if ( 
+            ($request instanceof \Zend\Http\PhpEnvironment\Request) ||
+            ($request instanceof \Zend\Http\Request) 
+        ) {
+            return ( $request->isXmlHttpRequest() );
+        }
+        return (false);
     }
     
     /**

Spacing +5 added lines, -5 removed lines

@@ -46,9 +46,9 @@ 
      * basic constructor injecting global service manager/locator
      * @return self
      */
-    public function __construct( ServiceLocatorInterface $serviceLocator )
+    public function __construct(ServiceLocatorInterface $serviceLocator)
     {
-    	if ( $serviceLocator ) {
+    	if ($serviceLocator) {
     		$this->setServiceLocator($serviceLocator);
     	}
     }
@@ -134,7 +134,7 @@ 
     {
 
         $oAuth = $this->getServiceLocator()->get('zfcuser_auth_service');
-        if ($oAuth->hasIdentity() ) {
+        if ($oAuth->hasIdentity()) {
             return $oAuth->getIdentity();
         }
         return null;
@@ -155,7 +155,7 @@ 
     		($request instanceof \Zend\Http\PhpEnvironment\Request) ||
     		($request instanceof \Zend\Http\Request) 
     	) {
-    		return ( $request->isXmlHttpRequest() );
+    		return ($request->isXmlHttpRequest());
     	}
     	return (false);
     }
@@ -179,7 +179,7 @@ 
      * @param array $vars [optional] additional variables
      * @return array
      */
-    public function getTemplateVars( $vars = array() ) 
+    public function getTemplateVars($vars = array()) 
     {
         $result = (array_merge( 
             $this->params()->fromRoute(),