Merge branch 'v3'

morozovsk · Sep 5, 2015 · 897607b · 897607b
2 parents 7afd3a0 + 11a4201
commit 897607b
Show file tree

Hide file tree

Showing 24 changed files with 21 additions and 457 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 Simple websocket server on php.
 
+"composer require morozovsk/websocket"
+
 ###Features:
 * server works with socket_select, pecl/event or pecl/libevent.
 * you can run multiple processes (one master and several workers).

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "require": {
         "php": ">=5.3.0"
     },
-    "version": "2.0.0",
+    "version": "3.0.0",
     "license": "MIT",
     "homepage": "http://sharoid.ru/game.html",
     "authors": [

diff --git a/samples/chat/server/ChatWebsocketDaemonHandler.php b/samples/chat/server/ChatWebsocketDaemonHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace morozovsk\websocket;
+namespace morozovsk\websocket\samples;
 
 //пример реализации чата
-class ChatWebsocketDaemonHandler extends Daemon
+class ChatWebsocketDaemonHandler extends \morozovsk\websocket\Daemon
 {
     protected function onOpen($connectionId, $info) {//вызывается при соединении с новым клиентом
 

diff --git a/samples/chat/server/index.php b/samples/chat/server/index.php
@@ -6,7 +6,7 @@
 }
 
 $config = array(
-    'class' => 'morozovsk\websocket\ChatWebsocketDaemonHandler',
+    'class' => 'morozovsk\websocket\samples\ChatWebsocketDaemonHandler',
     'pid' => '/tmp/websocket_chat.pid',
     'websocket' => 'tcp://127.0.0.1:8000',
     //'localsocket' => 'tcp://127.0.0.1:8010',

diff --git a/samples/chat2/server/Chat2WebsocketMasterHandler.php b/samples/chat2/server/Chat2WebsocketMasterHandler.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace morozovsk\websocket;
+namespace morozovsk\websocket\samples;
 
-class Chat2WebsocketMasterHandler extends Daemon
+class Chat2WebsocketMasterHandler extends \morozovsk\websocket\Daemon
 {
     protected $logins = array();
 

diff --git a/samples/chat2/server/Chat2WebsocketWorkerHandler.php b/samples/chat2/server/Chat2WebsocketWorkerHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace morozovsk\websocket;
+namespace morozovsk\websocket\samples;
 
 //пример реализации чата
-class Chat2WebsocketWorkerHandler extends Daemon
+class Chat2WebsocketWorkerHandler extends \morozovsk\websocket\Daemon
 {
     protected $flud;
 

diff --git a/samples/chat2/server/master.php b/samples/chat2/server/master.php
@@ -6,7 +6,7 @@
 }
 
 $config = array(
-    'class' => 'morozovsk\websocket\Chat2WebsocketMasterHandler',
+    'class' => 'morozovsk\websocket\samples\Chat2WebsocketMasterHandler',
     'pid' => '/tmp/websocket_chat2_master.pid',
     'websocket' => 'tcp://127.0.0.1:8011',
     'localsocket' => 'tcp://127.0.0.1:8010',

diff --git a/samples/chat2/server/worker.php b/samples/chat2/server/worker.php
@@ -6,7 +6,7 @@
 }
 
 $config = array(
-    'class' => 'morozovsk\websocket\Chat2WebsocketWorkerHandler',
+    'class' => 'morozovsk\websocket\samples\Chat2WebsocketWorkerHandler',
     'pid' => '/tmp/websocket_chat2_worker.pid',
     'websocket' => 'tcp://127.0.0.1:8001',
     //'localsocket' => 'tcp://127.0.0.1:8010',

diff --git a/samples/chat3/server/Chat3WebsocketDaemonHandler.php b/samples/chat3/server/Chat3WebsocketDaemonHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace morozovsk\websocket;
+namespace morozovsk\websocket\samples;
 
 //пример реализации чата
-class Chat3WebsocketDaemonHandler extends Daemon
+class Chat3WebsocketDaemonHandler extends \morozovsk\websocket\Daemon
 {
     public $userIds = [];
     protected function onOpen($connectionId, $info) {//вызывается при соединении с новым клиентом

diff --git a/samples/chat3/server/index.php b/samples/chat3/server/index.php
@@ -6,7 +6,7 @@
 }
 
 $config = array(
-    'class' => 'morozovsk\websocket\Chat3WebsocketDaemonHandler',
+    'class' => 'morozovsk\websocket\samples\Chat3WebsocketDaemonHandler',
     'pid' => '/tmp/websocket_chat.pid',
     'websocket' => 'tcp://127.0.0.1:8004',
     'localsocket' => 'tcp://127.0.0.1:8010',

diff --git a/samples/game/server/GameWebsocketDaemonHandler.php b/samples/game/server/GameWebsocketDaemonHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace morozovsk\websocket;
+namespace morozovsk\websocket\samples;
 
 //пример реализации чата
-class GameWebsocketDaemonHandler extends Daemon
+class GameWebsocketDaemonHandler extends \morozovsk\websocket\Daemon
 {
     protected $tanks = array();
     protected $bullets = array();

diff --git a/samples/game/server/index.php b/samples/game/server/index.php
@@ -6,7 +6,7 @@
 }
 
 $config = array(
-    'class' => 'morozovsk\websocket\GameWebsocketDaemonHandler',
+    'class' => 'morozovsk\websocket\samples\GameWebsocketDaemonHandler',
     'pid' => '/tmp/websocket_game.pid',
     'websocket' => 'tcp://127.0.0.1:8002',
     //'localsocket' => 'tcp://127.0.0.1:8010',

diff --git a/samples/game2/server/Game2WebsocketDaemonHandler.php b/samples/game2/server/Game2WebsocketDaemonHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace morozovsk\websocket;
+namespace morozovsk\websocket\samples;
 
 //пример реализации чата
-class Game2WebsocketDaemonHandler extends Daemon
+class Game2WebsocketDaemonHandler extends \morozovsk\websocket\Daemon
 {
     protected $units = []; //массив юнитов
     protected $items = []; //массив обьектов

diff --git a/samples/game2/server/index.php b/samples/game2/server/index.php
@@ -6,7 +6,7 @@
 }
 
 $config = array(
-    'class' => 'morozovsk\websocket\Game2WebsocketDaemonHandler',
+    'class' => 'morozovsk\websocket\samples\Game2WebsocketDaemonHandler',
     'pid' => '/tmp/websocket_game2.pid',
     'websocket' => 'tcp://127.0.0.1:8003',
     //'localsocket' => 'tcp://127.0.0.1:8010',

diff --git a/samples/yii/css/bootstrap.min.css b/samples/yii/css/bootstrap.min.css