Merge pull request #187 from StudioMaX/2.0-sync-with-master

[WIP] Sync 2.0 with 1.9.17-201905121748

Author: JamesHeinrich

.editorconfig

@@ -0,0 +1,9 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+end_of_line = LF
+
+[*.php]
+indent_style = tab

.gitattributes

@@ -21,9 +21,13 @@
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
 
-.gitattributes      export-ignore
-.gitignore          export-ignore
-/phpunit.xml        export-ignore
-/tests              export-ignore
-/.travis.yml        export-ignore
-/demos              export-ignore
+/.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+/.travis.yml export-ignore
+Doxyfile export-ignore
+/composer.json export-ignore
+/.phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/tests export-ignore
+/phpstan.neon export-ignore

.gitignore

@@ -62,7 +62,6 @@ local.properties
 *.tlb
 *.tli
 *.tlh
-*.tmp
 *.vspscc
 .builds
 *.dotCover
@@ -169,9 +168,8 @@ pip-log.txt
 .DS_Store
 demos/php_error.log
 
-
-#############
-## composer
-#############
+# Composer
 /vendor
 /composer.lock
+/composer.local.json
+/composer.phar

.travis.yml

@@ -1,26 +1,29 @@
 language: php
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
 php:
   - 5.4
   - 5.5
   - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  - 7.2
+  - 7.3
 
-sudo: false
+matrix:
+  include:
+    - php: 7.1
+      env: PHPSTAN=1
 
-env:
-  - COMPOSER_OPTS=""
-  - COMPOSER_OPTS="--prefer-lowest"
-
-install:
-  - composer self-update
-  - composer update $COMPOSER_OPTS
+before_script:
+  - travis_retry composer install --prefer-source --quiet --no-interaction
+  - if [[ $PHPSTAN = 1 ]]; then composer require --dev phpstan/phpstan:^0.9; fi
 
 script:
-  - phpunit
-  - ./tests/lint.sh
-
-git:
-  depth: 5
+  - vendor/bin/phpunit
+  - composer lint
+  - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -c phpstan.neon -l 4 src tests; fi

README.md

@@ -2,7 +2,7 @@ getID3
 ======
 
 A PHP library to extract and write useful information to/from popular multimedia file formats.  
-If you want to donate, there is a link on <http://www.getid3.org> for PayPal donations.
+If you want to donate, there is a link on <https://www.getid3.org> for PayPal donations.
 
 [![Latest Stable Version](https://poser.pugx.org/james-heinrich/getID3/version.svg)](https://packagist.org/packages/james-heinrich/getid3)
 [![Build Status](https://travis-ci.org/JamesHeinrich/getID3.svg?branch=2.0)](https://travis-ci.org/JamesHeinrich/getID3)

bin/metaflac.exe

@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////
 /// getID3() by James Heinrich <info@getid3.org>               //
 //  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
+//            or https://www.getid3.org                        //
 //          also https://github.com/JamesHeinrich/getID3       //
 /////////////////////////////////////////////////////////////////
 //                                                             //
@@ -53,4 +53,4 @@ Taken from http://www.etree.org/shncom.html
 Changelog:
 
 2003.12.29:
-  * Initial release
+  * Initial release