cross-solution / YAWIK

module/Auth/src/Auth/Factory/Listener/ExceptionStrategyFactory.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
                 break;
         }
 
-        $config   = $container->get('Config');
+        $config = $container->get('Config');
 
         if (isset($config['view_manager'])) {
             if (isset($config['view_manager']['display_exceptions'])) {

module/Auth/src/Auth/View/Helper/Auth.php

Spacing +2 added lines, -2 removed lines

@@ -97,8 +97,8 @@
             $value = null;
             $service = $this->getService();
             $user    = $service->getUser();
-            if (method_exists($user,"get".$property)) {
-                $value = $user->{"get" . $property}();
+            if (method_exists($user, "get".$property)) {
+                $value = $user->{"get".$property}();
             }
             return $value;
         } catch (\OutOfBoundsException $e) {

module/Auth/src/Auth/Controller/Plugin/Auth.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
                 }
                 return $value;
             }
-            return 'id' == $property ? $auth->getIdentity() : $auth->getUser()->{'get' . $property}();
+            return 'id' == $property ? $auth->getIdentity() : $auth->getUser()->{'get'.$property}();
         }
         return null;
     }

Doc Comments -1 removed lines

@@ -99,7 +99,6 @@
     }
     
     /**
-     * @param ControllerManager $controllerManager
      * @return \Auth\Controller\Plugin\Auth
      */
     public static function factory(ServiceManager $sm)

Indentation +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
      */
     public static function factory(ServiceManager $sm)
     {
-    	//$manager = $sm->get('ControllerManager');
+        //$manager = $sm->get('ControllerManager');
         return new static($sm->get('AuthenticationService'));
     }
 }

module/Auth/src/Auth/Controller/Plugin/SocialProfiles/AbstractAdapter.php

Doc Comments -1 removed lines

@@ -29,7 +29,6 @@
     {}
     
     /**
-     * @param string $network
      * @return \Auth\Entity\SocialProfiles\ProfileInterface|bool
      */
     public function fetch($api)

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function fetch($api)
     {
-        $result  = $this->queryApi($api);
+        $result = $this->queryApi($api);
         if (!$result) {
             return false;
         }
@@ -60,7 +60,7 @@ 
         $class = get_class($this);
         $class = explode('\\', $class);
         $class = array_pop($class);
-        $class = '\\Auth\\Entity\\SocialProfiles\\' . $class;
+        $class = '\\Auth\\Entity\\SocialProfiles\\'.$class;
         
         return $class;
     }

module/Auth/src/Auth/Adapter/ExternalApplication.php

Spacing +8 added lines, -8 removed lines

@@ -115,7 +115,7 @@ 
         }
                 
         $identity      = $this->getIdentity();
-        $applicationId = '@' . $this->getApplicationIdentifier();
+        $applicationId = '@'.$this->getApplicationIdentifier();
         $applicationIdIndex = strrpos($identity, $applicationId);
         //$login         = (0 < $applicationIdIndex &&  strlen($identity) - strlen($applicationId) == $applicationIdIndex)?substr($identity, 0, $applicationIdIndex):$identity;
         $login         = $identity;
@@ -128,8 +128,8 @@ 
         $loginSuccess = false;
         $loginResult = array();
         
-        if (0 < $applicationIdIndex &&  strlen($identity) - strlen($applicationId) == $applicationIdIndex) {
-            $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with correct suffix: ');
+        if (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex) {
+            $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with correct suffix: ');
             // the login ends with the applicationID, therefore use the secret key
             // the external login must be the form 'xxxxx@yyyy' where yyyy is the matching suffix to the external application key
             if (isset($user)) {
@@ -137,7 +137,7 @@ 
                     $loginSuccess = true;
                 } else {
                     $loginSuccess = false;
-                    $this->serviceManager->get('Core/Log')->info('User ' . $login . ', secret: ' . $user->getSecret() . ' != loginPassword: ' . $filter->filter($credential) . ' (' . $credential . ')');
+                    $this->serviceManager->get('Core/Log')->info('User '.$login.', secret: '.$user->getSecret().' != loginPassword: '.$filter->filter($credential).' ('.$credential.')');
                 }
             } else {
                 $user = $users->create(
@@ -153,17 +153,17 @@ 
                 $loginResult = array('firstLogin' => true);
             }
         } elseif (isset($user)) {
-            $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with incorrect suffix: ');
+            $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with incorrect suffix: ');
             if ($user->getCredential() == $filter->filter($credential)) {
-                $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are equal');
+                $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are equal');
                 $loginSuccess = true;
             } elseif (!empty($applicationId)) {
-                $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are not equal');
+                $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are not equal');
                 // TODO: remove this code as soon as the secret key has been fully established
                 // basically this does allow an external login with an applicationIndex match against the User-Password
                 // the way it had been used in the start
                 if ($user->getCredential() == $filter->filter($credential)) {
-                    $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials2 test');
+                    $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials2 test');
                     $loginSuccess = true;
                 }
             }

Indentation +3 added lines, -3 removed lines

@@ -42,9 +42,9 @@
         $this->setApplicationKey($applicationKey);
     }
 	
-	/**
-	 * @param ContainerInterface $serviceManager
-	 */
+    /**
+     * @param ContainerInterface $serviceManager
+     */
     public function setServiceLocator(ContainerInterface $serviceManager)
     {
         $this->serviceManager = $serviceManager;

module/Install/src/Listener/TracyListener.php

Indentation +25 added lines, -25 removed lines

@@ -23,31 +23,31 @@
  */
 class TracyListener implements ListenerAggregateInterface
 {
-	use ListenerAggregateTrait;
+    use ListenerAggregateTrait;
 	
-	/**
-	 * {@inheritDoc}
-	 * @see \Zend\EventManager\ListenerAggregateInterface::attach()
-	 */
-	public function attach(EventManagerInterface $events, $priority = 1)
-	{
-		$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'handleError'], $priority);
-		$this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, [$this, 'handleError'], $priority);
-	}
+    /**
+     * {@inheritDoc}
+     * @see \Zend\EventManager\ListenerAggregateInterface::attach()
+     */
+    public function attach(EventManagerInterface $events, $priority = 1)
+    {
+        $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'handleError'], $priority);
+        $this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, [$this, 'handleError'], $priority);
+    }
 	
-	/**
-	 * @param MvcEvent $e
-	 */
-	public function handleError(MvcEvent $e)
-	{
-		if ($e->getError() == \Zend\Mvc\Application::ERROR_EXCEPTION) {
-			if (Debugger::$productionMode) {
-				// log an exception in production environment (this will send email as well if email address is set)
-				Debugger::log($e->getParam('exception'), Debugger::ERROR);
-			} else {
-				// just re-throw an exception in non-production environment to let tracy display so called blue screen
-				throw $e->getParam('exception');
-			}
-		}
-	}
+    /**
+     * @param MvcEvent $e
+     */
+    public function handleError(MvcEvent $e)
+    {
+        if ($e->getError() == \Zend\Mvc\Application::ERROR_EXCEPTION) {
+            if (Debugger::$productionMode) {
+                // log an exception in production environment (this will send email as well if email address is set)
+                Debugger::log($e->getParam('exception'), Debugger::ERROR);
+            } else {
+                // just re-throw an exception in non-production environment to let tracy display so called blue screen
+                throw $e->getParam('exception');
+            }
+        }
+    }
 }

module/Install/src/Form/Installation.php

Indentation +46 added lines, -46 removed lines

@@ -26,57 +26,57 @@ 
 
     public function init()
     {
-	    $this->setName('installation');
+        $this->setName('installation');
 	
-	    $this->setAttributes(
-		    array(
-			    'method' => 'post',
-		    )
-	    );
+        $this->setAttributes(
+            array(
+                'method' => 'post',
+            )
+        );
 	
-	    $this->add(
-		    array(
-			    'type'       => 'Text',
-			    'name'       => 'db_conn',
-			    'options'    => array(
-				    'label' => /* @translate */ 'Database connection string',
-			    ),
-			    'attributes' => array(
-				    'placeholder' => 'mongodb://localhost:27017/YAWIK',
-			    ),
+        $this->add(
+            array(
+                'type'       => 'Text',
+                'name'       => 'db_conn',
+                'options'    => array(
+                    'label' => /* @translate */ 'Database connection string',
+                ),
+                'attributes' => array(
+                    'placeholder' => 'mongodb://localhost:27017/YAWIK',
+                ),
 		
-		    )
-	    );
+            )
+        );
 	
-	    $this->add(
-		    array(
-			    'type'    => 'Text',
-			    'name'    => 'username',
-			    'options' => array(
-				    'label' => /* @translate */ 'Initial user name',
-			    ),
-		    )
-	    );
+        $this->add(
+            array(
+                'type'    => 'Text',
+                'name'    => 'username',
+                'options' => array(
+                    'label' => /* @translate */ 'Initial user name',
+                ),
+            )
+        );
 	
-	    $this->add(
-		    array(
-			    'type'    => 'Password',
-			    'name'    => 'password',
-			    'options' => array(
-				    'label' => /* @translate */ 'Password',
-			    ),
-		    )
-	    );
+        $this->add(
+            array(
+                'type'    => 'Password',
+                'name'    => 'password',
+                'options' => array(
+                    'label' => /* @translate */ 'Password',
+                ),
+            )
+        );
 	
-	    $this->add(
-		    array(
-			    'type' => 'Text',
-			    'name' => 'email',
-			    'options' => array(
-				    'label' => /* @translate */ 'Email address for system messages',
-			    ),
-		    )
-	    );
+        $this->add(
+            array(
+                'type' => 'Text',
+                'name' => 'email',
+                'options' => array(
+                    'label' => /* @translate */ 'Email address for system messages',
+                ),
+            )
+        );
     }
 
     public function getInputFilterSpecification()
@@ -90,7 +90,7 @@ 
                 ),
                 'validators'        => array(
                     array('name' => MongoDbConnectionString::class,
-                          'break_chain_on_failure' => true),
+                            'break_chain_on_failure' => true),
                     array('name' => MongoDbConnection::class),
                 ),
             ),

module/Behat/src/Select2Context.php

Indentation +111 added lines, -111 removed lines

@@ -24,130 +24,130 @@
  */
 class Select2Context extends RawMinkContext implements Context
 {
-	protected $timeout = 5;
+    protected $timeout = 5;
 	
-	/**
-	 * Fills in Select2 field with specified
-	 *
-	 * @When /^(?:|I )fill in select2 "(?P<field>(?:[^"]|\\")*)" with "(?P<value>(?:[^"]|\\")*)"$/
-	 * @When /^(?:|I )fill in select2 "(?P<value>(?:[^"]|\\")*)" for "(?P<field>(?:[^"]|\\")*)"$/
-	 */
-	public function iFillInSelect2Field($field, $value)
-	{
-		$page = $this->getSession()->getPage();
+    /**
+     * Fills in Select2 field with specified
+     *
+     * @When /^(?:|I )fill in select2 "(?P<field>(?:[^"]|\\")*)" with "(?P<value>(?:[^"]|\\")*)"$/
+     * @When /^(?:|I )fill in select2 "(?P<value>(?:[^"]|\\")*)" for "(?P<field>(?:[^"]|\\")*)"$/
+     */
+    public function iFillInSelect2Field($field, $value)
+    {
+        $page = $this->getSession()->getPage();
 		
-		$this->openField($page, $field);
-		$this->selectValue($page, $field, $value, $this->timeout);
-	}
+        $this->openField($page, $field);
+        $this->selectValue($page, $field, $value, $this->timeout);
+    }
 	
-	/**
-	 * @When I fill in select2 search :field with :search and I choose :choice
-	 * @param $field
-	 * @param $value
-	 */
-	public function iFillInSelect2FieldWith($field,$search,$choice=null)
-	{
-		$page = $this->getSession()->getPage();
-		$this->openField($page, $field);
-		$this->fillSearchField($page,$field,$search);
-		$this->selectValue($page, $field, $choice);
-	}
+    /**
+     * @When I fill in select2 search :field with :search and I choose :choice
+     * @param $field
+     * @param $value
+     */
+    public function iFillInSelect2FieldWith($field,$search,$choice=null)
+    {
+        $page = $this->getSession()->getPage();
+        $this->openField($page, $field);
+        $this->fillSearchField($page,$field,$search);
+        $this->selectValue($page, $field, $choice);
+    }
 	
-	/**
-	 * Fill Select2 search field
-	 *
-	 * @param DocumentElement $page
-	 * @param string          $field
-	 * @param string          $value
-	 * @throws \Exception
-	 */
-	private function fillSearchField(DocumentElement $page, $field, $value)
-	{
-		$driver = $this->getSession()->getDriver();
-		if ('Behat\Mink\Driver\Selenium2Driver' === get_class($driver)) {
-			// Can't use `$this->getSession()->getPage()->find()` because of https://github.com/minkphp/MinkSelenium2Driver/issues/188
+    /**
+     * Fill Select2 search field
+     *
+     * @param DocumentElement $page
+     * @param string          $field
+     * @param string          $value
+     * @throws \Exception
+     */
+    private function fillSearchField(DocumentElement $page, $field, $value)
+    {
+        $driver = $this->getSession()->getDriver();
+        if ('Behat\Mink\Driver\Selenium2Driver' === get_class($driver)) {
+            // Can't use `$this->getSession()->getPage()->find()` because of https://github.com/minkphp/MinkSelenium2Driver/issues/188
 			
-			$element = $page->find('css','.select2-container--open .select2-search__field');
-			$xpath = $element->getXpath();
-			$select2Input = $this->getSession()
-				->getDriver()
-				->getWebDriverSession()
-				->element('xpath',$xpath)
-				//->element('xpath', "//html/descendant-or-self::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' select2-search__field ')]")
-			;
-			if (!$select2Input) {
-				throw new \Exception(sprintf('No field "%s" found', $field));
-			}
+            $element = $page->find('css','.select2-container--open .select2-search__field');
+            $xpath = $element->getXpath();
+            $select2Input = $this->getSession()
+                ->getDriver()
+                ->getWebDriverSession()
+                ->element('xpath',$xpath)
+                //->element('xpath', "//html/descendant-or-self::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' select2-search__field ')]")
+            ;
+            if (!$select2Input) {
+                throw new \Exception(sprintf('No field "%s" found', $field));
+            }
 			
-			$select2Input->postValue(['value' => [$value]]);
-		} else {
-			$select2Input = $page->find('css', '.select2-search__field');
-			if (!$select2Input) {
-				throw new \Exception(sprintf('No input found for "%s"', $field));
-			}
-			$select2Input->setValue($value);
-		}
+            $select2Input->postValue(['value' => [$value]]);
+        } else {
+            $select2Input = $page->find('css', '.select2-search__field');
+            if (!$select2Input) {
+                throw new \Exception(sprintf('No input found for "%s"', $field));
+            }
+            $select2Input->setValue($value);
+        }
 		
-		$this->waitForLoadingResults($this->timeout);
-	}
+        $this->waitForLoadingResults($this->timeout);
+    }
 	
-	/**
-	 * Select value in choice list
-	 *
-	 * @param DocumentElement $page
-	 * @param string          $field
-	 * @param string          $value
-	 * @param int             $time
-	 * @throws \Exception
-	 */
-	private function selectValue(DocumentElement $page, $field, $value, $time=5)
-	{
-		$this->waitForLoadingResults($time);
+    /**
+     * Select value in choice list
+     *
+     * @param DocumentElement $page
+     * @param string          $field
+     * @param string          $value
+     * @param int             $time
+     * @throws \Exception
+     */
+    private function selectValue(DocumentElement $page, $field, $value, $time=5)
+    {
+        $this->waitForLoadingResults($time);
 		
-		$chosenResults = $page->findAll('css', '.select2-results li');
-		foreach ($chosenResults as $result) {
-			$text = $result->getText();
-			if (false!==strpos($text,$value)) {
-				$result->click();
-				return;
-			}
-		}
+        $chosenResults = $page->findAll('css', '.select2-results li');
+        foreach ($chosenResults as $result) {
+            $text = $result->getText();
+            if (false!==strpos($text,$value)) {
+                $result->click();
+                return;
+            }
+        }
 		
-		throw new \Exception(sprintf('Value "%s" not found for "%s"', $value, $field));
-	}
+        throw new \Exception(sprintf('Value "%s" not found for "%s"', $value, $field));
+    }
 	
-	private function openField(DocumentElement $page, $field)
-	{
-		$inputField = $page->find('css',$field);
-		if(!$inputField){
-			$fieldName = sprintf('select[name="%s"] + .select2-container', $field);
-			$inputField = $page->find('css', $fieldName);
-		}
-		if (!$inputField) {
-			throw new \Exception(sprintf('No field "%s" found', $field));
-		}
+    private function openField(DocumentElement $page, $field)
+    {
+        $inputField = $page->find('css',$field);
+        if(!$inputField){
+            $fieldName = sprintf('select[name="%s"] + .select2-container', $field);
+            $inputField = $page->find('css', $fieldName);
+        }
+        if (!$inputField) {
+            throw new \Exception(sprintf('No field "%s" found', $field));
+        }
 		
-		$choice = $inputField->find('css', '.select2-selection');
-		if (!$choice) {
-			throw new \Exception(sprintf('No select2 choice found for "%s"', $field));
-		}
-		$choice->press();
-	}
+        $choice = $inputField->find('css', '.select2-selection');
+        if (!$choice) {
+            throw new \Exception(sprintf('No select2 choice found for "%s"', $field));
+        }
+        $choice->press();
+    }
 	
-	/**
-	 * Wait the end of fetching Select2 results
-	 *
-	 * @param int $time Time to wait in seconds
-	 */
-	private function waitForLoadingResults($time)
-	{
-		for ($i = 0; $i < $time; $i++) {
-			if (!$this->getSession()->getPage()->find('css', '.select2-results__option.loading-results')) {
-				return;
-			}
+    /**
+     * Wait the end of fetching Select2 results
+     *
+     * @param int $time Time to wait in seconds
+     */
+    private function waitForLoadingResults($time)
+    {
+        for ($i = 0; $i < $time; $i++) {
+            if (!$this->getSession()->getPage()->find('css', '.select2-results__option.loading-results')) {
+                return;
+            }
 			
-			sleep(1);
-		}
-	}
+            sleep(1);
+        }
+    }
 	
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -45,11 +45,11 @@ 
 	 * @param $field
 	 * @param $value
 	 */
-	public function iFillInSelect2FieldWith($field,$search,$choice=null)
+	public function iFillInSelect2FieldWith($field, $search, $choice = null)
 	{
 		$page = $this->getSession()->getPage();
 		$this->openField($page, $field);
-		$this->fillSearchField($page,$field,$search);
+		$this->fillSearchField($page, $field, $search);
 		$this->selectValue($page, $field, $choice);
 	}
 	
@@ -67,12 +67,12 @@ 
 		if ('Behat\Mink\Driver\Selenium2Driver' === get_class($driver)) {
 			// Can't use `$this->getSession()->getPage()->find()` because of https://github.com/minkphp/MinkSelenium2Driver/issues/188
 			
-			$element = $page->find('css','.select2-container--open .select2-search__field');
+			$element = $page->find('css', '.select2-container--open .select2-search__field');
 			$xpath = $element->getXpath();
 			$select2Input = $this->getSession()
 				->getDriver()
 				->getWebDriverSession()
-				->element('xpath',$xpath)
+				->element('xpath', $xpath)
 				//->element('xpath', "//html/descendant-or-self::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' select2-search__field ')]")
 			;
 			if (!$select2Input) {
@@ -100,14 +100,14 @@ 
 	 * @param int             $time
 	 * @throws \Exception
 	 */
-	private function selectValue(DocumentElement $page, $field, $value, $time=5)
+	private function selectValue(DocumentElement $page, $field, $value, $time = 5)
 	{
 		$this->waitForLoadingResults($time);
 		
 		$chosenResults = $page->findAll('css', '.select2-results li');
 		foreach ($chosenResults as $result) {
 			$text = $result->getText();
-			if (false!==strpos($text,$value)) {
+			if (false !== strpos($text, $value)) {
 				$result->click();
 				return;
 			}
@@ -118,8 +118,8 @@ 
 	
 	private function openField(DocumentElement $page, $field)
 	{
-		$inputField = $page->find('css',$field);
-		if(!$inputField){
+		$inputField = $page->find('css', $field);
+		if (!$inputField) {
 			$fieldName = sprintf('select[name="%s"] + .select2-container', $field);
 			$inputField = $page->find('css', $fieldName);
 		}

module/Settings/config/module.config.php

Indentation +116 added lines, -116 removed lines

@@ -14,133 +14,133 @@
 
 return [
 	
-	'doctrine' => [
-		'driver' => [
-			'odm_default' => [
-				'drivers' => [
-					'Settings\Entity' => 'annotation',
-				],
-			],
-		],
-		'eventmanager' => [
-			'odm_default' => [
-				'subscribers' => [
-					'Settings/InjectEntityResolverListener',
-				],
-			],
-		],
-	],
+    'doctrine' => [
+        'driver' => [
+            'odm_default' => [
+                'drivers' => [
+                    'Settings\Entity' => 'annotation',
+                ],
+            ],
+        ],
+        'eventmanager' => [
+            'odm_default' => [
+                'subscribers' => [
+                    'Settings/InjectEntityResolverListener',
+                ],
+            ],
+        ],
+    ],
 	
 	
-	// Translations
-	'translator' => [
-		'translation_file_patterns' => [
-			[
-				'type' => 'gettext',
-				'base_dir' => __DIR__ . '/../language',
-				'pattern' => '%s.mo',
-			],
-		],
-	],
-	// Routes
-	'router' => [
-		'routes' => [
-			'lang' => [
-				'child_routes' => [
-					'settings' => [
-						'type' => 'Segment',
-						'options' => [
-							'route' => '/settings[/:module]',
-							'defaults' => [
-								'controller' => 'Settings\Controller\Index',
-								'action' => 'index',
-								'module' => 'Core',
-							],
-						],
-						'may_terminate' => true,
-					],
-				],
-			],
-		],
-	],
+    // Translations
+    'translator' => [
+        'translation_file_patterns' => [
+            [
+                'type' => 'gettext',
+                'base_dir' => __DIR__ . '/../language',
+                'pattern' => '%s.mo',
+            ],
+        ],
+    ],
+    // Routes
+    'router' => [
+        'routes' => [
+            'lang' => [
+                'child_routes' => [
+                    'settings' => [
+                        'type' => 'Segment',
+                        'options' => [
+                            'route' => '/settings[/:module]',
+                            'defaults' => [
+                                'controller' => 'Settings\Controller\Index',
+                                'action' => 'index',
+                                'module' => 'Core',
+                            ],
+                        ],
+                        'may_terminate' => true,
+                    ],
+                ],
+            ],
+        ],
+    ],
 	
-	'acl' => ['rules' => [
-		'user' => [
-			'allow' => [
-				'route/lang/settings',
-				'Settings\Controller\Index',
-			],
-		],
-	]],
-	'navigation' => [
-		'default' => [
-			'settings' => [
-				'label'    => /*@translate*/ 'Settings',
-				'route'    => 'lang/settings',
-				'resource' => 'route/lang/settings',
-				'order'    => 100,
-				'params'   => ['module' => null],
-			],
-		],
-	],
+    'acl' => ['rules' => [
+        'user' => [
+            'allow' => [
+                'route/lang/settings',
+                'Settings\Controller\Index',
+            ],
+        ],
+    ]],
+    'navigation' => [
+        'default' => [
+            'settings' => [
+                'label'    => /*@translate*/ 'Settings',
+                'route'    => 'lang/settings',
+                'resource' => 'route/lang/settings',
+                'order'    => 100,
+                'params'   => ['module' => null],
+            ],
+        ],
+    ],
 	
-	// Configuration of the controller service manager (Which loads controllers)
-	'controllers' => [
-		'factories' => [
-			'Settings\Controller\Index' => [\Settings\Controller\IndexController::class,'factory']
-		],
-	],
+    // Configuration of the controller service manager (Which loads controllers)
+    'controllers' => [
+        'factories' => [
+            'Settings\Controller\Index' => [\Settings\Controller\IndexController::class,'factory']
+        ],
+    ],
 	
-	// Configure the view service manager
-	'view_manager' => [
-		// Map template to files. Speeds up the lookup through the template stack.
-		'template_map' => [
-		],
+    // Configure the view service manager
+    'view_manager' => [
+        // Map template to files. Speeds up the lookup through the template stack.
+        'template_map' => [
+        ],
 		
-		// Where to look for view templates not mapped above
-		'template_path_stack' => [
-			__DIR__ . '/../view',
-		],
-	],
+        // Where to look for view templates not mapped above
+        'template_path_stack' => [
+            __DIR__ . '/../view',
+        ],
+    ],
 	
-	'view_helpers' => [
-		'invokables' => [
-			'Settings/FormDisableElementsCapableFormSettings' => 'Settings\Form\View\Helper\FormDisableElementsCapableFormSettings',
-		],
-		'factories' => [
-		],
-	],
+    'view_helpers' => [
+        'invokables' => [
+            'Settings/FormDisableElementsCapableFormSettings' => 'Settings\Form\View\Helper\FormDisableElementsCapableFormSettings',
+        ],
+        'factories' => [
+        ],
+    ],
 	
-	'service_manager' => [
-		'factories' => [
-			'Settings' => '\Settings\Settings\SettingsFactory',
-			'Settings/EntityResolver' => '\Settings\Repository\SettingsEntityResolverFactory',
-			'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class,'factory'],
-		],
-		'initializers' => [],
-		'shared' => [],
-		'aliases' => [],
-	],
+    'service_manager' => [
+        'factories' => [
+            'Settings' => '\Settings\Settings\SettingsFactory',
+            'Settings/EntityResolver' => '\Settings\Repository\SettingsEntityResolverFactory',
+            'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class,'factory'],
+        ],
+        'initializers' => [],
+        'shared' => [],
+        'aliases' => [],
+    ],
 	
-	'controller_plugins' => [
-		'factories' => ['settings' => '\Settings\Controller\Plugin\SettingsFactory'],
-	],
+    'controller_plugins' => [
+        'factories' => ['settings' => '\Settings\Controller\Plugin\SettingsFactory'],
+    ],
 	
-	'form_elements' => [
-		'factories' => [
-			'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class,'factory'],
-			'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class,'factory'],
-			'Settings/Fieldset' => \Settings\Form\Factory\SettingsFieldsetFactory::class,
-		],
-		'aliases' => [
-		],
-	],
+    'form_elements' => [
+        'factories' => [
+            'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class,'factory'],
+            'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class,'factory'],
+            'Settings/Fieldset' => \Settings\Form\Factory\SettingsFieldsetFactory::class,
+        ],
+        'aliases' => [
+        ],
+    ],
 	
-	'filters' => [
-		'invokables' => [
-			'Settings/Filter/DisableElementsCapableFormSettings' => \Settings\Form\Filter\DisableElementsCapableFormSettings::class,
-		]
-	]
+    'filters' => [
+        'invokables' => [
+            'Settings/Filter/DisableElementsCapableFormSettings' => \Settings\Form\Filter\DisableElementsCapableFormSettings::class,
+        ]
+    ]
 
 
 ];

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
 		'translation_file_patterns' => [
 			[
 				'type' => 'gettext',
-				'base_dir' => __DIR__ . '/../language',
+				'base_dir' => __DIR__.'/../language',
 				'pattern' => '%s.mo',
 			],
 		],
@@ -87,7 +87,7 @@ 
 	// Configuration of the controller service manager (Which loads controllers)
 	'controllers' => [
 		'factories' => [
-			'Settings\Controller\Index' => [\Settings\Controller\IndexController::class,'factory']
+			'Settings\Controller\Index' => [\Settings\Controller\IndexController::class, 'factory']
 		],
 	],
 	
@@ -99,7 +99,7 @@ 
 		
 		// Where to look for view templates not mapped above
 		'template_path_stack' => [
-			__DIR__ . '/../view',
+			__DIR__.'/../view',
 		],
 	],
 	
@@ -115,7 +115,7 @@ 
 		'factories' => [
 			'Settings' => '\Settings\Settings\SettingsFactory',
 			'Settings/EntityResolver' => '\Settings\Repository\SettingsEntityResolverFactory',
-			'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class,'factory'],
+			'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class, 'factory'],
 		],
 		'initializers' => [],
 		'shared' => [],
@@ -128,8 +128,8 @@ 
 	
 	'form_elements' => [
 		'factories' => [
-			'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class,'factory'],
-			'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class,'factory'],
+			'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class, 'factory'],
+			'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class, 'factory'],
 			'Settings/Fieldset' => \Settings\Form\Factory\SettingsFieldsetFactory::class,
 		],
 		'aliases' => [