aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-28 12:28:34 +1100
committerredmatrix <redmatrix@redmatrix.me>2015-10-28 12:28:34 +1100
commit0147186565da99d6d89d6c2d57f5b7034fca0d68 (patch)
tree3a65e8653f14482fac119e90db0e62f3eccc0b98
parent605381f83deecc384a0ed7630dd1577e93b2cf8f (diff)
parent8924cb0960eb732e9fac015d62fcfccbd5a81e12 (diff)
downloadvolse-hubzilla-0147186565da99d6d89d6c2d57f5b7034fca0d68.tar.gz
volse-hubzilla-0147186565da99d6d89d6c2d57f5b7034fca0d68.tar.bz2
volse-hubzilla-0147186565da99d6d89d6c2d57f5b7034fca0d68.zip
Merge pull request #101 from kenrestivo/kens-fixes
Add YML file for travis CI suite, fix MIME types for audio files
-rw-r--r--.travis.yml46
-rw-r--r--include/attach.php5
2 files changed, 50 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..583b2a1a8
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,46 @@
+# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
+language: php
+
+# list any PHP version you want to test against
+php:
+ # using major version aliases
+
+ # aliased to a recent 5.4.x version
+ - 5.4
+ # aliased to a recent 5.5.x version
+ - 5.5
+ # aliased to a recent 5.6.x version
+ - 5.6
+ # aliased to a recent 7.x version
+ - 7.0
+ # aliased to a recent hhvm version
+ - hhvm
+
+# optionally specify a list of environments, for example to test different RDBMS
+#env:
+# - DB=mysql
+# - DB=pgsql
+
+# optionally set up exclutions and allowed failures in the matrix
+matrix:
+# exclude:
+# - php: hhvm
+# env: DB=pgsql # PDO driver for pgsql is unsupported by HHVM (3rd party install for support)
+ allow_failures:
+ - php: 7.0
+ - php: hhvm
+
+# execute any number of scripts before the test run, custom env's are available as variables
+#before_script:
+# - if [[ "$DB" == "pgsql" ]]; then psql -c "DROP DATABASE IF EXISTS hello_world_test;" -U postgres; fi
+# - if [[ "$DB" == "pgsql" ]]; then psql -c "create database hello_world_test;" -U postgres; fi
+# - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS hello_world_test;" -uroot; fi
+
+# omitting "script:" will default to phpunit
+# use the $DB env variable to determine the phpunit.xml to use
+script: phpunit tests/*php
+
+# configure notifications (email, IRC, campfire etc)
+notifications:
+# irc: "irc.freenode.org#yourfavouriteroomfortravis"
+# a plugin/script to post to a hubzilla channel would be neat here \ No newline at end of file
diff --git a/include/attach.php b/include/attach.php
index f5d2c69b6..a959a5bcb 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -64,7 +64,10 @@ function z_mime_content_type($filename) {
'wav' => 'audio/wav',
'qt' => 'video/quicktime',
'mov' => 'video/quicktime',
- 'ogg' => 'application/ogg',
+ 'ogg' => 'audio/ogg',
+ 'ogv' => 'video/ogg',
+ 'ogx' => 'application/ogg',
+ 'flac' => 'audio/flac',
'opus' => 'audio/ogg',
'webm' => 'video/webm',
// 'webm' => 'audio/webm',