Skip to content

Commit

Permalink
Merge pull request #1005 from phalcon/3.1.x
Browse files Browse the repository at this point in the history
3.1.2
  • Loading branch information
sergeyklay authored Apr 6, 2017
2 parents 428f3cf + de59326 commit a832aef
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ide/stubs/Phalcon/queue/Beanstalk.php
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public function read($length = 0) {}
* @param string $data
* @return bool|int
*/
protected function write($data) {}
public function write($data) {}

/**
* Closes the connection to the beanstalk server.
Expand Down
2 changes: 1 addition & 1 deletion phalcon.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off

set PTOOLSPATH="%~dp0\"
set PTOOLSPATH=%~dp0
php %PTOOLSPATH%phalcon.php %*
2 changes: 1 addition & 1 deletion scripts/Phalcon/Devtools/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ class Version extends PhVersion
*/
protected static function _getVersion()
{
return [3, 1, 1, 4, 0];
return [3, 1, 2, 4, 0];
}
}

0 comments on commit a832aef

Please sign in to comment.