浏览代码

fixed utils fixes

develop
Robin Thoni 7 年前
父节点
当前提交
9e66239a02
共有 6 个文件被更改,包括 586 次插入282 次删除
  1. 5
    6
      app/Middleware/Test2Middleware.php
  2. 5
    5
      app/Middleware/TestMiddleware.php
  3. 2
    2
      app/routes.php
  4. 2
    5
      composer.json
  5. 566
    262
      composer.lock
  6. 6
    2
      config.json

+ 5
- 6
app/Middleware/Test2Middleware.php 查看文件

11
 use Luticate\Utils\Dbo\LuRouteDbo;
11
 use Luticate\Utils\Dbo\LuRouteDbo;
12
 use Luticate\Utils\Middleware\LuAbstractMiddleware;
12
 use Luticate\Utils\Middleware\LuAbstractMiddleware;
13
 
13
 
14
-class Test2Middleware extends LuAbstractMiddleware
14
+class Test2Middleware implements LuAbstractMiddleware
15
 {
15
 {
16
-
17
-    public function onBefore(LuRouteDbo $route, $parameters)
16
+    public function onBefore($_parameters)
18
     {
17
     {
19
-        return $parameters;
18
+        return $_parameters;
20
     }
19
     }
21
 
20
 
22
-    public function onAfter(LuRouteDbo $route, $parameters, $result)
21
+    public function onAfter($_result)
23
     {
22
     {
24
-        return $result;
23
+        return $_result;
25
     }
24
     }
26
 }
25
 }

+ 5
- 5
app/Middleware/TestMiddleware.php 查看文件

11
 use Luticate\Utils\Dbo\LuRouteDbo;
11
 use Luticate\Utils\Dbo\LuRouteDbo;
12
 use Luticate\Utils\Middleware\LuAbstractMiddleware;
12
 use Luticate\Utils\Middleware\LuAbstractMiddleware;
13
 
13
 
14
-class TestMiddleware extends LuAbstractMiddleware
14
+class TestMiddleware implements LuAbstractMiddleware
15
 {
15
 {
16
-    public function onBefore(LuRouteDbo $route, $parameters)
16
+    public function onBefore($_parameters)
17
     {
17
     {
18
-        return $parameters;
18
+        return $_parameters;
19
     }
19
     }
20
 
20
 
21
-    public function onAfter(LuRouteDbo $route, $parameters, $result)
21
+    public function onAfter($_result)
22
     {
22
     {
23
-        return $result;
23
+        return $_result;
24
     }
24
     }
25
 }
25
 }

+ 2
- 2
app/routes.php 查看文件

5
  */
5
  */
6
 $route = $app->getRouter();
6
 $route = $app->getRouter();
7
 
7
 
8
-$route->addMiddleware(['Middleware' => 'App\Middleware\TestMiddleware', "Parameters" => ["test" => "lol"]]);
8
+$route->addMiddleware(['middleware' => 'App\Middleware\TestMiddleware', "parameters" => ["test" => "lol"]]);
9
 
9
 
10
 $route->get("/{test}", "Test", "test", ["permissions" => ["LU_PERMISSION"], "test2" => "lol2_"],
10
 $route->get("/{test}", "Test", "test", ["permissions" => ["LU_PERMISSION"], "test2" => "lol2_"],
11
-    [['Middleware' => 'App\Middleware\Test2Middleware', "Parameters" => ["test2" => "lol2"]]]);
11
+    [['middleware' => 'App\Middleware\Test2Middleware', "parameters" => ["test2" => "lol2"]]]);

+ 2
- 5
composer.json 查看文件

6
     "type": "project",
6
     "type": "project",
7
     "repositories": [{
7
     "repositories": [{
8
         "type": "vcs",
8
         "type": "vcs",
9
-        "url":  "/home/robin/projects/luticate/api/utils"
10
-    },{
11
-        "type": "vcs",
12
-        "url":  "/home/robin/projects/luticate/api/auth"
9
+        "url":  "https://git.rthoni.com/luticate/api-utils.git"
13
     }],
10
     }],
14
     "require": {
11
     "require": {
15
         "php": ">=5.5.9",
12
         "php": ">=5.5.9",
16
-        "luticate/auth": "dev-develop"
13
+        "luticate/utils": "dev-develop"
17
     },
14
     },
18
     "require-dev": {
15
     "require-dev": {
19
         "phpunit/phpunit": "~4.0"
16
         "phpunit/phpunit": "~4.0"

+ 566
- 262
composer.lock
文件差异内容过多而无法显示
查看文件


+ 6
- 2
config.json 查看文件

6
   },
6
   },
7
   "databases": [
7
   "databases": [
8
     {
8
     {
9
-      "name": "default", "driver": "pgsql",
9
+      "name": "mydb", "driver": "pgsql",
10
       "host": "127.0.0.1", "database": "project",
10
       "host": "127.0.0.1", "database": "project",
11
       "username": "project", "password": "password"
11
       "username": "project", "password": "password"
12
     }
12
     }
13
-  ]
13
+  ],
14
+  "settings": {
15
+    "MCRYPT_KEY": "ffffffffffffffffffffffff",
16
+    "JWT_KEY": "ffffffffffffffffffffffffffffffffffffffff"
17
+  }
14
 }
18
 }

正在加载...
取消
保存