Completed
Branch develop (7585df)
by Carsten
11:01
created
module/Jobs/src/Jobs/Form/Job.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
 
100 100
     public function renderPost(Renderer $renderer)
101 101
     {
102
-        $coreformsjs   = $renderer->basepath('/Core/js/core.forms.js');
102
+        $coreformsjs = $renderer->basepath('/Core/js/core.forms.js');
103 103
         $javaScript = <<<JS
104 104
         $(document).ready(function() {
105 105
 
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** SettingsEntityResolverFactory.php */
11 11
 namespace Settings\Repository;
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Listener/MailSender.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license    MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license    MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
 
10 10
 /** */
11 11
 namespace Jobs\Listener;
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
     {
137 137
         $mail = $this->mailer->get('htmltemplate');
138 138
         $mail->setTemplate($template)
139
-             ->setSubject($subject)
140
-             ->setVariables(
141
-                 array(
139
+                ->setSubject($subject)
140
+                ->setVariables(
141
+                    array(
142 142
                                 'job'      => $job,
143 143
                                 'siteName' => $this->options['siteName'],
144 144
                             )
145
-             );
145
+                );
146 146
 
147 147
         if ($adminMail) {
148 148
             $mail->setTo($this->options['adminEmail']);
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Listener/Response/JobResponse.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -23,35 +23,35 @@  discard block
 block discarded – undo
23 23
     /**
24 24
      * Job has been published
25 25
      */
26
-    const RESPONSE_OK             = 'ok';
26
+    const RESPONSE_OK = 'ok';
27 27
 
28 28
     /**
29 29
      * Job has been published and has stopped all other publishing
30 30
      */
31
-    const RESPONSE_OKANDSTOP      = 'ok and publishing terminated afterwards';
31
+    const RESPONSE_OKANDSTOP = 'ok and publishing terminated afterwards';
32 32
 
33 33
     /**
34 34
      * publishing has been stopped
35 35
      */
36
-    const RESPONSE_STOP           = 'publishing terminated';
36
+    const RESPONSE_STOP = 'publishing terminated';
37 37
 
38 38
     /**
39 39
      * publishing has been denied,
40 40
      * this is very likely when a job was not intended to be sended to a portal
41 41
      */
42
-    const RESPONSE_DENIED         = 'denied';
42
+    const RESPONSE_DENIED = 'denied';
43 43
 
44 44
     /**
45 45
      * a connection to the portal could not be established
46 46
      * or the publishing of the Job has been rejected for other reasons
47 47
      */
48
-    const RESPONSE_FAIL           = 'fail';
48
+    const RESPONSE_FAIL = 'fail';
49 49
 
50 50
     /**
51 51
      * This error has nothing to do with wrong inputs,
52 52
      * something just has happend in the programm
53 53
      */
54
-    const RESPONSE_ERROR          = 'internal Error';
54
+    const RESPONSE_ERROR = 'internal Error';
55 55
 
56 56
     /**
57 57
      * nothing happens, but that's not a failure
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     /**
63 63
      * nothing happens, and get used to it
64 64
      */
65
-    const RESPONSE_DEPRECATED     = 'deprecated';
65
+    const RESPONSE_DEPRECATED = 'deprecated';
66 66
 
67 67
     /**
68 68
      * @var string
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- * @author    [email protected]
9
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     * @author    [email protected]
9
+     */
10 10
 
11 11
 namespace Organizations\Form;
12 12
 
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Options/ModuleOptions.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @author cbleek
8
- * @license   MIT
9
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @author cbleek
8
+     * @license   MIT
9
+     */
10 10
 
11 11
 namespace Jobs\Options;
12 12
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,21 +44,21 @@
 block discarded – undo
44 44
      *
45 45
      * @var string $defaultLogo
46 46
      */
47
-    protected $defaultLogo="/Jobs/images/yawik-small.jpg";
47
+    protected $defaultLogo = "/Jobs/images/yawik-small.jpg";
48 48
 
49 49
     /**
50 50
      * Maximum size in bytes of a company Logo. Default 200k
51 51
      *
52 52
      * @var int $companyLogoMaxSize
53 53
      */
54
-    protected $companyLogoMaxSize=200000;
54
+    protected $companyLogoMaxSize = 200000;
55 55
 
56 56
     /**
57 57
      * Allowed Mime-Types for company Logos
58 58
      *
59 59
      * @var array
60 60
      */
61
-    protected $companyLogoMimeType=array("image");
61
+    protected $companyLogoMimeType = array("image");
62 62
 
63 63
 
64 64
     /**
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Repository/Filter/PaginationQuery.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
              */
78 78
             if (isset($this->value['params']['by']) && 'me' == $this->value['params']['by']) {
79 79
                 $queryBuilder->field('user')->equals($this->user->id);
80
-            }else{
80
+            } else{
81 81
                 $queryBuilder->field('permissions.view')->equals($this->user->id);
82 82
             }
83 83
             if (
Please login to merge, or discard this patch.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
6
- * @license   MIT
7
- */
3
+     * YAWIK
4
+     *
5
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
6
+     * @license   MIT
7
+     */
8 8
 
9 9
 namespace Organizations\Entity;
10 10
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
         if (isset($this->value['location']->coordinates)) {
83 83
             $coordinates = $this->value['location']->coordinates->getCoordinates();
84
-            $queryBuilder->field('locations.coordinates')->geoWithinCenter($coordinates[0], $coordinates[1],(float) $this->value['d']/100);
84
+            $queryBuilder->field('locations.coordinates')->geoWithinCenter($coordinates[0], $coordinates[1], (float) $this->value['d'] / 100);
85 85
         }
86 86
 
87 87
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
              */
95 95
             if (isset($this->value['params']['by']) && 'me' == $this->value['params']['by']) {
96 96
                 $queryBuilder->field('user')->equals($this->user->id);
97
-            }else{
97
+            } else {
98 98
                 $queryBuilder->field('permissions.view')->equals($this->user->id);
99 99
             }
100 100
             if (
Please login to merge, or discard this patch.
module/Organizations/Module.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- * Organizations Module Bootstrap
5
- *
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   GPLv3
8
- */
3
+     * YAWIK
4
+     * Organizations Module Bootstrap
5
+     *
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   GPLv3
8
+     */
9 9
 
10 10
 namespace Organizations;
11 11
 
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
      */
26 26
     public function getConfig()
27 27
     {
28
-         return ModuleConfigLoader::load(__DIR__ . '/config');
28
+            return ModuleConfigLoader::load(__DIR__ . '/config');
29 29
     }
30 30
     
31 31
     /**
Please login to merge, or discard this patch.
module/Organizations/config/module.config.php 2 patches
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @author Mathias Weitz <[email protected]>
4
- * @author Mathias Gelhausen <[email protected]>
5
- */
3
+     * @author Mathias Weitz <[email protected]>
4
+     * @author Mathias Gelhausen <[email protected]>
5
+     */
6 6
 
7 7
 return array(
8 8
     'doctrine' => array(
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
     'view_manager' => array(
64 64
         // Map template to files. Speeds up the lookup through the template stack.
65 65
         'template_map' => array(
66
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
67
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
68
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
69
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
70
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
71
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
72
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
66
+                'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
67
+                'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
68
+                'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
69
+                'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
70
+                'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
71
+                'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
72
+                'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
73 73
         ),
74 74
         // Where to look for view templates not mapped above
75 75
         'template_path_stack' => array(
@@ -78,13 +78,13 @@  discard block
 block discarded – undo
78 78
     ),
79 79
     'form_elements' => array(
80 80
         'invokables' => array(
81
-             'Organizations/form' => 'Organizations\Form\Organizations',
82
-             'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
83
-             'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
84
-             'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
85
-             'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
86
-             'Organizations/OrganizationsNameFieldset'    => 'Organizations\Form\OrganizationsNameFieldset',
87
-             'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
81
+                'Organizations/form' => 'Organizations\Form\Organizations',
82
+                'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
83
+                'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
84
+                'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
85
+                'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
86
+                'Organizations/OrganizationsNameFieldset'    => 'Organizations\Form\OrganizationsNameFieldset',
87
+                'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
88 88
             //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
89 89
             'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
90 90
             'Organizations/Employees'                    => 'Organizations\Form\Employees',
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
         'template_map' => array(
66 66
              'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
67 67
              'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
68
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
68
+             'organizations/form/employee-fieldset' => __DIR__ . '/../view/form/employee-fieldset.phtml',
69 69
              'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
70 70
              'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
71 71
              'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
@@ -151,8 +151,8 @@  discard block
 block discarded – undo
151 151
             'organizations' => array(
152 152
                 'label' => 'Organizations',
153 153
                 'route' => 'lang/organizations',
154
-                'order' => 65,                             // allows to order the menu items
155
-                'resource' => 'route/lang/organizations',  // if a resource is defined, the acl will be applied.
154
+                'order' => 65, // allows to order the menu items
155
+                'resource' => 'route/lang/organizations', // if a resource is defined, the acl will be applied.
156 156
 
157 157
                 'pages' => array(
158 158
                     'list' => array(
Please login to merge, or discard this patch.
Organizations/src/Organizations/Controller/InviteEmployeeController.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license    MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license    MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
 
10 10
 /** */
11 11
 namespace Organizations\Controller;
@@ -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.
src/Organizations/Controller/Plugin/AcceptInvitationHandler.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@
 block discarded – undo
127 127
 
128 128
     public function process($token, $organizationId)
129 129
     {
130
-        $organizationRepository   = $this->getOrganizationRepository();
130
+        $organizationRepository = $this->getOrganizationRepository();
131 131
         $organization = $organizationRepository->find($organizationId); /* @var $organization \Organizations\Entity\OrganizationInterface */
132 132
 
133 133
         if (!$organization) {
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
   
10 10
 /** */
11 11
 namespace Organizations\Repository\Event;
Please login to merge, or discard this patch.