[MediaWiki-commits] [Gerrit] Fix issue where getCommonMetaArray returned false instead of... - change (mediawiki...TimedMediaHandler)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix issue where getCommonMetaArray returned false instead of 
array()
......................................................................


Fix issue where getCommonMetaArray returned false instead of array()

Function is documented as always returning an array. Caused php
warning when it returned false instead on a certain error condition

Bug: 66801
Bug: 66802
Change-Id: I158808fbd7e64c4faceb80353bd6c6c3d6206dd8
Follow-up: fa36010cf60
---
M handlers/OggHandler/OggHandler.php
M tests/phpunit/TestOggHandler.php
A tests/phpunit/media/broken-file.ogg
3 files changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Gilles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/handlers/OggHandler/OggHandler.php 
b/handlers/OggHandler/OggHandler.php
index 66bba53..a19abc3 100644
--- a/handlers/OggHandler/OggHandler.php
+++ b/handlers/OggHandler/OggHandler.php
@@ -75,7 +75,7 @@
        public function getCommonMetaArray( File $file ) {
                $metadata = $this->unpackMetadata( $file->getMetadata() );
                if ( !$metadata || isset( $metadata['error'] ) || !isset( 
$metadata['streams'] ) ) {
-                       return false;
+                       return array();
                }
                wfProfileIn( __METHOD__ );
 
diff --git a/tests/phpunit/TestOggHandler.php b/tests/phpunit/TestOggHandler.php
index 1216774..4aa7629 100644
--- a/tests/phpunit/TestOggHandler.php
+++ b/tests/phpunit/TestOggHandler.php
@@ -37,7 +37,10 @@
                                        'Artist' => array( 'Brian', 'Bawolff' ),
                                        'Software' => array( 'Lavf55.10.2' )
                                )
-                       )
+                       ),
+                       array( 'broken-file.ogg',
+                               array()
+                       ),
                );
        }
 }
diff --git a/tests/phpunit/media/broken-file.ogg 
b/tests/phpunit/media/broken-file.ogg
new file mode 100644
index 0000000..c9fc4fd
--- /dev/null
+++ b/tests/phpunit/media/broken-file.ogg
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/140643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I158808fbd7e64c4faceb80353bd6c6c3d6206dd8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Mdale <md...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits