Skip to content

Commit

Permalink
Merge pull request phalcon#12747 from Jurigag/3.1.x-7.1
Browse files Browse the repository at this point in the history
Remove php 7.1 from allowed failures
  • Loading branch information
sergeyklay authored Mar 27, 2017
2 parents 0a5c93b + 4f8eff3 commit 499d248
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ php:
matrix:
fast_finish: true
allow_failures:
- php: 7.1
- php: nightly
include:
- php: 7.0
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# [3.1.2](https://github.com/phalcon/cphalcon/releases/tag/v3.1.2) (2017-XX-XX)
- Fixed PHP 7.1 issues [#12055](https://github.com/phalcon/cphalcon/issues/12055)

# [3.1.1](https://github.com/phalcon/cphalcon/releases/tag/v3.1.1) (2017-03-25)
- Fixed undefined index warning on existing cached resultsets
Expand Down
2 changes: 1 addition & 1 deletion phalcon/queue/beanstalk.zep
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ class Beanstalk
/**
* Writes data to the socket. Performs a connection if none is available
*/
protected function write(string data) -> boolean|int
public function write(string data) -> boolean|int
{
var connection, packet;

Expand Down

0 comments on commit 499d248

Please sign in to comment.