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

3.1.2 #1005

Merged
merged 3 commits into from
Apr 6, 2017
Merged

3.1.2 #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e3d952
Fix initialization home directory in Windows batch file.
Apr 5, 2017
e7308bc
Updated IDE stubs
sergeyklay Apr 5, 2017
de59326
Bump version
sergeyklay Apr 5, 2017
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: 1 addition & 1 deletion ide/stubs/Phalcon/queue/Beanstalk.php
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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];
}
}