Merge pull request #300 from barbushin/develop

Merge develop into master
barbushin · Apr 30, 2019 · 74933b0 · 74933b0
2 parents 3348b86 + d9a7676
commit 74933b0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1,498 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # All of the vendor directory should be installed by running 'composer install'
 vendor/
+composer.lock
 
 #################
 ## Eclipse
@@ -165,3 +166,6 @@ pip-log.txt
 
 # Mac crap
 .DS_Store
+
+# NetBeans IDE
+nbproject/
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,10 @@
 language: php
 php:
+  - 5.6
+  - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 before_script:
   - composer install --no-interaction

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 
 ### Requirements
 
-* PHP 7.1, 7.2
+* PHP 5.6, 7.0, 7.1, 7.2 or 7.3
 * IMAP extension must be present; so make sure this line is active in your php.ini: `extension=php_imap.dll`
 
 ### Installation by Composer

diff --git a/composer.json b/composer.json
@@ -20,9 +20,9 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=5.6",
         "ext-imap": "*",
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^5.7"
     },
     "autoload": {
         "psr-4": {