zikula / core

src/lib/Zikula/Bundle/CoreBundle/Tests/Bundle/MetaDataTest.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
         }
     }
 }
-EOF
+eof
         ;
 
         return json_decode($json, true);

src/lib/Zikula/Bundle/CoreBundle/Command/BootstrapBundlesCommand.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
             ->setDescription('Loads bundles into persistences')
             ->setHelp(<<<'EOT'
 The <info>scan:bundles</info> command loads bundle table.
-EOT
+eot
             )
             ->setDefinition([
                 new InputArgument('create', InputArgument::OPTIONAL, 'Create schema'),

src/lib/Zikula/Bundle/HookBundle/Dispatcher/Storage/Doctrine/DoctrineStorage.php

Indentation +69 added lines, -69 removed lines

@@ -72,10 +72,10 @@ 
     public function getSubscriberByEventName($eventName)
     {
         return $this->em->createQueryBuilder()->select('t')
-                 ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
-                 ->where('t.eventname = ?1')
-                 ->getQuery()->setParameter(1, $eventName)
-                 ->getArrayResult();
+                    ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
+                    ->where('t.eventname = ?1')
+                    ->getQuery()->setParameter(1, $eventName)
+                    ->getArrayResult();
     }
 
     public function unregisterSubscriberByArea($areaName)
@@ -88,24 +88,24 @@ 
 
         // delete subscriber entry
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
-                 ->where('t.sareaid = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
+                    ->where('t.sareaid = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         // remove bindings
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->where('t.sareaid = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->where('t.sareaid = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         // clean areas
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity', 't')
-                 ->where('t.id = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity', 't')
+                    ->where('t.id = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         $this->generateRuntimeHandlers();
     }
@@ -164,24 +164,24 @@ 
 
         // delete provider entry
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookProviderEntity', 't')
-                 ->where('t.pareaid = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookProviderEntity', 't')
+                    ->where('t.pareaid = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         // remove bindings
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->where('t.pareaid = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->where('t.pareaid = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         // clean area
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity', 't')
-                 ->where('t.id = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity', 't')
+                    ->where('t.id = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         $this->generateRuntimeHandlers();
     }
@@ -239,9 +239,9 @@ 
     {
         // truncate runtime
         $this->em->createQueryBuilder()
-             ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookRuntimeEntity')
-             ->getQuery()
-             ->execute();
+                ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookRuntimeEntity')
+                ->getQuery()
+                ->execute();
 
         foreach ($this->getBindings() as $binding) {
             $this->addRuntimeHandlers($binding['sareaid'], $binding['pareaid']);
@@ -251,9 +251,9 @@ 
     private function addRuntimeHandlers($subscriberAreaId, $providerAreaId)
     {
         $sa = $this->em->find('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity',
-                              $subscriberAreaId);
+                                $subscriberAreaId);
         $pa = $this->em->find('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity',
-                              $providerAreaId);
+                                $providerAreaId);
 
         $subscribers = $this->em->createQueryBuilder()->select('t')
                             ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
@@ -267,10 +267,10 @@ 
 
         foreach ($subscribers as $subscriber) {
             $provider = $this->em->createQueryBuilder()->select('t')
-                             ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookProviderEntity', 't')
-                             ->where('t.pareaid = ?1 AND t.hooktype = ?2')
-                             ->getQuery()->setParameters([1 => $providerAreaId, 2 => $subscriber['hooktype']])
-                             ->getArrayResult();
+                                ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookProviderEntity', 't')
+                                ->where('t.pareaid = ?1 AND t.hooktype = ?2')
+                                ->getQuery()->setParameters([1 => $providerAreaId, 2 => $subscriber['hooktype']])
+                                ->getArrayResult();
 
             if ($provider) {
                 $provider = $provider[0];
@@ -298,9 +298,9 @@ 
     {
         $this->runtimeHandlers =
             $this->em->createQueryBuilder()->select('t')
-                 ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookRuntimeEntity', 't')
-                 ->getQuery()
-                 ->getArrayResult();
+                    ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookRuntimeEntity', 't')
+                    ->getQuery()
+                    ->getArrayResult();
 
         return $this->runtimeHandlers;
     }
@@ -308,9 +308,9 @@ 
     public function bindSubscriber($subscriberArea, $providerArea)
     {
         $sa = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $subscriberArea]);
+                    ->findOneBy(['areaname' => $subscriberArea]);
         $pa = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $providerArea]);
+                    ->findOneBy(['areaname' => $providerArea]);
 
         if ($sa->getCategory() != $pa->getCategory()) {
             throw new \LogicException('Cannot bind areas from different categories.');
@@ -334,18 +334,18 @@ 
     public function unbindSubscriber($subscriberArea, $providerArea)
     {
         $sa = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $subscriberArea]);
+                    ->findOneBy(['areaname' => $subscriberArea]);
         $pa = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $providerArea]);
+                    ->findOneBy(['areaname' => $providerArea]);
 
         $subscriberAreaId = $sa->getId();
         $providerAreaId = $pa->getId();
 
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->where('t.pareaid = ?1 AND t.sareaid = ?2')
-                 ->getQuery()->setParameters([1 => $providerAreaId, 2 => $subscriberAreaId])
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->where('t.pareaid = ?1 AND t.sareaid = ?2')
+                    ->getQuery()->setParameters([1 => $providerAreaId, 2 => $subscriberAreaId])
+                    ->execute();
 
         $this->generateRuntimeHandlers();
     }
@@ -357,16 +357,16 @@ 
         $order->add('t.sortorder', 'ASC');
 
         return $this->em->createQueryBuilder()->select('t')
-                 ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->orderBy($order)
-                 ->getQuery()
-                 ->getArrayResult();
+                    ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->orderBy($order)
+                    ->getQuery()
+                    ->getArrayResult();
     }
 
     public function getBindingsFor($areaName)
     {
         $area = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                     ->findOneBy(['areaname' => $areaName]);
+                        ->findOneBy(['areaname' => $areaName]);
 
         if (!$area) {
             return [];
@@ -382,11 +382,11 @@ 
         $order->add('t.sortorder', 'ASC');
         $order->add('t.sareaid', 'ASC');
         $results = $this->em->createQueryBuilder()->select('t')
-                         ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                         ->where("t.$areaIdField = ?1")
-                         ->orderBy($order)
-                         ->getQuery()->setParameter(1, $area->getId())
-                         ->getArrayResult();
+                            ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                            ->where("t.$areaIdField = ?1")
+                            ->orderBy($order)
+                            ->getQuery()->setParameter(1, $area->getId())
+                            ->getArrayResult();
 
         // this could be an area where related entities would help CAH - 23 Oct 2013
         $areas = [];
@@ -413,18 +413,18 @@ 
         foreach ($providerAreaNames as $name) {
             $providerAreaIds[] =
                 $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                     ->findOneBy(['areaname' => $name])
-                     ->getId();
+                        ->findOneBy(['areaname' => $name])
+                        ->getId();
         }
 
         // sort bindings in order of appearance from $providerAreaIds
         $counter = 1;
         foreach ($providerAreaIds as $id) {
             $this->em->createQueryBuilder()
-                 ->update('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->set('t.sortorder', $counter)
-                 ->where('t.sareaid = ?1 AND t.pareaid = ?2')
-                 ->getQuery()->setParameters([1 => $sareaId, 2 => $id])
+                    ->update('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->set('t.sortorder', $counter)
+                    ->where('t.sareaid = ?1 AND t.pareaid = ?2')
+                    ->getQuery()->setParameters([1 => $sareaId, 2 => $id])
                 ->execute();
             $counter++;
         }
@@ -471,7 +471,7 @@ 
 
         $subscribers =
             $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity')
-                 ->findBy(['sareaid' => $sareaId]);
+                    ->findBy(['sareaid' => $sareaId]);
 
         if (!$subscribers) {
             return false;
@@ -482,8 +482,8 @@ 
         foreach ($subscribers as $subscriber) {
             $pareaId =
                 $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                     ->findOneBy(['areaname' => $providerArea])
-                     ->getId();
+                        ->findOneBy(['areaname' => $providerArea])
+                        ->getId();
 
             $hookprovider =
                 $this->em->createQueryBuilder()->select('t')
@@ -494,7 +494,7 @@ 
                         2 => $subscriber->getHooktype(),
                         3 => $subscriber->getCategory()
                     ])
-                     ->getArrayResult();
+                        ->getArrayResult();
 
             if ($hookprovider) {
                 $allow = true;
@@ -542,7 +542,7 @@ 
     public function getAreaId($areaName)
     {
         $hookArea = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $areaName]);
+                    ->findOneBy(['areaname' => $areaName]);
 
         if (!$hookArea) {
             return false;

Braces +2 added lines, -1 removed lines

@@ -374,7 +374,8 @@
 
         if ($area->getAreatype() == self::PROVIDER) {
             $areaIdField = 'pareaid';
-        } else { // $area->getAreatype() == self::SUBSCRIBER
+        } else {
+// $area->getAreatype() == self::SUBSCRIBER
             $areaIdField = 'sareaid';
         }
 

src/system/RoutesModule/Base/AbstractRoutesModuleInstaller.php

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
     /**
      * Build array with all entity classes for ZikulaRoutesModule.
      *
-     * @return array list of class names
+     * @return string[] list of class names
      */
     protected function listEntityClasses()
     {

src/system/PermissionsModule/Twig/Extension/PermissionsExtension.php

Spacing +1 added lines, -1 removed lines

@@ -62,6 +62,6 @@
 
         $result = $this->container->get('zikula_permissions_module.api.permission')->hasPermission($component, $instance, constant($level));
 
-        return (bool) $result;
+        return (bool)$result;
     }
 }

src/system/GroupsModule/Controller/MembershipController.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
         if ($gid < 1 || $uid < 1) {
             throw new \InvalidArgumentException($this->__('Invalid Group ID or User ID.'));
         }
-        if (!$this->hasPermission('ZikulaGroupsModule::', $gid.'::', ACCESS_EDIT)) {
+        if (!$this->hasPermission('ZikulaGroupsModule::', $gid . '::', ACCESS_EDIT)) {
             throw new AccessDeniedException();
         }
         $group = $this->get('zikula_groups_module.group_repository')->find($gid);

src/system/GroupsModule/GroupsModuleInstaller.php

Spacing +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
         switch ($oldVersion) {
             case '2.3.2':
             case '2.4.0':
-                $this->setVar('mailwarning', (bool) $this->getVar('mailwarning'));
-                $this->setVar('hideclosed', (bool) $this->getVar('hideclosed'));
+                $this->setVar('mailwarning', (bool)$this->getVar('mailwarning'));
+                $this->setVar('hideclosed', (bool)$this->getVar('hideclosed'));
                 $this->setVar('hidePrivate', false);
             case '2.4.1':
             // future upgrade routines

src/lib/Zikula/Bundle/CoreBundle/Twig/Extension/PagerExtension.php

Spacing +13 added lines, -13 removed lines

@@ -139,7 +139,7 @@ 
                     case 'lang':
                         $addcurrentlang2url = $systemVars['languageurl'];
                         if ($addcurrentlang2url == 0) {
-                            $pager['args'][$k] =  $v;
+                            $pager['args'][$k] = $v;
                         }
                         break;
                     default:
@@ -161,19 +161,19 @@ 
                                     }
                                 } elseif (strlen($vv)) {
                                     $tkey = $k . '[' . $kk . ']';
-                                    $pager['args'][$tkey] =  $vv;
+                                    $pager['args'][$tkey] = $vv;
                                 }
                             }
                         } else {
                             if (strlen($v)) {
-                                $pager['args'][$k] =  $v;
+                                $pager['args'][$k] = $v;
                             }
                         }
                 }
             }
         }
 
-        $pagerUrl = function ($pager) use ($routeName, $systemVars) {
+        $pagerUrl = function($pager) use ($routeName, $systemVars) {
             if ($routeName) {
                 return $this->container->get('router')->generate($routeName, $pager['args']);
             }
@@ -373,7 +373,7 @@ 
             // predefined abc
             if (strtolower($params['skin']) == 'hu') {
                 // Hungarian
-                $pager['names']  = $pager['values'] = ['A', '?', 'B', 'C', 'D', 'E', '?', 'F', 'G', 'H', 'I', '?', 'J', 'K', 'L', 'M', 'N', 'O', '?', '?', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', '?', '?', 'U', 'V', 'W', 'X', 'Y', 'Z'];
+                $pager['names'] = $pager['values'] = ['A', '?', 'B', 'C', 'D', 'E', '?', 'F', 'G', 'H', 'I', '?', 'J', 'K', 'L', 'M', 'N', 'O', '?', '?', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', '?', '?', 'U', 'V', 'W', 'X', 'Y', 'Z'];
                 //$params['names']  = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U'    ,'V','W','X','Y','Z');
                 //$params['values'] = array('A,?','B','C','D','E,?','F','G','H','I,?','J','K','L','M','N','O,?,?,O','P','Q','R','S','T','U,?,?,U','V','W','X','Y','Z');
             } else {
@@ -387,7 +387,7 @@ 
         unset($params['names']);
         unset($params['values']);
         unset($params['route']);
-        $pagerUrl = function ($pager) {
+        $pagerUrl = function($pager) {
             return $this->container->get('router')->generate($pager['route'], $pager['args']);
         };
         $allVars = array_merge($request->request->all(), $request->query->all(), $request->attributes->get('_route_params', []));
@@ -418,38 +418,38 @@ 
         }
         unset($pager['args'][$pager['posvar']]);
         // begin to fill the output
-        $output = '<ul class="'.$params['class'].'">'."\n";
+        $output = '<ul class="' . $params['class'] . '">' . "\n";
         $style = '';
         if ($params['printempty']) {
             $active = '';
             if (!empty($params['class_numon'])) {
                 if (!isset($allVars[$pager['posvar']])) {
-                    $style = ' class="'.$params['class_numon'].'"';
+                    $style = ' class="' . $params['class_numon'] . '"';
                     $active = 'class="active"';
                 } elseif (!empty($params['class_num'])) {
-                    $style = ' class="'.$params['class_num'].'"';
+                    $style = ' class="' . $params['class_num'] . '"';
                 } else {
                     $style = '';
                 }
             }
             $vars[$pager['posvar']] = '';
-            $output .= '<li '.$active.'><a '.$style.' href="'.$pagerUrl($pager).'"> -'."\n</a></li>";
+            $output .= '<li ' . $active . '><a ' . $style . ' href="' . $pagerUrl($pager) . '"> -' . "\n</a></li>";
         }
         $style = '';
         foreach (array_keys($pager['names']) as $i) {
             $active = '';
             if (!empty($params['class_numon'])) {
                 if (isset($allVars[$pager['posvar']]) && $allVars[$pager['posvar']] == $pager['values'][$i]) {
-                    $style = ' class="'.$params['class_numon'].'"';
+                    $style = ' class="' . $params['class_numon'] . '"';
                     $active = 'class="active"';
                 } elseif (!empty($params['class_num'])) {
-                    $style = ' class="'.$params['class_num'].'"';
+                    $style = ' class="' . $params['class_num'] . '"';
                 } else {
                     $style = '';
                 }
             }
             $pager['args'][$pager['posvar']] = $pager['values'][$i];
-            $output .= '<li '.$active.'><a '.$style.' href="'.$pagerUrl($pager).'">'.$pager['names'][$i]."</a></li>\n";
+            $output .= '<li ' . $active . '><a ' . $style . ' href="' . $pagerUrl($pager) . '">' . $pager['names'][$i] . "</a></li>\n";
         }
         $output .= "</ul>\n";
 

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     /**
      * Returns a list of functions to add to the existing list.
      *
-     * @return array An array of functions
+     * @return \Twig_SimpleFunction[] An array of functions
      */
     public function getFunctions()
     {

src/system/SettingsModule/Api/LocaleApi.php

Spacing +2 added lines, -2 removed lines

@@ -59,11 +59,11 @@
         $availableLanguages = [];
         foreach ($matches as $match) {
             list($languageCode, $unusedVar) = explode('-', $match[1]) + ['', ''];
-            $priority = isset($match[2]) ? (float) $match[2] : 1.0;
+            $priority = isset($match[2]) ? (float)$match[2] : 1.0;
             $availableLanguages[][$languageCode] = $priority;
         }
 
-        $defaultPriority = (float) 0;
+        $defaultPriority = (float)0;
         $matchedLanguage = '';
         foreach ($availableLanguages as $key => $value) {
             $languageCode = key($value);