Skip to content

add named parameter #43

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

Open
wants to merge 4 commits into
base: 0.7.x
Choose a base branch
from
Open

add named parameter #43

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6571ee1
[+]: fixed reported by "Php Inspections" + (EA Extended)
voku Apr 28, 2018
c57bb1f
[+]: add named parameter
voku Apr 28, 2018
d8f6f08
[+]: add named parameter v2
voku Apr 28, 2018
24a52f7
[*]: try to fix "travis-ci" random error
voku Apr 28, 2018
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
8 changes: 5 additions & 3 deletions src/Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,19 @@ abstract class Command extends EventEmitter implements CommandInterface
*/
const INIT_AUTHENTICATE = 0xf1;

/**
* @var Connection
*/
protected $connection;

private $states = [];

private $error;

/**
* Construtor.
* Constructor.
*
* @param integer $cmd
* @param string $q
* @param Connection $connection
*/
public function __construct(Connection $connection)
{
Expand Down
23 changes: 14 additions & 9 deletions src/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,15 @@ class Connection extends EventEmitter implements ConnectionInterface
public function __construct(LoopInterface $loop, array $connectOptions = array(), ConnectorInterface $connector = null)
{
$this->loop = $loop;

if (!$connector) {
$connector = new Connector($loop);
}
$this->connector = $connector;

$this->executor = new Executor($this);
$this->options = $connectOptions + $this->options;

$this->options = array_replace($this->options, $connectOptions);
}

/**
Expand Down Expand Up @@ -262,7 +265,7 @@ public function getServerOptions()
}

/**
* @param Exception $err Error from socket.
* @param \Exception $err Error from socket.
*
* @return void
* @internal
Expand Down Expand Up @@ -293,12 +296,14 @@ public function handleConnectionClosed()
*/
protected function _doCommand(Command $command)
{
if ($command->equals(Command::INIT_AUTHENTICATE)) {
return $this->executor->undequeue($command);
} elseif ($this->state >= self::STATE_CONNECTING && $this->state <= self::STATE_AUTHENTICATED) {
return $this->executor->enqueue($command);
} else {
throw new Exception("Can't send command");
}
if ($command->equals(Command::INIT_AUTHENTICATE)) {
return $this->executor->undequeue($command);
}

if ($this->state >= self::STATE_CONNECTING && $this->state <= self::STATE_AUTHENTICATED) {
return $this->executor->enqueue($command);
}

throw new Exception("Can't send command");
}
}
Loading