@@ -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'), |
@@ -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 | { |
@@ -246,7 +246,7 @@ |
||
246 | 246 | * @param AbstractBundle $bundle The bundle |
247 | 247 | * @param string $bundleName The bundle's name |
248 | 248 | * |
249 | - * @return array The legacy $type and $func parameters |
|
249 | + * @return string[] The legacy $type and $func parameters |
|
250 | 250 | */ |
251 | 251 | private function setZikulaDefaults(Route $route, AbstractBundle $bundle, $bundleName) |
252 | 252 | { |
@@ -98,7 +98,7 @@ |
||
98 | 98 | } |
99 | 99 | } |
100 | 100 | } |
101 | - $cacheName = in_array($type, ['js', 'css']) ? "{$type}Cache" : null; |
|
101 | + $cacheName = in_array($type, ['js', 'css']) ? "{$type}cache" : null; |
|
102 | 102 | /** @var CacheProvider $cacheService */ |
103 | 103 | $cacheService = $this->$cacheName; |
104 | 104 | $key = md5(serialize($assets)) . (int)$this->minify . (int)$this->compress . $this->lifetime . '.' . $type; |
@@ -63,7 +63,7 @@ |
||
63 | 63 | |
64 | 64 | if ($constraint->propertyName == 'workflowState' && in_array($value, ['initial', 'deleted'])) { |
65 | 65 | return; |
66 | - } |
|
66 | + } |
|
67 | 67 | |
68 | 68 | $listEntries = $this->listEntriesHelper->getEntries($constraint->entityName, $constraint->propertyName); |
69 | 69 | $allowedValues = []; |
@@ -262,7 +262,7 @@ |
||
262 | 262 | * |
263 | 263 | * @param EntityAccess $entity The given entity |
264 | 264 | * |
265 | - * @return Event The created event instance |
|
265 | + * @return string The created event instance |
|
266 | 266 | */ |
267 | 267 | protected function createFilterEvent($entity) |
268 | 268 | { |
@@ -24,7 +24,6 @@ |
||
24 | 24 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
25 | 25 | use Zikula\Core\Doctrine\EntityAccess; |
26 | 26 | use Zikula\RoutesModule\RoutesEvents; |
27 | -use Zikula\RoutesModule\Event\FilterRouteEvent; |
|
28 | 27 | |
29 | 28 | /** |
30 | 29 | * Event subscriber base class for entity lifecycle events. |