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.

Sign up for GitHub

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

Jump to bottom

Merge develop into master #300

Merged
merged 13 commits into from
Apr 30, 2019
Merged

Merge develop into master #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4be6d59
Downgraded PHPUnit and added back support for PHP 5.6 and 7.0
Apr 29, 2019
e3b0e05
Update composer.json
barbushin Apr 29, 2019
1509a73
Added PHP 7.3 to Travis
Apr 29, 2019
ced28b6
Update composer.json
barbushin Apr 29, 2019
25989d1
Merge branch 'develop' of github.com:barbushin/php-imap into develop
Apr 29, 2019
a07814c
Added PHP 7.3 to README requirements
Apr 29, 2019
2cfb254
Update .gitignore
barbushin Apr 29, 2019
b3ff50a
Delete composer.lock
barbushin Apr 29, 2019
699588a
Added NetBeans IDE to gitignore
Apr 29, 2019
67027e3
Merge branch 'develop' of github.com:barbushin/php-imap into develop
Apr 29, 2019
485ba6d
Merge pull request #299 from barbushin/master
Sebbo94BY Apr 29, 2019
1e309cc
Fixed 'must be an instance of PhpImap\string, string given'
Apr 29, 2019
d9a7676
Updated PHP requirements in README
Sebbo94BY Apr 30, 2019
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# All of the vendor directory should be installed by running 'composer install'
vendor/
composer.lock

#################
## Eclipse
Expand Down Expand Up @@ -165,3 +166,6 @@ pip-log.txt

# Mac crap
.DS_Store

# NetBeans IDE
nbproject/
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
language: php
php:
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3

before_script:
- composer install --no-interaction
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading