@@ -62,13 +62,13 @@ |
||
62 | 62 | $services = $application->getServiceManager(); |
63 | 63 | |
64 | 64 | $services->get('Install/Listener/LanguageSetter') |
65 | - ->attach($eventManager); |
|
65 | + ->attach($eventManager); |
|
66 | 66 | |
67 | - $tracyConfig = $services->get('Config')['tracy']; |
|
67 | + $tracyConfig = $services->get('Config')['tracy']; |
|
68 | 68 | |
69 | - if ($tracyConfig['enabled']) { |
|
70 | - (new TracyService())->register($tracyConfig); |
|
71 | - (new TracyListener())->attach($eventManager); |
|
72 | - } |
|
69 | + if ($tracyConfig['enabled']) { |
|
70 | + (new TracyService())->register($tracyConfig); |
|
71 | + (new TracyListener())->attach($eventManager); |
|
72 | + } |
|
73 | 73 | } |
74 | 74 | } |
@@ -26,18 +26,18 @@ |
||
26 | 26 | */ |
27 | 27 | public function register(array $config) |
28 | 28 | { |
29 | - try{ |
|
30 | - // enable logging of all error types globally |
|
31 | - Debugger::enable($config['mode'], $config['log'], $config['email']); |
|
32 | - Debugger::$strictMode = $config['strict']; |
|
33 | - Debugger::$showBar = $config['bar']; |
|
29 | + try{ |
|
30 | + // enable logging of all error types globally |
|
31 | + Debugger::enable($config['mode'], $config['log'], $config['email']); |
|
32 | + Debugger::$strictMode = $config['strict']; |
|
33 | + Debugger::$showBar = $config['bar']; |
|
34 | 34 | |
35 | - /** @var \Tracy\Logger $logger */ |
|
36 | - $logger = Debugger::getLogger(); |
|
37 | - $logger->emailSnooze = $config['email_snooze']; |
|
38 | - }catch (\Exception $e){ |
|
39 | - throw $e; |
|
40 | - } |
|
35 | + /** @var \Tracy\Logger $logger */ |
|
36 | + $logger = Debugger::getLogger(); |
|
37 | + $logger->emailSnooze = $config['email_snooze']; |
|
38 | + }catch (\Exception $e){ |
|
39 | + throw $e; |
|
40 | + } |
|
41 | 41 | |
42 | 42 | } |
43 | 43 | } |
@@ -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 | } |
@@ -22,55 +22,55 @@ |
||
22 | 22 | */ |
23 | 23 | class LazyControllerFactory implements AbstractFactoryInterface |
24 | 24 | { |
25 | - protected $aliases = [ |
|
26 | - FormElementManager::class => 'FormElementManager', |
|
27 | - ValidatorPluginManager::class => 'ValidatorManager', |
|
28 | - Translator::class => 'translator', |
|
29 | - ]; |
|
25 | + protected $aliases = [ |
|
26 | + FormElementManager::class => 'FormElementManager', |
|
27 | + ValidatorPluginManager::class => 'ValidatorManager', |
|
28 | + Translator::class => 'translator', |
|
29 | + ]; |
|
30 | 30 | |
31 | - public function canCreate( ContainerInterface $container, $requestedName ) |
|
32 | - { |
|
33 | - list( $module, ) = explode( '\\', __NAMESPACE__, 2 ); |
|
34 | - return strstr( $requestedName, $module . '\Controller') !== false; |
|
35 | - } |
|
31 | + public function canCreate( ContainerInterface $container, $requestedName ) |
|
32 | + { |
|
33 | + list( $module, ) = explode( '\\', __NAMESPACE__, 2 ); |
|
34 | + return strstr( $requestedName, $module . '\Controller') !== false; |
|
35 | + } |
|
36 | 36 | |
37 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
38 | - { |
|
39 | - $class = new \ReflectionClass($requestedName); |
|
40 | - $parentLocator = $container; |
|
41 | - if( $constructor = $class->getConstructor() ) |
|
42 | - { |
|
43 | - if( $params = $constructor->getParameters() ) |
|
44 | - { |
|
45 | - $parameter_instances = []; |
|
46 | - foreach( $params as $p ) |
|
47 | - { |
|
37 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
38 | + { |
|
39 | + $class = new \ReflectionClass($requestedName); |
|
40 | + $parentLocator = $container; |
|
41 | + if( $constructor = $class->getConstructor() ) |
|
42 | + { |
|
43 | + if( $params = $constructor->getParameters() ) |
|
44 | + { |
|
45 | + $parameter_instances = []; |
|
46 | + foreach( $params as $p ) |
|
47 | + { |
|
48 | 48 | |
49 | - if( $p->getClass() ) { |
|
50 | - $cn = $p->getClass()->getName(); |
|
51 | - if (array_key_exists($cn, $this->aliases)) { |
|
52 | - $cn = $this->aliases[$cn]; |
|
53 | - } |
|
49 | + if( $p->getClass() ) { |
|
50 | + $cn = $p->getClass()->getName(); |
|
51 | + if (array_key_exists($cn, $this->aliases)) { |
|
52 | + $cn = $this->aliases[$cn]; |
|
53 | + } |
|
54 | 54 | |
55 | - try { |
|
56 | - $parameter_instances[] = $parentLocator->get($cn); |
|
57 | - } |
|
58 | - catch (\Exception $x) { |
|
59 | - echo __CLASS__ |
|
60 | - . " couldn't create an instance of $cn to satisfy the constructor for $requestedName."; |
|
61 | - exit; |
|
62 | - } |
|
63 | - } |
|
64 | - else{ |
|
65 | - if( $p->isArray() && $p->getName() == 'config' ) |
|
66 | - $parameter_instances[] = $parentLocator->get('config'); |
|
67 | - } |
|
55 | + try { |
|
56 | + $parameter_instances[] = $parentLocator->get($cn); |
|
57 | + } |
|
58 | + catch (\Exception $x) { |
|
59 | + echo __CLASS__ |
|
60 | + . " couldn't create an instance of $cn to satisfy the constructor for $requestedName."; |
|
61 | + exit; |
|
62 | + } |
|
63 | + } |
|
64 | + else{ |
|
65 | + if( $p->isArray() && $p->getName() == 'config' ) |
|
66 | + $parameter_instances[] = $parentLocator->get('config'); |
|
67 | + } |
|
68 | 68 | |
69 | - } |
|
70 | - return $class->newInstanceArgs($parameter_instances); |
|
71 | - } |
|
72 | - } |
|
69 | + } |
|
70 | + return $class->newInstanceArgs($parameter_instances); |
|
71 | + } |
|
72 | + } |
|
73 | 73 | |
74 | - return new $requestedName; |
|
75 | - } |
|
74 | + return new $requestedName; |
|
75 | + } |
|
76 | 76 | } |
77 | 77 | \ No newline at end of file |
@@ -26,14 +26,14 @@ discard block |
||
26 | 26 | */ |
27 | 27 | class Index extends AbstractActionController |
28 | 28 | { |
29 | - protected $installForm; |
|
29 | + protected $installForm; |
|
30 | 30 | |
31 | - public function __construct(FormElementManager $formElementManager) |
|
32 | - { |
|
33 | - $this->installForm = $formElementManager->get('Install/Installation'); |
|
34 | - } |
|
31 | + public function __construct(FormElementManager $formElementManager) |
|
32 | + { |
|
33 | + $this->installForm = $formElementManager->get('Install/Installation'); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
36 | + /** |
|
37 | 37 | * Hook for custom preDispatch event. |
38 | 38 | * |
39 | 39 | * @param MvcEvent $event |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | $routeMatch->setParam('action', $p); |
51 | 51 | $response = $this->getResponse(); |
52 | 52 | $response->getHeaders() |
53 | - ->addHeaderLine('Content-Type', 'application/json') |
|
54 | - ->addHeaderLine('Content-Encoding', 'utf8'); |
|
53 | + ->addHeaderLine('Content-Type', 'application/json') |
|
54 | + ->addHeaderLine('Content-Encoding', 'utf8'); |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 | |
@@ -65,13 +65,13 @@ discard block |
||
65 | 65 | $form = $this->installForm; |
66 | 66 | $prereqs = $this->plugin('Install/Prerequisites')->check(); |
67 | 67 | |
68 | - return $this->createViewModel( |
|
69 | - array( |
|
70 | - 'prerequisites' => $prereqs, |
|
71 | - 'form' => $form, |
|
72 | - 'lang' => $this->params('lang'), |
|
73 | - ) |
|
74 | - ); |
|
68 | + return $this->createViewModel( |
|
69 | + array( |
|
70 | + 'prerequisites' => $prereqs, |
|
71 | + 'form' => $form, |
|
72 | + 'lang' => $this->params('lang'), |
|
73 | + ) |
|
74 | + ); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
@@ -100,12 +100,12 @@ discard block |
||
100 | 100 | $form->setData($_POST); |
101 | 101 | |
102 | 102 | if (!$form->isValid()) { |
103 | - return $this->createJsonResponse( |
|
104 | - array( |
|
105 | - 'ok' => false, |
|
106 | - 'errors' => $form->getMessages(), |
|
107 | - ) |
|
108 | - ); |
|
103 | + return $this->createJsonResponse( |
|
104 | + array( |
|
105 | + 'ok' => false, |
|
106 | + 'errors' => $form->getMessages(), |
|
107 | + ) |
|
108 | + ); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | $data = $form->getData(); |
@@ -133,10 +133,10 @@ discard block |
||
133 | 133 | */ |
134 | 134 | protected function attachDefaultListeners() |
135 | 135 | { |
136 | - parent::attachDefaultListeners(); |
|
136 | + parent::attachDefaultListeners(); |
|
137 | 137 | |
138 | - $events = $this->getEventManager(); |
|
139 | - $events->attach( MvcEvent::EVENT_DISPATCH, array( $this, 'preDispatch' ), 100 ); |
|
138 | + $events = $this->getEventManager(); |
|
139 | + $events->attach( MvcEvent::EVENT_DISPATCH, array( $this, 'preDispatch' ), 100 ); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | /** |
@@ -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 |
@@ -171,13 +171,13 @@ |
||
171 | 171 | $response_externalIdUpdate = $decodedBody->applyIdUpdate; |
172 | 172 | |
173 | 173 | if ($publisher->externalId != $response_externalIdUpdate || $publisher->reference != $response_referenceUpdate) { |
174 | - $logInfo = 'RestCall changed externalID [' |
|
175 | - . var_export($publisher->externalId, true) |
|
176 | - . ' => ' |
|
177 | - . var_export($response_externalIdUpdate, true) . '], reference [' |
|
178 | - . var_export($publisher->reference, true) |
|
179 | - . ' => ' |
|
180 | - . var_export($response_referenceUpdate, true) . ']'; |
|
174 | + $logInfo = 'RestCall changed externalID [' |
|
175 | + . var_export($publisher->externalId, true) |
|
176 | + . ' => ' |
|
177 | + . var_export($response_externalIdUpdate, true) . '], reference [' |
|
178 | + . var_export($publisher->reference, true) |
|
179 | + . ' => ' |
|
180 | + . var_export($response_referenceUpdate, true) . ']'; |
|
181 | 181 | $log->info($logInfo); |
182 | 182 | $publisher->reference = $response_referenceUpdate; |
183 | 183 | $publisher->externalId = $response_externalIdUpdate; |
@@ -31,54 +31,54 @@ |
||
31 | 31 | */ |
32 | 32 | class ViewModelTemplateFilterFactory implements FactoryInterface |
33 | 33 | { |
34 | - /** |
|
35 | - * @var ServiceLocatorInterface |
|
36 | - */ |
|
37 | - protected $service; |
|
34 | + /** |
|
35 | + * @var ServiceLocatorInterface |
|
36 | + */ |
|
37 | + protected $service; |
|
38 | 38 | |
39 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
40 | - { |
|
41 | - $this->service = $container; |
|
42 | - return $this; |
|
43 | - } |
|
39 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
40 | + { |
|
41 | + $this->service = $container; |
|
42 | + return $this; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * @param $element |
|
47 | - * @return \Zend\View\Model\ViewModel |
|
48 | - * @throws \InvalidArgumentException |
|
49 | - * @TODO: [ZF3] renamed this method into getModel because conflict with FactoryInterface::__invoke() method |
|
50 | - */ |
|
51 | - public function getModel($element) |
|
52 | - { |
|
53 | - $filter = null; |
|
54 | - if ($element instanceof EntityInterface) { |
|
55 | - $filter = new ViewModelTemplateFilterJob; |
|
56 | - } |
|
57 | - if ($element instanceof Element) { |
|
58 | - $filter = new ViewModelTemplateFilterForm; |
|
59 | - $viewHelperManager = $this->service->get('ViewHelperManager'); |
|
60 | - $viewHelperForm = $viewHelperManager->get('formSimple'); |
|
61 | - $filter->setViewHelperForm($viewHelperForm); |
|
62 | - } |
|
63 | - if (!isset($filter)) { |
|
64 | - throw new \InvalidArgumentException(get_class($element) . ' cannot be used to initialize a template'); |
|
65 | - } |
|
66 | - $viewManager = $this->service->get('ViewHelperManager'); |
|
67 | - $basePathHelper = $viewManager->get('basePath'); |
|
68 | - $serverUrlHelper = $viewManager->get('serverUrl'); |
|
69 | - $imageFileCacheHelper = $this->service->get('Organizations\ImageFileCache\Manager'); |
|
70 | - $filter->setBasePathHelper($basePathHelper); |
|
71 | - $filter->setImageFileCacheHelper($imageFileCacheHelper); |
|
72 | - $filter->setServerUrlHelper($serverUrlHelper); |
|
45 | + /** |
|
46 | + * @param $element |
|
47 | + * @return \Zend\View\Model\ViewModel |
|
48 | + * @throws \InvalidArgumentException |
|
49 | + * @TODO: [ZF3] renamed this method into getModel because conflict with FactoryInterface::__invoke() method |
|
50 | + */ |
|
51 | + public function getModel($element) |
|
52 | + { |
|
53 | + $filter = null; |
|
54 | + if ($element instanceof EntityInterface) { |
|
55 | + $filter = new ViewModelTemplateFilterJob; |
|
56 | + } |
|
57 | + if ($element instanceof Element) { |
|
58 | + $filter = new ViewModelTemplateFilterForm; |
|
59 | + $viewHelperManager = $this->service->get('ViewHelperManager'); |
|
60 | + $viewHelperForm = $viewHelperManager->get('formSimple'); |
|
61 | + $filter->setViewHelperForm($viewHelperForm); |
|
62 | + } |
|
63 | + if (!isset($filter)) { |
|
64 | + throw new \InvalidArgumentException(get_class($element) . ' cannot be used to initialize a template'); |
|
65 | + } |
|
66 | + $viewManager = $this->service->get('ViewHelperManager'); |
|
67 | + $basePathHelper = $viewManager->get('basePath'); |
|
68 | + $serverUrlHelper = $viewManager->get('serverUrl'); |
|
69 | + $imageFileCacheHelper = $this->service->get('Organizations\ImageFileCache\Manager'); |
|
70 | + $filter->setBasePathHelper($basePathHelper); |
|
71 | + $filter->setImageFileCacheHelper($imageFileCacheHelper); |
|
72 | + $filter->setServerUrlHelper($serverUrlHelper); |
|
73 | 73 | |
74 | - if($filter instanceof ViewModelTemplateFilterJob || method_exists($filter,'setJsonLdHelper')){ |
|
75 | - $jsonLdHelper = $viewManager->get(JsonLd::class); |
|
76 | - $filter->setJsonLdHelper($jsonLdHelper); |
|
77 | - } |
|
78 | - $urlPlugin = $this->service->get('ControllerPluginManager')->get('url'); |
|
79 | - $filter->setUrlPlugin($urlPlugin); |
|
80 | - $options = $this->service->get('Jobs/Options'); |
|
81 | - $filter->setConfig($options); |
|
82 | - return $filter->filter($element); |
|
83 | - } |
|
74 | + if($filter instanceof ViewModelTemplateFilterJob || method_exists($filter,'setJsonLdHelper')){ |
|
75 | + $jsonLdHelper = $viewManager->get(JsonLd::class); |
|
76 | + $filter->setJsonLdHelper($jsonLdHelper); |
|
77 | + } |
|
78 | + $urlPlugin = $this->service->get('ControllerPluginManager')->get('url'); |
|
79 | + $filter->setUrlPlugin($urlPlugin); |
|
80 | + $options = $this->service->get('Jobs/Options'); |
|
81 | + $filter->setConfig($options); |
|
82 | + return $filter->filter($element); |
|
83 | + } |
|
84 | 84 | } |
85 | 85 | \ No newline at end of file |