Merge branch 'master' of github.com:tourze/workerman-yii2

# Conflicts: # src/commands/ServerController.php # src/server/HttpServer.php
tourze · Dec 5, 2016 · 2f051c9 · 2f051c9
2 parents 67b247e + d4b569b
commit 2f051c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Container.php b/src/Container.php
@@ -34,6 +34,7 @@ class Container extends \yii\di\Container
         'yii\web\ErrorHandler' => 'tourze\workerman\yii2\web\ErrorHandler',
         'yii\web\User' => 'tourze\workerman\yii2\web\User',
         'yii\web\View' => 'tourze\workerman\yii2\web\View',
+        'yii\web\UrlManager' => 'tourze\workerman\yii2\web\UrlManager',
     ];
 
     /**
@@ -203,7 +204,6 @@ class Container extends \yii\di\Container
         'yii\web\JsonResponseFormatter',
         'yii\web\Link',
         'yii\web\MultipartFormDataParser',
-        'yii\web\UrlManager',
         'yii\web\UrlNormalizer',
         'yii\web\UrlRule',
         'yii\web\UserEvent',

diff --git a/src/web/UrlManager.php b/src/web/UrlManager.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace tourze\workerman\yii2\web;
+
+use Yii;
+
+/**
+ * Url管理组件
+ *
+ * @package tourze\workerman\yii2\web
+ */
+class UrlManager extends \yii\web\UrlManager
+{
+}