Completed
Push — develop ( e37f14...da7aa8 )
by greg
03:12
created
language/fr.php 1 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
- * Zend Framework (http://framework.zend.com/)
4
- *
5
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
6
- * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
8
- */
3
+     * Zend Framework (http://framework.zend.com/)
4
+     *
5
+     * @link      http://github.com/zendframework/zf2 for the canonical source repository
6
+     * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7
+     * @license    http://framework.zend.com/license/new-bsd     New BSD License
8
+     */
9 9
 
10 10
 
11 11
 /**
Please login to merge, or discard this patch.
src/PlaygroundCore/Module.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
                     if (empty($locale) && in_array('cookie', $pgstrat)) {
58 58
                         $serviceManager->get('router')->setTranslator($translator);
59 59
                         if ($serviceManager->get('router')->match($serviceManager->get('request')) &&
60
-                            strpos($serviceManager->get('router')->match($serviceManager->get('request'))->getMatchedRouteName(), 'admin') !==false
60
+                            strpos($serviceManager->get('router')->match($serviceManager->get('request'))->getMatchedRouteName(), 'admin') !== false
61 61
                         ) {
62 62
                             if ($e->getRequest()->getCookie() &&
63 63
                                 $e->getRequest()->getCookie()->offsetExists('pg_locale_back')
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 
159 159
         // Google Analytics : When the render event is triggered, we invoke the view helper to
160 160
         // render the javascript code.
161
-        $e->getApplication()->getEventManager()->attach(\Zend\Mvc\MvcEvent::EVENT_RENDER, function (\Zend\Mvc\MvcEvent $e) use ($serviceManager) {
161
+        $e->getApplication()->getEventManager()->attach(\Zend\Mvc\MvcEvent::EVENT_RENDER, function(\Zend\Mvc\MvcEvent $e) use ($serviceManager) {
162 162
             $view   = $serviceManager->get('ViewHelperManager');
163 163
             $plugin = $view->get('googleAnalytics');
164 164
             $plugin();
@@ -185,8 +185,8 @@  discard block
 block discarded – undo
185 185
                 // that they need to send the user back to FB...
186 186
 
187 187
                 if (!count($_COOKIE) > 0 && strpos($_SERVER['HTTP_USER_AGENT'], 'Safari')) {
188
-                    echo '<script type="text/javascript">' .
189
-                    'window.top.location.href = window.location.href+"?redir_fb_page_id='. $data["page"]["id"]. '";' .
188
+                    echo '<script type="text/javascript">'.
189
+                    'window.top.location.href = window.location.href+"?redir_fb_page_id='.$data["page"]["id"].'";'.
190 190
                     '</script>';
191 191
                 }
192 192
 
@@ -203,11 +203,11 @@  discard block
 block discarded – undo
203 203
     {
204 204
         return array(
205 205
             'Zend\Loader\ClassMapAutoloader' => array(
206
-                __DIR__ . '/../../autoload_classmap.php',
206
+                __DIR__.'/../../autoload_classmap.php',
207 207
             ),
208 208
             'Zend\Loader\StandardAutoloader' => array(
209 209
                 'namespaces' => array(
210
-                    __NAMESPACE__ => __DIR__ . '/../../src/' . __NAMESPACE__,
210
+                    __NAMESPACE__ => __DIR__.'/../../src/'.__NAMESPACE__,
211 211
                 ),
212 212
             ),
213 213
         );
@@ -215,21 +215,21 @@  discard block
 block discarded – undo
215 215
 
216 216
     public function getConfig()
217 217
     {
218
-        return include __DIR__ . '/../../config/module.config.php';
218
+        return include __DIR__.'/../../config/module.config.php';
219 219
     }
220 220
 
221 221
     public function getViewHelperConfig()
222 222
     {
223 223
         return array(
224 224
             'factories' => array(
225
-                'QgCKEditor' => function (\Zend\ServiceManager\ServiceManager $sm) {
225
+                'QgCKEditor' => function(\Zend\ServiceManager\ServiceManager $sm) {
226 226
                     $config = $sm->getServiceLocator()->get('config');
227 227
                     $QuCk = new View\Helper\AdCKEditor($config['playgroundcore']['ckeditor']);
228 228
 
229 229
                     return $QuCk;
230 230
                 },
231 231
 
232
-                'googleAnalytics' => function (\Zend\ServiceManager\ServiceManager $sm) {
232
+                'googleAnalytics' => function(\Zend\ServiceManager\ServiceManager $sm) {
233 233
                     $tracker = $sm->getServiceLocator()->get('google-analytics');
234 234
     
235 235
                     $helper  = new View\Helper\GoogleAnalytics($tracker, $sm->getServiceLocator()->get('Request'));
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
                     return $helper;
238 238
                 },
239 239
 
240
-                'facebookOpengraph' => function (\Zend\ServiceManager\ServiceManager $sm) {
240
+                'facebookOpengraph' => function(\Zend\ServiceManager\ServiceManager $sm) {
241 241
                     $tracker = $sm->getServiceLocator()->get('facebook-opengraph');
242 242
 
243 243
                     $helper  = new View\Helper\FacebookOpengraph($tracker, $sm->getServiceLocator()->get('Request'));
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
                     return $helper;
246 246
                 },
247 247
                 
248
-                'twitterCard' => function (\Zend\ServiceManager\ServiceManager $sm) {
248
+                'twitterCard' => function(\Zend\ServiceManager\ServiceManager $sm) {
249 249
                     $viewHelper = new View\Helper\TwitterCard();
250 250
                     $viewHelper->setConfig($sm->getServiceLocator()->get('twitter-card'));
251 251
                     $viewHelper->setRequest($sm->getServiceLocator()->get('Request'));
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
                     return $viewHelper;
254 254
                 },
255 255
 
256
-                'switchLocaleWidget' => function (\Zend\ServiceManager\ServiceManager $sm) {
256
+                'switchLocaleWidget' => function(\Zend\ServiceManager\ServiceManager $sm) {
257 257
                     $viewHelper = new View\Helper\SwitchLocaleWidget();
258 258
                     $viewHelper->setLocaleService($sm->getServiceLocator()->get('playgroundcore_locale_service'));
259 259
                     $viewHelper->setWebsiteService($sm->getServiceLocator()->get('playgroundcore_website_service'));
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
                     return $viewHelper;
263 263
                 },
264 264
 
265
-                'countryName' => function (\Zend\ServiceManager\ServiceManager $sm) {
265
+                'countryName' => function(\Zend\ServiceManager\ServiceManager $sm) {
266 266
                     $service = $sm->getServiceLocator()->get('playgroundcore_country_service');
267 267
                     $viewHelper = new View\Helper\CountryName($service);
268 268
 
@@ -304,29 +304,29 @@  discard block
 block discarded – undo
304 304
                     'playgroundcore_country_service'     => 'PlaygroundCore\Service\Country',
305 305
                 ),
306 306
                 'factories' => array(
307
-                    'playgroundcore_module_options' => function (\Zend\ServiceManager\ServiceManager $sm) {
307
+                    'playgroundcore_module_options' => function(\Zend\ServiceManager\ServiceManager $sm) {
308 308
                         $config = $sm->get('Configuration');
309 309
 
310 310
                         return new Options\ModuleOptions(isset($config['playgroundcore']) ? $config['playgroundcore'] : array());
311 311
                     },
312 312
 
313
-                    'playgroundcore_formgen_mapper' => function (\Zend\ServiceManager\ServiceManager $sm) {
313
+                    'playgroundcore_formgen_mapper' => function(\Zend\ServiceManager\ServiceManager $sm) {
314 314
                         return new Mapper\Formgen($sm->get('playgroundcore_doctrine_em'), $sm->get('playgroundcore_module_options'));
315 315
                     },
316 316
 
317
-                    'playgroundcore_website_mapper' => function (\Zend\ServiceManager\ServiceManager $sm) {
317
+                    'playgroundcore_website_mapper' => function(\Zend\ServiceManager\ServiceManager $sm) {
318 318
 
319 319
                         return new Mapper\Website($sm->get('playgroundcore_doctrine_em'), $sm->get('playgroundcore_module_options'));
320 320
                     },
321 321
 
322
-                    'playgroundcore_locale_mapper' => function (\Zend\ServiceManager\ServiceManager $sm) {
322
+                    'playgroundcore_locale_mapper' => function(\Zend\ServiceManager\ServiceManager $sm) {
323 323
                         return new Mapper\Locale($sm->get('playgroundcore_doctrine_em'), $sm->get('playgroundcore_module_options'));
324 324
                     },
325 325
 
326 326
                     'playgroundcore_twilio' => 'PlaygroundCore\Service\Factory\TwilioServiceFactory',
327 327
                     'playgroundcore_phpvideotoolkit' => 'PlaygroundCore\Service\Factory\PhpvideotoolkitServiceFactory',
328 328
                     'playgroundcore_transport' => 'PlaygroundCore\Mail\Transport\Service\TransportFactory',
329
-                    'PlaygroundCore\Analytics\Tracker' => function (\Zend\ServiceManager\ServiceManager $sm) {
329
+                    'PlaygroundCore\Analytics\Tracker' => function(\Zend\ServiceManager\ServiceManager $sm) {
330 330
                         $config = $sm->get('config');
331 331
                         $config = isset($config['playgroundcore']) ? $config['playgroundcore']['googleAnalytics'] : array('id' => 'UA-XXXXXXXX-X');
332 332
 
@@ -339,8 +339,8 @@  discard block
 block discarded – undo
339 339
                         if (isset($config['custom_vars'])) {
340 340
                             foreach ($config['custom_vars'] as $customVar) {
341 341
                                 $customVarId        = $customVar['id'];
342
-                                $customVarName        = $customVar['name'];
343
-                                $customVarValue    = $customVar['value'];
342
+                                $customVarName = $customVar['name'];
343
+                                $customVarValue = $customVar['value'];
344 344
                                 $customVarOptScope  = $customVar['optScope'];
345 345
                                 $customVar = new Analytics\CustomVar($customVarId, $customVarName, $customVarValue, $customVarOptScope);
346 346
                                 $tracker->addCustomVar($customVar);
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 
362 362
                         return $tracker;
363 363
                     },
364
-                    'PlaygroundCore\Opengraph\Tracker' => function (\Zend\ServiceManager\ServiceManager $sm) {
364
+                    'PlaygroundCore\Opengraph\Tracker' => function(\Zend\ServiceManager\ServiceManager $sm) {
365 365
                         $config = $sm->get('config');
366 366
                         $config = isset($config['playgroundcore']['facebookOpengraph']) ? $config['playgroundcore']['facebookOpengraph'] : array('appId' => '');
367 367
 
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 
381 381
                         return $tracker;
382 382
                     },
383
-                    'PlaygroundCore\TwitterCard\Config' => function (\Zend\ServiceManager\ServiceManager $sm) {
383
+                    'PlaygroundCore\TwitterCard\Config' => function(\Zend\ServiceManager\ServiceManager $sm) {
384 384
                         $config = $sm->get('config');
385 385
                         $config = isset($config['playgroundcore']['twitterCard']) ? $config['playgroundcore']['twitterCard'] : array();
386 386
                         return new TwitterCard\Config($config);
Please login to merge, or discard this patch.
src/PlaygroundCore/Mail/Service/Message.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
         $content = $renderer->render($nameOrModel, $values);
73 73
         $resolver = $this->getServiceManager()->get('Zend\View\Resolver\TemplatePathStack');
74 74
         // check if plain text email template exist
75
-        if ($resolver->resolve($nameOrModel . '-plain')) {
76
-            $contentText = $renderer->render($nameOrModel . '-plain', $values);
75
+        if ($resolver->resolve($nameOrModel.'-plain')) {
76
+            $contentText = $renderer->render($nameOrModel.'-plain', $values);
77 77
         } else {
78 78
             $contentText = '';
79 79
         }
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
         $html->encoding    = Mime::ENCODING_QUOTEDPRINTABLE;
93 93
         $html->disposition = Mime::DISPOSITION_INLINE;
94 94
         $html->charset     = 'UTF-8';
95
-        $bodyMessage     = new MimeMessage();
95
+        $bodyMessage = new MimeMessage();
96 96
 
97 97
         $multiPartContentMessage = new MimeMessage();
98 98
         $multiPartContentMessage->addPart($text);
Please login to merge, or discard this patch.
Doc Comments   +7 added lines, -4 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
      *            Either the template to use, or a ViewModel
47 47
      * @param null|array $values
48 48
      *            Values to use when the template is rendered
49
-     * @return Message
49
+     * @return MailMessage
50 50
      */
51 51
     public function createHtmlMessage($from, $to, $subject, $nameOrModel, $values = array())
52 52
     {
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
      *            Either the template to use, or a ViewModel
107 107
      * @param null|array $values
108 108
      *            Values to use when the template is rendered
109
-     * @return Message
109
+     * @return MailMessage
110 110
      */
111 111
     public function createTextMessage($from, $to, $subject, $nameOrModel, $values = array())
112 112
     {
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
     /**
120 120
      * Send the message
121 121
      *
122
-     * @param Message $message
122
+     * @param MailMessage $message
123 123
      */
124 124
     public function send(MailMessage $message)
125 125
     {
@@ -157,7 +157,10 @@  discard block
 block discarded – undo
157 157
 
158 158
     /**
159 159
      *
160
-     * @return Message
160
+     * @param string $encoding
161
+     * @param string $subject
162
+     * @param string $body
163
+     * @return MailMessage
161 164
      */
162 165
     protected function getDefaultMessage($from, $encoding, $to, $subject, $body)
163 166
     {
Please login to merge, or discard this patch.
src/PlaygroundCore/Service/Locale.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
      * setLocaleMapper
50 50
      * @param  LocaleMapper $localeMapper
51 51
      *
52
-     * @return PlaygroundCore\Entity\Locale Locale
52
+     * @return Locale Locale
53 53
      */
54 54
     public function setLocaleMapper($localeMapper)
55 55
     {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
      * setOptions
63 63
      * @param  ModuleOptions $options
64 64
      *
65
-     * @return PlaygroundCore\Service\Locale $this
65
+     * @return Locale $this
66 66
      */
67 67
     public function setOptions(ModuleOptions $options)
68 68
     {
Please login to merge, or discard this patch.
src/PlaygroundCore/Service/Website.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
      * setWebsiteMapper
50 50
      * @param  Mapper/Website $websiteMapper
51 51
      *
52
-     * @return PlaygroundCore\Entity\WebsiteMapper websiteMapper
52
+     * @return Website websiteMapper
53 53
      */
54 54
     public function setWebsiteMapper($websiteMapper)
55 55
     {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
      * setOptions
63 63
      * @param  ModuleOptions $options
64 64
      *
65
-     * @return PlaygroundCore\Service\Website $this
65
+     * @return Website $this
66 66
      */
67 67
     public function setOptions(ModuleOptions $options)
68 68
     {
Please login to merge, or discard this patch.
src/PlaygroundCore/Service/Factory/CountryFactory.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,9 +8,9 @@
 block discarded – undo
8 8
 class CountryFactory implements FactoryInterface
9 9
 {
10 10
     /**
11
-    * @param ServiceLocatorInterface $locator
12
-    * @return \PlaygroundCore\Service\Country
13
-    */
11
+     * @param ServiceLocatorInterface $locator
12
+     * @return \PlaygroundCore\Service\Country
13
+     */
14 14
     public function createService(ServiceLocatorInterface $locator)
15 15
     {
16 16
         $service = new Country($locator);
Please login to merge, or discard this patch.
src/PlaygroundCore/Service/Factory/FfmpegFactory.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,9 +8,9 @@
 block discarded – undo
8 8
 class FfmpegFactory implements FactoryInterface
9 9
 {
10 10
     /**
11
-    * @param ServiceLocatorInterface $locator
12
-    * @return \PlaygroundCore\Service\Ffmpeg
13
-    */
11
+     * @param ServiceLocatorInterface $locator
12
+     * @return \PlaygroundCore\Service\Ffmpeg
13
+     */
14 14
     public function createService(ServiceLocatorInterface $locator)
15 15
     {
16 16
         $service = new Ffmpeg($locator);
Please login to merge, or discard this patch.
src/PlaygroundCore/Service/Factory/ShortenUrlFactory.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,9 +8,9 @@
 block discarded – undo
8 8
 class ShortenUrlFactory implements FactoryInterface
9 9
 {
10 10
     /**
11
-    * @param ServiceLocatorInterface $locator
12
-    * @return \PlaygroundCore\Service\ShortenUrl
13
-    */
11
+     * @param ServiceLocatorInterface $locator
12
+     * @return \PlaygroundCore\Service\ShortenUrl
13
+     */
14 14
     public function createService(ServiceLocatorInterface $locator)
15 15
     {
16 16
         $service = new ShortenUrl($locator);
Please login to merge, or discard this patch.
src/PlaygroundCore/Service/Factory/FormgenFactory.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,9 +8,9 @@
 block discarded – undo
8 8
 class FormgenFactory implements FactoryInterface
9 9
 {
10 10
     /**
11
-    * @param ServiceLocatorInterface $locator
12
-    * @return \PlaygroundCore\Service\Formgen
13
-    */
11
+     * @param ServiceLocatorInterface $locator
12
+     * @return \PlaygroundCore\Service\Formgen
13
+     */
14 14
     public function createService(ServiceLocatorInterface $locator)
15 15
     {
16 16
         $service = new Formgen($locator);
Please login to merge, or discard this patch.