Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change StyleCI config #70

Merged
merged 3 commits into from
Jan 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
preset: recommended

enabled:
- long_array_syntax

disabled:
- short_array_syntax
preset: recommended
6 changes: 3 additions & 3 deletions src/Builder/MediaInfoCommandBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -30,9 +30,9 @@ public function buildMediaInfoCommandRunner($filepath, array $configuration = ar
}
}

$configuration = $configuration + array(
$configuration = $configuration + [
'command' => null,
);
];

return new MediaInfoCommandRunner($filepath, $configuration['command']);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Builder/MediaInfoContainerBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Checker/CoverChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ public function create($value)
*/
public function getMembersFields()
{
return array('cover_data');
return ['cover_data'];
}
}
4 changes: 2 additions & 2 deletions src/Checker/DateTimeChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ public function create($value)
*/
public function getMembersFields()
{
return array(
return [
'file_last_modification_date',
'file_last_modification_date_local',
);
];
}
}
4 changes: 2 additions & 2 deletions src/Checker/DurationChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ public function create($durations)
*/
public function getMembersFields()
{
return array(
return [
'duration',
'delay_relative_to_video',
'video0_delay',
'delay',
);
];
}
}
4 changes: 2 additions & 2 deletions src/Checker/ModeChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function create($rateMode)
*/
public function getMembersFields()
{
return array(
return [
'overall_bit_rate_mode',
'overall_bit_rate',
'bit_rate_mode',
Expand All @@ -48,6 +48,6 @@ public function getMembersFields()
'frame_rate_mode',
'format_settings_cabac',
'unique_id',
);
];
}
}
4 changes: 2 additions & 2 deletions src/Checker/RateChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function create($value)
*/
public function getMembersFields()
{
return array(
return [
'maximum_bit_rate',
'channel_s',
'bit_rate',
Expand All @@ -35,6 +35,6 @@ public function getMembersFields()
'format_settings_reframes',
'height',
'resolution',
);
];
}
}
4 changes: 2 additions & 2 deletions src/Checker/RatioChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public function create($value)
*/
public function getMembersFields()
{
return array(
return [
'display_aspect_ratio',
'original_display_aspect_ratio',
);
];
}
}
4 changes: 2 additions & 2 deletions src/Checker/SizeChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public function create($sizes)
*/
public function getMembersFields()
{
return array(
return [
'file_size',
'stream_size',
);
];
}
}
12 changes: 6 additions & 6 deletions src/Container/MediaInfoContainer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Factory/AttributeFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ public static function create($attribute, $value)
*/
private static function getAllAttributeType()
{
return array(
return [
new CoverChecker(),
new DurationChecker(),
new ModeChecker(),
new RateChecker(),
new RatioChecker(),
new SizeChecker(),
new DateTimeChecker(),
);
];
}
}
4 changes: 2 additions & 2 deletions src/MediaInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ class MediaInfo
/**
* @var array
*/
private $configuration = array(
private $configuration = [
'command' => null,
);
];

/**
* @param $filePath
Expand Down
2 changes: 1 addition & 1 deletion src/Runner/MediaInfoCommandRunner.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class MediaInfoCommandRunner
/**
* @var array
*/
protected $arguments = array('--OUTPUT=XML', '-f');
protected $arguments = ['--OUTPUT=XML', '-f'];

/**
* @param string $filePath
Expand Down
2 changes: 1 addition & 1 deletion src/Type/AbstractType.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ abstract class AbstractType implements \JsonSerializable
/**
* @var array
*/
protected $attributes = array();
protected $attributes = [];

/**
* @param $attribute
Expand Down
4 changes: 2 additions & 2 deletions test/Builder/MediaInfoCommandBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
46 changes: 23 additions & 23 deletions test/Builder/MediaInfoContainerBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand All @@ -62,7 +62,7 @@ public function testAddTrackType()
public function testAddInvalidType()
{
$mediaInfoContainerBuilder = new MediaInfoContainerBuilder();
$mediaInfoContainerBuilder->addTrackType('InvalidType', array());
$mediaInfoContainerBuilder->addTrackType('InvalidType', []);
}

/**
Expand All @@ -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'],
],
],
];
}

/**
Expand Down
Loading