Completed
Pull Request — develop (#456)
by ANTHONIUS
12:28
created
module/Core/src/Core/Form/FileUploadFactory.php 1 patch
Indentation   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -79,87 +79,87 @@  discard block
 block discarded – undo
79 79
      */
80 80
     protected $options;
81 81
 	
82
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
83
-		/* @var $formElementManager \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */
84
-		$formElementManager = $container->get('FormElementManager');
85
-		$options=null;
86
-		if ($this->options) {
87
-			$options = $container->get($this->options);
88
-		}
82
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
83
+        /* @var $formElementManager \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */
84
+        $formElementManager = $container->get('FormElementManager');
85
+        $options=null;
86
+        if ($this->options) {
87
+            $options = $container->get($this->options);
88
+        }
89 89
 		
90
-		// Retrieve configuration.
91
-		if ($this->configKey) {
92
-			$config   = $container->get('config');
93
-			$config   = isset($config['form_elements_config']['file_upload_factories'][$this->configKey])
94
-				? $config['form_elements_config']['file_upload_factories'][$this->configKey]
95
-				: array();
96
-			$this->config = $config;
97
-		}
90
+        // Retrieve configuration.
91
+        if ($this->configKey) {
92
+            $config   = $container->get('config');
93
+            $config   = isset($config['form_elements_config']['file_upload_factories'][$this->configKey])
94
+                ? $config['form_elements_config']['file_upload_factories'][$this->configKey]
95
+                : array();
96
+            $this->config = $config;
97
+        }
98 98
 		
99 99
 		
100
-		$form = new Form();
101
-		$formElementManager->injectFactory($formElementManager,$form);
102
-		$form->add(
103
-			array(
104
-				'type' => $this->fileElement,
105
-				'name' => $this->fileName,
106
-				'options' => array(
107
-					/* @TODO: [ZF3] set this value to false will make upload field invisible in organization and user profile profile */
108
-					'use_formrow_helper' => true,
109
-				),
110
-				'attributes' => array(
111
-					'class' => 'hide',
112
-				),
113
-			)
114
-		);
115
-		/* @var $element \Core\Form\Element\FileUpload */
116
-		$element = $form->get($this->fileName);
117
-		$element->setIsMultiple($this->multiple);
100
+        $form = new Form();
101
+        $formElementManager->injectFactory($formElementManager,$form);
102
+        $form->add(
103
+            array(
104
+                'type' => $this->fileElement,
105
+                'name' => $this->fileName,
106
+                'options' => array(
107
+                    /* @TODO: [ZF3] set this value to false will make upload field invisible in organization and user profile profile */
108
+                    'use_formrow_helper' => true,
109
+                ),
110
+                'attributes' => array(
111
+                    'class' => 'hide',
112
+                ),
113
+            )
114
+        );
115
+        /* @var $element \Core\Form\Element\FileUpload */
116
+        $element = $form->get($this->fileName);
117
+        $element->setIsMultiple($this->multiple);
118 118
 		
119
-		$user = $container->get('AuthenticationService')->getUser();
119
+        $user = $container->get('AuthenticationService')->getUser();
120 120
 		
121
-		if (isset($this->config['hydrator']) && $this->config['hydrator']) {
122
-			/** @noinspection PhpUndefinedVariableInspection */
123
-			$hydrator = $container->get('HydratorManager')->get($this->config['hydrator']);
124
-		} else {
125
-			/* @var $fileEntity \Core\Entity\FileInterface */
126
-			$fileEntity = new $this->fileEntityClass();
127
-			if ($user instanceof AnonymousUser) {
128
-				$fileEntity->getPermissions()->grant($user, 'all');
129
-			} else {
130
-				$fileEntity->setUser($user);
131
-			}
121
+        if (isset($this->config['hydrator']) && $this->config['hydrator']) {
122
+            /** @noinspection PhpUndefinedVariableInspection */
123
+            $hydrator = $container->get('HydratorManager')->get($this->config['hydrator']);
124
+        } else {
125
+            /* @var $fileEntity \Core\Entity\FileInterface */
126
+            $fileEntity = new $this->fileEntityClass();
127
+            if ($user instanceof AnonymousUser) {
128
+                $fileEntity->getPermissions()->grant($user, 'all');
129
+            } else {
130
+                $fileEntity->setUser($user);
131
+            }
132 132
 			
133
-			$strategy = new FileUploadStrategy($fileEntity);
134
-			if ($this->multiple) {
135
-				$hydrator = new FileCollectionUploadHydrator($this->fileName, $strategy);
136
-				$form->add(
137
-					array(
138
-						'type' => 'button',
139
-						'name' => 'remove',
140
-						'options' => array(
141
-							'label' => /*@translate*/ 'Remove all',
142
-						),
143
-						'attributes' => array(
144
-							'class' => 'fu-remove-all btn btn-danger btn-xs pull-right'
145
-						),
146
-					)
147
-				);
148
-			} else {
149
-				$hydrator = new EntityHydrator();
150
-				$hydrator->addStrategy($this->fileName, $strategy);
151
-			}
152
-		}
133
+            $strategy = new FileUploadStrategy($fileEntity);
134
+            if ($this->multiple) {
135
+                $hydrator = new FileCollectionUploadHydrator($this->fileName, $strategy);
136
+                $form->add(
137
+                    array(
138
+                        'type' => 'button',
139
+                        'name' => 'remove',
140
+                        'options' => array(
141
+                            'label' => /*@translate*/ 'Remove all',
142
+                        ),
143
+                        'attributes' => array(
144
+                            'class' => 'fu-remove-all btn btn-danger btn-xs pull-right'
145
+                        ),
146
+                    )
147
+                );
148
+            } else {
149
+                $hydrator = new EntityHydrator();
150
+                $hydrator->addStrategy($this->fileName, $strategy);
151
+            }
152
+        }
153 153
 		
154
-		$form->setHydrator($hydrator);
155
-		$form->setOptions(array('use_files_array' => true));
154
+        $form->setHydrator($hydrator);
155
+        $form->setOptions(array('use_files_array' => true));
156 156
 		
157
-		$this->configureForm($form, $options);
158
-		return $form;
159
-	}
157
+        $this->configureForm($form, $options);
158
+        return $form;
159
+    }
160 160
 	
161 161
 	
162
-	/**
162
+    /**
163 163
      * The configuration from the FileUploadFactory configuration
164 164
      *
165 165
      * @param ServiceLocatorInterface $serviceLocator
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
      */
168 168
     public function createService(ServiceLocatorInterface $serviceLocator)
169 169
     {
170
-    	return $this($serviceLocator,static::class);
170
+        return $this($serviceLocator,static::class);
171 171
     }
172 172
 
173 173
     /**
Please login to merge, or discard this patch.
module/Core/src/Core/Form/Service/InjectHeadscriptInitializer.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -24,31 +24,31 @@
 block discarded – undo
24 24
  */
25 25
 class InjectHeadscriptInitializer implements InitializerInterface
26 26
 {
27
-	public function __invoke( ContainerInterface $container, $instance ) {
28
-		/* @var $serviceLocator \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */
27
+    public function __invoke( ContainerInterface $container, $instance ) {
28
+        /* @var $serviceLocator \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */
29 29
 		
30
-		if (!$instance instanceof HeadscriptProviderInterface) {
31
-			return;
32
-		}
30
+        if (!$instance instanceof HeadscriptProviderInterface) {
31
+            return;
32
+        }
33 33
 		
34
-		$scripts = $instance->getHeadscripts();
34
+        $scripts = $instance->getHeadscripts();
35 35
 		
36
-		if (!is_array($scripts) || empty($scripts)) {
37
-			return;
38
-		}
36
+        if (!is_array($scripts) || empty($scripts)) {
37
+            return;
38
+        }
39 39
 		
40
-		/* @var $basepath \Zend\View\Helper\BasePath
40
+        /* @var $basepath \Zend\View\Helper\BasePath
41 41
 		 * @var $headscript \Zend\View\Helper\HeadScript */
42
-		$helpers  = $container->get('ViewHelperManager');
43
-		$basepath = $helpers->get('basepath');
44
-		$headscript = $helpers->get('headscript');
42
+        $helpers  = $container->get('ViewHelperManager');
43
+        $basepath = $helpers->get('basepath');
44
+        $headscript = $helpers->get('headscript');
45 45
 		
46
-		foreach ($scripts as $script) {
47
-			$headscript->appendFile($basepath($script));
48
-		}
49
-	}
46
+        foreach ($scripts as $script) {
47
+            $headscript->appendFile($basepath($script));
48
+        }
49
+    }
50 50
 	
51
-	/**
51
+    /**
52 52
      * Injects scripts to the headscript view helper.
53 53
      *
54 54
      * If the created instance implements {@link HeadscriptProviderInterface},
Please login to merge, or discard this patch.
module/Core/src/Core/Form/Service/Initializer.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,15 +21,15 @@
 block discarded – undo
21 21
  */
22 22
 class Initializer implements InitializerInterface
23 23
 {
24
-	public function __invoke( ContainerInterface $container, $instance )
25
-	{
26
-		if ($instance instanceof FormContainer) {
27
-			$instance->setFormElementManager($container->get('FormElementManager'));
28
-		}
29
-	}
24
+    public function __invoke( ContainerInterface $container, $instance )
25
+    {
26
+        if ($instance instanceof FormContainer) {
27
+            $instance->setFormElementManager($container->get('FormElementManager'));
28
+        }
29
+    }
30 30
 	
31 31
 	
32
-	/**
32
+    /**
33 33
      * @see \Zend\ServiceManager\InitializerInterface::initialize()
34 34
      */
35 35
     public function initialize($instance, ServiceLocatorInterface $serviceLocator)
Please login to merge, or discard this patch.
module/Core/src/Core/Form/Container.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -328,11 +328,11 @@
 block discarded – undo
328 328
         }
329 329
 
330 330
         // @TODO: [ZF3] which one is correct? $form[options][label] or $form[options]
331
-	    if(isset($form['label'])){
332
-		    $formLabel = $form['label'];
333
-	    }elseif(isset($form['options']['label'])){
334
-		    $formLabel = $form['options']['label'];
335
-	    }
331
+        if(isset($form['label'])){
332
+            $formLabel = $form['label'];
333
+        }elseif(isset($form['options']['label'])){
334
+            $formLabel = $form['options']['label'];
335
+        }
336 336
 	    
337 337
         if (isset($formLabel)) {
338 338
             $formInstance->setLabel($formLabel);
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/MailService.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
                     }
99 99
                     $instance->setTranslatorEnabled(true);
100 100
                 }
101
-	            if($instance instanceof ContainerAwareInterface){
102
-		            $instance->setContainer($context);
103
-	            }
101
+                if($instance instanceof ContainerAwareInterface){
102
+                    $instance->setContainer($context);
103
+                }
104 104
             }
105 105
         );
106 106
         
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
         //        if (method_exists($instance, 'setServiceLocator')) {
111 111
         //            //$instance->setServiceLocator($this);
112 112
         //        }
113
-         //   }
113
+            //   }
114 114
         //);
115 115
         
116 116
         $this->addInitializer(
@@ -159,13 +159,13 @@  discard block
 block discarded – undo
159 159
      */
160 160
     public function setFrom($email, $name = null)
161 161
     {
162
-    	if(is_array($email)){
163
-    		$this->from = [$email['email'] => $email['name']];
164
-	    }else{
165
-		    $this->from = is_object($email) || null === $name
166
-			    ? $email
167
-			    : array($email => $name);
168
-	    }
162
+        if(is_array($email)){
163
+            $this->from = [$email['email'] => $email['name']];
164
+        }else{
165
+            $this->from = is_object($email) || null === $name
166
+                ? $email
167
+                : array($email => $name);
168
+        }
169 169
 
170 170
         return $this;
171 171
     }
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/HTMLTemplateMessage.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -38,15 +38,15 @@  discard block
 block discarded – undo
38 38
 
39 39
     protected $renderedBody;
40 40
 	
41
-	/**
42
-	 * HTMLTemplateMessage constructor.
43
-	 *
44
-	 * @param ContainerInterface $serviceManager
45
-	 * @param array $options
46
-	 */
41
+    /**
42
+     * HTMLTemplateMessage constructor.
43
+     *
44
+     * @param ContainerInterface $serviceManager
45
+     * @param array $options
46
+     */
47 47
     public function __construct(
48
-    	ContainerInterface $serviceManager,
49
-	    array $options = array()
48
+        ContainerInterface $serviceManager,
49
+        array $options = array()
50 50
     )
51 51
     {
52 52
         // @TODO make this multipart
@@ -266,11 +266,11 @@  discard block
 block discarded – undo
266 266
         return $this->renderedBody;
267 267
     }
268 268
 	
269
-	/**
270
-	 * @param ContainerInterface $container
271
-	 *
272
-	 * @return static
273
-	 */
269
+    /**
270
+     * @param ContainerInterface $container
271
+     *
272
+     * @return static
273
+     */
274 274
     public static function factory(ContainerInterface $container)
275 275
     {
276 276
         return new static($container);
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/MailServiceFactory.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -20,40 +20,40 @@
 block discarded – undo
20 20
 
21 21
 class MailServiceFactory implements FactoryInterface
22 22
 {
23
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
24
-	{
25
-		$config = $container->get('Config');
26
-		$mails = isset($config['mails']) ? $config['mails'] : [];
23
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
24
+    {
25
+        $config = $container->get('Config');
26
+        $mails = isset($config['mails']) ? $config['mails'] : [];
27 27
 		
28
-		/* @var \Auth\Options\ModuleOptions $authOptions */
29
-		$authOptions = $container->get('Auth/Options');
28
+        /* @var \Auth\Options\ModuleOptions $authOptions */
29
+        $authOptions = $container->get('Auth/Options');
30 30
 		
31
-		/* @var \Core\Options\MailServiceOptions $mailServiceOptions */
32
-		$mailServiceOptions = $container->get('Core/MailServiceOptions');
31
+        /* @var \Core\Options\MailServiceOptions $mailServiceOptions */
32
+        $mailServiceOptions = $container->get('Core/MailServiceOptions');
33 33
 		
34
-		$configArray = [
35
-			'from' => [
36
-				'name' => $authOptions->getFromName(),
37
-				'email' => $authOptions->getFromEmail()
38
-			],
39
-		];
34
+        $configArray = [
35
+            'from' => [
36
+                'name' => $authOptions->getFromName(),
37
+                'email' => $authOptions->getFromEmail()
38
+            ],
39
+        ];
40 40
 		
41
-		if ($mailServiceOptions->getTransportClass() == 'smtp') {
42
-			$configArray['transport'] = new Smtp($mailServiceOptions);
43
-		}
41
+        if ($mailServiceOptions->getTransportClass() == 'smtp') {
42
+            $configArray['transport'] = new Smtp($mailServiceOptions);
43
+        }
44 44
 		
45
-		$configArray = array_merge($configArray, $mails);
45
+        $configArray = array_merge($configArray, $mails);
46 46
 		
47
-		$config = new MailServiceConfig($configArray);
48
-		$service   = new MailService($container,$config->toArray());
49
-		$config->configureServiceManager($service);
50
-		foreach($config->toArray() as $name=>$value){
51
-			$method = 'set'.$name;
52
-			if(method_exists($service,$method)){
53
-				call_user_func([$service,$method],$value);
54
-			}
55
-		}
47
+        $config = new MailServiceConfig($configArray);
48
+        $service   = new MailService($container,$config->toArray());
49
+        $config->configureServiceManager($service);
50
+        foreach($config->toArray() as $name=>$value){
51
+            $method = 'set'.$name;
52
+            if(method_exists($service,$method)){
53
+                call_user_func([$service,$method],$value);
54
+            }
55
+        }
56 56
 		
57
-		return $service;
58
-	}
57
+        return $service;
58
+    }
59 59
 }
Please login to merge, or discard this patch.
module/Cv/config/module.config.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -219,10 +219,10 @@
 block discarded – undo
219 219
     ],
220 220
     
221 221
     'input_filters' => [
222
-	    'aliases' => [
223
-	    	'Cv/Employment' => Employment::class,
224
-		    'Cv/Education' => Education::class
225
-	    ],
222
+        'aliases' => [
223
+            'Cv/Employment' => Employment::class,
224
+            'Cv/Education' => Education::class
225
+        ],
226 226
         'invokables' => [
227 227
             'Cv/Employment' => Employment::class,
228 228
             'Cv/Education' => Education::class
Please login to merge, or discard this patch.
module/Cv/src/Cv/Repository/Filter/PaginationQueryFactory.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,12 +24,12 @@
 block discarded – undo
24 24
  */
25 25
 class PaginationQueryFactory implements FactoryInterface
26 26
 {
27
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
28
-	{
29
-		$auth     = $container->get('AuthenticationService');
30
-		$user     = $auth->hasIdentity() ? $auth->getUser() : null;
31
-		$filter   = new PaginationQuery($user);
27
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
28
+    {
29
+        $auth     = $container->get('AuthenticationService');
30
+        $user     = $auth->hasIdentity() ? $auth->getUser() : null;
31
+        $filter   = new PaginationQuery($user);
32 32
 		
33
-		return $filter;
34
-	}
33
+        return $filter;
34
+    }
35 35
 }
Please login to merge, or discard this patch.