Merge branch '2.0'

Author: JanHuang

composer.json

@@ -17,7 +17,8 @@
         "symfony/console": "^3.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0"
+        "phpunit/phpunit": "^5.0",
+        "fzaninotto/faker": "^1.6"
     },
     "autoload": {
         "psr-4": {

docs/zh_CN/2-1-server.md

@@ -22,7 +22,7 @@ class DemoServer extends TCP
 {
     public function doWork(swoole_server $server, $fd, $data, $from_id)
     {
-        return 'hello tcp';
+         $server->send($fd, $data);
     }
 }
 
@@ -41,9 +41,9 @@ use \FastD\Swoole\Server\UDP;
 
 class DemoServer extends UDP
 {
-    public function doPacket(swoole_server $server, $data, $client_info)
+    public function doPacket(swoole_server $server, $data, $clientInfo)
     {
-        return 'hello udp';
+        $server->sendto($clientInfo['address'], $clientInfo['port'], $data);
     }
 }
 

docs/zh_CN/2-2-client.md

@@ -2,93 +2,32 @@
 
 首先得必须说明一下什么是客户端，所谓客户端，就是咱们所指的 "消费者"，服务器，也有可能是客户端。可以这么理解，只要是发起请求到另外一段获取获取的，即可视为客户端。因此有时候咱们的服务器，也是其中一个客户端。
 
-客户端最后通过 `resolve` 进行调用。
-
-### 客户端命令行
-
-> 1.1.0 新增
-
-当用户输入 (quit/exit) 的时候，客户端自动退出当前循环。
-
-默认数据为: `Hello World`
-
-```php
-$ php swoole [host] [port]
-```
-
-效果: 
-
-```
-➜  swoole (1.1) ✗ php swoole 11.11.11.22 9527
-Please enter the send data.(default: Hello World, Enter (exit/quit) can be exit console.):
-Receive: Hello World
-Please enter the send data.(default: Hello World, Enter (exit/quit) can be exit console.): exit
-```
-
 ### 同步客户端
 
 同步客户端是最传统的一种方式，也是最容易上手的，整个过程都是阻塞的。
 
 ```php
-use FastD\Swoole\Client\Sync\SyncClient;
+use FastD\Swoole\Client;
 
 
-$client = new SyncClient('tcp://127.0.0.1:9527');
+$client = new Client('tcp://127.0.0.1:9527');
 
-$client
-    ->connect(function ($client) {
-        $client->send('hello world');
-    })
-    ->receive(function ($client, $data) {
-        echo $data . PHP_EOL;
-        $client->close();
-    })
-    ->resolve()
-;
+$client->send();
 ```
 
 ### 异步客户端
 
 不管是同步还是异步客户端，每个方法都是一个回调，统一客户端的写法，避免造成多种操作方式的，造成混淆。
 
-值得注意的是，异步客户端需要对每个操作进行回调处理。
-
-```php
-use FastD\Swoole\Client\Async\AsyncClient;
-
-
-$client = new AsyncClient('tcp://127.0.0.1:9527');
-
-$client
-    ->connect(function ($client) {
-        $client->send('hello world');
-    })
-    ->receive(function ($client, $data) {
-        echo $data . PHP_EOL;
-    })
-    ->error(function ($client) {
-        print_r($client);
-    })
-    ->close(function ($client) {})
-    ->resolve()
-;
-```
-
-### Socket 客户端
-
-Socket 客户端是基于 PHP 内部的 sockets 扩展实现，因此使用该客户端前先要确保 sockets 扩展已经正常安装。
+值得注意的是，异步客户端需要对 `connect`, `receive`, `error`, `close` 进行重写，并且通过 start 进行启动客户端
 
 ```php
-use FastD\Swoole\Client\Socket;
+use FastD\Swoole\Client;
 
 
-$socket = new Socket('tcp://127.0.0.1:9527');
+$client = new Client('tcp://127.0.0.1:9527');
 
-$socket->connect(function (Socket $socket) {
-    $socket->send('hello world');
-})->receive(function ($data) {
-    echo ($data) . PHP_EOL;
-})->resolve();
+$client->start();
 ```
 
 下一节: [进程](2-3-process.md)

docs/zh_CN/3-2-overrite.md

@@ -0,0 +1 @@
+# 重写回调

docs/zh_CN/readme.md

@@ -17,7 +17,8 @@
 高级
 -------
 
-* [信号量](3-1-singo.md)
+* [信号量](3-1-signo.md)
+* [重写回调](3-2-overrite.md)
 
 ### Support
 

examples/client/async.php

@@ -9,6 +9,20 @@
 
 include __DIR__ . '/../../vendor/autoload.php';
 
-$client = new \FastD\Swoole\Client('tcp://127.0.0.1:9527');
+class Cli extends \FastD\Swoole\Client
+{
+    public function connect(swoole_client $client)
+    {
+        $client->send('hello');
+    }
 
-echo $client->send('hello', true);
+    public function receive(swoole_client $client, $data)
+    {
+        echo $data;
+        $client->close();
+    }
+}
+
+$client = new Cli('tcp://127.0.0.1:9527', true);
+
+$client->start();

examples/client/tcp.php

@@ -4,6 +4,6 @@
 
 $client = new \FastD\Swoole\Client('tcp://127.0.0.1:9527');
 
-echo $client->send('hello', true);
+echo $client->send('hello');
 
 

examples/client/udp.php

@@ -9,6 +9,6 @@
 
 include __DIR__ . '/../../vendor/autoload.php';
 
-$client = new \FastD\Swoole\Client('tcp://127.0.0.1:9527', SWOOLE_SOCK_UDP);
+$client = new \FastD\Swoole\Client('tcp://127.0.0.1:9527', false, false, SWOOLE_SOCK_UDP);
 
 echo $client->send('hello');

examples/coroutine/tcp.php

@@ -9,7 +9,7 @@
 
 include __DIR__ . '/../../vendor/autoload.php';
 
-$client = new \FastD\Swoole\Client\Sync\TCP('tcp://127.0.0.1:9527');
+$client = new \FastD\Swoole\Client('tcp://127.0.0.1:9527', false, true);
 
 for ($i = 0; $i< 10; $i++) {
     echo $client->send('hello', false, true) . PHP_EOL;