cross-solution / YAWIK

module/Auth/src/Auth/Form/GroupUsersCollection.php

Indentation +3 added lines, -3 removed lines

@@ -98,9 +98,9 @@
         );
         
         $this->setCount(0)
-             ->setAllowRemove(true)
-             ->setAllowAdd(true)
-             ->setShouldCreateTemplate(true);
+                ->setAllowRemove(true)
+                ->setAllowAdd(true)
+                ->setShouldCreateTemplate(true);
     }
     
     /**

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/Factory/Controller/LazyControllerFactory.php

Indentation +45 added lines, -45 removed lines

@@ -22,55 +22,55 @@
  */
 class LazyControllerFactory implements AbstractFactoryInterface
 {
-	protected $aliases = [
-		FormElementManager::class => 'FormElementManager',
-		ValidatorPluginManager::class => 'ValidatorManager',
-		Translator::class => 'translator',
-	];
+    protected $aliases = [
+        FormElementManager::class => 'FormElementManager',
+        ValidatorPluginManager::class => 'ValidatorManager',
+        Translator::class => 'translator',
+    ];
 	
-	public function canCreate( ContainerInterface $container, $requestedName )
-	{
-		list( $module, ) = explode( '\\', __NAMESPACE__, 2 );
-		return strstr( $requestedName, $module . '\Controller') !== false;
-	}
+    public function canCreate( ContainerInterface $container, $requestedName )
+    {
+        list( $module, ) = explode( '\\', __NAMESPACE__, 2 );
+        return strstr( $requestedName, $module . '\Controller') !== false;
+    }
 	
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
-	{
-		$class = new \ReflectionClass($requestedName);
-		$parentLocator = $container;
-		if( $constructor = $class->getConstructor() )
-		{
-			if( $params = $constructor->getParameters() )
-			{
-				$parameter_instances = [];
-				foreach( $params as $p )
-				{
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
+    {
+        $class = new \ReflectionClass($requestedName);
+        $parentLocator = $container;
+        if( $constructor = $class->getConstructor() )
+        {
+            if( $params = $constructor->getParameters() )
+            {
+                $parameter_instances = [];
+                foreach( $params as $p )
+                {
 					
-					if( $p->getClass() ) {
-						$cn = $p->getClass()->getName();
-						if (array_key_exists($cn, $this->aliases)) {
-							$cn = $this->aliases[$cn];
-						}
+                    if( $p->getClass() ) {
+                        $cn = $p->getClass()->getName();
+                        if (array_key_exists($cn, $this->aliases)) {
+                            $cn = $this->aliases[$cn];
+                        }
 						
-						try {
-							$parameter_instances[] = $parentLocator->get($cn);
-						}
-						catch (\Exception $x) {
-							echo __CLASS__
-							     . " couldn't create an instance of $cn to satisfy the constructor for $requestedName.";
-							exit;
-						}
-					}
-					else{
-						if( $p->isArray() && $p->getName() == 'config' )
-							$parameter_instances[] = $parentLocator->get('config');
-					}
+                        try {
+                            $parameter_instances[] = $parentLocator->get($cn);
+                        }
+                        catch (\Exception $x) {
+                            echo __CLASS__
+                                    . " couldn't create an instance of $cn to satisfy the constructor for $requestedName.";
+                            exit;
+                        }
+                    }
+                    else{
+                        if( $p->isArray() && $p->getName() == 'config' )
+                            $parameter_instances[] = $parentLocator->get('config');
+                    }
 					
-				}
-				return $class->newInstanceArgs($parameter_instances);
-			}
-		}
+                }
+                return $class->newInstanceArgs($parameter_instances);
+            }
+        }
 		
-		return new $requestedName;
-	}
+        return new $requestedName;
+    }
 }
\ No newline at end of file

module/Install/src/Controller/Index.php

Indentation +24 added lines, -24 removed lines

@@ -26,14 +26,14 @@ 
  */
 class Index extends AbstractActionController
 {
-	protected $installForm;
+    protected $installForm;
 	
-	public function __construct(FormElementManager $formElementManager)
-	{
-		$this->installForm = $formElementManager->get('Install/Installation');
-	}
+    public function __construct(FormElementManager $formElementManager)
+    {
+        $this->installForm = $formElementManager->get('Install/Installation');
+    }
 	
-	/**
+    /**
      * Hook for custom preDispatch event.
      *
      * @param MvcEvent $event
@@ -50,8 +50,8 @@ 
             $routeMatch->setParam('action', $p);
             $response = $this->getResponse();
             $response->getHeaders()
-                     ->addHeaderLine('Content-Type', 'application/json')
-                     ->addHeaderLine('Content-Encoding', 'utf8');
+                        ->addHeaderLine('Content-Type', 'application/json')
+                        ->addHeaderLine('Content-Encoding', 'utf8');
         }
     }
 
@@ -65,13 +65,13 @@ 
         $form    = $this->installForm;
         $prereqs = $this->plugin('Install/Prerequisites')->check();
 	
-	    return $this->createViewModel(
-		    array(
-			    'prerequisites' => $prereqs,
-			    'form'          => $form,
-			    'lang'          => $this->params('lang'),
-		    )
-	    );
+        return $this->createViewModel(
+            array(
+                'prerequisites' => $prereqs,
+                'form'          => $form,
+                'lang'          => $this->params('lang'),
+            )
+        );
     }
 
     /**
@@ -100,12 +100,12 @@ 
         $form->setData($_POST);
 
         if (!$form->isValid()) {
-	        return $this->createJsonResponse(
-		        array(
-			        'ok'     => false,
-			        'errors' => $form->getMessages(),
-		        )
-	        );
+            return $this->createJsonResponse(
+                array(
+                    'ok'     => false,
+                    'errors' => $form->getMessages(),
+                )
+            );
         }
 
         $data = $form->getData();
@@ -133,10 +133,10 @@ 
      */
     protected function attachDefaultListeners()
     {
-	    parent::attachDefaultListeners();
+        parent::attachDefaultListeners();
 	
-	    $events = $this->getEventManager();
-	    $events->attach( MvcEvent::EVENT_DISPATCH, array( $this, 'preDispatch' ), 100 );
+        $events = $this->getEventManager();
+        $events->attach( MvcEvent::EVENT_DISPATCH, array( $this, 'preDispatch' ), 100 );
     }
 
     /**

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

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,
+        ]
+    ]
 
 
 ];

module/Auth/config/module.config.php

Indentation +9 added lines, -9 removed lines

@@ -80,7 +80,7 @@ 
         'aliases' => [
             'assertions' => 'Acl\AssertionManager',
             'Auth/UserTokenGenerator' => 'Auth\Service\UserUniqueTokenGenerator',
-	        'acl' => 'Acl'
+            'acl' => 'Acl'
         ]
     ],
 
@@ -91,8 +91,8 @@ 
             'Auth/SocialProfiles' => 'Auth\Controller\SocialProfilesController',
         ],
         'factories' => [
-	        'Auth\Controller\Manage' => [ManageController::class,'factory'],
-	        'Auth/ManageGroups' => [ManageGroupsController::class,'factory'],
+            'Auth\Controller\Manage' => [ManageController::class,'factory'],
+            'Auth/ManageGroups' => [ManageGroupsController::class,'factory'],
             'Auth\Controller\ForgotPassword' => 'Auth\Factory\Controller\ForgotPasswordControllerFactory',
             'Auth\Controller\GotoResetPassword' => 'Auth\Factory\Controller\GotoResetPasswordControllerFactory',
             'Auth\Controller\Register' => 'Auth\Factory\Controller\RegisterControllerFactory',
@@ -116,10 +116,10 @@ 
         'shared' => [
             'OAuth' => false,
         ],
-	    'aliases' => [
-	    	'acl' => 'Acl',
-		    'auth' => 'Auth'
-	    ]
+        'aliases' => [
+            'acl' => 'Acl',
+            'auth' => 'Auth'
+        ]
     ],
     'hybridauth' => [
         "Facebook" => [
@@ -224,7 +224,7 @@ 
                     'Auth/Users' => 'switch',
                 ],
                 'deny' => [
-                   // 'route/lang/auth',
+                    // 'route/lang/auth',
                     'route/auth-provider',
                     'route/auth-extern',
                     'route/lang/forgot-password',
@@ -311,7 +311,7 @@ 
         'factories' => [
             'auth' => '\Auth\Factory\View\Helper\AuthFactory',
             'acl'  => '\Acl\Factory\View\Helper\AclFactory',
-         ],
+            ],
     ],
     
     'form_elements' => [

module/Auth/src/Acl/Listener/CheckPermissionsListener.php

Indentation +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
      *
      * @param  EventManagerInterface $events
      * @param  integer $priority
-    */
+     */
     public function attach(EventManagerInterface $events, $priority=1)
     {
         $this->listeners[] = $events->attach(MvcEvent::EVENT_ROUTE, array($this, 'onRoute'), -10);
@@ -80,11 +80,11 @@ 
         }
     }
 	
-	/**
-	 * @param MvcEvent $event
-	 *
-	 * @return array|\ArrayAccess|mixed|object
-	 */
+    /**
+     * @param MvcEvent $event
+     *
+     * @return array|\ArrayAccess|mixed|object
+     */
     public function onRoute(MvcEvent $event)
     {
         if ($event->isError()) {
@@ -115,7 +115,7 @@ 
 
 
         if ($resourceId && !$acl->isAllowed($role, $resourceId, $privilege)) {
-           /*
+            /*
             * Exceptions are only catched within the dispatch listener, so
             * we have to set the exception manually in the event
             * and trigger the DISPATCH_ERROR event.