gregorybesson / PlaygroundCore

config/module.config.php

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,7 @@ 
             'playgroundcore_entity' => array(
                 'class' => 'Doctrine\ORM\Mapping\Driver\AnnotationDriver',
                 'cache' => 'array',
-                'paths' => __DIR__ . '/../src/PlaygroundCore/Entity'
+                'paths' => __DIR__.'/../src/PlaygroundCore/Entity'
             ),
 
             'orm_default' => array(
@@ -53,7 +53,7 @@ 
         'rule_providers' => array(
             'BjyAuthorize\Provider\Rule\Config' => array(
                 'allow' => array(
-                    array(array('admin'), 'core',           array('dashboard', 'edit')),
+                    array(array('admin'), 'core', array('dashboard', 'edit')),
                 ),
             ),
         ),
@@ -82,7 +82,7 @@ 
                 'collections' => array(    
                     'core_flags' => array(
                         'assets' => array(
-                            __DIR__ . '/../view/images/flag/*.png',
+                            __DIR__.'/../view/images/flag/*.png',
                         ),
                         'options' => array(
                             'move_raw' => true,
@@ -515,25 +515,25 @@ 
         'translation_file_patterns' => array(
             array(
                 'type'         => 'phpArray',
-                'base_dir'     => __DIR__ . '/../../../../language',
+                'base_dir'     => __DIR__.'/../../../../language',
                 'pattern'      => 'routes_%s.php',
                 'text_domain'  => 'routes'
             ),
             array(
                 'type'         => 'phpArray',
-                'base_dir'     => __DIR__ . '/../language',
+                'base_dir'     => __DIR__.'/../language',
                 'pattern'      => 'routes_%s.php',
                 'text_domain'  => 'routes'
             ),
             array(
                 'type'         => 'phpArray',
-                'base_dir'     => __DIR__ . '/../../../../language',
+                'base_dir'     => __DIR__.'/../../../../language',
                 'pattern'      => '%s.php',
                 'text_domain'  => 'playgroundcore'
             ),
             array(
                 'type'         => 'phpArray',
-                'base_dir'     => __DIR__ . '/../language',
+                'base_dir'     => __DIR__.'/../language',
                 'pattern'      => '%s.php',
                 'text_domain'  => 'playgroundcore'
             ),
@@ -542,8 +542,8 @@ 
 
     'view_manager' => array(
         'template_path_stack' => array(
-            __DIR__ . '/../view/admin',
-            __DIR__ . '/../view/frontend',
+            __DIR__.'/../view/admin',
+            __DIR__.'/../view/frontend',
         ),
     ),
 

Indentation +16 added lines, -16 removed lines

@@ -139,19 +139,19 @@ 
                             ),
                         ),
                     ),
-		            // Give the possibility to call Cron from browser
-		            'cron' => array(
-		                'type' => 'Literal',
-		                'options' => array(
-		                    'route' => 'cron',
-		                    'defaults' => array(
-		                        'controller' => 'playgroundcore_console',
-		                        'action' => 'cron'
-		                    ),
-		                ),
-		            ),
-        		),
-        	),
+                    // Give the possibility to call Cron from browser
+                    'cron' => array(
+                        'type' => 'Literal',
+                        'options' => array(
+                            'route' => 'cron',
+                            'defaults' => array(
+                                'controller' => 'playgroundcore_console',
+                                'action' => 'cron'
+                            ),
+                        ),
+                    ),
+                ),
+            ),
             'admin' => array(
                 'type' => 'Literal',
                 'priority' => -1000,
@@ -448,7 +448,7 @@ 
                             'list' => array(
                                 'type' => 'Segment',
                                 'options' => array(
-                                     'route' => '/list',
+                                        'route' => '/list',
                                     'defaults' => array(
                                         'controller' => 'playgroundcore_admin_website',
                                         'action'     => 'list',
@@ -459,7 +459,7 @@ 
                             'edit-active' => array(
                                 'type' => 'Segment',
                                 'options' => array(
-                                     'route' => '/edit-active/[:websiteId]',
+                                        'route' => '/edit-active/[:websiteId]',
                                     'defaults' => array(
                                         'controller' => 'playgroundcore_admin_website',
                                         'action'     => 'editactive',
@@ -566,6 +566,6 @@ 
         'invokables' => array(
             'NotInBlacklist' => 'PlaygroundCore\Validator\Blacklist',
             'InMailDomainList' => 'PlaygroundCore\Validator\MailDomain',
-         ),
+            ),
     ),
 );

language/nl.php

Indentation +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
  * NL-Revision: 06 Nov 2015 *** G.Besson ***
  */
 return array(
-	// PlaygroundCore\Validator\Blacklist
-	"You're not allowed to use this word" => "Het is niet toegestaan ​​om dit woord te gebruiken",
+    // PlaygroundCore\Validator\Blacklist
+    "You're not allowed to use this word" => "Het is niet toegestaan ​​om dit woord te gebruiken",
 
     // Zend\I18n\Validator\Alnum
     "Invalid type given. String, integer or float expected" => "Ongeldig type opgegeven, waarde moet een float, string of integer zijn",

src/PlaygroundCore/Service/Ffmpeg.php

Doc Comments +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
      * This method will merge videos in .mpg format with exactly the same codec and codec parameters :
      * http://trac.ffmpeg.org/wiki/Concatenate
      * @param  array $videos
-     * @return string
+     * @return boolean
      */
     public function mergeMpgVideos($videos = false, $target = false)
     {

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
             ->addPreInputCommand('-pattern_type', 'glob')
             ->addCommand('-i', $path)
             ->addCommand('-c:v', 'libx264')
-            ->addCommand('-vf', 'fps='. $fps)
+            ->addCommand('-vf', 'fps='.$fps)
             ->addCommand('-pix_fmt', 'yuv420p')
             ->setOutputPath($target)
             ->execute();
@@ -107,7 +107,7 @@ 
             ->addPreInputCommand('-pattern_type', 'glob')
             ->addCommand('-i', $path)
             ->addCommand('-vcodec', 'qtrle')
-            ->addCommand('-vf', 'fps='. $fps)
+            ->addCommand('-vf', 'fps='.$fps)
             ->setOutputPath($target)
             ->execute();
         } catch (FfmpegProcessOutputException $e) {
@@ -180,7 +180,7 @@ 
                 $this->serviceLocator->setShared('playgroundcore_phpvideotoolkit', false);
                 $this->serviceLocator->get('playgroundcore_phpvideotoolkit')
                     ->addPreInputCommand('-y')
-                    ->addCommand('-i', 'concat:' . implode('|', $videos))
+                    ->addCommand('-i', 'concat:'.implode('|', $videos))
                     ->addCommand('-c', 'copy')
                     ->addCommand('-bsf:a', 'aac_adtstoasc')
                     ->addCommand('-bufsize', '1835k')
@@ -295,7 +295,7 @@ 
         foreach ($layer as $k => $l) {
             $ffmpeg->addCommand('-i', $l, true);
             $overlay .= 'overlay=format=rgb';
-            if ($k<count($layer)-1) {
+            if ($k < count($layer) - 1) {
                 $overlay .= ',';
             }
         }
@@ -396,7 +396,7 @@ 
             $ffmpeg->addCommand('-i', $s, true);
             $concat .= '['.$k.':0]';
         }
-        $concat .= 'concat=n='. count($sounds) .':v=0:a=1[out]';
+        $concat .= 'concat=n='.count($sounds).':v=0:a=1[out]';
 
         $ffmpeg->addCommand('-filter_complex', $concat)
             ->addCommand('-map', '[out]')
@@ -429,7 +429,7 @@ 
             $ffmpeg->addCommand('-i', $s, true);
             $merge .= '['.$k.':a]';
         }
-        $merge .= 'amerge=inputs='. count($sounds) .'[aout]';
+        $merge .= 'amerge=inputs='.count($sounds).'[aout]';
 
         $ffmpeg->addCommand('-filter_complex', $merge)
             ->addCommand('-map', '[aout]')
@@ -450,8 +450,8 @@ 
     {
         $this->serviceLocator->setShared('playgroundcore_phpvideotoolkit', false);
 
-        $text = "fontfile=$font:text='". $message."':fontsize=".
-            $fontSize .":fontcolor=" . $fontColor . ":x=".$x.":y=".$y;
+        $text = "fontfile=$font:text='".$message."':fontsize=".
+            $fontSize.":fontcolor=".$fontColor.":x=".$x.":y=".$y;
        
         $this->serviceLocator->get('playgroundcore_phpvideotoolkit')
             ->addPreInputCommand('-y')
@@ -498,14 +498,14 @@ 
         }
         $this->serviceLocator->setShared('playgroundcore_phpvideotoolkit', false);
         
-        $i=1;
+        $i = 1;
         foreach ($frames as $frame) {
             $this->serviceLocator->get('playgroundcore_phpvideotoolkit')
                 ->addPreInputCommand('-y')
                 ->addCommand('-i', $source)
                 ->addCommand('-an')
-                ->addCommand('-vf', 'select=between(n\,' . $frame[0] . '\,' . $frame[1] . '),setpts=PTS-STARTPTS')
-                ->setOutputPath($target . sprintf('s%02d', $i) . '.mov')
+                ->addCommand('-vf', 'select=between(n\,'.$frame[0].'\,'.$frame[1].'),setpts=PTS-STARTPTS')
+                ->setOutputPath($target.sprintf('s%02d', $i).'.mov')
                 ->execute();
             $i++;
         }

Indentation +19 added lines, -19 removed lines

@@ -203,10 +203,10 @@ 
         $this->serviceLocator->setShared('playgroundcore_phpvideotoolkit', false);
        
         $this->serviceLocator->get('playgroundcore_phpvideotoolkit')
-           ->addCommand('-i', $videoSource)
-           ->addCommand('-i', $audioSource, true)
-           ->setOutputPath($target)
-           ->execute();
+            ->addCommand('-i', $videoSource)
+            ->addCommand('-i', $audioSource, true)
+            ->setOutputPath($target)
+            ->execute();
         return $target;
     }
 
@@ -374,10 +374,10 @@ 
     }
 
     /**
-    * This method concatenate an array of sounds
-    * ffmpeg -y -i in-1.wav -i in-2.wav -i in-3.wav
-    * -filter_complex '[0:0][1:0][2:0]concat=n=3:v=0:a=1[out]' -map '[out]' out.wav
-    */
+     * This method concatenate an array of sounds
+     * ffmpeg -y -i in-1.wav -i in-2.wav -i in-3.wav
+     * -filter_complex '[0:0][1:0][2:0]concat=n=3:v=0:a=1[out]' -map '[out]' out.wav
+     */
     public function concatenateSounds($sounds, $target)
     {
         if (empty($sounds)) {
@@ -407,10 +407,10 @@ 
     }
 
     /**
-    * This method merge an array of sounds
-    * ffmpeg -i in-1.wav -i in-2.wav -i in-3.wav
-    * -filter_complex "[0:a][1:a][2:a]amerge=inputs=3[aout]" -map "[aout]" -ac 2 out.wav
-    */
+     * This method merge an array of sounds
+     * ffmpeg -i in-1.wav -i in-2.wav -i in-3.wav
+     * -filter_complex "[0:a][1:a][2:a]amerge=inputs=3[aout]" -map "[aout]" -ac 2 out.wav
+     */
     public function mergeSounds($sounds, $target)
     {
         if (empty($sounds)) {
@@ -464,9 +464,9 @@ 
     }
 
     /**
-    *  this method extracts an image form a video at the $time second in the video.
-    *  ffmpeg -ss 00:00:04 -i video.mp4 -vframes 1 out.png
-    */
+     *  this method extracts an image form a video at the $time second in the video.
+     *  ffmpeg -ss 00:00:04 -i video.mp4 -vframes 1 out.png
+     */
     public function extractImage($source, $target, $start = '00:00:01', $frames = 1)
     {
         $this->serviceLocator->setShared('playgroundcore_phpvideotoolkit', false);
@@ -487,10 +487,10 @@ 
     }
 
     /**
-    *  this method splits a video into n chunks defined by the frames array.
-    *  $frames = array(array(0, 12), array(13, 110), array(111, 200));
-    *  ffmpeg -i quickns.mov -an -vf "select=between(n\,110\,200),setpts=PTS-STARTPTS" grg.mov
-    */
+     *  this method splits a video into n chunks defined by the frames array.
+     *  $frames = array(array(0, 12), array(13, 110), array(111, 200));
+     *  ffmpeg -i quickns.mov -an -vf "select=between(n\,110\,200),setpts=PTS-STARTPTS" grg.mov
+     */
     public function splitVideo($source, $frames, $target)
     {
         if (empty($frames)) {

src/PlaygroundCore/Service/Locale.php

Doc Comments +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      * setLocaleMapper
      * @param  LocaleMapper $localeMapper
      *
-     * @return PlaygroundCore\Entity\Locale Locale
+     * @return Locale Locale
      */
     public function setLocaleMapper($localeMapper)
     {
@@ -62,7 +62,7 @@ 
      * setOptions
      * @param  ModuleOptions $options
      *
-     * @return PlaygroundCore\Service\Locale $this
+     * @return Locale $this
      */
     public function setOptions(ModuleOptions $options)
     {

src/PlaygroundCore/Service/Website.php

Doc Comments +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      * setWebsiteMapper
      * @param  Mapper/Website $websiteMapper
      *
-     * @return PlaygroundCore\Entity\WebsiteMapper websiteMapper
+     * @return Website websiteMapper
      */
     public function setWebsiteMapper($websiteMapper)
     {
@@ -62,7 +62,7 @@ 
      * setOptions
      * @param  ModuleOptions $options
      *
-     * @return PlaygroundCore\Service\Website $this
+     * @return Website $this
      */
     public function setOptions(ModuleOptions $options)
     {

src/PlaygroundCore/Service/Factory/CountryFactory.php

Indentation +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
 class CountryFactory implements FactoryInterface
 {
     /**
-    * @param ServiceLocatorInterface $locator
-    * @return \PlaygroundCore\Service\Country
-    */
+     * @param ServiceLocatorInterface $locator
+     * @return \PlaygroundCore\Service\Country
+     */
     public function createService(ServiceLocatorInterface $locator)
     {
         $service = new Country($locator);

src/PlaygroundCore/Service/Factory/FfmpegFactory.php

Indentation +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
 class FfmpegFactory implements FactoryInterface
 {
     /**
-    * @param ServiceLocatorInterface $locator
-    * @return \PlaygroundCore\Service\Ffmpeg
-    */
+     * @param ServiceLocatorInterface $locator
+     * @return \PlaygroundCore\Service\Ffmpeg
+     */
     public function createService(ServiceLocatorInterface $locator)
     {
         $service = new Ffmpeg($locator);

src/PlaygroundCore/Service/Factory/ShortenUrlFactory.php

Indentation +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
 class ShortenUrlFactory implements FactoryInterface
 {
     /**
-    * @param ServiceLocatorInterface $locator
-    * @return \PlaygroundCore\Service\ShortenUrl
-    */
+     * @param ServiceLocatorInterface $locator
+     * @return \PlaygroundCore\Service\ShortenUrl
+     */
     public function createService(ServiceLocatorInterface $locator)
     {
         $service = new ShortenUrl($locator);

src/PlaygroundCore/Service/Factory/FormgenFactory.php

Indentation +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
 class FormgenFactory implements FactoryInterface
 {
     /**
-    * @param ServiceLocatorInterface $locator
-    * @return \PlaygroundCore\Service\Formgen
-    */
+     * @param ServiceLocatorInterface $locator
+     * @return \PlaygroundCore\Service\Formgen
+     */
     public function createService(ServiceLocatorInterface $locator)
     {
         $service = new Formgen($locator);