@@ -98,9 +98,9 @@ |
||
| 98 | 98 | ); |
| 99 | 99 | |
| 100 | 100 | $this->setCount(0) |
| 101 | - ->setAllowRemove(true) |
|
| 102 | - ->setAllowAdd(true) |
|
| 103 | - ->setShouldCreateTemplate(true); |
|
| 101 | + ->setAllowRemove(true) |
|
| 102 | + ->setAllowAdd(true) |
|
| 103 | + ->setShouldCreateTemplate(true); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -23,31 +23,31 @@ |
||
| 23 | 23 | */ |
| 24 | 24 | class TracyListener implements ListenerAggregateInterface |
| 25 | 25 | { |
| 26 | - use ListenerAggregateTrait; |
|
| 26 | + use ListenerAggregateTrait; |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * {@inheritDoc} |
|
| 30 | - * @see \Zend\EventManager\ListenerAggregateInterface::attach() |
|
| 31 | - */ |
|
| 32 | - public function attach(EventManagerInterface $events, $priority = 1) |
|
| 33 | - { |
|
| 34 | - $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'handleError'], $priority); |
|
| 35 | - $this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, [$this, 'handleError'], $priority); |
|
| 36 | - } |
|
| 28 | + /** |
|
| 29 | + * {@inheritDoc} |
|
| 30 | + * @see \Zend\EventManager\ListenerAggregateInterface::attach() |
|
| 31 | + */ |
|
| 32 | + public function attach(EventManagerInterface $events, $priority = 1) |
|
| 33 | + { |
|
| 34 | + $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'handleError'], $priority); |
|
| 35 | + $this->listeners[] = $events->attach(MvcEvent::EVENT_RENDER_ERROR, [$this, 'handleError'], $priority); |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @param MvcEvent $e |
|
| 40 | - */ |
|
| 41 | - public function handleError(MvcEvent $e) |
|
| 42 | - { |
|
| 43 | - if ($e->getError() == \Zend\Mvc\Application::ERROR_EXCEPTION) { |
|
| 44 | - if (Debugger::$productionMode) { |
|
| 45 | - // log an exception in production environment (this will send email as well if email address is set) |
|
| 46 | - Debugger::log($e->getParam('exception'), Debugger::ERROR); |
|
| 47 | - } else { |
|
| 48 | - // just re-throw an exception in non-production environment to let tracy display so called blue screen |
|
| 49 | - throw $e->getParam('exception'); |
|
| 50 | - } |
|
| 51 | - } |
|
| 52 | - } |
|
| 38 | + /** |
|
| 39 | + * @param MvcEvent $e |
|
| 40 | + */ |
|
| 41 | + public function handleError(MvcEvent $e) |
|
| 42 | + { |
|
| 43 | + if ($e->getError() == \Zend\Mvc\Application::ERROR_EXCEPTION) { |
|
| 44 | + if (Debugger::$productionMode) { |
|
| 45 | + // log an exception in production environment (this will send email as well if email address is set) |
|
| 46 | + Debugger::log($e->getParam('exception'), Debugger::ERROR); |
|
| 47 | + } else { |
|
| 48 | + // just re-throw an exception in non-production environment to let tracy display so called blue screen |
|
| 49 | + throw $e->getParam('exception'); |
|
| 50 | + } |
|
| 51 | + } |
|
| 52 | + } |
|
| 53 | 53 | } |
@@ -26,57 +26,57 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function init() |
| 28 | 28 | { |
| 29 | - $this->setName('installation'); |
|
| 29 | + $this->setName('installation'); |
|
| 30 | 30 | |
| 31 | - $this->setAttributes( |
|
| 32 | - array( |
|
| 33 | - 'method' => 'post', |
|
| 34 | - ) |
|
| 35 | - ); |
|
| 31 | + $this->setAttributes( |
|
| 32 | + array( |
|
| 33 | + 'method' => 'post', |
|
| 34 | + ) |
|
| 35 | + ); |
|
| 36 | 36 | |
| 37 | - $this->add( |
|
| 38 | - array( |
|
| 39 | - 'type' => 'Text', |
|
| 40 | - 'name' => 'db_conn', |
|
| 41 | - 'options' => array( |
|
| 42 | - 'label' => /* @translate */ 'Database connection string', |
|
| 43 | - ), |
|
| 44 | - 'attributes' => array( |
|
| 45 | - 'placeholder' => 'mongodb://localhost:27017/YAWIK', |
|
| 46 | - ), |
|
| 37 | + $this->add( |
|
| 38 | + array( |
|
| 39 | + 'type' => 'Text', |
|
| 40 | + 'name' => 'db_conn', |
|
| 41 | + 'options' => array( |
|
| 42 | + 'label' => /* @translate */ 'Database connection string', |
|
| 43 | + ), |
|
| 44 | + 'attributes' => array( |
|
| 45 | + 'placeholder' => 'mongodb://localhost:27017/YAWIK', |
|
| 46 | + ), |
|
| 47 | 47 | |
| 48 | - ) |
|
| 49 | - ); |
|
| 48 | + ) |
|
| 49 | + ); |
|
| 50 | 50 | |
| 51 | - $this->add( |
|
| 52 | - array( |
|
| 53 | - 'type' => 'Text', |
|
| 54 | - 'name' => 'username', |
|
| 55 | - 'options' => array( |
|
| 56 | - 'label' => /* @translate */ 'Initial user name', |
|
| 57 | - ), |
|
| 58 | - ) |
|
| 59 | - ); |
|
| 51 | + $this->add( |
|
| 52 | + array( |
|
| 53 | + 'type' => 'Text', |
|
| 54 | + 'name' => 'username', |
|
| 55 | + 'options' => array( |
|
| 56 | + 'label' => /* @translate */ 'Initial user name', |
|
| 57 | + ), |
|
| 58 | + ) |
|
| 59 | + ); |
|
| 60 | 60 | |
| 61 | - $this->add( |
|
| 62 | - array( |
|
| 63 | - 'type' => 'Password', |
|
| 64 | - 'name' => 'password', |
|
| 65 | - 'options' => array( |
|
| 66 | - 'label' => /* @translate */ 'Password', |
|
| 67 | - ), |
|
| 68 | - ) |
|
| 69 | - ); |
|
| 61 | + $this->add( |
|
| 62 | + array( |
|
| 63 | + 'type' => 'Password', |
|
| 64 | + 'name' => 'password', |
|
| 65 | + 'options' => array( |
|
| 66 | + 'label' => /* @translate */ 'Password', |
|
| 67 | + ), |
|
| 68 | + ) |
|
| 69 | + ); |
|
| 70 | 70 | |
| 71 | - $this->add( |
|
| 72 | - array( |
|
| 73 | - 'type' => 'Text', |
|
| 74 | - 'name' => 'email', |
|
| 75 | - 'options' => array( |
|
| 76 | - 'label' => /* @translate */ 'Email address for system messages', |
|
| 77 | - ), |
|
| 78 | - ) |
|
| 79 | - ); |
|
| 71 | + $this->add( |
|
| 72 | + array( |
|
| 73 | + 'type' => 'Text', |
|
| 74 | + 'name' => 'email', |
|
| 75 | + 'options' => array( |
|
| 76 | + 'label' => /* @translate */ 'Email address for system messages', |
|
| 77 | + ), |
|
| 78 | + ) |
|
| 79 | + ); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public function getInputFilterSpecification() |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | ), |
| 91 | 91 | 'validators' => array( |
| 92 | 92 | array('name' => MongoDbConnectionString::class, |
| 93 | - 'break_chain_on_failure' => true), |
|
| 93 | + 'break_chain_on_failure' => true), |
|
| 94 | 94 | array('name' => MongoDbConnection::class), |
| 95 | 95 | ), |
| 96 | 96 | ), |
@@ -24,130 +24,130 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | class Select2Context extends RawMinkContext implements Context |
| 26 | 26 | { |
| 27 | - protected $timeout = 5; |
|
| 27 | + protected $timeout = 5; |
|
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * Fills in Select2 field with specified |
|
| 31 | - * |
|
| 32 | - * @When /^(?:|I )fill in select2 "(?P<field>(?:[^"]|\\")*)" with "(?P<value>(?:[^"]|\\")*)"$/ |
|
| 33 | - * @When /^(?:|I )fill in select2 "(?P<value>(?:[^"]|\\")*)" for "(?P<field>(?:[^"]|\\")*)"$/ |
|
| 34 | - */ |
|
| 35 | - public function iFillInSelect2Field($field, $value) |
|
| 36 | - { |
|
| 37 | - $page = $this->getSession()->getPage(); |
|
| 29 | + /** |
|
| 30 | + * Fills in Select2 field with specified |
|
| 31 | + * |
|
| 32 | + * @When /^(?:|I )fill in select2 "(?P<field>(?:[^"]|\\")*)" with "(?P<value>(?:[^"]|\\")*)"$/ |
|
| 33 | + * @When /^(?:|I )fill in select2 "(?P<value>(?:[^"]|\\")*)" for "(?P<field>(?:[^"]|\\")*)"$/ |
|
| 34 | + */ |
|
| 35 | + public function iFillInSelect2Field($field, $value) |
|
| 36 | + { |
|
| 37 | + $page = $this->getSession()->getPage(); |
|
| 38 | 38 | |
| 39 | - $this->openField($page, $field); |
|
| 40 | - $this->selectValue($page, $field, $value, $this->timeout); |
|
| 41 | - } |
|
| 39 | + $this->openField($page, $field); |
|
| 40 | + $this->selectValue($page, $field, $value, $this->timeout); |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @When I fill in select2 search :field with :search and I choose :choice |
|
| 45 | - * @param $field |
|
| 46 | - * @param $value |
|
| 47 | - */ |
|
| 48 | - public function iFillInSelect2FieldWith($field,$search,$choice=null) |
|
| 49 | - { |
|
| 50 | - $page = $this->getSession()->getPage(); |
|
| 51 | - $this->openField($page, $field); |
|
| 52 | - $this->fillSearchField($page,$field,$search); |
|
| 53 | - $this->selectValue($page, $field, $choice); |
|
| 54 | - } |
|
| 43 | + /** |
|
| 44 | + * @When I fill in select2 search :field with :search and I choose :choice |
|
| 45 | + * @param $field |
|
| 46 | + * @param $value |
|
| 47 | + */ |
|
| 48 | + public function iFillInSelect2FieldWith($field,$search,$choice=null) |
|
| 49 | + { |
|
| 50 | + $page = $this->getSession()->getPage(); |
|
| 51 | + $this->openField($page, $field); |
|
| 52 | + $this->fillSearchField($page,$field,$search); |
|
| 53 | + $this->selectValue($page, $field, $choice); |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * Fill Select2 search field |
|
| 58 | - * |
|
| 59 | - * @param DocumentElement $page |
|
| 60 | - * @param string $field |
|
| 61 | - * @param string $value |
|
| 62 | - * @throws \Exception |
|
| 63 | - */ |
|
| 64 | - private function fillSearchField(DocumentElement $page, $field, $value) |
|
| 65 | - { |
|
| 66 | - $driver = $this->getSession()->getDriver(); |
|
| 67 | - if ('Behat\Mink\Driver\Selenium2Driver' === get_class($driver)) { |
|
| 68 | - // Can't use `$this->getSession()->getPage()->find()` because of https://github.com/minkphp/MinkSelenium2Driver/issues/188 |
|
| 56 | + /** |
|
| 57 | + * Fill Select2 search field |
|
| 58 | + * |
|
| 59 | + * @param DocumentElement $page |
|
| 60 | + * @param string $field |
|
| 61 | + * @param string $value |
|
| 62 | + * @throws \Exception |
|
| 63 | + */ |
|
| 64 | + private function fillSearchField(DocumentElement $page, $field, $value) |
|
| 65 | + { |
|
| 66 | + $driver = $this->getSession()->getDriver(); |
|
| 67 | + if ('Behat\Mink\Driver\Selenium2Driver' === get_class($driver)) { |
|
| 68 | + // Can't use `$this->getSession()->getPage()->find()` because of https://github.com/minkphp/MinkSelenium2Driver/issues/188 |
|
| 69 | 69 | |
| 70 | - $element = $page->find('css','.select2-container--open .select2-search__field'); |
|
| 71 | - $xpath = $element->getXpath(); |
|
| 72 | - $select2Input = $this->getSession() |
|
| 73 | - ->getDriver() |
|
| 74 | - ->getWebDriverSession() |
|
| 75 | - ->element('xpath',$xpath) |
|
| 76 | - //->element('xpath', "//html/descendant-or-self::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' select2-search__field ')]") |
|
| 77 | - ; |
|
| 78 | - if (!$select2Input) { |
|
| 79 | - throw new \Exception(sprintf('No field "%s" found', $field)); |
|
| 80 | - } |
|
| 70 | + $element = $page->find('css','.select2-container--open .select2-search__field'); |
|
| 71 | + $xpath = $element->getXpath(); |
|
| 72 | + $select2Input = $this->getSession() |
|
| 73 | + ->getDriver() |
|
| 74 | + ->getWebDriverSession() |
|
| 75 | + ->element('xpath',$xpath) |
|
| 76 | + //->element('xpath', "//html/descendant-or-self::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' select2-search__field ')]") |
|
| 77 | + ; |
|
| 78 | + if (!$select2Input) { |
|
| 79 | + throw new \Exception(sprintf('No field "%s" found', $field)); |
|
| 80 | + } |
|
| 81 | 81 | |
| 82 | - $select2Input->postValue(['value' => [$value]]); |
|
| 83 | - } else { |
|
| 84 | - $select2Input = $page->find('css', '.select2-search__field'); |
|
| 85 | - if (!$select2Input) { |
|
| 86 | - throw new \Exception(sprintf('No input found for "%s"', $field)); |
|
| 87 | - } |
|
| 88 | - $select2Input->setValue($value); |
|
| 89 | - } |
|
| 82 | + $select2Input->postValue(['value' => [$value]]); |
|
| 83 | + } else { |
|
| 84 | + $select2Input = $page->find('css', '.select2-search__field'); |
|
| 85 | + if (!$select2Input) { |
|
| 86 | + throw new \Exception(sprintf('No input found for "%s"', $field)); |
|
| 87 | + } |
|
| 88 | + $select2Input->setValue($value); |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | - $this->waitForLoadingResults($this->timeout); |
|
| 92 | - } |
|
| 91 | + $this->waitForLoadingResults($this->timeout); |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * Select value in choice list |
|
| 96 | - * |
|
| 97 | - * @param DocumentElement $page |
|
| 98 | - * @param string $field |
|
| 99 | - * @param string $value |
|
| 100 | - * @param int $time |
|
| 101 | - * @throws \Exception |
|
| 102 | - */ |
|
| 103 | - private function selectValue(DocumentElement $page, $field, $value, $time=5) |
|
| 104 | - { |
|
| 105 | - $this->waitForLoadingResults($time); |
|
| 94 | + /** |
|
| 95 | + * Select value in choice list |
|
| 96 | + * |
|
| 97 | + * @param DocumentElement $page |
|
| 98 | + * @param string $field |
|
| 99 | + * @param string $value |
|
| 100 | + * @param int $time |
|
| 101 | + * @throws \Exception |
|
| 102 | + */ |
|
| 103 | + private function selectValue(DocumentElement $page, $field, $value, $time=5) |
|
| 104 | + { |
|
| 105 | + $this->waitForLoadingResults($time); |
|
| 106 | 106 | |
| 107 | - $chosenResults = $page->findAll('css', '.select2-results li'); |
|
| 108 | - foreach ($chosenResults as $result) { |
|
| 109 | - $text = $result->getText(); |
|
| 110 | - if (false!==strpos($text,$value)) { |
|
| 111 | - $result->click(); |
|
| 112 | - return; |
|
| 113 | - } |
|
| 114 | - } |
|
| 107 | + $chosenResults = $page->findAll('css', '.select2-results li'); |
|
| 108 | + foreach ($chosenResults as $result) { |
|
| 109 | + $text = $result->getText(); |
|
| 110 | + if (false!==strpos($text,$value)) { |
|
| 111 | + $result->click(); |
|
| 112 | + return; |
|
| 113 | + } |
|
| 114 | + } |
|
| 115 | 115 | |
| 116 | - throw new \Exception(sprintf('Value "%s" not found for "%s"', $value, $field)); |
|
| 117 | - } |
|
| 116 | + throw new \Exception(sprintf('Value "%s" not found for "%s"', $value, $field)); |
|
| 117 | + } |
|
| 118 | 118 | |
| 119 | - private function openField(DocumentElement $page, $field) |
|
| 120 | - { |
|
| 121 | - $inputField = $page->find('css',$field); |
|
| 122 | - if(!$inputField){ |
|
| 123 | - $fieldName = sprintf('select[name="%s"] + .select2-container', $field); |
|
| 124 | - $inputField = $page->find('css', $fieldName); |
|
| 125 | - } |
|
| 126 | - if (!$inputField) { |
|
| 127 | - throw new \Exception(sprintf('No field "%s" found', $field)); |
|
| 128 | - } |
|
| 119 | + private function openField(DocumentElement $page, $field) |
|
| 120 | + { |
|
| 121 | + $inputField = $page->find('css',$field); |
|
| 122 | + if(!$inputField){ |
|
| 123 | + $fieldName = sprintf('select[name="%s"] + .select2-container', $field); |
|
| 124 | + $inputField = $page->find('css', $fieldName); |
|
| 125 | + } |
|
| 126 | + if (!$inputField) { |
|
| 127 | + throw new \Exception(sprintf('No field "%s" found', $field)); |
|
| 128 | + } |
|
| 129 | 129 | |
| 130 | - $choice = $inputField->find('css', '.select2-selection'); |
|
| 131 | - if (!$choice) { |
|
| 132 | - throw new \Exception(sprintf('No select2 choice found for "%s"', $field)); |
|
| 133 | - } |
|
| 134 | - $choice->press(); |
|
| 135 | - } |
|
| 130 | + $choice = $inputField->find('css', '.select2-selection'); |
|
| 131 | + if (!$choice) { |
|
| 132 | + throw new \Exception(sprintf('No select2 choice found for "%s"', $field)); |
|
| 133 | + } |
|
| 134 | + $choice->press(); |
|
| 135 | + } |
|
| 136 | 136 | |
| 137 | - /** |
|
| 138 | - * Wait the end of fetching Select2 results |
|
| 139 | - * |
|
| 140 | - * @param int $time Time to wait in seconds |
|
| 141 | - */ |
|
| 142 | - private function waitForLoadingResults($time) |
|
| 143 | - { |
|
| 144 | - for ($i = 0; $i < $time; $i++) { |
|
| 145 | - if (!$this->getSession()->getPage()->find('css', '.select2-results__option.loading-results')) { |
|
| 146 | - return; |
|
| 147 | - } |
|
| 137 | + /** |
|
| 138 | + * Wait the end of fetching Select2 results |
|
| 139 | + * |
|
| 140 | + * @param int $time Time to wait in seconds |
|
| 141 | + */ |
|
| 142 | + private function waitForLoadingResults($time) |
|
| 143 | + { |
|
| 144 | + for ($i = 0; $i < $time; $i++) { |
|
| 145 | + if (!$this->getSession()->getPage()->find('css', '.select2-results__option.loading-results')) { |
|
| 146 | + return; |
|
| 147 | + } |
|
| 148 | 148 | |
| 149 | - sleep(1); |
|
| 150 | - } |
|
| 151 | - } |
|
| 149 | + sleep(1); |
|
| 150 | + } |
|
| 151 | + } |
|
| 152 | 152 | |
| 153 | 153 | } |
| 154 | 154 | \ No newline at end of file |
@@ -14,133 +14,133 @@ |
||
| 14 | 14 | |
| 15 | 15 | return [ |
| 16 | 16 | |
| 17 | - 'doctrine' => [ |
|
| 18 | - 'driver' => [ |
|
| 19 | - 'odm_default' => [ |
|
| 20 | - 'drivers' => [ |
|
| 21 | - 'Settings\Entity' => 'annotation', |
|
| 22 | - ], |
|
| 23 | - ], |
|
| 24 | - ], |
|
| 25 | - 'eventmanager' => [ |
|
| 26 | - 'odm_default' => [ |
|
| 27 | - 'subscribers' => [ |
|
| 28 | - 'Settings/InjectEntityResolverListener', |
|
| 29 | - ], |
|
| 30 | - ], |
|
| 31 | - ], |
|
| 32 | - ], |
|
| 17 | + 'doctrine' => [ |
|
| 18 | + 'driver' => [ |
|
| 19 | + 'odm_default' => [ |
|
| 20 | + 'drivers' => [ |
|
| 21 | + 'Settings\Entity' => 'annotation', |
|
| 22 | + ], |
|
| 23 | + ], |
|
| 24 | + ], |
|
| 25 | + 'eventmanager' => [ |
|
| 26 | + 'odm_default' => [ |
|
| 27 | + 'subscribers' => [ |
|
| 28 | + 'Settings/InjectEntityResolverListener', |
|
| 29 | + ], |
|
| 30 | + ], |
|
| 31 | + ], |
|
| 32 | + ], |
|
| 33 | 33 | |
| 34 | 34 | |
| 35 | - // Translations |
|
| 36 | - 'translator' => [ |
|
| 37 | - 'translation_file_patterns' => [ |
|
| 38 | - [ |
|
| 39 | - 'type' => 'gettext', |
|
| 40 | - 'base_dir' => __DIR__ . '/../language', |
|
| 41 | - 'pattern' => '%s.mo', |
|
| 42 | - ], |
|
| 43 | - ], |
|
| 44 | - ], |
|
| 45 | - // Routes |
|
| 46 | - 'router' => [ |
|
| 47 | - 'routes' => [ |
|
| 48 | - 'lang' => [ |
|
| 49 | - 'child_routes' => [ |
|
| 50 | - 'settings' => [ |
|
| 51 | - 'type' => 'Segment', |
|
| 52 | - 'options' => [ |
|
| 53 | - 'route' => '/settings[/:module]', |
|
| 54 | - 'defaults' => [ |
|
| 55 | - 'controller' => 'Settings\Controller\Index', |
|
| 56 | - 'action' => 'index', |
|
| 57 | - 'module' => 'Core', |
|
| 58 | - ], |
|
| 59 | - ], |
|
| 60 | - 'may_terminate' => true, |
|
| 61 | - ], |
|
| 62 | - ], |
|
| 63 | - ], |
|
| 64 | - ], |
|
| 65 | - ], |
|
| 35 | + // Translations |
|
| 36 | + 'translator' => [ |
|
| 37 | + 'translation_file_patterns' => [ |
|
| 38 | + [ |
|
| 39 | + 'type' => 'gettext', |
|
| 40 | + 'base_dir' => __DIR__ . '/../language', |
|
| 41 | + 'pattern' => '%s.mo', |
|
| 42 | + ], |
|
| 43 | + ], |
|
| 44 | + ], |
|
| 45 | + // Routes |
|
| 46 | + 'router' => [ |
|
| 47 | + 'routes' => [ |
|
| 48 | + 'lang' => [ |
|
| 49 | + 'child_routes' => [ |
|
| 50 | + 'settings' => [ |
|
| 51 | + 'type' => 'Segment', |
|
| 52 | + 'options' => [ |
|
| 53 | + 'route' => '/settings[/:module]', |
|
| 54 | + 'defaults' => [ |
|
| 55 | + 'controller' => 'Settings\Controller\Index', |
|
| 56 | + 'action' => 'index', |
|
| 57 | + 'module' => 'Core', |
|
| 58 | + ], |
|
| 59 | + ], |
|
| 60 | + 'may_terminate' => true, |
|
| 61 | + ], |
|
| 62 | + ], |
|
| 63 | + ], |
|
| 64 | + ], |
|
| 65 | + ], |
|
| 66 | 66 | |
| 67 | - 'acl' => ['rules' => [ |
|
| 68 | - 'user' => [ |
|
| 69 | - 'allow' => [ |
|
| 70 | - 'route/lang/settings', |
|
| 71 | - 'Settings\Controller\Index', |
|
| 72 | - ], |
|
| 73 | - ], |
|
| 74 | - ]], |
|
| 75 | - 'navigation' => [ |
|
| 76 | - 'default' => [ |
|
| 77 | - 'settings' => [ |
|
| 78 | - 'label' => /*@translate*/ 'Settings', |
|
| 79 | - 'route' => 'lang/settings', |
|
| 80 | - 'resource' => 'route/lang/settings', |
|
| 81 | - 'order' => 100, |
|
| 82 | - 'params' => ['module' => null], |
|
| 83 | - ], |
|
| 84 | - ], |
|
| 85 | - ], |
|
| 67 | + 'acl' => ['rules' => [ |
|
| 68 | + 'user' => [ |
|
| 69 | + 'allow' => [ |
|
| 70 | + 'route/lang/settings', |
|
| 71 | + 'Settings\Controller\Index', |
|
| 72 | + ], |
|
| 73 | + ], |
|
| 74 | + ]], |
|
| 75 | + 'navigation' => [ |
|
| 76 | + 'default' => [ |
|
| 77 | + 'settings' => [ |
|
| 78 | + 'label' => /*@translate*/ 'Settings', |
|
| 79 | + 'route' => 'lang/settings', |
|
| 80 | + 'resource' => 'route/lang/settings', |
|
| 81 | + 'order' => 100, |
|
| 82 | + 'params' => ['module' => null], |
|
| 83 | + ], |
|
| 84 | + ], |
|
| 85 | + ], |
|
| 86 | 86 | |
| 87 | - // Configuration of the controller service manager (Which loads controllers) |
|
| 88 | - 'controllers' => [ |
|
| 89 | - 'factories' => [ |
|
| 90 | - 'Settings\Controller\Index' => [\Settings\Controller\IndexController::class,'factory'] |
|
| 91 | - ], |
|
| 92 | - ], |
|
| 87 | + // Configuration of the controller service manager (Which loads controllers) |
|
| 88 | + 'controllers' => [ |
|
| 89 | + 'factories' => [ |
|
| 90 | + 'Settings\Controller\Index' => [\Settings\Controller\IndexController::class,'factory'] |
|
| 91 | + ], |
|
| 92 | + ], |
|
| 93 | 93 | |
| 94 | - // Configure the view service manager |
|
| 95 | - 'view_manager' => [ |
|
| 96 | - // Map template to files. Speeds up the lookup through the template stack. |
|
| 97 | - 'template_map' => [ |
|
| 98 | - ], |
|
| 94 | + // Configure the view service manager |
|
| 95 | + 'view_manager' => [ |
|
| 96 | + // Map template to files. Speeds up the lookup through the template stack. |
|
| 97 | + 'template_map' => [ |
|
| 98 | + ], |
|
| 99 | 99 | |
| 100 | - // Where to look for view templates not mapped above |
|
| 101 | - 'template_path_stack' => [ |
|
| 102 | - __DIR__ . '/../view', |
|
| 103 | - ], |
|
| 104 | - ], |
|
| 100 | + // Where to look for view templates not mapped above |
|
| 101 | + 'template_path_stack' => [ |
|
| 102 | + __DIR__ . '/../view', |
|
| 103 | + ], |
|
| 104 | + ], |
|
| 105 | 105 | |
| 106 | - 'view_helpers' => [ |
|
| 107 | - 'invokables' => [ |
|
| 108 | - 'Settings/FormDisableElementsCapableFormSettings' => 'Settings\Form\View\Helper\FormDisableElementsCapableFormSettings', |
|
| 109 | - ], |
|
| 110 | - 'factories' => [ |
|
| 111 | - ], |
|
| 112 | - ], |
|
| 106 | + 'view_helpers' => [ |
|
| 107 | + 'invokables' => [ |
|
| 108 | + 'Settings/FormDisableElementsCapableFormSettings' => 'Settings\Form\View\Helper\FormDisableElementsCapableFormSettings', |
|
| 109 | + ], |
|
| 110 | + 'factories' => [ |
|
| 111 | + ], |
|
| 112 | + ], |
|
| 113 | 113 | |
| 114 | - 'service_manager' => [ |
|
| 115 | - 'factories' => [ |
|
| 116 | - 'Settings' => '\Settings\Settings\SettingsFactory', |
|
| 117 | - 'Settings/EntityResolver' => '\Settings\Repository\SettingsEntityResolverFactory', |
|
| 118 | - 'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class,'factory'], |
|
| 119 | - ], |
|
| 120 | - 'initializers' => [], |
|
| 121 | - 'shared' => [], |
|
| 122 | - 'aliases' => [], |
|
| 123 | - ], |
|
| 114 | + 'service_manager' => [ |
|
| 115 | + 'factories' => [ |
|
| 116 | + 'Settings' => '\Settings\Settings\SettingsFactory', |
|
| 117 | + 'Settings/EntityResolver' => '\Settings\Repository\SettingsEntityResolverFactory', |
|
| 118 | + 'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class,'factory'], |
|
| 119 | + ], |
|
| 120 | + 'initializers' => [], |
|
| 121 | + 'shared' => [], |
|
| 122 | + 'aliases' => [], |
|
| 123 | + ], |
|
| 124 | 124 | |
| 125 | - 'controller_plugins' => [ |
|
| 126 | - 'factories' => ['settings' => '\Settings\Controller\Plugin\SettingsFactory'], |
|
| 127 | - ], |
|
| 125 | + 'controller_plugins' => [ |
|
| 126 | + 'factories' => ['settings' => '\Settings\Controller\Plugin\SettingsFactory'], |
|
| 127 | + ], |
|
| 128 | 128 | |
| 129 | - 'form_elements' => [ |
|
| 130 | - 'factories' => [ |
|
| 131 | - 'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class,'factory'], |
|
| 132 | - 'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class,'factory'], |
|
| 133 | - 'Settings/Fieldset' => \Settings\Form\Factory\SettingsFieldsetFactory::class, |
|
| 134 | - ], |
|
| 135 | - 'aliases' => [ |
|
| 136 | - ], |
|
| 137 | - ], |
|
| 129 | + 'form_elements' => [ |
|
| 130 | + 'factories' => [ |
|
| 131 | + 'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class,'factory'], |
|
| 132 | + 'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class,'factory'], |
|
| 133 | + 'Settings/Fieldset' => \Settings\Form\Factory\SettingsFieldsetFactory::class, |
|
| 134 | + ], |
|
| 135 | + 'aliases' => [ |
|
| 136 | + ], |
|
| 137 | + ], |
|
| 138 | 138 | |
| 139 | - 'filters' => [ |
|
| 140 | - 'invokables' => [ |
|
| 141 | - 'Settings/Filter/DisableElementsCapableFormSettings' => \Settings\Form\Filter\DisableElementsCapableFormSettings::class, |
|
| 142 | - ] |
|
| 143 | - ] |
|
| 139 | + 'filters' => [ |
|
| 140 | + 'invokables' => [ |
|
| 141 | + 'Settings/Filter/DisableElementsCapableFormSettings' => \Settings\Form\Filter\DisableElementsCapableFormSettings::class, |
|
| 142 | + ] |
|
| 143 | + ] |
|
| 144 | 144 | |
| 145 | 145 | |
| 146 | 146 | ]; |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | 'aliases' => [ |
| 81 | 81 | 'assertions' => 'Acl\AssertionManager', |
| 82 | 82 | 'Auth/UserTokenGenerator' => 'Auth\Service\UserUniqueTokenGenerator', |
| 83 | - 'acl' => 'Acl' |
|
| 83 | + 'acl' => 'Acl' |
|
| 84 | 84 | ] |
| 85 | 85 | ], |
| 86 | 86 | |
@@ -91,8 +91,8 @@ discard block |
||
| 91 | 91 | 'Auth/SocialProfiles' => 'Auth\Controller\SocialProfilesController', |
| 92 | 92 | ], |
| 93 | 93 | 'factories' => [ |
| 94 | - 'Auth\Controller\Manage' => [ManageController::class,'factory'], |
|
| 95 | - 'Auth/ManageGroups' => [ManageGroupsController::class,'factory'], |
|
| 94 | + 'Auth\Controller\Manage' => [ManageController::class,'factory'], |
|
| 95 | + 'Auth/ManageGroups' => [ManageGroupsController::class,'factory'], |
|
| 96 | 96 | 'Auth\Controller\ForgotPassword' => 'Auth\Factory\Controller\ForgotPasswordControllerFactory', |
| 97 | 97 | 'Auth\Controller\GotoResetPassword' => 'Auth\Factory\Controller\GotoResetPasswordControllerFactory', |
| 98 | 98 | 'Auth\Controller\Register' => 'Auth\Factory\Controller\RegisterControllerFactory', |
@@ -116,10 +116,10 @@ discard block |
||
| 116 | 116 | 'shared' => [ |
| 117 | 117 | 'OAuth' => false, |
| 118 | 118 | ], |
| 119 | - 'aliases' => [ |
|
| 120 | - 'acl' => 'Acl', |
|
| 121 | - 'auth' => 'Auth' |
|
| 122 | - ] |
|
| 119 | + 'aliases' => [ |
|
| 120 | + 'acl' => 'Acl', |
|
| 121 | + 'auth' => 'Auth' |
|
| 122 | + ] |
|
| 123 | 123 | ], |
| 124 | 124 | 'hybridauth' => [ |
| 125 | 125 | "Facebook" => [ |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | 'Auth/Users' => 'switch', |
| 225 | 225 | ], |
| 226 | 226 | 'deny' => [ |
| 227 | - // 'route/lang/auth', |
|
| 227 | + // 'route/lang/auth', |
|
| 228 | 228 | 'route/auth-provider', |
| 229 | 229 | 'route/auth-extern', |
| 230 | 230 | 'route/lang/forgot-password', |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | 'factories' => [ |
| 312 | 312 | 'auth' => '\Auth\Factory\View\Helper\AuthFactory', |
| 313 | 313 | 'acl' => '\Acl\Factory\View\Helper\AclFactory', |
| 314 | - ], |
|
| 314 | + ], |
|
| 315 | 315 | ], |
| 316 | 316 | |
| 317 | 317 | 'form_elements' => [ |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * |
| 59 | 59 | * @param EventManagerInterface $events |
| 60 | 60 | * @param integer $priority |
| 61 | - */ |
|
| 61 | + */ |
|
| 62 | 62 | public function attach(EventManagerInterface $events, $priority=1) |
| 63 | 63 | { |
| 64 | 64 | $this->listeners[] = $events->attach(MvcEvent::EVENT_ROUTE, array($this, 'onRoute'), -10); |
@@ -80,11 +80,11 @@ discard block |
||
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * @param MvcEvent $event |
|
| 85 | - * |
|
| 86 | - * @return array|\ArrayAccess|mixed|object |
|
| 87 | - */ |
|
| 83 | + /** |
|
| 84 | + * @param MvcEvent $event |
|
| 85 | + * |
|
| 86 | + * @return array|\ArrayAccess|mixed|object |
|
| 87 | + */ |
|
| 88 | 88 | public function onRoute(MvcEvent $event) |
| 89 | 89 | { |
| 90 | 90 | if ($event->isError()) { |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | |
| 117 | 117 | if ($resourceId && !$acl->isAllowed($role, $resourceId, $privilege)) { |
| 118 | - /* |
|
| 118 | + /* |
|
| 119 | 119 | * Exceptions are only catched within the dispatch listener, so |
| 120 | 120 | * we have to set the exception manually in the event |
| 121 | 121 | * and trigger the DISPATCH_ERROR event. |
@@ -96,18 +96,18 @@ |
||
| 96 | 96 | |
| 97 | 97 | $event = new AssertionEvent(null, $this); |
| 98 | 98 | $event->setAcl($acl) |
| 99 | - ->setRole($role) |
|
| 100 | - ->setResource($resource) |
|
| 101 | - ->setPrivilege($privilege); |
|
| 99 | + ->setRole($role) |
|
| 100 | + ->setResource($resource) |
|
| 101 | + ->setPrivilege($privilege); |
|
| 102 | 102 | |
| 103 | 103 | $events = $this->getEventManager(); |
| 104 | 104 | |
| 105 | 105 | $callback = function ($r) { |
| 106 | - return false === $r; |
|
| 106 | + return false === $r; |
|
| 107 | 107 | }; |
| 108 | 108 | |
| 109 | 109 | $results = $events->triggerUntil( |
| 110 | - $callback, |
|
| 110 | + $callback, |
|
| 111 | 111 | $event->getName(), |
| 112 | 112 | $event |
| 113 | 113 | ); |
@@ -20,15 +20,15 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | class AssertionManagerFactory implements FactoryInterface |
| 22 | 22 | { |
| 23 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
| 24 | - $configContainer = $container->get('Config'); |
|
| 25 | - $configArray = isset($configContainer['acl']['assertions']) |
|
| 26 | - ? $configContainer['acl']['assertions'] |
|
| 27 | - : array(); |
|
| 23 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
| 24 | + $configContainer = $container->get('Config'); |
|
| 25 | + $configArray = isset($configContainer['acl']['assertions']) |
|
| 26 | + ? $configContainer['acl']['assertions'] |
|
| 27 | + : array(); |
|
| 28 | 28 | |
| 29 | - $manager = new AssertionManager($container, $configArray); |
|
| 29 | + $manager = new AssertionManager($container, $configArray); |
|
| 30 | 30 | |
| 31 | - $manager->configure(['shared_by_default'=>false]); |
|
| 32 | - return $manager; |
|
| 33 | - } |
|
| 31 | + $manager->configure(['shared_by_default'=>false]); |
|
| 32 | + return $manager; |
|
| 33 | + } |
|
| 34 | 34 | } |