From 6440b038cafe0b5a2e55f4279fbfa42afef2d73d Mon Sep 17 00:00:00 2001
From: tabuna <bliz48rus@gmail.com>
Date: Fri, 27 May 2016 21:36:43 +0300
Subject: [PATCH] update version and change structure

---
 Console/MakeListener.php            |  8 ++++----
 Console/Server.php                  | 27 ++++++---------------------
 Providers/SocketServiceProvider.php |  5 +++--
 README.md                           |  2 +-
 composer.json                       |  7 ++++---
 5 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/Console/MakeListener.php b/Console/MakeListener.php
index 3ab073b..17bf22b 100644
--- a/Console/MakeListener.php
+++ b/Console/MakeListener.php
@@ -1,5 +1,6 @@
 <?php namespace Orchid\Socket\Console;
 
+use Illuminate\Console\GeneratorCommand;
 use Illuminate\Console\GeneratorCommand;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -39,13 +40,12 @@ protected function getStub()
     /**
      * Get the default namespace for the class.
      *
-     * @param  string $rootNamespace
+     * @param string $rootNamespace
+     *
      * @return string
      */
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace . '\Socket\Listener';
+        return $rootNamespace . '\Http\Socket\Listener';
     }
-
-
 }
diff --git a/Console/Server.php b/Console/Server.php
index 266e402..fd36c5e 100644
--- a/Console/Server.php
+++ b/Console/Server.php
@@ -1,21 +1,13 @@
-<?php namespace Orchid\Socket\Console;
+<?php
+
+namespace Orchid\Socket\Console;
 
 use Config;
 use Illuminate\Console\Command;
 use Ratchet\App as Socket;
-use Ratchet\ConnectionInterface;
-use Ratchet\Http\HttpServer;
-use Ratchet\MessageComponentInterface;
-use Ratchet\Server\IoServer;
-use Ratchet\WebSocket\WsServer;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
 
 class Server extends Command
 {
-
     /**
      * The console command name.
      *
@@ -30,17 +22,15 @@ class Server extends Command
      */
     protected $description = 'Start web socket server.';
 
-
     /**
      * $httpHost HTTP hostname clients intend to connect to.
-     * MUST match JS `new WebSocket('ws://$httpHost')
+     * MUST match JS `new WebSocket('ws://$httpHost').
      */
     protected $httpHost;
 
-
     /**
      * Port to listen on. If 80, assuming production,
-     * Flash on 843 otherwise expecting Flash to be proxied through 8843
+     * Flash on 843 otherwise expecting Flash to be proxied through 8843.
      */
     protected $port;
 
@@ -50,11 +40,8 @@ class Server extends Command
      */
     protected $address;
 
-
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -73,10 +60,8 @@ public function __construct()
     public function fire()
     {
         $socket = new Socket($this->httpHost, $this->port, $this->address);
-        require_once(app_path() . '/Socket/routes.php');
+        require_once app_path() . '/Socket/routes.php';
         $this->info('Laravel web socket server started on ' . $this->httpHost . ':' . $this->port . '/' . 'address:' . $this->address);
         $socket->run();
     }
-
-
 }
diff --git a/Providers/SocketServiceProvider.php b/Providers/SocketServiceProvider.php
index 0f8e4a4..3751909 100644
--- a/Providers/SocketServiceProvider.php
+++ b/Providers/SocketServiceProvider.php
@@ -33,16 +33,17 @@ protected function registerConfig()
     {
         $this->publishes([
             __DIR__ . '/../Config/socket.php' => config_path('socket.php'),
-            __DIR__ . '/../routes.php' => app_path('/Socket/routes.php'),
+            __DIR__ . '/../Services/Socket/routes.php' => app_path('/Http/Socket/routes.php'),
         ]);
         $this->mergeConfigFrom(
             __DIR__ . '/../Config/socket.php', 'socket'
         );
     }
 
+
     public function registerProviders()
     {
-        $this->app->register('Orchid\\Socket\\Providers\\ConsoleServiceProvider');
+        //   $this->app->register('Orchid\\Socket\\Providers\\ConsoleServiceProvider');
     }
 
     /**
diff --git a/README.md b/README.md
index e18a34e..33613a6 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ php artisan make:socket MyNameClass
 1. add socket route
 
 ```php
-You will define most of the routes for your application in the app/Socket/routes.php file
+You will define most of the routes for your application in the app/Http/Socket/routes.php file
 ```
 
 1. start socket server
diff --git a/composer.json b/composer.json
index 48560cd..fce6408 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,8 @@
     "web",
     "websocket",
     "socket",
-    "php"
+    "php",
+    "server"
   ],
   "license": "MIT",
   "authors": [
@@ -18,8 +19,8 @@
   ],
   "require": {
     "php": ">=5.5.9",
-    "laravel/framework": "5.1.*",
-    "cboden/ratchet": "^0.3.3"
+    "laravel/framework": ">5.0",
+    "cboden/ratchet": "^0.3.5"
   },
   "autoload": {
     "psr-4": {