Skip to content
This repository has been archived by the owner on Nov 8, 2018. It is now read-only.

php7 #1300

Merged
merged 2 commits into from
Feb 24, 2016
Merged

php7 #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8dcf07
Go for php7
DeepDiver1975 Feb 3, 2016
3047601
horde version bump
ChristophWurst Feb 17, 2016
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
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,4 @@ matrix:
- php: 5.4
env: "DB=mysql CORE_BRANCH=stable8.2"

allow_failures:
- php: 7
fast_finish: true
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ New:
* Address collector - Addresses of sent mails will be used for auto-completion
[#1276](https://github.com/owncloud/mail/pull/1276) @ChristophWurst

* PHP 7 support
[#1300](https://github.com/owncloud/mail/pull/1300) @ChristophWurst

Fixes:

*
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</documentation>
<dependencies>
<owncloud min-version="8.0" max-version="9.0" />
<php min-version="5.4" max-version="5.6" />
<php min-version="5.4" max-version="7.0" />
</dependencies>
<ocsid>169914</ocsid>
</info>
24 changes: 12 additions & 12 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
],
"require": {
"php": ">=5.4.0",
"pear-pear.horde.org/Horde_Date": "^2.0.0@stable",
"pear-pear.horde.org/Horde_Exception": "^2.0.0@stable",
"pear-pear.horde.org/Horde_Imap_Client": "^2.28.0@stable",
"pear-pear.horde.org/Horde_Mail": "^2.6.1@stable",
"pear-pear.horde.org/Horde_Mime": "^2.1.0@stable",
"pear-pear.horde.org/Horde_Nls": "^2.0.0@stable",
"pear-pear.horde.org/Horde_Stream": "^1.0.0@stable",
"pear-pear.horde.org/Horde_Support": "^2.0.5@stable",
"pear-pear.horde.org/Horde_Text_Filter": "^2.1.0@stable",
"pear-pear.horde.org/Horde_Text_Flowed": "^2.0.0@stable",
"pear-pear.horde.org/Horde_Util": "^2.2.0@stable",
"pear-pear.horde.org/Horde_Smtp": "^1.5.0@stable",
"pear-pear.horde.org/Horde_Date": "^2.2.0@stable",
"pear-pear.horde.org/Horde_Exception": "^2.0.7@stable",
"pear-pear.horde.org/Horde_Imap_Client": "^2.29.0@stable",
"pear-pear.horde.org/Horde_Mail": "^2.6.3@stable",
"pear-pear.horde.org/Horde_Mime": "^2.9.3@stable",
"pear-pear.horde.org/Horde_Nls": "^2.1.0@stable",
"pear-pear.horde.org/Horde_Stream": "^1.6.3@stable",
"pear-pear.horde.org/Horde_Support": "^2.1.5@stable",
"pear-pear.horde.org/Horde_Text_Filter": "^2.3.3@stable",
"pear-pear.horde.org/Horde_Text_Flowed": "^2.0.3@stable",
"pear-pear.horde.org/Horde_Util": "^2.5.7@stable",
"pear-pear.horde.org/Horde_Smtp": "^1.9.2@stable",
"ezyang/htmlpurifier": "4.7.0",
"kwi/urllinker": "dev-default"
}
Expand Down
Loading