@@ -75,10 +75,10 @@ |
||
75 | 75 | [ |
76 | 76 | 'decorate' => true, |
77 | 77 | 'html' => true, |
78 | - 'childOpen' => function ($node) { |
|
78 | + 'childOpen' => function($node) { |
|
79 | 79 | return '<li class="jstree-open" id="' . $this->domTreeNodePrefix . $node['id'] . '">'; |
80 | 80 | }, |
81 | - 'nodeDecorator' => function ($node) { |
|
81 | + 'nodeDecorator' => function($node) { |
|
82 | 82 | return '<a href="#">' . $node['title'] . ' (' . $node['id'] . ')</a>'; |
83 | 83 | } |
84 | 84 | ] |
@@ -122,6 +122,10 @@ |
||
122 | 122 | |
123 | 123 | /** |
124 | 124 | * This method includes the common implementation code for adminView() and view(). |
125 | + * @param string $sort |
|
126 | + * @param string $sortdir |
|
127 | + * @param integer $pos |
|
128 | + * @param integer $num |
|
125 | 129 | */ |
126 | 130 | protected function viewInternal(Request $request, $sort, $sortdir, $pos, $num, $isAdmin = false) |
127 | 131 | { |
@@ -506,7 +506,7 @@ |
||
506 | 506 | try { |
507 | 507 | // execute the workflow action |
508 | 508 | $success = $workflowHelper->executeAction($entity, $action); |
509 | - } catch(\Exception $e) { |
|
509 | + } catch (\Exception $e) { |
|
510 | 510 | $this->addFlash('error', $this->__f('Sorry, but an error occured during the %action% action.', ['%action%' => $action]) . ' ' . $e->getMessage()); |
511 | 511 | $logger->error('{app}: User {user} tried to execute the {action} workflow action for the {entity} with id {id}, but failed. Error details: {errorMessage}.', ['app' => 'ZikulaRoutesModule', 'user' => $userName, 'action' => $action, 'entity' => 'route', 'id' => $itemId, 'errorMessage' => $e->getMessage()]); |
512 | 512 | } |
@@ -13,13 +13,13 @@ |
||
13 | 13 | namespace Zikula\RoutesModule\Controller\Base; |
14 | 14 | |
15 | 15 | use RuntimeException; |
16 | -use Symfony\Component\HttpFoundation\Request; |
|
17 | -use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
18 | -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
|
19 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
20 | 16 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; |
21 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
22 | 18 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
19 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
20 | +use Symfony\Component\HttpFoundation\Request; |
|
21 | +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
|
22 | +use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
23 | 23 | use Zikula\Bundle\FormExtensionBundle\Form\Type\DeletionType; |
24 | 24 | use Zikula\Component\SortableColumns\Column; |
25 | 25 | use Zikula\Component\SortableColumns\SortableColumns; |
@@ -26,7 +26,7 @@ |
||
26 | 26 | */ |
27 | 27 | public function load(array $configs, ContainerBuilder $container) |
28 | 28 | { |
29 | - $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config'))); |
|
29 | + $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__ . '/../Resources/config'))); |
|
30 | 30 | |
31 | 31 | $loader->load('services.yml'); |
32 | 32 | $loader->load('doctrine.yml'); |
@@ -95,7 +95,7 @@ |
||
95 | 95 | } |
96 | 96 | // remove disabled |
97 | 97 | foreach ($searchModules as $displayName => $moduleName) { |
98 | - if ((bool) $this->getVar('disable_' . $moduleName, false)) { |
|
98 | + if ((bool)$this->getVar('disable_' . $moduleName, false)) { |
|
99 | 99 | unset($searchModules[$displayName]); |
100 | 100 | } |
101 | 101 | } |
@@ -47,7 +47,7 @@ |
||
47 | 47 | /** |
48 | 48 | * Returns a list of functions to add to the existing list. |
49 | 49 | * |
50 | - * @return array An array of functions |
|
50 | + * @return \Twig_SimpleFunction[] An array of functions |
|
51 | 51 | */ |
52 | 52 | public function getFunctions() |
53 | 53 | { |
@@ -108,6 +108,9 @@ |
||
108 | 108 | $response->setContent($content); |
109 | 109 | } |
110 | 110 | |
111 | + /** |
|
112 | + * @param string $search |
|
113 | + */ |
|
111 | 114 | private function readdUntrimmedBlocks($search, $replace, &$subject) |
112 | 115 | { |
113 | 116 | $len = strlen($search); |
@@ -134,7 +134,7 @@ |
||
134 | 134 | /** |
135 | 135 | * @param UserEntity $user |
136 | 136 | * @param $selectedMethod |
137 | - * @param $returnUrl |
|
137 | + * @param string $returnUrl |
|
138 | 138 | * @return mixed |
139 | 139 | */ |
140 | 140 | private function dispatchLoginSuccessEvent(UserEntity $user, $selectedMethod, $returnUrl) |
@@ -91,7 +91,8 @@ |
||
91 | 91 | $form = $this->createForm(DefaultLoginType::class, ['uid' => $uid]); |
92 | 92 | $loginFormEvent = new UserFormAwareEvent($form); |
93 | 93 | $dispatcher->dispatch(AccessEvents::AUTHENTICATION_FORM, $loginFormEvent); |
94 | - if ($form->count() > 3) { // count > 3 means that the AUTHENTICATION_FORM event added some form children |
|
94 | + if ($form->count() > 3) { |
|
95 | +// count > 3 means that the AUTHENTICATION_FORM event added some form children |
|
95 | 96 | $form->handleRequest($request); |
96 | 97 | if ($form->isValid() && $form->isSubmitted()) { |
97 | 98 | $uid = $form->get('uid')->getData(); |
@@ -413,7 +413,7 @@ |
||
413 | 413 | ->setDefaults([ |
414 | 414 | // define class for underlying data (required for embedding forms) |
415 | 415 | 'data_class' => 'Zikula\RoutesModule\Entity\RouteEntity', |
416 | - 'empty_data' => function (FormInterface $form) { |
|
416 | + 'empty_data' => function(FormInterface $form) { |
|
417 | 417 | return $this->entityFactory->createRoute(); |
418 | 418 | }, |
419 | 419 | 'error_mapping' => [ |
@@ -28,8 +28,8 @@ |
||
28 | 28 | use Zikula\RoutesModule\Entity\Factory\EntityFactory; |
29 | 29 | use Zikula\RoutesModule\Form\Type\Field\ArrayType; |
30 | 30 | use Zikula\RoutesModule\Form\Type\Field\MultiListType; |
31 | -use Zikula\UsersModule\Form\Type\UserLiveSearchType; |
|
32 | 31 | use Zikula\RoutesModule\Helper\ListEntriesHelper; |
32 | +use Zikula\UsersModule\Form\Type\UserLiveSearchType; |
|
33 | 33 | |
34 | 34 | /** |
35 | 35 | * Route editing form type base class. |
@@ -385,6 +385,9 @@ discard block |
||
385 | 385 | } |
386 | 386 | } |
387 | 387 | |
388 | + /** |
|
389 | + * @param string $name |
|
390 | + */ |
|
388 | 391 | protected function createRegistryMock($name, $em) |
389 | 392 | { |
390 | 393 | $registry = $this->getMockBuilder(ManagerRegistry::class)->getMock(); |
@@ -396,6 +399,9 @@ discard block |
||
396 | 399 | return $registry; |
397 | 400 | } |
398 | 401 | |
402 | + /** |
|
403 | + * @param \DateTime $now |
|
404 | + */ |
|
399 | 405 | protected function generateCategoryRegistry($now) |
400 | 406 | { |
401 | 407 | $registry = new CategoryRegistryEntity(); |
@@ -411,6 +417,9 @@ discard block |
||
411 | 417 | $this->em->flush(); |
412 | 418 | } |
413 | 419 | |
420 | + /** |
|
421 | + * @param \DateTime $now |
|
422 | + */ |
|
414 | 423 | protected function generateCategories($now) |
415 | 424 | { |
416 | 425 | // root |