@@ -46,7 +46,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | { |
@@ -76,7 +76,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -8,9 +8,9 @@ |
||
| 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); |