Completed
Pull Request — develop (#303)
by
unknown
11:32
created
module/Organizations/src/Organizations/ImageFileCache/ODMListener.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@
 block discarded – undo
132 132
     }
133 133
     
134 134
     /**
135
-     * @param LifecycleEventArgs $eventArgs
135
+     * @param PostFlushEventArgs $eventArgs
136 136
      * @since 0.27
137 137
      */
138 138
     public function postFlush(PostFlushEventArgs $eventArgs)
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
      */
49 49
     public function getSubscribedEvents()
50 50
     {
51
-        if (! $this->manager->isEnabled()) {
51
+        if (!$this->manager->isEnabled()) {
52 52
             return [];
53 53
         }
54 54
         
@@ -66,19 +66,19 @@  discard block
 block discarded – undo
66 66
         $organization = $eventArgs->getDocument();
67 67
         
68 68
         // check for a organization instance
69
-        if (! $organization instanceof Organization) {
69
+        if (!$organization instanceof Organization) {
70 70
             return;
71 71
         }
72 72
         
73 73
         // check if the image has been changed
74
-        if (! $eventArgs->hasChangedField('image')) {
74
+        if (!$eventArgs->hasChangedField('image')) {
75 75
             return;
76 76
         }
77 77
         
78 78
         $image = $eventArgs->getOldValue('image');
79 79
         
80 80
         // check if any image existed
81
-        if (! $image instanceof OrganizationImage) {
81
+        if (!$image instanceof OrganizationImage) {
82 82
             return;
83 83
         }
84 84
         
Please login to merge, or discard this patch.
Organizations/src/Organizations/ImageFileCache/ApplicationListener.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
         // try get image from repository
67 67
         $image = $this->repository->find($id);
68 68
 
69
-        if (! $image) {
69
+        if (!$image) {
70 70
             // abort if image does not exist
71 71
             return;
72 72
         }
Please login to merge, or discard this patch.
module/Organizations/src/Organizations/ImageFileCache/Manager.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
      */
85 85
     public function matchUri($uri)
86 86
     {
87
-        $pattern = '#^' . preg_quote($this->options->getUriPath(), '#') . '/[0-9a-z]/[0-9a-z]/([0-9a-z]+)\.[a-zA-Z]{3,4}$#';
87
+        $pattern = '#^'.preg_quote($this->options->getUriPath(), '#').'/[0-9a-z]/[0-9a-z]/([0-9a-z]+)\.[a-zA-Z]{3,4}$#';
88 88
         $matches = [];
89 89
         preg_match($pattern, $uri, $matches);
90 90
         
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
     {
121 121
         $dir = rtrim($dir, '/\\');
122 122
         
123
-        if (! is_dir($dir)) {
123
+        if (!is_dir($dir)) {
124 124
             $this->createDirectoryRecursively(dirname($dir));
125 125
             
126 126
             $oldUmask = umask(0);
Please login to merge, or discard this patch.
module/Organizations/src/Organizations/Options/ImageFileCacheOptions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
      */
46 46
     public function __construct($options = null)
47 47
     {
48
-        $this->filePath = __DIR__ . '/../../../../../public' . $this->uriPath;
48
+        $this->filePath = __DIR__.'/../../../../../public'.$this->uriPath;
49 49
         
50 50
         parent::__construct($options);
51 51
     }
Please login to merge, or discard this patch.
module/Organizations/Module.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -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
     /**
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
         return array(
40 40
             'Zend\Loader\StandardAutoloader' => array(
41 41
                 'namespaces' => array(
42
-                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
43
-                    'OrganizationsTest' => __DIR__ . '/test/' . 'OrganizationsTest'
42
+                    __NAMESPACE__ => __DIR__.'/src/'.__NAMESPACE__,
43
+                    'OrganizationsTest' => __DIR__.'/test/'.'OrganizationsTest'
44 44
                 ),
45 45
             ),
46 46
         );
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
         $createJobListener->attachShared($sharedManager);
57 57
 
58 58
         if ($e->getRequest() instanceof \Zend\Http\Request) {
59
-            $eventManager->attach(MvcEvent::EVENT_DISPATCH_ERROR, function (MvcEvent $event) {
59
+            $eventManager->attach(MvcEvent::EVENT_DISPATCH_ERROR, function(MvcEvent $event) {
60 60
                 $serviceManager = $event->getApplication()
61 61
                     ->getServiceManager();
62 62
                 $options = $serviceManager->get('Organizations/ImageFileCacheOptions');
Please login to merge, or discard this patch.
module/Organizations/config/module.config.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
68 68
     'view_manager' => array(
69 69
         // Map template to files. Speeds up the lookup through the template stack.
70 70
         'template_map' => array(
71
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
72
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
73
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
74
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
75
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
76
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
77
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
71
+                'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
72
+                'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
73
+                'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
74
+                'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
75
+                'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
76
+                'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
77
+                'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
78 78
             'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
79 79
         ),
80 80
         // Where to look for view templates not mapped above
@@ -84,20 +84,20 @@  discard block
 block discarded – undo
84 84
     ),
85 85
     'form_elements' => array(
86 86
         'invokables' => array(
87
-             'Organizations/form' => 'Organizations\Form\Organizations',
88
-             'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
89
-             'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
90
-             'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
91
-             'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
92
-             'Organizations/OrganizationsNameFieldset'    => 'Organizations\Form\OrganizationsNameFieldset',
93
-             'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
94
-             //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
95
-             'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
96
-             'Organizations/Employees'                    => 'Organizations\Form\Employees',
97
-             'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
98
-             'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
99
-             'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
100
-             'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
87
+                'Organizations/form' => 'Organizations\Form\Organizations',
88
+                'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
89
+                'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
90
+                'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
91
+                'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
92
+                'Organizations/OrganizationsNameFieldset'    => 'Organizations\Form\OrganizationsNameFieldset',
93
+                'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
94
+                //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
95
+                'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
96
+                'Organizations/Employees'                    => 'Organizations\Form\Employees',
97
+                'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
98
+                'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
99
+                'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
100
+                'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
101 101
 
102 102
         ),
103 103
         'factories' => array(
@@ -187,13 +187,13 @@  discard block
 block discarded – undo
187 187
     ),
188 188
     'service_manager' => [
189 189
         'invokables' => [
190
-           'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
190
+            'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
191 191
         ],
192 192
         'factories' => [
193
-           'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
194
-           'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
195
-           'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
196
-           'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory'
193
+            'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
194
+            'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
195
+            'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
196
+            'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory'
197 197
         ]
198 198
     ],
199 199
     'event_manager' => [
Please login to merge, or discard this patch.