Completed
Pull Request — master (#3643)
by Craig
12:52 queued 05:53
created
src/system/ThemeModule/EventListener/CreateThemedResponseListener.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -108,6 +108,9 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
src/system/RoutesModule/Form/Type/Base/AbstractRouteType.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -413,7 +413,7 @@
 block discarded – undo
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' => [
Please login to merge, or discard this patch.
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,8 +28,8 @@
 block discarded – undo
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.
Please login to merge, or discard this patch.
src/system/CategoriesModule/Tests/Form/Type/CategoriesTypeTest.php 1 patch
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -385,6 +385,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/system/RoutesModule/Helper/Base/AbstractWorkflowHelper.php 2 patches
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -93,31 +93,31 @@
 block discarded – undo
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.
Please login to merge, or discard this patch.
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@
 block discarded – undo
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.
Please login to merge, or discard this patch.
system/CategoriesModule/DependencyInjection/ZikulaCategoriesExtension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
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('helpers.yml');
Please login to merge, or discard this patch.
src/system/CategoriesModule/Form/Type/CategoryType.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
                 'mapped' => false,
92 92
                 'required' => false
93 93
             ])
94
-            ->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) use ($options) {
94
+            ->addEventListener(FormEvents::SUBMIT, function(FormEvent $event) use ($options) {
95 95
                 // ensure all locales have a display name
96 96
                 /** @var CategoryEntity $category */
97 97
                 $category = $event->getData();
@@ -109,10 +109,10 @@  discard block
 block discarded – undo
109 109
         $builder->get('name')
110 110
             ->addModelTransformer(new CallbackTransformer(
111 111
                 // remove slash from name before persistence to prevent issues with path
112
-                function ($string) {
112
+                function($string) {
113 113
                     return $string;
114 114
                 },
115
-                function ($string) {
115
+                function($string) {
116 116
                     return str_replace('/', '/', $string);
117 117
                 }
118 118
             ))
Please login to merge, or discard this patch.
src/system/CategoriesModule/Form/Type/CategoriesType.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -57,10 +57,10 @@  discard block
 block discarded – undo
57 57
 
58 58
         /** @var CategoryRegistryEntity[] $registries */
59 59
         foreach ($registries as $registry) {
60
-            $queryBuilderClosure = function (CategoryRepositoryInterface $repo) use ($registry, $options) {
60
+            $queryBuilderClosure = function(CategoryRepositoryInterface $repo) use ($registry, $options) {
61 61
                 return $repo->getChildrenQueryBuilder($registry->getCategory(), $options['direct']);
62 62
             };
63
-            $choiceLabelClosure = function (CategoryEntity $category) use ($registry) {
63
+            $choiceLabelClosure = function(CategoryEntity $category) use ($registry) {
64 64
                 $indent = str_repeat('--', $category->getLvl() - $registry->getCategory()->getLvl() - 1);
65 65
 
66 66
                 return (!empty($indent) ? '|' : '') . $indent . $category->getName();
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
         $resolver->setAllowedTypes('entityCategoryClass', 'string');
120 120
         $resolver->setAllowedTypes('em', [ObjectManager::class, 'null']);
121 121
 
122
-        $resolver->addAllowedValues('entityCategoryClass', function ($value) {
122
+        $resolver->addAllowedValues('entityCategoryClass', function($value) {
123 123
             return is_subclass_of($value, AbstractCategoryAssignment::class);
124 124
         });
125 125
     }
Please login to merge, or discard this patch.
src/system/CategoriesModule/Controller/NodeController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
                 $newCategory->setName($category->getName() . 'copy');
55 55
                 $displayNames = [];
56 56
                 foreach ($newCategory->getDisplay_name() as $locale => $displayName) {
57
-                    $displayNames[$locale] = $displayName . ' ' .$this->__('copy');
57
+                    $displayNames[$locale] = $displayName . ' ' . $this->__('copy');
58 58
                 }
59 59
                 $newCategory->setDisplay_name($displayNames);
60 60
                 $action = 'edit';
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,8 @@
 block discarded – undo
70 70
                         $parent = $repo->find($parentId);
71 71
                         $category->setParent($parent);
72 72
                         $category->setRoot($parent->getRoot());
73
-                    } elseif (empty($parent) && $request->request->has('after')) { // sibling of top-level child
73
+                    } elseif (empty($parent) && $request->request->has('after')) {
74
+// sibling of top-level child
74 75
                         $sibling = $repo->find($request->request->get('after'));
75 76
                         $category->setParent($sibling->getParent());
76 77
                         $category->setRoot($sibling->getRoot());
Please login to merge, or discard this patch.
src/system/CategoriesModule/Controller/CategoryController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         return [
80 80
             'decorate' => true,
81 81
             'html' => true,
82
-            'childOpen' => function ($node) {
82
+            'childOpen' => function($node) {
83 83
                 $jsTreeData = [];
84 84
                 $jsTreeData['disabled'] = $node['status'] != 'A';
85 85
                 $jsTreeData['type'] = $node['is_leaf'] ? 'leaf' : 'default';
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
                 return '<li ' . $jsTreeData . 'class="jstree-open" id="' . $this->domTreeNodePrefix . $node['id'] . '">';
89 89
             },
90
-            'nodeDecorator' => function ($node) use ($locale) {
90
+            'nodeDecorator' => function($node) use ($locale) {
91 91
                 $displayName = isset($node['display_name'][$locale]) ? $node['display_name'][$locale] : $node['name'];
92 92
                 $title = ' title="' . $this->createTitleAttribute($node, $displayName, $locale) . '"';
93 93
                 $classes = [];
Please login to merge, or discard this patch.