Completed
Pull Request — develop (#349)
by ANTHONIUS
06:14
created
module/Core/config/doctrine.config.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@
 block discarded – undo
26 26
 //                'driver'             => 'odm_default',
27 27
 //
28 28
 //                'generate_proxies'   => true,
29
-                  'proxy_dir'          => 'cache/DoctrineMongoODMModule/Proxy',
29
+                    'proxy_dir'          => 'cache/DoctrineMongoODMModule/Proxy',
30 30
 //                'proxy_namespace'    => 'DoctrineMongoODMModule\Proxy',
31 31
 //
32 32
 //                'generate_hydrators' => true,
33
-                  'hydrator_dir'       => 'cache/DoctrineMongoODMModule/Hydrator',
33
+                    'hydrator_dir'       => 'cache/DoctrineMongoODMModule/Hydrator',
34 34
 //                'hydrator_namespace' => 'DoctrineMongoODMModule\Hydrator',
35 35
 //
36 36
 //                'default_db'         => '',
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/IndexController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
     {
132 132
         $viewModel = new ViewModel();
133 133
         $viewModel->setTemplate('error/index')
134
-                  ->setVariable('message', 'An unexpected error had occured. Please try again later.');
134
+                    ->setVariable('message', 'An unexpected error had occured. Please try again later.');
135 135
         return $viewModel;
136 136
     }
137 137
 }
Please login to merge, or discard this patch.
module/Organizations/src/Organizations/Repository/Organization.php 3 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -128,10 +128,10 @@  discard block
 block discarded – undo
128 128
 //           )
129 129
 //        );
130 130
         $qb->addAnd($qb->expr()->field('user')->equals($userId))
131
-           ->addAnd(
132
-               $qb->expr()->addOr($qb->expr()->field('parent')->exists(false))
133
-                               ->addOr($qb->expr()->field('parent')->equals(null))
134
-           );
131
+            ->addAnd(
132
+                $qb->expr()->addOr($qb->expr()->field('parent')->exists(false))
133
+                                ->addOr($qb->expr()->field('parent')->equals(null))
134
+            );
135 135
 
136 136
         $q      = $qb->getQuery();
137 137
         $entity = $q->getSingleResult();
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
         if ($userOrg->hasAssociation()) {
253 253
             $qb->addAnd(
254 254
                 $qb->expr()->addOr($qb->expr()->field('parent')->equals($userOrg->getId()))
255
-                           ->addOr($qb->expr()->field('_id')->equals($userOrg->getId()))
255
+                            ->addOr($qb->expr()->field('_id')->equals($userOrg->getId()))
256 256
             );
257 257
         }
258 258
 
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
     /**
107 107
      * Finds the main organization of an user.
108 108
      *
109
-     * @param string|UserInterface $userOrId
109
+     * @param string $userOrId
110 110
      *
111 111
      * @return null|OrganizationInterface
112 112
      */
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
     /**
143 143
      * Finds the organization, an user is employed by.
144 144
      *
145
-     * @param string|UserInterface $userOrId
145
+     * @param string $userOrId
146 146
      *
147 147
      * @return null|OrganizationInterface
148 148
      */
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
     /**
271 271
      * Look for an drafted Document of a given user
272 272
      *
273
-     * @param $user
273
+     * @param \Auth\Entity\AnonymousUser $user
274 274
      * @return \Organizations\Entity\Organization|null
275 275
      */
276 276
     public function findDraft($user)
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         $organizationNameQb = $this->getDocumentManager()->createQueryBuilder('Organizations\Entity\OrganizationName');
226 226
         $organizationNameQb->hydrate(false)
227 227
             ->select(array('id', 'name'))
228
-            ->field('name')->equals(new \MongoRegex('/' . $query . '/i'))
228
+            ->field('name')->equals(new \MongoRegex('/'.$query.'/i'))
229 229
             ->sort('name')
230 230
             ->limit(5);
231 231
 
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 
261 261
         foreach ($result as $id => $item) {
262 262
             $organizations[$id] = $item;
263
-            $organizationNameId = (string)$organizations[$id]['organizationName'];
263
+            $organizationNameId = (string) $organizations[$id]['organizationName'];
264 264
             $organizations[$id]['organizationName'] = $organizationNames[$organizationNameId];
265 265
         }
266 266
 
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Entity/Job.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -380,10 +380,10 @@
 block discarded – undo
380 380
         return $this;
381 381
     }
382 382
     
383
-     /**
384
-     * (non-PHPdoc)
385
-     * @see \Jobs\Entity\JobInterface::getOrganization()
386
-     */
383
+        /**
384
+         * (non-PHPdoc)
385
+         * @see \Jobs\Entity\JobInterface::getOrganization()
386
+         */
387 387
     public function getOrganization()
388 388
     {
389 389
         return $this->organization;
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -536,7 +536,7 @@
 block discarded – undo
536 536
 
537 537
     /**
538 538
      * Gets the number of unread applications
539
-     * @return Collection
539
+     * @return integer
540 540
      */
541 541
     public function getUnreadApplications()
542 542
     {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -459,10 +459,10 @@  discard block
 block discarded – undo
459 459
     public function getLocation()
460 460
     {
461 461
         if (null === $this->location) {
462
-            $array=[];
463
-            if(null != $this->locations){
462
+            $array = [];
463
+            if (null != $this->locations) {
464 464
                 foreach ($this->locations as $location) { /* @var \Core\Entity\LocationInterface $location */
465
-                    $array[]=$location->getCity();
465
+                    $array[] = $location->getCity();
466 466
                 }
467 467
                 return implode(', ', $array);
468 468
             }
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
             if ($removePermissions) {
518 518
                 $this->getPermissions()->revoke($this->user, Permissions::PERMISSION_ALL);
519 519
             }
520
-            $this->user=null;
520
+            $this->user = null;
521 521
         }
522 522
 
523 523
         return $this;
@@ -767,7 +767,7 @@  discard block
 block discarded – undo
767 767
         $organization = $this->organization;
768 768
         if (isset($organization) && isset($organization->image)) {
769 769
             $organizationImage = $organization->image;
770
-            return "/file/Organizations.OrganizationImage/" . $organizationImage->id;
770
+            return "/file/Organizations.OrganizationImage/".$organizationImage->id;
771 771
         }
772 772
         return $this->logoRef;
773 773
     }
Please login to merge, or discard this patch.
Organizations/src/Organizations/Controller/InviteEmployeeController.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
         $result       = $this->forward()->dispatch('Auth\Controller\Password', array('action' => 'index'));
100 100
         $model        = new ViewModel(
101 101
             array(
102
-                                          'organization' => $organization->getOrganizationName()->getName()
103
-                                      )
102
+                                            'organization' => $organization->getOrganizationName()->getName()
103
+                                        )
104 104
         );
105 105
 
106 106
         if (!$result->getVariable('valid', false)) {
@@ -141,8 +141,8 @@  discard block
 block discarded – undo
141 141
 
142 142
         return new ViewModel(
143 143
             array(
144
-                                 'organization' => $organization->getOrganizationName()->getName()
145
-                             )
144
+                                    'organization' => $organization->getOrganizationName()->getName()
145
+                                )
146 146
         );
147 147
     }
148 148
 
Please login to merge, or discard this patch.
module/Settings/config/module.config.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
                 'odm_default' => array(
27 27
                 'subscribers' => array(
28 28
                     'Settings/InjectEntityResolverListener',
29
-                 ),
29
+                    ),
30 30
                 ),
31 31
                 ),
32 32
         ),
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
         'translation_file_patterns' => array(
38 38
             array(
39 39
                 'type' => 'gettext',
40
-                'base_dir' => __DIR__ . '/../language',
40
+                'base_dir' => __DIR__.'/../language',
41 41
                 'pattern' => '%s.mo',
42 42
             ),
43 43
         ),
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
         
101 101
         // Where to look for view templates not mapped above
102 102
         'template_path_stack' => array(
103
-            __DIR__ . '/../view',
103
+            __DIR__.'/../view',
104 104
         ),
105 105
         ),
106 106
     
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Form/Multipost.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -60,9 +60,9 @@
 block discarded – undo
60 60
     protected function addButtonsFieldset()
61 61
     {
62 62
         $this->add(
63
-             array(
64
-                 'type' => 'Jobs/MultipostButtonFieldset'
65
-             )
63
+                array(
64
+                    'type' => 'Jobs/MultipostButtonFieldset'
65
+                )
66 66
         );
67 67
     }
68 68
 }
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Filter/ViewModelTemplateFilterAbstract.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
 
112 112
     /**
113 113
      * @param mixed $value
114
-     * @return mixed|ViewModel
114
+     * @return ViewModel
115 115
      * @throws \InvalidArgumentException
116 116
      */
117 117
     public function filter($value)
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         if (!isset($this->job)) {
124 124
             throw new \InvalidArgumentException('cannot create a viewModel for Templates without an $job');
125 125
         }
126
-        $model->setTemplate('templates/' . $this->job->getTemplate() . '/index');
126
+        $model->setTemplate('templates/'.$this->job->getTemplate().'/index');
127 127
         return $model;
128 128
     }
129 129
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
             throw new \InvalidArgumentException('cannot create a viewModel for Templates without aa $job');
172 172
         }
173 173
         $location = $this->job->getLocation();
174
-        $this->container['location'] = isset($location)?$location:'';
174
+        $this->container['location'] = isset($location) ? $location : '';
175 175
         return $this;
176 176
     }
177 177
 
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
         }
193 193
         $description = $this->job->templateValues->description;
194 194
 
195
-        $this->container['description'] = isset($description)?$description:'';
195
+        $this->container['description'] = isset($description) ? $description : '';
196 196
         return $this;
197 197
     }
198 198
 
@@ -256,9 +256,9 @@  discard block
 block discarded – undo
256 256
         if (!isset($this->job)) {
257 257
             throw new \InvalidArgumentException('cannot create a viewModel for Templates without a $job');
258 258
         }
259
-        $labelQualifications='';
260
-        $labelBenefits='';
261
-        $labelRequirements='';
259
+        $labelQualifications = '';
260
+        $labelBenefits = '';
261
+        $labelRequirements = '';
262 262
 
263 263
         $organization = $this->job->organization;
264 264
         if (isset($organization)) {
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
         return;
102 102
     }
103 103
 
104
-	/**
104
+    /**
105 105
      * @return mixed
106 106
      */
107 107
     public function getServerUrlHelper()
Please login to merge, or discard this patch.
module/Core/src/Core/Entity/Hydrator/Strategy/FileUploadStrategy.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,8 +61,8 @@
 block discarded – undo
61 61
         $file = $this->getFileEntity();
62 62
         
63 63
         $file->setName($value['name'])
64
-             ->setType($value['type'])
65
-             ->setFile($value['tmp_name']);
64
+                ->setType($value['type'])
65
+                ->setFile($value['tmp_name']);
66 66
         
67 67
         return $file;
68 68
     }
Please login to merge, or discard this patch.