@@ -118,7 +118,7 @@ |
||
118 | 118 | } |
119 | 119 | } |
120 | 120 | } |
121 | -EOF |
|
121 | +eof |
|
122 | 122 | ; |
123 | 123 | |
124 | 124 | return json_decode($json, true); |
@@ -56,7 +56,7 @@ |
||
56 | 56 | |
57 | 57 | <info>php %command.full_name% web --symlink --relative</info> |
58 | 58 | |
59 | -EOT |
|
59 | +eot |
|
60 | 60 | ); |
61 | 61 | } |
62 | 62 |
@@ -24,7 +24,7 @@ |
||
24 | 24 | ->setDescription('Loads bundles into persistences') |
25 | 25 | ->setHelp(<<<'EOT' |
26 | 26 | The <info>scan:bundles</info> command loads bundle table. |
27 | -EOT |
|
27 | +eot |
|
28 | 28 | ) |
29 | 29 | ->setDefinition([ |
30 | 30 | new InputArgument('create', InputArgument::OPTIONAL, 'Create schema'), |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | if ($sessionId != '') { |
36 | 36 | $qb->where('tbl.sesid = :sid') |
37 | - ->setParameter('sid', $sessionId); |
|
37 | + ->setParameter('sid', $sessionId); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $query = $qb->getQuery(); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $i = 1; |
65 | 65 | foreach ($filters as $w_key => $w_value) { |
66 | 66 | $qb->andWhere($qb->expr()->eq('tbl.' . $w_key, '?' . $i)) |
67 | - ->setParameter($i, $w_value); |
|
67 | + ->setParameter($i, $w_value); |
|
68 | 68 | $i++; |
69 | 69 | } |
70 | 70 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | |
105 | 105 | if ($sessionId != '') { |
106 | 106 | $qb->orWhere('tbl.sesid = :sid') |
107 | - ->setParameter('sid', $sessionId); |
|
107 | + ->setParameter('sid', $sessionId); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | $query = $qb->getQuery(); |
@@ -46,12 +46,12 @@ discard block |
||
46 | 46 | |
47 | 47 | if (null !== $groupType) { |
48 | 48 | $qb->where('g.gtype = :gtype') |
49 | - ->setParameter('gtype', $groupType); |
|
49 | + ->setParameter('gtype', $groupType); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | if (null !== $excludedState) { |
53 | 53 | $qb->andWhere('g.state != :state') |
54 | - ->setParameter('state', $excludedState); |
|
54 | + ->setParameter('state', $excludedState); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | $query = $qb->getQuery(); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $i = 1; |
80 | 80 | foreach ($filters as $w_key => $w_value) { |
81 | 81 | $qb->andWhere($qb->expr()->eq('g.' . $w_key, '?' . $i)) |
82 | - ->setParameter($i, $w_value); |
|
82 | + ->setParameter($i, $w_value); |
|
83 | 83 | $i++; |
84 | 84 | } |
85 | 85 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $i = 1; |
88 | 88 | foreach ($exclusions as $w_key => $w_value) { |
89 | 89 | $qb->andWhere($qb->expr()->neq('g.' . $w_key, '?' . $i)) |
90 | - ->setParameter($i, $w_value); |
|
90 | + ->setParameter($i, $w_value); |
|
91 | 91 | $i++; |
92 | 92 | } |
93 | 93 | } |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | // already another group by that name. |
164 | 164 | if (is_numeric($excludedGroupId) && $excludedGroupId > 0) { |
165 | 165 | $qb->andWhere($qb->expr()->neq('g.gid', ':ggid')) |
166 | - ->setParameter('ggid', $excludedGroupId); |
|
166 | + ->setParameter('ggid', $excludedGroupId); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | $query = $qb->getQuery(); |
@@ -85,7 +85,7 @@ |
||
85 | 85 | <p>Zikula has been successfully installed at <a href="$url">$url</a>. If you have further questions, |
86 | 86 | visit <a href="http://zikula.org">zikula.org</a></p> |
87 | 87 | </body> |
88 | -EOF; |
|
88 | +eof; |
|
89 | 89 | $message = \Swift_Message::newInstance() |
90 | 90 | ->setSubject($this->__('Zikula installation completed!')) |
91 | 91 | ->setFrom($adminUser->getEmail()) |
@@ -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 | { |
@@ -13,13 +13,11 @@ |
||
13 | 13 | namespace Zikula\RoutesModule\Controller\Base; |
14 | 14 | |
15 | 15 | use RuntimeException; |
16 | +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
17 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
16 | 18 | use Symfony\Component\HttpFoundation\Request; |
17 | -use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
18 | 19 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
19 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
20 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; |
|
21 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
|
22 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
20 | +use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
23 | 21 | use Zikula\Bundle\FormExtensionBundle\Form\Type\DeletionType; |
24 | 22 | use Zikula\Component\SortableColumns\Column; |
25 | 23 | use Zikula\Component\SortableColumns\SortableColumns; |
@@ -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 | { |
@@ -93,31 +93,31 @@ |
||
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
96 | - * This method returns a list of possible object states. |
|
97 | - * |
|
98 | - * @return array List of collected state information |
|
99 | - */ |
|
100 | - public function getObjectStates() |
|
101 | - { |
|
102 | - $states = []; |
|
103 | - $states[] = [ |
|
104 | - 'value' => 'initial', |
|
105 | - 'text' => $this->translator->__('Initial'), |
|
106 | - 'ui' => 'danger' |
|
107 | - ]; |
|
108 | - $states[] = [ |
|
109 | - 'value' => 'approved', |
|
110 | - 'text' => $this->translator->__('Approved'), |
|
111 | - 'ui' => 'success' |
|
112 | - ]; |
|
113 | - $states[] = [ |
|
114 | - 'value' => 'deleted', |
|
115 | - 'text' => $this->translator->__('Deleted'), |
|
116 | - 'ui' => 'danger' |
|
117 | - ]; |
|
96 | + * This method returns a list of possible object states. |
|
97 | + * |
|
98 | + * @return array List of collected state information |
|
99 | + */ |
|
100 | + public function getObjectStates() |
|
101 | + { |
|
102 | + $states = []; |
|
103 | + $states[] = [ |
|
104 | + 'value' => 'initial', |
|
105 | + 'text' => $this->translator->__('Initial'), |
|
106 | + 'ui' => 'danger' |
|
107 | + ]; |
|
108 | + $states[] = [ |
|
109 | + 'value' => 'approved', |
|
110 | + 'text' => $this->translator->__('Approved'), |
|
111 | + 'ui' => 'success' |
|
112 | + ]; |
|
113 | + $states[] = [ |
|
114 | + 'value' => 'deleted', |
|
115 | + 'text' => $this->translator->__('Deleted'), |
|
116 | + 'ui' => 'danger' |
|
117 | + ]; |
|
118 | 118 | |
119 | - return $states; |
|
120 | - } |
|
119 | + return $states; |
|
120 | + } |
|
121 | 121 | |
122 | 122 | /** |
123 | 123 | * This method returns information about a certain state. |
@@ -17,9 +17,9 @@ |
||
17 | 17 | use Zikula\Common\Translator\TranslatorInterface; |
18 | 18 | use Zikula\Core\Doctrine\EntityAccess; |
19 | 19 | use Zikula\PermissionsModule\Api\ApiInterface\PermissionApiInterface; |
20 | -use Zikula\UsersModule\Api\ApiInterface\CurrentUserApiInterface; |
|
21 | 20 | use Zikula\RoutesModule\Entity\Factory\EntityFactory; |
22 | 21 | use Zikula\RoutesModule\Helper\ListEntriesHelper; |
22 | +use Zikula\UsersModule\Api\ApiInterface\CurrentUserApiInterface; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * Helper base class for workflow methods. |