dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CS

Browse source
This commit is contained in:
Romain Neutron 2012-05-25 16:22:16 +02:00
commit 04daae19d6
6 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/FFMpeg/Binary.php
View file

@ -33,7 +33,7 @@ abstract class Binary implements AdapterInterface
/** /**
* Binary constructor * 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 * @param Logger $logger A logger
*/ */
public function __construct($binary, Logger $logger) public function __construct($binary, Logger $logger)
@ -53,8 +53,8 @@ abstract class Binary implements AdapterInterface
/** /**
* {@inheritdoc} * {@inheritdoc}
* *
* @param Logger $logger A logger * @param Logger $logger A logger
* @return Binary The binary * @return Binary The binary
* *
* @throws Exception\BinaryNotFoundException * @throws Exception\BinaryNotFoundException
*/ */

24
src/FFMpeg/FFMpeg.php
View file

@ -30,7 +30,7 @@ class FFMpeg extends Binary
/** /**
* Opens a file in order to be processed * Opens a file in order to be processed
* *
* @param string $pathfile A pathfile * @param string $pathfile A pathfile
* @return \FFMpeg\FFMpeg * @return \FFMpeg\FFMpeg
* @throws InvalidArgumentException * @throws InvalidArgumentException
*/ */
@ -65,8 +65,8 @@ class FFMpeg extends Binary
/** /**
* *
* @param integer $time The time in second where to take the snapshot * @param integer $time The time in second where to take the snapshot
* @param string $output The pathfile where to write * @param string $output The pathfile where to write
* @return \FFMpeg\FFMpeg * @return \FFMpeg\FFMpeg
* @throws RuntimeException * @throws RuntimeException
* @throws LogicException * @throws LogicException
@ -108,9 +108,9 @@ class FFMpeg extends Binary
/** /**
* Encode the file to the specified format * Encode the file to the specified format
* *
* @param AudioFormat $format The output format * @param AudioFormat $format The output format
* @param string $outputPathfile The pathfile where to write * @param string $outputPathfile The pathfile where to write
* @param integer $threads The number of threads to use * @param integer $threads The number of threads to use
* @return \FFMpeg\FFMpeg * @return \FFMpeg\FFMpeg
* @throws RuntimeException * @throws RuntimeException
* @throws LogicException * @throws LogicException
@ -139,9 +139,9 @@ class FFMpeg extends Binary
/** /**
* Encode to audio * Encode to audio
* *
* @param AudioFormat $format The output format * @param AudioFormat $format The output format
* @param string $outputPathfile The pathfile where to write * @param string $outputPathfile The pathfile where to write
* @param integer $threads The number of threads to use * @param integer $threads The number of threads to use
* @return \FFMpeg\FFMpeg * @return \FFMpeg\FFMpeg
* @throws RuntimeException * @throws RuntimeException
*/ */
@ -180,9 +180,9 @@ class FFMpeg extends Binary
/** /**
* Encode to video * Encode to video
* *
* @param VideoFormat $format The output format * @param VideoFormat $format The output format
* @param string $outputPathfile The pathfile where to write * @param string $outputPathfile The pathfile where to write
* @param integer $threads The number of threads to use * @param integer $threads The number of threads to use
* @return \FFMpeg\FFMpeg * @return \FFMpeg\FFMpeg
* @throws RuntimeException * @throws RuntimeException
*/ */

6
src/FFMpeg/FFProbe.php
View file

@ -26,7 +26,7 @@ class FFProbe extends Binary
/** /**
* Probe the format of a given file * Probe the format of a given file
* *
* @param string $pathfile * @param string $pathfile
* @return string * @return string
* @throws InvalidArgumentException * @throws InvalidArgumentException
* @throws RuntimeException * @throws RuntimeException
@ -45,7 +45,7 @@ class FFProbe extends Binary
/** /**
* Probe the streams contained in a given file * Probe the streams contained in a given file
* *
* @param string $pathfile * @param string $pathfile
* @return string * @return string
* @throws InvalidArgumentException * @throws InvalidArgumentException
* @throws RuntimeException * @throws RuntimeException
@ -63,7 +63,7 @@ class FFProbe extends Binary
/** /**
* *
* @param string $command * @param string $command
* @return string * @return string
* @throws RuntimeException * @throws RuntimeException
*/ */

4
src/FFMpeg/Format/DefaultVideoFormat.php
View file

@ -87,7 +87,7 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/** /**
* Set the framerate * Set the framerate
* *
* @param integer $frameRate * @param integer $frameRate
* *
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
@ -142,7 +142,7 @@ abstract class DefaultVideoFormat extends DefaultAudioFormat implements VideoFor
/** /**
* Set the GOP size * Set the GOP size
* *
* @param integer $GOPsize * @param integer $GOPsize
* *
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */

2
tests/src/FFMpeg/FFMpegTest.php
View file

@ -75,7 +75,6 @@ class FFMpegTest extends \PHPUnit_Framework_TestCase
unlink($dest); unlink($dest);
} }
/** /**
* @covers FFMpeg\FFMpeg::extractImage * @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'); $this->object->encode(new Format\Video\WebM(32, 32), './invalid.file');
} }
/** /**
* @covers FFMpeg\FFMpeg::encode * @covers FFMpeg\FFMpeg::encode
* @expectedException \RuntimeException * @expectedException \RuntimeException