From 04daae19d6cf97f25c754ef39eaf802db0953706 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 25 May 2012 16:22:16 +0200 Subject: [PATCH] Fix CS --- src/FFMpeg/Binary.php | 6 +++--- src/FFMpeg/FFMpeg.php | 24 ++++++++++++------------ src/FFMpeg/FFProbe.php | 6 +++--- src/FFMpeg/Format/AudioFormat.php | 2 +- src/FFMpeg/Format/DefaultVideoFormat.php | 4 ++-- tests/src/FFMpeg/FFMpegTest.php | 2 -- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/FFMpeg/Binary.php b/src/FFMpeg/Binary.php index c6221a5..a85518e 100644 --- a/src/FFMpeg/Binary.php +++ b/src/FFMpeg/Binary.php @@ -33,7 +33,7 @@ abstract class Binary implements AdapterInterface /** * Binary constructor * - * @param type $binary The path file to the binary + * @param type $binary The path file to the binary * @param Logger $logger A logger */ public function __construct($binary, Logger $logger) @@ -53,8 +53,8 @@ abstract class Binary implements AdapterInterface /** * {@inheritdoc} * - * @param Logger $logger A logger - * @return Binary The binary + * @param Logger $logger A logger + * @return Binary The binary * * @throws Exception\BinaryNotFoundException */ diff --git a/src/FFMpeg/FFMpeg.php b/src/FFMpeg/FFMpeg.php index 006b743..fca021b 100644 --- a/src/FFMpeg/FFMpeg.php +++ b/src/FFMpeg/FFMpeg.php @@ -30,7 +30,7 @@ class FFMpeg extends Binary /** * Opens a file in order to be processed * - * @param string $pathfile A pathfile + * @param string $pathfile A pathfile * @return \FFMpeg\FFMpeg * @throws InvalidArgumentException */ @@ -65,8 +65,8 @@ class FFMpeg extends Binary /** * - * @param integer $time The time in second where to take the snapshot - * @param string $output The pathfile where to write + * @param integer $time The time in second where to take the snapshot + * @param string $output The pathfile where to write * @return \FFMpeg\FFMpeg * @throws RuntimeException * @throws LogicException @@ -108,9 +108,9 @@ class FFMpeg extends Binary /** * Encode the file to the specified format * - * @param AudioFormat $format The output format - * @param string $outputPathfile The pathfile where to write - * @param integer $threads The number of threads to use + * @param AudioFormat $format The output format + * @param string $outputPathfile The pathfile where to write + * @param integer $threads The number of threads to use * @return \FFMpeg\FFMpeg * @throws RuntimeException * @throws LogicException @@ -139,9 +139,9 @@ class FFMpeg extends Binary /** * Encode to audio * - * @param AudioFormat $format The output format - * @param string $outputPathfile The pathfile where to write - * @param integer $threads The number of threads to use + * @param AudioFormat $format The output format + * @param string $outputPathfile The pathfile where to write + * @param integer $threads The number of threads to use * @return \FFMpeg\FFMpeg * @throws RuntimeException */ @@ -180,9 +180,9 @@ class FFMpeg extends Binary /** * Encode to video * - * @param VideoFormat $format The output format - * @param string $outputPathfile The pathfile where to write - * @param integer $threads The number of threads to use + * @param VideoFormat $format The output format + * @param string $outputPathfile The pathfile where to write + * @param integer $threads The number of threads to use * @return \FFMpeg\FFMpeg * @throws RuntimeException */ diff --git a/src/FFMpeg/FFProbe.php b/src/FFMpeg/FFProbe.php index 17f3572..4bb3af4 100644 --- a/src/FFMpeg/FFProbe.php +++ b/src/FFMpeg/FFProbe.php @@ -26,7 +26,7 @@ class FFProbe extends Binary /** * Probe the format of a given file * - * @param string $pathfile + * @param string $pathfile * @return string * @throws InvalidArgumentException * @throws RuntimeException @@ -45,7 +45,7 @@ class FFProbe extends Binary /** * Probe the streams contained in a given file * - * @param string $pathfile + * @param string $pathfile * @return string * @throws InvalidArgumentException * @throws RuntimeException @@ -63,7 +63,7 @@ class FFProbe extends Binary /** * - * @param string $command + * @param string $command * @return string * @throws RuntimeException */ diff --git a/src/FFMpeg/Format/AudioFormat.php b/src/FFMpeg/Format/AudioFormat.php index efb42d8..9c2f7d2 100644 --- a/src/FFMpeg/Format/AudioFormat.php +++ b/src/FFMpeg/Format/AudioFormat.php @@ -30,7 +30,7 @@ interface AudioFormat /** * Get the kiloBitrate value - * + * * @return integer */ public function getKiloBitrate(); diff --git a/src/FFMpeg/Format/DefaultVideoFormat.php b/src/FFMpeg/Format/DefaultVideoFormat.php index 974d20c..5eecfc5 100644 --- a/src/FFMpeg/Format/DefaultVideoFormat.php +++ b/src/FFMpeg/Format/DefaultVideoFormat.php @@ -87,7 +87,7 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor /** * Set the framerate * - * @param integer $frameRate + * @param integer $frameRate * * @throws \InvalidArgumentException */ @@ -142,7 +142,7 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor /** * Set the GOP size * - * @param integer $GOPsize + * @param integer $GOPsize * * @throws \InvalidArgumentException */ diff --git a/tests/src/FFMpeg/FFMpegTest.php b/tests/src/FFMpeg/FFMpegTest.php index 01a6801..578ae09 100644 --- a/tests/src/FFMpeg/FFMpegTest.php +++ b/tests/src/FFMpeg/FFMpegTest.php @@ -75,7 +75,6 @@ class FFMpegTest extends \PHPUnit_Framework_TestCase unlink($dest); } - /** * @covers FFMpeg\FFMpeg::extractImage */ @@ -109,7 +108,6 @@ class FFMpegTest extends \PHPUnit_Framework_TestCase $this->object->encode(new Format\Video\WebM(32, 32), './invalid.file'); } - /** * @covers FFMpeg\FFMpeg::encode * @expectedException \RuntimeException