zikula / core

src/system/CategoriesModule/DependencyInjection/ZikulaCategoriesExtension.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config')));
+        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__ . '/../Resources/config')));
 
         $loader->load('services.yml');
         $loader->load('helpers.yml');

src/system/CategoriesModule/Form/Type/CategoryTreeType.php

Spacing +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
         $resolver->setAllowedTypes('includeLeaf', 'bool');
         $resolver->setAllowedTypes('all', 'bool');
 
-        $resolver->setNormalizer('label', function (Options $options, $label) {
+        $resolver->setNormalizer('label', function(Options $options, $label) {
             if (null === $label || empty($label)) {
                 $isMultiple = $options['multiple'];
                 $translator = $options['translator'];
@@ -98,7 +98,7 @@ 
 
             return $label;
         });
-        $resolver->setNormalizer('placeholder', function (Options $options, $placeholder) {
+        $resolver->setNormalizer('placeholder', function(Options $options, $placeholder) {
             if (!$options['required']) {
                 if (null == $placeholder || empty($placeholder)) {
                     $isMultiple = $options['multiple'];
@@ -110,7 +110,7 @@ 
 
             return $placeholder;
         });
-        $resolver->setNormalizer('choices', function (Options $options, $choices) {
+        $resolver->setNormalizer('choices', function(Options $options, $choices) {
             if (empty($choices)) {
                 $choices = $this->getCategoryChoices($options);
             }

src/system/CategoriesModule/Form/Type/CategoryType.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
                 'mapped' => false,
                 'required' => false
             ])
-            ->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) use ($options) {
+            ->addEventListener(FormEvents::SUBMIT, function(FormEvent $event) use ($options) {
                 // ensure all locales have a display name
                 /** @var CategoryEntity $category */
                 $category = $event->getData();
@@ -109,10 +109,10 @@ 
         $builder->get('name')
             ->addModelTransformer(new CallbackTransformer(
                 // remove slash from name before persistence to prevent issues with path
-                function ($string) {
+                function($string) {
                     return $string;
                 },
-                function ($string) {
+                function($string) {
                     return str_replace('/', '/', $string);
                 }
             ))

src/system/CategoriesModule/Form/Type/CategoriesType.php

Spacing +3 added lines, -3 removed lines

@@ -57,10 +57,10 @@ 
 
         /** @var CategoryRegistryEntity[] $registries */
         foreach ($registries as $registry) {
-            $queryBuilderClosure = function (CategoryRepositoryInterface $repo) use ($registry, $options) {
+            $queryBuilderClosure = function(CategoryRepositoryInterface $repo) use ($registry, $options) {
                 return $repo->getChildrenQueryBuilder($registry->getCategory(), $options['direct']);
             };
-            $choiceLabelClosure = function (CategoryEntity $category) use ($registry) {
+            $choiceLabelClosure = function(CategoryEntity $category) use ($registry) {
                 $indent = str_repeat('--', $category->getLvl() - $registry->getCategory()->getLvl() - 1);
 
                 return (!empty($indent) ? '|' : '') . $indent . $category->getName();
@@ -119,7 +119,7 @@ 
         $resolver->setAllowedTypes('entityCategoryClass', 'string');
         $resolver->setAllowedTypes('em', [ObjectManager::class, 'null']);
 
-        $resolver->addAllowedValues('entityCategoryClass', function ($value) {
+        $resolver->addAllowedValues('entityCategoryClass', function($value) {
             return is_subclass_of($value, AbstractCategoryAssignment::class);
         });
     }

src/system/CategoriesModule/Form/Type/CategoryRegistryType.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
             ])
         ;
 
-        $formModifier = function (FormInterface $form, $modName = null) use ($options) {
+        $formModifier = function(FormInterface $form, $modName = null) use ($options) {
             $entities = null === $modName ? [] : $this->entitySelectionBuilder->buildFor($modName);
             $form->add('entityname', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
                 'label' => $options['translator']->__('Entity'),
@@ -85,7 +85,7 @@ 
 
         $builder->addEventListener(
             FormEvents::PRE_SET_DATA,
-            function (FormEvent $event) use ($formModifier) {
+            function(FormEvent $event) use ($formModifier) {
                 /** @var CategoryRegistryEntity $data */
                 $data = $event->getData();
                 $formModifier($event->getForm(), $data->getModname());
@@ -94,7 +94,7 @@ 
 
         $builder->get('modname')->addEventListener(
             FormEvents::POST_SUBMIT,
-            function (FormEvent $event) use ($formModifier) {
+            function(FormEvent $event) use ($formModifier) {
                 $modName = $event->getForm()->getData();
                 $formModifier($event->getForm()->getParent(), $modName);
             }

src/system/CategoriesModule/Controller/NodeController.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
                 $newCategory->setName($category->getName() . 'copy');
                 $displayNames = [];
                 foreach ($newCategory->getDisplay_name() as $locale => $displayName) {
-                    $displayNames[$locale] = $displayName . ' ' .$this->__('copy');
+                    $displayNames[$locale] = $displayName . ' ' . $this->__('copy');
                 }
                 $newCategory->setDisplay_name($displayNames);
                 $action = 'edit';

Braces +2 added lines, -1 removed lines

@@ -70,7 +70,8 @@
                         $parent = $repo->find($parentId);
                         $category->setParent($parent);
                         $category->setRoot($parent->getRoot());
-                    } elseif (empty($parent) && $request->request->has('after')) { // sibling of top-level child
+                    } elseif (empty($parent) && $request->request->has('after')) {
+// sibling of top-level child
                         $sibling = $repo->find($request->request->get('after'));
                         $category->setParent($sibling->getParent());
                         $category->setRoot($sibling->getRoot());

src/system/CategoriesModule/Controller/CategoryController.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
         return [
             'decorate' => true,
             'html' => true,
-            'childOpen' => function ($node) {
+            'childOpen' => function($node) {
                 $jsTreeData = [];
                 $jsTreeData['disabled'] = $node['status'] != 'A';
                 $jsTreeData['type'] = $node['is_leaf'] ? 'leaf' : 'default';
@@ -87,7 +87,7 @@ 
 
                 return '<li ' . $jsTreeData . 'class="jstree-open" id="' . $this->domTreeNodePrefix . $node['id'] . '">';
             },
-            'nodeDecorator' => function ($node) use ($locale) {
+            'nodeDecorator' => function($node) use ($locale) {
                 $displayName = isset($node['display_name'][$locale]) ? $node['display_name'][$locale] : $node['name'];
                 $title = ' title="' . $this->createTitleAttribute($node, $displayName, $locale) . '"';
                 $classes = [];

src/lib/Zikula/Bundle/HookBundle/Controller/HookController.php

Spacing +4 added lines, -4 removed lines

@@ -208,7 +208,7 @@ 
                 }
 
                 // does the user have admin permissions on the provider module?
-                if (!$this->get('zikula_permissions_module.api.permission')->hasPermission($hookproviders[$i]['name']."::", '::', ACCESS_ADMIN)) {
+                if (!$this->get('zikula_permissions_module.api.permission')->hasPermission($hookproviders[$i]['name'] . "::", '::', ACCESS_ADMIN)) {
                     unset($hookproviders[$i]);
                     continue;
                 }
@@ -292,7 +292,7 @@ 
         if (!$this->get('kernel')->isBundle($subscriber)) {
             throw new \RuntimeException($this->get('translator.default')->__f('Subscriber module "%s" is not available.', $subscriber));
         }
-        if (!$this->get('zikula_permissions_module.api.permission')->hasPermission($subscriber.'::', '::', ACCESS_ADMIN)) {
+        if (!$this->get('zikula_permissions_module.api.permission')->hasPermission($subscriber . '::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();
         }
 
@@ -310,7 +310,7 @@ 
         if (!$this->get('kernel')->isBundle($provider)) {
             throw new \RuntimeException($this->get('translator.default')->__f('Provider module "%s" is not available.', $provider));
         }
-        if (!$this->get('zikula_permissions_module.api.permission')->hasPermission($provider.'::', '::', ACCESS_ADMIN)) {
+        if (!$this->get('zikula_permissions_module.api.permission')->hasPermission($provider . '::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();
         }
 
@@ -372,7 +372,7 @@ 
         if (!$this->get('kernel')->isBundle($subscriber)) {
             throw new \RuntimeException($this->get('translator.default')->__f('Subscriber module "%s" is not available.', $subscriber));
         }
-        if (!$this->get('zikula_permissions_module.api.permission')->hasPermission($subscriber.'::', '::', ACCESS_ADMIN)) {
+        if (!$this->get('zikula_permissions_module.api.permission')->hasPermission($subscriber . '::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();
         }
 

src/system/RoutesModule/Entity/Repository/Base/AbstractRouteRepository.php

Doc Comments +3 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
     /**
      * Retrieves an array with all fields which can be used for sorting instances.
      *
-     * @return array Sorting fields array
+     * @return string[] Sorting fields array
      */
     public function getAllowedSortingFields()
     {
@@ -103,7 +103,7 @@ 
     /**
      * Returns the request.
      *
-     * @return Request
+     * @return null|Request
      */
     public function getRequest()
     {
@@ -175,7 +175,6 @@ 
     /**
      * Returns an array of additional template variables which are specific to the object type treated by this repository.
      *
-     * @param ImageHelper $imageHelper ImageHelper service instance
      * @param string      $context     Usage context (allowed values: controllerAction, api, actionHandler, block, contentType)
      * @param array       $args        Additional arguments
      *
@@ -421,7 +420,7 @@ 
     /**
      * Selects an object from the database.
      *
-     * @param mixed   $id       The id (or array of ids) to use to retrieve the object (optional) (default=0)
+     * @param integer   $id       The id (or array of ids) to use to retrieve the object (optional) (default=0)
      * @param boolean $useJoins Whether to include joining related objects (optional) (default=true)
      * @param boolean $slimMode If activated only some basic fields are selected without using any joins (optional) (default=false)
      *

Indentation +24 added lines, -24 removed lines

@@ -279,9 +279,9 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->update('Zikula\RoutesModule\Entity\RouteEntity', 'tbl')
-           ->set('tbl.createdBy', $newUserId)
-           ->where('tbl.createdBy = :creator')
-           ->setParameter('creator', $userId);
+            ->set('tbl.createdBy', $newUserId)
+            ->where('tbl.createdBy = :creator')
+            ->setParameter('creator', $userId);
         $query = $qb->getQuery();
         $query->execute();
     
@@ -312,9 +312,9 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->update('Zikula\RoutesModule\Entity\RouteEntity', 'tbl')
-           ->set('tbl.updatedBy', $newUserId)
-           ->where('tbl.updatedBy = :editor')
-           ->setParameter('editor', $userId);
+            ->set('tbl.updatedBy', $newUserId)
+            ->where('tbl.updatedBy = :editor')
+            ->setParameter('editor', $userId);
         $query = $qb->getQuery();
         $query->execute();
     
@@ -343,8 +343,8 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->delete('Zikula\RoutesModule\Entity\RouteEntity', 'tbl')
-           ->where('tbl.createdBy = :creator')
-           ->setParameter('creator', $userId);
+            ->where('tbl.createdBy = :creator')
+            ->setParameter('creator', $userId);
         $query = $qb->getQuery();
     
         $query->execute();
@@ -374,8 +374,8 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->delete('Zikula\RoutesModule\Entity\RouteEntity', 'tbl')
-           ->where('tbl.updatedBy = :editor')
-           ->setParameter('editor', $userId);
+            ->where('tbl.updatedBy = :editor')
+            ->setParameter('editor', $userId);
         $query = $qb->getQuery();
     
         $query->execute();
@@ -471,7 +471,7 @@ 
     {
         if ($excludeId > 0) {
             $qb->andWhere('tbl.id != :excludeId')
-               ->setParameter('excludeId', $excludeId);
+                ->setParameter('excludeId', $excludeId);
         }
     
         return $qb;
@@ -533,7 +533,7 @@ 
         $offset = ($currentPage-1) * $resultsPerPage;
     
         $query->setFirstResult($offset)
-              ->setMaxResults($resultsPerPage);
+                ->setMaxResults($resultsPerPage);
     
         return $query;
     }
@@ -599,14 +599,14 @@ 
                 if ((!is_numeric($v) && $v != '') || (is_numeric($v) && $v > 0)) {
                     if ($k == 'workflowState' && substr($v, 0, 1) == '!') {
                         $qb->andWhere('tbl.' . $k . ' != :' . $k)
-                           ->setParameter($k, substr($v, 1, strlen($v)-1));
+                            ->setParameter($k, substr($v, 1, strlen($v)-1));
                     } elseif (substr($v, 0, 1) == '%') {
                         $qb->andWhere('tbl.' . $k . ' LIKE :' . $k)
-                           ->setParameter($k, '%' . $v . '%');
+                            ->setParameter($k, '%' . $v . '%');
                     } else {
                         $qb->andWhere('tbl.' . $k . ' = :' . $k)
-                           ->setParameter($k, $v);
-                   }
+                            ->setParameter($k, $v);
+                    }
                 }
             }
         }
@@ -703,7 +703,7 @@ 
         $parameters['searchGroup'] = '%' . $fragment . '%';
     
         $qb->andWhere('(' . implode(' OR ', $filters) . ')')
-           ->setParameters($parameters);
+            ->setParameters($parameters);
     
         return $qb;
     }
@@ -756,7 +756,7 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->select($selection)
-           ->from('Zikula\RoutesModule\Entity\RouteEntity', 'tbl');
+            ->from('Zikula\RoutesModule\Entity\RouteEntity', 'tbl');
     
         if (true === $useJoins) {
             $this->addJoinsToFrom($qb);
@@ -801,7 +801,7 @@ 
     {
         $qb = $this->getCountQuery('', false);
         $qb->andWhere('tbl.' . $fieldName . ' = :' . $fieldName)
-           ->setParameter($fieldName, $fieldValue);
+            ->setParameter($fieldName, $fieldValue);
     
         $qb = $this->addExclusion($qb, $excludeId);
     
@@ -847,7 +847,7 @@ 
     
         $qb = $this->getEntityManager()->createQueryBuilder();
         $qb->select($selection)
-           ->from('Zikula\RoutesModule\Entity\RouteEntity', 'tbl');
+            ->from('Zikula\RoutesModule\Entity\RouteEntity', 'tbl');
     
         if (true === $useJoins) {
             $this->addJoinsToFrom($qb);
@@ -921,7 +921,7 @@ 
             
             $userId = $this->getRequest()->getSession()->get('uid');
             $qb->andWhere('tbl.createdBy = :creator')
-               ->setParameter('creator', $userId);
+                ->setParameter('creator', $userId);
         }
     
         return $qb;
@@ -940,7 +940,7 @@ 
         if ($orderBy == 'RAND()') {
             // random selection
             $qb->addSelect('MOD(tbl.id, ' . mt_rand(2, 15) . ') AS HIDDEN randomIdentifiers')
-               ->add('orderBy', 'randomIdentifiers');
+                ->add('orderBy', 'randomIdentifiers');
             $orderBy = '';
         } elseif (empty($orderBy)) {
             $orderBy = $this->defaultSortingField;
@@ -953,12 +953,12 @@ 
             }
             if (false !== strpos($orderBy, 'tbl.createdBy')) {
                 $qb->addSelect('tblCreator')
-                   ->leftJoin('tbl.createdBy', 'tblCreator');
+                    ->leftJoin('tbl.createdBy', 'tblCreator');
                 $orderBy = str_replace('tbl.createdBy', 'tblCreator.uname', $orderBy);
             }
             if (false !== strpos($orderBy, 'tbl.updatedBy')) {
                 $qb->addSelect('tblUpdater')
-                   ->leftJoin('tbl.updatedBy', 'tblUpdater');
+                    ->leftJoin('tbl.updatedBy', 'tblUpdater');
                 $orderBy = str_replace('tbl.updatedBy', 'tblUpdater.uname', $orderBy);
             }
             $qb->add('orderBy', $orderBy);

Spacing +2 added lines, -2 removed lines

@@ -528,7 +528,7 @@ 
     public function getSelectWherePaginatedQuery(QueryBuilder $qb, $currentPage = 1, $resultsPerPage = 25)
     {
         $query = $this->getQueryFromBuilder($qb);
-        $offset = ($currentPage-1) * $resultsPerPage;
+        $offset = ($currentPage - 1) * $resultsPerPage;
     
         $query->setFirstResult($offset)
               ->setMaxResults($resultsPerPage);
@@ -596,7 +596,7 @@ 
                 if ((!is_numeric($v) && $v != '') || (is_numeric($v) && $v > 0)) {
                     if ($k == 'workflowState' && substr($v, 0, 1) == '!') {
                         $qb->andWhere('tbl.' . $k . ' != :' . $k)
-                           ->setParameter($k, substr($v, 1, strlen($v)-1));
+                           ->setParameter($k, substr($v, 1, strlen($v) - 1));
                     } elseif (substr($v, 0, 1) == '%') {
                         $qb->andWhere('tbl.' . $k . ' LIKE :' . $k)
                            ->setParameter($k, '%' . $v . '%');