Completed
Push — develop ( dd9c1c...e37f14 )
by greg
07:53
created
src/PlaygroundCore/TwitterCard/Tag.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
     public function __construct($property, $value = null)
10 10
     {
11 11
         $this->property = $property;
12
-        $this->value   = $value;
12
+        $this->value = $value;
13 13
     }
14 14
 
15 15
     public function getProperty()
Please login to merge, or discard this patch.
src/PlaygroundCore/View/Helper/AdCKEditor.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
          * General module configurations
48 48
          */
49 49
         if (isset($this->Config['BasePath'])) {
50
-            $CKEditor->basePath            = $this->Config['BasePath'].'/';
50
+            $CKEditor->basePath = $this->Config['BasePath'].'/';
51 51
         }
52 52
         if (isset($this->Config['Toolbar'])) {
53 53
             $CKEditor->config['toolbar']    = $this->Config['Toolbar'];
@@ -68,10 +68,10 @@  discard block
 block discarded – undo
68 68
             $CKEditor->config['stylesSet']  = $this->Config['stylesSet'];
69 69
         }
70 70
         if (isset($this->Config['contentsCss'])) {
71
-            $CKEditor->config['contentsCss']= $this->Config['contentsCss'];
71
+            $CKEditor->config['contentsCss'] = $this->Config['contentsCss'];
72 72
         }
73 73
         if (isset($this->Config['templates_files'])) {
74
-            $CKEditor->config['templates_files']  = $this->Config['templates_files'];
74
+            $CKEditor->config['templates_files'] = $this->Config['templates_files'];
75 75
         }
76 76
 
77 77
         // El Finder
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             $CKEditor->config['contentsCss'] = $options['contentsCss'];
117 117
         }
118 118
         if (isset($options['templates_files'])) {
119
-            $CKEditor->config['templates_files']  = $options['templates_files'];
119
+            $CKEditor->config['templates_files'] = $options['templates_files'];
120 120
         }
121 121
 
122 122
         // El Finder
Please login to merge, or discard this patch.
src/PlaygroundCore/View/Helper/GoogleAnalytics.php 1 patch
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -1,43 +1,43 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Copyright (c) 2012 Jurian Sluiman.
4
- * All rights reserved.
5
- *
6
- * Redistribution and use in source and binary forms, with or without
7
- * modification, are permitted provided that the following conditions
8
- * are met:
9
- *
10
- *   * Redistributions of source code must retain the above copyright
11
- *     notice, this list of conditions and the following disclaimer.
12
- *
13
- *   * Redistributions in binary form must reproduce the above copyright
14
- *     notice, this list of conditions and the following disclaimer in
15
- *     the documentation and/or other materials provided with the
16
- *     distribution.
17
- *
18
- *   * Neither the names of the copyright holders nor the names of the
19
- *     contributors may be used to endorse or promote products derived
20
- *     from this software without specific prior written permission.
21
- *
22
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
25
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
26
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
27
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
28
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
30
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
32
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33
- * POSSIBILITY OF SUCH DAMAGE.
34
- *
35
- * @package     SlmGoogleAnalytics
36
- * @author      Jurian Sluiman <[email protected]> updated by GrG <[email protected]>
37
- * @copyright   2012 Jurian Sluiman.
38
- * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
39
- * @link        http://juriansluiman.nl
40
- */
3
+     * Copyright (c) 2012 Jurian Sluiman.
4
+     * All rights reserved.
5
+     *
6
+     * Redistribution and use in source and binary forms, with or without
7
+     * modification, are permitted provided that the following conditions
8
+     * are met:
9
+     *
10
+     *   * Redistributions of source code must retain the above copyright
11
+     *     notice, this list of conditions and the following disclaimer.
12
+     *
13
+     *   * Redistributions in binary form must reproduce the above copyright
14
+     *     notice, this list of conditions and the following disclaimer in
15
+     *     the documentation and/or other materials provided with the
16
+     *     distribution.
17
+     *
18
+     *   * Neither the names of the copyright holders nor the names of the
19
+     *     contributors may be used to endorse or promote products derived
20
+     *     from this software without specific prior written permission.
21
+     *
22
+     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23
+     * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24
+     * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
25
+     * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
26
+     * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
27
+     * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
28
+     * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29
+     * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
30
+     * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31
+     * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
32
+     * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33
+     * POSSIBILITY OF SUCH DAMAGE.
34
+     *
35
+     * @package     SlmGoogleAnalytics
36
+     * @author      Jurian Sluiman <[email protected]> updated by GrG <[email protected]>
37
+     * @copyright   2012 Jurian Sluiman.
38
+     * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
39
+     * @link        http://juriansluiman.nl
40
+     */
41 41
 namespace PlaygroundCore\View\Helper;
42 42
 
43 43
 use Zend\View\Helper\AbstractHelper;
Please login to merge, or discard this patch.
src/PlaygroundCore/View/Helper/SwitchLocaleWidget.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
         return $locales;
51 51
     }
52 52
 
53
-     /**
54
-    * getLocaleService : Recuperer le service des locales
55
-    *
56
-    * @return Service/Locale $localeService
57
-    */
53
+        /**
54
+         * getLocaleService : Recuperer le service des locales
55
+         *
56
+         * @return Service/Locale $localeService
57
+         */
58 58
     public function getLocaleService()
59 59
     {
60 60
         if ($this->localeService === null) {
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
     }
65 65
 
66 66
     /**
67
-    * setLocaleService : set le service locale
68
-    */
67
+     * setLocaleService : set le service locale
68
+     */
69 69
     public function setLocaleService($localeService)
70 70
     {
71 71
         $this->localeService = $localeService;
Please login to merge, or discard this patch.
src/PlaygroundCore/Service/Factory/PhpvideotoolkitServiceFactory.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,6 @@
 block discarded – undo
25 25
     /**
26 26
      * Generates the Item controller
27 27
      *
28
-     * @param  ServiceLocatorInterface $serviceLocator
29 28
      * @return Services_Twilio
30 29
      */
31 30
     public function createService(ServiceLocatorInterface $serviceManager)
Please login to merge, or discard this patch.
src/PlaygroundCore/Analytics/Ecommerce/Transaction.php 1 patch
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -1,43 +1,43 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Copyright (c) 2012 Jurian Sluiman.
4
- * All rights reserved.
5
- *
6
- * Redistribution and use in source and binary forms, with or without
7
- * modification, are permitted provided that the following conditions
8
- * are met:
9
- *
10
- *   * Redistributions of source code must retain the above copyright
11
- *     notice, this list of conditions and the following disclaimer.
12
- *
13
- *   * Redistributions in binary form must reproduce the above copyright
14
- *     notice, this list of conditions and the following disclaimer in
15
- *     the documentation and/or other materials provided with the
16
- *     distribution.
17
- *
18
- *   * Neither the names of the copyright holders nor the names of the
19
- *     contributors may be used to endorse or promote products derived
20
- *     from this software without specific prior written permission.
21
- *
22
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
25
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
26
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
27
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
28
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
30
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
32
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33
- * POSSIBILITY OF SUCH DAMAGE.
34
- *
35
- * @package     PlaygroundCore
36
- * @author      Jurian Sluiman <[email protected]>
37
- * @copyright   2012 Jurian Sluiman.
38
- * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
39
- * @link        http://juriansluiman.nl
40
- */
3
+     * Copyright (c) 2012 Jurian Sluiman.
4
+     * All rights reserved.
5
+     *
6
+     * Redistribution and use in source and binary forms, with or without
7
+     * modification, are permitted provided that the following conditions
8
+     * are met:
9
+     *
10
+     *   * Redistributions of source code must retain the above copyright
11
+     *     notice, this list of conditions and the following disclaimer.
12
+     *
13
+     *   * Redistributions in binary form must reproduce the above copyright
14
+     *     notice, this list of conditions and the following disclaimer in
15
+     *     the documentation and/or other materials provided with the
16
+     *     distribution.
17
+     *
18
+     *   * Neither the names of the copyright holders nor the names of the
19
+     *     contributors may be used to endorse or promote products derived
20
+     *     from this software without specific prior written permission.
21
+     *
22
+     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23
+     * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24
+     * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
25
+     * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
26
+     * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
27
+     * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
28
+     * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29
+     * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
30
+     * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31
+     * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
32
+     * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33
+     * POSSIBILITY OF SUCH DAMAGE.
34
+     *
35
+     * @package     PlaygroundCore
36
+     * @author      Jurian Sluiman <[email protected]>
37
+     * @copyright   2012 Jurian Sluiman.
38
+     * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
39
+     * @link        http://juriansluiman.nl
40
+     */
41 41
 namespace PlaygroundCore\Analytics;
42 42
 
43 43
 use PlaygroundCore\Analytics\Ecommerce\Transaction;
Please login to merge, or discard this patch.
src/PlaygroundCore/Analytics/Event.php 1 patch
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -1,43 +1,43 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Copyright (c) 2012 Jurian Sluiman.
4
- * All rights reserved.
5
- *
6
- * Redistribution and use in source and binary forms, with or without
7
- * modification, are permitted provided that the following conditions
8
- * are met:
9
- *
10
- *   * Redistributions of source code must retain the above copyright
11
- *     notice, this list of conditions and the following disclaimer.
12
- *
13
- *   * Redistributions in binary form must reproduce the above copyright
14
- *     notice, this list of conditions and the following disclaimer in
15
- *     the documentation and/or other materials provided with the
16
- *     distribution.
17
- *
18
- *   * Neither the names of the copyright holders nor the names of the
19
- *     contributors may be used to endorse or promote products derived
20
- *     from this software without specific prior written permission.
21
- *
22
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
25
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
26
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
27
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
28
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
30
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
32
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33
- * POSSIBILITY OF SUCH DAMAGE.
34
- *
35
- * @package     PlaygroundCore
36
- * @author      Jurian Sluiman <[email protected]>
37
- * @copyright   2012 Jurian Sluiman.
38
- * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
39
- * @link        http://juriansluiman.nl
40
- */
3
+     * Copyright (c) 2012 Jurian Sluiman.
4
+     * All rights reserved.
5
+     *
6
+     * Redistribution and use in source and binary forms, with or without
7
+     * modification, are permitted provided that the following conditions
8
+     * are met:
9
+     *
10
+     *   * Redistributions of source code must retain the above copyright
11
+     *     notice, this list of conditions and the following disclaimer.
12
+     *
13
+     *   * Redistributions in binary form must reproduce the above copyright
14
+     *     notice, this list of conditions and the following disclaimer in
15
+     *     the documentation and/or other materials provided with the
16
+     *     distribution.
17
+     *
18
+     *   * Neither the names of the copyright holders nor the names of the
19
+     *     contributors may be used to endorse or promote products derived
20
+     *     from this software without specific prior written permission.
21
+     *
22
+     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23
+     * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24
+     * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
25
+     * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
26
+     * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
27
+     * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
28
+     * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29
+     * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
30
+     * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31
+     * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
32
+     * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33
+     * POSSIBILITY OF SUCH DAMAGE.
34
+     *
35
+     * @package     PlaygroundCore
36
+     * @author      Jurian Sluiman <[email protected]>
37
+     * @copyright   2012 Jurian Sluiman.
38
+     * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
39
+     * @link        http://juriansluiman.nl
40
+     */
41 41
 namespace PlaygroundCore\Analytics;
42 42
 
43 43
 use PlaygroundCore\Analytics\Ecommerce\Transaction;
Please login to merge, or discard this patch.
src/PlaygroundCore/Opengraph/Tag.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
     public function __construct($property, $value = null)
10 10
     {
11 11
         $this->property = $property;
12
-        $this->value   = $value;
12
+        $this->value = $value;
13 13
     }
14 14
 
15 15
     public function getProperty()
Please login to merge, or discard this patch.
src/PlaygroundCore/Service/Ffmpeg.php 3 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -199,10 +199,10 @@  discard block
 block discarded – undo
199 199
         $this->getServiceManager()->setShared('playgroundcore_phpvideotoolkit', false);
200 200
        
201 201
         $this->getServiceManager()->get('playgroundcore_phpvideotoolkit')
202
-           ->addCommand('-i', $videoSource)
203
-           ->addCommand('-i', $audioSource, true)
204
-           ->setOutputPath($target)
205
-           ->execute();
202
+            ->addCommand('-i', $videoSource)
203
+            ->addCommand('-i', $audioSource, true)
204
+            ->setOutputPath($target)
205
+            ->execute();
206 206
         return $target;
207 207
     }
208 208
 
@@ -366,10 +366,10 @@  discard block
 block discarded – undo
366 366
     }
367 367
 
368 368
     /**
369
-    * This method concatenate an array of sounds
370
-    * ffmpeg -y -i in-1.wav -i in-2.wav -i in-3.wav
371
-    * -filter_complex '[0:0][1:0][2:0]concat=n=3:v=0:a=1[out]' -map '[out]' out.wav
372
-    */
369
+     * This method concatenate an array of sounds
370
+     * ffmpeg -y -i in-1.wav -i in-2.wav -i in-3.wav
371
+     * -filter_complex '[0:0][1:0][2:0]concat=n=3:v=0:a=1[out]' -map '[out]' out.wav
372
+     */
373 373
     public function concatenateSounds($sounds = array(), $target)
374 374
     {
375 375
         if (!is_array($sounds)) {
@@ -396,10 +396,10 @@  discard block
 block discarded – undo
396 396
     }
397 397
 
398 398
     /**
399
-    * This method merge an array of sounds
400
-    * ffmpeg -i in-1.wav -i in-2.wav -i in-3.wav
401
-    * -filter_complex "[0:a][1:a][2:a]amerge=inputs=3[aout]" -map "[aout]" -ac 2 out.wav
402
-    */
399
+     * This method merge an array of sounds
400
+     * ffmpeg -i in-1.wav -i in-2.wav -i in-3.wav
401
+     * -filter_complex "[0:a][1:a][2:a]amerge=inputs=3[aout]" -map "[aout]" -ac 2 out.wav
402
+     */
403 403
     public function mergeSounds($sounds = array(), $target)
404 404
     {
405 405
         if (!is_array($sounds)) {
@@ -449,9 +449,9 @@  discard block
 block discarded – undo
449 449
     }
450 450
 
451 451
     /**
452
-    *  this method extracts an image form a video at the $time second in the video.
453
-    *  ffmpeg -ss 00:00:04 -i video.mp4 -vframes 1 out.png
454
-    */
452
+     *  this method extracts an image form a video at the $time second in the video.
453
+     *  ffmpeg -ss 00:00:04 -i video.mp4 -vframes 1 out.png
454
+     */
455 455
     public function extractImage($source, $target, $start = '00:00:01', $frames = 1)
456 456
     {
457 457
         $this->getServiceManager()->setShared('playgroundcore_phpvideotoolkit', false);
@@ -472,10 +472,10 @@  discard block
 block discarded – undo
472 472
     }
473 473
 
474 474
     /**
475
-    *  this method splits a video into n chunks defined by the frames array.
476
-    *  $frames = array(array(0, 12), array(13, 110), array(111, 200));
477
-    *  ffmpeg -i quickns.mov -an -vf "select=between(n\,110\,200),setpts=PTS-STARTPTS" grg.mov
478
-    */
475
+     *  this method splits a video into n chunks defined by the frames array.
476
+     *  $frames = array(array(0, 12), array(13, 110), array(111, 200));
477
+     *  ffmpeg -i quickns.mov -an -vf "select=between(n\,110\,200),setpts=PTS-STARTPTS" grg.mov
478
+     */
479 479
     public function splitVideo($source, $frames = array(), $target)
480 480
     {
481 481
         $this->getServiceManager()->setShared('playgroundcore_phpvideotoolkit', false);
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@
 block discarded – undo
171 171
      * This method will merge videos in .mpg format with exactly the same codec and codec parameters :
172 172
      * http://trac.ffmpeg.org/wiki/Concatenate
173 173
      * @param  array $videos
174
-     * @return string
174
+     * @return boolean
175 175
      */
176 176
     public function mergeMpgVideos($videos = false, $target = false)
177 177
     {
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
             ->addPreInputCommand('-pattern_type', 'glob')
77 77
             ->addCommand('-i', $path)
78 78
             ->addCommand('-c:v', 'libx264')
79
-            ->addCommand('-vf', 'fps='. $fps)
79
+            ->addCommand('-vf', 'fps='.$fps)
80 80
             ->addCommand('-pix_fmt', 'yuv420p')
81 81
             ->setOutputPath($target)
82 82
             ->execute();
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
             ->addPreInputCommand('-pattern_type', 'glob')
108 108
             ->addCommand('-i', $path)
109 109
             ->addCommand('-vcodec', 'qtrle')
110
-            ->addCommand('-vf', 'fps='. $fps)
110
+            ->addCommand('-vf', 'fps='.$fps)
111 111
             ->setOutputPath($target)
112 112
             ->execute();
113 113
         } catch (FfmpegProcessOutputException $e) {
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
                 $this->serviceLocator->setShared('playgroundcore_phpvideotoolkit', false);
181 181
                 $this->serviceLocator->get('playgroundcore_phpvideotoolkit')
182 182
                     ->addPreInputCommand('-y')
183
-                    ->addCommand('-i', 'concat:' . implode('|', $videos))
183
+                    ->addCommand('-i', 'concat:'.implode('|', $videos))
184 184
                     ->addCommand('-c', 'copy')
185 185
                     ->addCommand('-bsf:a', 'aac_adtstoasc')
186 186
                     ->addCommand('-bufsize', '1835k')
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
         foreach ($layer as $k => $l) {
296 296
             $ffmpeg->addCommand('-i', $l, true);
297 297
             $overlay .= 'overlay=format=rgb';
298
-            if ($k<count($layer)-1) {
298
+            if ($k < count($layer) - 1) {
299 299
                 $overlay .= ',';
300 300
             }
301 301
         }
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
             $ffmpeg->addCommand('-i', $s, true);
397 397
             $concat .= '['.$k.':0]';
398 398
         }
399
-        $concat .= 'concat=n='. count($sounds) .':v=0:a=1[out]';
399
+        $concat .= 'concat=n='.count($sounds).':v=0:a=1[out]';
400 400
 
401 401
         $ffmpeg->addCommand('-filter_complex', $concat)
402 402
             ->addCommand('-map', '[out]')
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
             $ffmpeg->addCommand('-i', $s, true);
430 430
             $merge .= '['.$k.':a]';
431 431
         }
432
-        $merge .= 'amerge=inputs='. count($sounds) .'[aout]';
432
+        $merge .= 'amerge=inputs='.count($sounds).'[aout]';
433 433
 
434 434
         $ffmpeg->addCommand('-filter_complex', $merge)
435 435
             ->addCommand('-map', '[aout]')
@@ -450,8 +450,8 @@  discard block
 block discarded – undo
450 450
     {
451 451
         $this->serviceLocator->setShared('playgroundcore_phpvideotoolkit', false);
452 452
 
453
-        $text = "fontfile=$font:text='". $message."':fontsize=".
454
-            $fontSize .":fontcolor=" . $fontColor . ":x=".$x.":y=".$y;
453
+        $text = "fontfile=$font:text='".$message."':fontsize=".
454
+            $fontSize.":fontcolor=".$fontColor.":x=".$x.":y=".$y;
455 455
        
456 456
         $this->serviceLocator->get('playgroundcore_phpvideotoolkit')
457 457
             ->addPreInputCommand('-y')
@@ -498,14 +498,14 @@  discard block
 block discarded – undo
498 498
         }
499 499
         $this->serviceLocator->setShared('playgroundcore_phpvideotoolkit', false);
500 500
         
501
-        $i=1;
501
+        $i = 1;
502 502
         foreach ($frames as $frame) {
503 503
             $this->serviceLocator->get('playgroundcore_phpvideotoolkit')
504 504
                 ->addPreInputCommand('-y')
505 505
                 ->addCommand('-i', $source)
506 506
                 ->addCommand('-an')
507
-                ->addCommand('-vf', 'select=between(n\,' . $frame[0] . '\,' . $frame[1] . '),setpts=PTS-STARTPTS')
508
-                ->setOutputPath($target . sprintf('s%02d', $i) . '.mov')
507
+                ->addCommand('-vf', 'select=between(n\,'.$frame[0].'\,'.$frame[1].'),setpts=PTS-STARTPTS')
508
+                ->setOutputPath($target.sprintf('s%02d', $i).'.mov')
509 509
                 ->execute();
510 510
             $i++;
511 511
         }
Please login to merge, or discard this patch.