From b30a20f50ae1d1ee36d4ab951b3b3db97939419d Mon Sep 17 00:00:00 2001 From: Maxime Horcholle Date: Thu, 19 Jan 2017 23:12:21 +0100 Subject: [PATCH 1/2] change StyleCI config --- .styleci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.styleci.yml b/.styleci.yml index 76cb2b5..413f1e4 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -1,7 +1 @@ -preset: recommended - -enabled: - - long_array_syntax - -disabled: - - short_array_syntax +preset: recommended From 2016eb7b23f422bd08bb3204e39be84794a81fec Mon Sep 17 00:00:00 2001 From: Maxime Horcholle Date: Thu, 19 Jan 2017 22:14:56 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- src/Builder/MediaInfoCommandBuilder.php | 6 +-- src/Builder/MediaInfoContainerBuilder.php | 6 +-- src/Checker/CoverChecker.php | 2 +- src/Checker/DateTimeChecker.php | 4 +- src/Checker/DurationChecker.php | 4 +- src/Checker/ModeChecker.php | 4 +- src/Checker/RateChecker.php | 4 +- src/Checker/RatioChecker.php | 4 +- src/Checker/SizeChecker.php | 4 +- src/Container/MediaInfoContainer.php | 12 ++--- src/Factory/AttributeFactory.php | 4 +- src/MediaInfo.php | 4 +- src/Runner/MediaInfoCommandRunner.php | 2 +- src/Type/AbstractType.php | 2 +- test/Builder/MediaInfoCommandBuilderTest.php | 4 +- .../Builder/MediaInfoContainerBuilderTest.php | 46 +++++++++---------- test/Factory/AttributeFactoryTest.php | 24 +++++----- test/Runner/MediaInfoCommandRunnerTest.php | 6 +-- 18 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/Builder/MediaInfoCommandBuilder.php b/src/Builder/MediaInfoCommandBuilder.php index b8c77ca..81d1fcb 100644 --- a/src/Builder/MediaInfoCommandBuilder.php +++ b/src/Builder/MediaInfoCommandBuilder.php @@ -13,7 +13,7 @@ class MediaInfoCommandBuilder * * @return MediaInfoCommandRunner */ - public function buildMediaInfoCommandRunner($filepath, array $configuration = array()) + public function buildMediaInfoCommandRunner($filepath, array $configuration = []) { if (filter_var($filepath, FILTER_VALIDATE_URL) === false) { $fileSystem = new Filesystem(); @@ -30,9 +30,9 @@ public function buildMediaInfoCommandRunner($filepath, array $configuration = ar } } - $configuration = $configuration + array( + $configuration = $configuration + [ 'command' => null, - ); + ]; return new MediaInfoCommandRunner($filepath, $configuration['command']); } diff --git a/src/Builder/MediaInfoContainerBuilder.php b/src/Builder/MediaInfoContainerBuilder.php index bf693cb..1b37999 100644 --- a/src/Builder/MediaInfoContainerBuilder.php +++ b/src/Builder/MediaInfoContainerBuilder.php @@ -80,16 +80,16 @@ private function addAttributes(AbstractType $trackType, $attributes) */ private function sanitizeAttributes(array $attributes) { - $sanitizeAttributes = array(); + $sanitizeAttributes = []; foreach ($attributes as $key => $value) { $key = $this->formatAttribute($key); if (isset($sanitizeAttributes[$key])) { if (!is_array($sanitizeAttributes[$key])) { - $sanitizeAttributes[$key] = array($sanitizeAttributes[$key]); + $sanitizeAttributes[$key] = [$sanitizeAttributes[$key]]; } if (!is_array($value)) { - $value = array($value); + $value = [$value]; } $value = $sanitizeAttributes[$key] + $value; diff --git a/src/Checker/CoverChecker.php b/src/Checker/CoverChecker.php index cb1a87a..3f7884d 100644 --- a/src/Checker/CoverChecker.php +++ b/src/Checker/CoverChecker.php @@ -23,6 +23,6 @@ public function create($value) */ public function getMembersFields() { - return array('cover_data'); + return ['cover_data']; } } diff --git a/src/Checker/DateTimeChecker.php b/src/Checker/DateTimeChecker.php index 4646cfb..ea346c4 100644 --- a/src/Checker/DateTimeChecker.php +++ b/src/Checker/DateTimeChecker.php @@ -19,9 +19,9 @@ public function create($value) */ public function getMembersFields() { - return array( + return [ 'file_last_modification_date', 'file_last_modification_date_local', - ); + ]; } } diff --git a/src/Checker/DurationChecker.php b/src/Checker/DurationChecker.php index 4346997..8b15685 100644 --- a/src/Checker/DurationChecker.php +++ b/src/Checker/DurationChecker.php @@ -23,11 +23,11 @@ public function create($durations) */ public function getMembersFields() { - return array( + return [ 'duration', 'delay_relative_to_video', 'video0_delay', 'delay', - ); + ]; } } diff --git a/src/Checker/ModeChecker.php b/src/Checker/ModeChecker.php index 9929a43..f3b06aa 100644 --- a/src/Checker/ModeChecker.php +++ b/src/Checker/ModeChecker.php @@ -27,7 +27,7 @@ public function create($rateMode) */ public function getMembersFields() { - return array( + return [ 'overall_bit_rate_mode', 'overall_bit_rate', 'bit_rate_mode', @@ -48,6 +48,6 @@ public function getMembersFields() 'frame_rate_mode', 'format_settings_cabac', 'unique_id', - ); + ]; } } diff --git a/src/Checker/RateChecker.php b/src/Checker/RateChecker.php index d6d18f7..a0f7907 100644 --- a/src/Checker/RateChecker.php +++ b/src/Checker/RateChecker.php @@ -23,7 +23,7 @@ public function create($value) */ public function getMembersFields() { - return array( + return [ 'maximum_bit_rate', 'channel_s', 'bit_rate', @@ -35,6 +35,6 @@ public function getMembersFields() 'format_settings_reframes', 'height', 'resolution', - ); + ]; } } diff --git a/src/Checker/RatioChecker.php b/src/Checker/RatioChecker.php index 5bdd65d..1df6f75 100644 --- a/src/Checker/RatioChecker.php +++ b/src/Checker/RatioChecker.php @@ -23,9 +23,9 @@ public function create($value) */ public function getMembersFields() { - return array( + return [ 'display_aspect_ratio', 'original_display_aspect_ratio', - ); + ]; } } diff --git a/src/Checker/SizeChecker.php b/src/Checker/SizeChecker.php index 4e4420f..1f8f835 100644 --- a/src/Checker/SizeChecker.php +++ b/src/Checker/SizeChecker.php @@ -23,9 +23,9 @@ public function create($sizes) */ public function getMembersFields() { - return array( + return [ 'file_size', 'stream_size', - ); + ]; } } diff --git a/src/Container/MediaInfoContainer.php b/src/Container/MediaInfoContainer.php index 1492088..a5133f8 100644 --- a/src/Container/MediaInfoContainer.php +++ b/src/Container/MediaInfoContainer.php @@ -37,32 +37,32 @@ class MediaInfoContainer implements \JsonSerializable /** * @var Audio[] */ - private $audios = array(); + private $audios = []; /** * @var Video[] */ - private $videos = array(); + private $videos = []; /** * @var Subtitle[] */ - private $subtitles = array(); + private $subtitles = []; /** * @var Image[] */ - private $images = array(); + private $images = []; /** * @var Menu[] */ - private $menus = array(); + private $menus = []; /** * @var Other[] */ - private $others = array(); + private $others = []; /** * @return General diff --git a/src/Factory/AttributeFactory.php b/src/Factory/AttributeFactory.php index 4fd2d2f..949f8dd 100644 --- a/src/Factory/AttributeFactory.php +++ b/src/Factory/AttributeFactory.php @@ -36,7 +36,7 @@ public static function create($attribute, $value) */ private static function getAllAttributeType() { - return array( + return [ new CoverChecker(), new DurationChecker(), new ModeChecker(), @@ -44,6 +44,6 @@ private static function getAllAttributeType() new RatioChecker(), new SizeChecker(), new DateTimeChecker(), - ); + ]; } } diff --git a/src/MediaInfo.php b/src/MediaInfo.php index 9a46db6..7e34931 100644 --- a/src/MediaInfo.php +++ b/src/MediaInfo.php @@ -17,9 +17,9 @@ class MediaInfo /** * @var array */ - private $configuration = array( + private $configuration = [ 'command' => null, - ); + ]; /** * @param $filePath diff --git a/src/Runner/MediaInfoCommandRunner.php b/src/Runner/MediaInfoCommandRunner.php index e9551b8..ea2a505 100644 --- a/src/Runner/MediaInfoCommandRunner.php +++ b/src/Runner/MediaInfoCommandRunner.php @@ -29,7 +29,7 @@ class MediaInfoCommandRunner /** * @var array */ - protected $arguments = array('--OUTPUT=XML', '-f'); + protected $arguments = ['--OUTPUT=XML', '-f']; /** * @param string $filePath diff --git a/src/Type/AbstractType.php b/src/Type/AbstractType.php index bb1cd38..6e6a39f 100644 --- a/src/Type/AbstractType.php +++ b/src/Type/AbstractType.php @@ -11,7 +11,7 @@ abstract class AbstractType implements \JsonSerializable /** * @var array */ - protected $attributes = array(); + protected $attributes = []; /** * @param $attribute diff --git a/test/Builder/MediaInfoCommandBuilderTest.php b/test/Builder/MediaInfoCommandBuilderTest.php index f6337d7..79708c8 100644 --- a/test/Builder/MediaInfoCommandBuilderTest.php +++ b/test/Builder/MediaInfoCommandBuilderTest.php @@ -63,9 +63,9 @@ public function testConfiguredCommand() $mediaInfoCommandBuilder = new MediaInfoCommandBuilder(); $mediaInfoCommandRunner = $mediaInfoCommandBuilder->buildMediaInfoCommandRunner( $this->filePath, - array( + [ 'command' => '/usr/bin/local/mediainfo', - ) + ] ); $equalsMediaInfoCommandRunner = new MediaInfoCommandRunner($this->filePath, '/usr/bin/local/mediainfo'); diff --git a/test/Builder/MediaInfoContainerBuilderTest.php b/test/Builder/MediaInfoContainerBuilderTest.php index 85109fd..1dc1256 100644 --- a/test/Builder/MediaInfoContainerBuilderTest.php +++ b/test/Builder/MediaInfoContainerBuilderTest.php @@ -26,31 +26,31 @@ public function testAddTrackType() { $mediaInfoContainerBuilder = new MediaInfoContainerBuilder(); - $mediaInfoContainerBuilder->addTrackType(TypeFactory::AUDIO, array()); + $mediaInfoContainerBuilder->addTrackType(TypeFactory::AUDIO, []); $mediaContainer = $mediaInfoContainerBuilder->build(); $audios = $mediaContainer->getAudios(); $this->assertEquals(0, count($audios[0]->get())); - $mediaInfoContainerBuilder->addTrackType(TypeFactory::VIDEO, array()); + $mediaInfoContainerBuilder->addTrackType(TypeFactory::VIDEO, []); $mediaContainer = $mediaInfoContainerBuilder->build(); $videos = $mediaContainer->getVideos(); $this->assertEquals(0, count($videos[0]->get())); - $mediaInfoContainerBuilder->addTrackType(TypeFactory::GENERAL, array()); + $mediaInfoContainerBuilder->addTrackType(TypeFactory::GENERAL, []); $mediaContainer = $mediaInfoContainerBuilder->build(); $this->assertEquals(0, count($mediaContainer->getGeneral()->get())); - $mediaInfoContainerBuilder->addTrackType(TypeFactory::IMAGE, array()); + $mediaInfoContainerBuilder->addTrackType(TypeFactory::IMAGE, []); $mediaContainer = $mediaInfoContainerBuilder->build(); $images = $mediaContainer->getImages(); $this->assertEquals(0, count($images[0]->get())); - $mediaInfoContainerBuilder->addTrackType(TypeFactory::SUBTITLE, array()); + $mediaInfoContainerBuilder->addTrackType(TypeFactory::SUBTITLE, []); $mediaContainer = $mediaInfoContainerBuilder->build(); $subtitles = $mediaContainer->getSubtitles(); $this->assertEquals(0, count($subtitles[0]->get())); - $mediaInfoContainerBuilder->addTrackType(TypeFactory::OTHER, array()); + $mediaInfoContainerBuilder->addTrackType(TypeFactory::OTHER, []); $mediaContainer = $mediaInfoContainerBuilder->build(); $others = $mediaContainer->getOthers(); $this->assertEquals(0, count($others[0]->get())); @@ -62,7 +62,7 @@ public function testAddTrackType() public function testAddInvalidType() { $mediaInfoContainerBuilder = new MediaInfoContainerBuilder(); - $mediaInfoContainerBuilder->addTrackType('InvalidType', array()); + $mediaInfoContainerBuilder->addTrackType('InvalidType', []); } /** @@ -77,29 +77,29 @@ public function testAddInvalidTypeOnMediaInfoContainer() public function attributesProvider() { - return array( - array( - array( + return [ + [ + [ 'Duration' => '10', 'DuRatioN' => '20', 'DURATION' => '4000', - ), - ), - array( - array( - 'Duration' => array('10', '30', '40'), + ], + ], + [ + [ + 'Duration' => ['10', '30', '40'], 'DuRatioN' => '20', 'DURATION' => '4000', - ), - ), - array( - array( + ], + ], + [ + [ 'Duration' => '10', 'DuRatioN' => '20', - 'DURATION' => array('60', '70', '80'), - ), - ), - ); + 'DURATION' => ['60', '70', '80'], + ], + ], + ]; } /** diff --git a/test/Factory/AttributeFactoryTest.php b/test/Factory/AttributeFactoryTest.php index bfb188a..0cf841d 100644 --- a/test/Factory/AttributeFactoryTest.php +++ b/test/Factory/AttributeFactoryTest.php @@ -10,10 +10,10 @@ public function testCreateRatio() { $ratio = AttributeFactory::create( 'display_aspect_ratio', - array( + [ '15.55', '15.55 Mo', - ) + ] ); $this->assertEquals('Mhor\MediaInfo\Attribute\Ratio', get_class($ratio)); @@ -23,10 +23,10 @@ public function testCreateRate() { $rate = AttributeFactory::create( 'height', - array( + [ '720', '720p', - ) + ] ); $this->assertEquals('Mhor\MediaInfo\Attribute\Rate', get_class($rate)); @@ -36,10 +36,10 @@ public function testCreateSize() { $size = AttributeFactory::create( 'file_size', - array( + [ '19316079', '18.4 MiB', - ) + ] ); $this->assertEquals('Mhor\MediaInfo\Attribute\Size', get_class($size)); @@ -49,10 +49,10 @@ public function testCreateMode() { $mode = AttributeFactory::create( 'overall_bit_rate', - array( + [ 'CBR', 'Constant', - ) + ] ); $this->assertEquals('Mhor\MediaInfo\Attribute\Mode', get_class($mode)); @@ -62,9 +62,9 @@ public function testCreateDuration() { $duration = AttributeFactory::create( 'duration', - array( + [ '475193', - ) + ] ); $this->assertEquals('Mhor\MediaInfo\Attribute\Duration', get_class($duration)); @@ -74,9 +74,9 @@ public function testCreateCover() { $cover = AttributeFactory::create( 'cover_data', - array( + [ '01010101', - ) + ] ); $this->assertEquals('Mhor\MediaInfo\Attribute\Cover', get_class($cover)); diff --git a/test/Runner/MediaInfoCommandRunnerTest.php b/test/Runner/MediaInfoCommandRunnerTest.php index 8e7974e..560c819 100644 --- a/test/Runner/MediaInfoCommandRunnerTest.php +++ b/test/Runner/MediaInfoCommandRunnerTest.php @@ -47,7 +47,7 @@ public function testRun() $mediaInfoCommandRunner = new MediaInfoCommandRunner( $this->filePath, null, - array('--OUTPUT=XML', '-f'), + ['--OUTPUT=XML', '-f'], $processBuilderMock ); @@ -82,7 +82,7 @@ public function testRunException() $mediaInfoCommandRunner = new MediaInfoCommandRunner( $this->filePath, 'custom_mediainfo', - array('--OUTPUT=XML', '-f'), + ['--OUTPUT=XML', '-f'], $processBuilderMock ); @@ -117,7 +117,7 @@ public function testRunAsync() $mediaInfoCommandRunner = new MediaInfoCommandRunner( $this->filePath, null, - array('--OUTPUT=XML', '-f'), + ['--OUTPUT=XML', '-f'], $processBuilderMock );