tyler.durden/xo-server
1
0
Fork 0
mirror of https://github.com/mclueppers/xo-server.git synced 2025-07-27 07:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use call_user_func() instead of direct variable (only in PHP 5.4).

Browse Source
This commit is contained in:
Julien Fontanet 2013-03-04 18:07:09 +01:00
parent 1203149cb7
commit 029a9293f0
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
composer.lock generated
View File

@ -146,12 +146,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vatesfr/eventus.git", "url": "https://github.com/vatesfr/eventus.git",
"reference": "27efc85692f8f77531f0864da30a3724890a44b7" "reference": "472924725b04ec8c6452b86d97ae7fe84dff43ad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vatesfr/eventus/zipball/27efc85692f8f77531f0864da30a3724890a44b7", "url": "https://api.github.com/repos/vatesfr/eventus/zipball/472924725b04ec8c6452b86d97ae7fe84dff43ad",
"reference": "27efc85692f8f77531f0864da30a3724890a44b7", "reference": "472924725b04ec8c6452b86d97ae7fe84dff43ad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -180,7 +180,7 @@
"keywords": [ "keywords": [
"event" "event"
], ],
"time": "2013-02-16 11:40:13" "time": "2013-03-04 17:11:11"
}, },
{ {
"name": "vates/rekodi", "name": "vates/rekodi",
@ -225,7 +225,9 @@
"time": "2013-03-03 13:25:27" "time": "2013-03-03 13:25:27"
} }
], ],
"packages-dev": null, "packages-dev": [
],
"aliases": [ "aliases": [
], ],
@ -234,5 +236,12 @@
"ircmaxell/password-compat": 20, "ircmaxell/password-compat": 20,
"vates/eventus": 20, "vates/eventus": 20,
"vates/rekodi": 20 "vates/rekodi": 20
} },
"platform": {
"php": ">=5.3.0",
"ext-xmlrpc": "*"
},
"platform-dev": [
]
} }

6
lib/Client.php
View File

@ -162,8 +162,10 @@ final class Client extends Base
if (isset($this->_methods[$method])) if (isset($this->_methods[$method]))
{ {
$_ = $this->_methods[$method]; $error = call_user_func(
$error = $_($id, $params, $this); $this->_methods[$method],
$id, $params, $this
);
} }
else else
{ {

4
lib/Loop.php
View File

@ -120,7 +120,7 @@ final class Loop extends Base
foreach ($read as $handle) foreach ($read as $handle)
{ {
$callback = $this->_readCallbacks[(int) $handle]; $callback = $this->_readCallbacks[(int) $handle];
$result = $callback($handle, $user_data); $result = call_user_func($callback, $handle, $user_data);
if (!is_resource($handle)) if (!is_resource($handle))
{ {
@ -134,7 +134,7 @@ final class Loop extends Base
foreach ($write as $handle) foreach ($write as $handle)
{ {
$callback = $this->_writeCallbacks[(int) $handle]; $callback = $this->_writeCallbacks[(int) $handle];
$result = $callback($handle, $user_data); $result = call_user_func($callback, $handle, $user_data);
if (!is_resource($handle)) if (!is_resource($handle))
{ {

2
lib/XCP.php
View File

@ -92,7 +92,7 @@ final class XCP extends Base
if ($request[0] !== null) if ($request[0] !== null)
{ {
$callback = $request[0]; $callback = $request[0];
$result = $callback($response, $this); $result = call_user_func($callback, $response, $this);
if ($result === true) if ($result === true)
{ {
$this->_queue[] = $request; $this->_queue[] = $request;