@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | Route::group([ |
55 | 55 | 'middleware' => 'web', |
56 | 56 | 'namespace' => $this->namespace, |
57 | - ], function ($router) { |
|
57 | + ], function($router) { |
|
58 | 58 | require module_path('reporting', 'Routes/web.php'); |
59 | 59 | }); |
60 | 60 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | 'middleware' => 'api', |
73 | 73 | 'namespace' => $this->namespace, |
74 | 74 | 'prefix' => 'api', |
75 | - ], function ($router) { |
|
75 | + ], function($router) { |
|
76 | 76 | require module_path('reporting', 'Routes/api.php'); |
77 | 77 | }); |
78 | 78 | } |
@@ -7,73 +7,73 @@ |
||
7 | 7 | |
8 | 8 | class RouteServiceProvider extends ServiceProvider |
9 | 9 | { |
10 | - /** |
|
11 | - * This namespace is applied to your controller routes. |
|
12 | - * |
|
13 | - * In addition, it is set as the URL generator's root namespace. |
|
14 | - * |
|
15 | - * @var string |
|
16 | - */ |
|
17 | - protected $namespace = 'App\Modules\Reporting\Http\Controllers'; |
|
10 | + /** |
|
11 | + * This namespace is applied to your controller routes. |
|
12 | + * |
|
13 | + * In addition, it is set as the URL generator's root namespace. |
|
14 | + * |
|
15 | + * @var string |
|
16 | + */ |
|
17 | + protected $namespace = 'App\Modules\Reporting\Http\Controllers'; |
|
18 | 18 | |
19 | - /** |
|
20 | - * Define your route model bindings, pattern filters, etc. |
|
21 | - * |
|
22 | - * @return void |
|
23 | - */ |
|
24 | - public function boot() |
|
25 | - { |
|
26 | - // |
|
19 | + /** |
|
20 | + * Define your route model bindings, pattern filters, etc. |
|
21 | + * |
|
22 | + * @return void |
|
23 | + */ |
|
24 | + public function boot() |
|
25 | + { |
|
26 | + // |
|
27 | 27 | |
28 | - parent::boot(); |
|
29 | - } |
|
28 | + parent::boot(); |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * Define the routes for the module. |
|
33 | - * |
|
34 | - * @return void |
|
35 | - */ |
|
36 | - public function map() |
|
37 | - { |
|
38 | - $this->mapWebRoutes(); |
|
31 | + /** |
|
32 | + * Define the routes for the module. |
|
33 | + * |
|
34 | + * @return void |
|
35 | + */ |
|
36 | + public function map() |
|
37 | + { |
|
38 | + $this->mapWebRoutes(); |
|
39 | 39 | |
40 | - $this->mapApiRoutes(); |
|
40 | + $this->mapApiRoutes(); |
|
41 | 41 | |
42 | - // |
|
43 | - } |
|
42 | + // |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * Define the "web" routes for the module. |
|
47 | - * |
|
48 | - * These routes all receive session state, CSRF protection, etc. |
|
49 | - * |
|
50 | - * @return void |
|
51 | - */ |
|
52 | - protected function mapWebRoutes() |
|
53 | - { |
|
54 | - Route::group([ |
|
55 | - 'middleware' => 'web', |
|
56 | - 'namespace' => $this->namespace, |
|
57 | - ], function ($router) { |
|
58 | - require module_path('reporting', 'Routes/web.php'); |
|
59 | - }); |
|
60 | - } |
|
45 | + /** |
|
46 | + * Define the "web" routes for the module. |
|
47 | + * |
|
48 | + * These routes all receive session state, CSRF protection, etc. |
|
49 | + * |
|
50 | + * @return void |
|
51 | + */ |
|
52 | + protected function mapWebRoutes() |
|
53 | + { |
|
54 | + Route::group([ |
|
55 | + 'middleware' => 'web', |
|
56 | + 'namespace' => $this->namespace, |
|
57 | + ], function ($router) { |
|
58 | + require module_path('reporting', 'Routes/web.php'); |
|
59 | + }); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * Define the "api" routes for the module. |
|
64 | - * |
|
65 | - * These routes are typically stateless. |
|
66 | - * |
|
67 | - * @return void |
|
68 | - */ |
|
69 | - protected function mapApiRoutes() |
|
70 | - { |
|
71 | - Route::group([ |
|
72 | - 'middleware' => 'api', |
|
73 | - 'namespace' => $this->namespace, |
|
74 | - 'prefix' => 'api', |
|
75 | - ], function ($router) { |
|
76 | - require module_path('reporting', 'Routes/api.php'); |
|
77 | - }); |
|
78 | - } |
|
62 | + /** |
|
63 | + * Define the "api" routes for the module. |
|
64 | + * |
|
65 | + * These routes are typically stateless. |
|
66 | + * |
|
67 | + * @return void |
|
68 | + */ |
|
69 | + protected function mapApiRoutes() |
|
70 | + { |
|
71 | + Route::group([ |
|
72 | + 'middleware' => 'api', |
|
73 | + 'namespace' => $this->namespace, |
|
74 | + 'prefix' => 'api', |
|
75 | + ], function ($router) { |
|
76 | + require module_path('reporting', 'Routes/api.php'); |
|
77 | + }); |
|
78 | + } |
|
79 | 79 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | Route::group([ |
55 | 55 | 'middleware' => 'web', |
56 | 56 | 'namespace' => $this->namespace, |
57 | - ], function ($router) { |
|
57 | + ], function($router) { |
|
58 | 58 | require module_path('notifications', 'Routes/web.php'); |
59 | 59 | }); |
60 | 60 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | 'middleware' => 'api', |
73 | 73 | 'namespace' => $this->namespace, |
74 | 74 | 'prefix' => 'api', |
75 | - ], function ($router) { |
|
75 | + ], function($router) { |
|
76 | 76 | require module_path('notifications', 'Routes/api.php'); |
77 | 77 | }); |
78 | 78 | } |
@@ -7,73 +7,73 @@ |
||
7 | 7 | |
8 | 8 | class RouteServiceProvider extends ServiceProvider |
9 | 9 | { |
10 | - /** |
|
11 | - * This namespace is applied to your controller routes. |
|
12 | - * |
|
13 | - * In addition, it is set as the URL generator's root namespace. |
|
14 | - * |
|
15 | - * @var string |
|
16 | - */ |
|
17 | - protected $namespace = 'App\Modules\Notifications\Http\Controllers'; |
|
10 | + /** |
|
11 | + * This namespace is applied to your controller routes. |
|
12 | + * |
|
13 | + * In addition, it is set as the URL generator's root namespace. |
|
14 | + * |
|
15 | + * @var string |
|
16 | + */ |
|
17 | + protected $namespace = 'App\Modules\Notifications\Http\Controllers'; |
|
18 | 18 | |
19 | - /** |
|
20 | - * Define your route model bindings, pattern filters, etc. |
|
21 | - * |
|
22 | - * @return void |
|
23 | - */ |
|
24 | - public function boot() |
|
25 | - { |
|
26 | - // |
|
19 | + /** |
|
20 | + * Define your route model bindings, pattern filters, etc. |
|
21 | + * |
|
22 | + * @return void |
|
23 | + */ |
|
24 | + public function boot() |
|
25 | + { |
|
26 | + // |
|
27 | 27 | |
28 | - parent::boot(); |
|
29 | - } |
|
28 | + parent::boot(); |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * Define the routes for the module. |
|
33 | - * |
|
34 | - * @return void |
|
35 | - */ |
|
36 | - public function map() |
|
37 | - { |
|
38 | - $this->mapWebRoutes(); |
|
31 | + /** |
|
32 | + * Define the routes for the module. |
|
33 | + * |
|
34 | + * @return void |
|
35 | + */ |
|
36 | + public function map() |
|
37 | + { |
|
38 | + $this->mapWebRoutes(); |
|
39 | 39 | |
40 | - $this->mapApiRoutes(); |
|
40 | + $this->mapApiRoutes(); |
|
41 | 41 | |
42 | - // |
|
43 | - } |
|
42 | + // |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * Define the "web" routes for the module. |
|
47 | - * |
|
48 | - * These routes all receive session state, CSRF protection, etc. |
|
49 | - * |
|
50 | - * @return void |
|
51 | - */ |
|
52 | - protected function mapWebRoutes() |
|
53 | - { |
|
54 | - Route::group([ |
|
55 | - 'middleware' => 'web', |
|
56 | - 'namespace' => $this->namespace, |
|
57 | - ], function ($router) { |
|
58 | - require module_path('notifications', 'Routes/web.php'); |
|
59 | - }); |
|
60 | - } |
|
45 | + /** |
|
46 | + * Define the "web" routes for the module. |
|
47 | + * |
|
48 | + * These routes all receive session state, CSRF protection, etc. |
|
49 | + * |
|
50 | + * @return void |
|
51 | + */ |
|
52 | + protected function mapWebRoutes() |
|
53 | + { |
|
54 | + Route::group([ |
|
55 | + 'middleware' => 'web', |
|
56 | + 'namespace' => $this->namespace, |
|
57 | + ], function ($router) { |
|
58 | + require module_path('notifications', 'Routes/web.php'); |
|
59 | + }); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * Define the "api" routes for the module. |
|
64 | - * |
|
65 | - * These routes are typically stateless. |
|
66 | - * |
|
67 | - * @return void |
|
68 | - */ |
|
69 | - protected function mapApiRoutes() |
|
70 | - { |
|
71 | - Route::group([ |
|
72 | - 'middleware' => 'api', |
|
73 | - 'namespace' => $this->namespace, |
|
74 | - 'prefix' => 'api', |
|
75 | - ], function ($router) { |
|
76 | - require module_path('notifications', 'Routes/api.php'); |
|
77 | - }); |
|
78 | - } |
|
62 | + /** |
|
63 | + * Define the "api" routes for the module. |
|
64 | + * |
|
65 | + * These routes are typically stateless. |
|
66 | + * |
|
67 | + * @return void |
|
68 | + */ |
|
69 | + protected function mapApiRoutes() |
|
70 | + { |
|
71 | + Route::group([ |
|
72 | + 'middleware' => 'api', |
|
73 | + 'namespace' => $this->namespace, |
|
74 | + 'prefix' => 'api', |
|
75 | + ], function ($router) { |
|
76 | + require module_path('notifications', 'Routes/api.php'); |
|
77 | + }); |
|
78 | + } |
|
79 | 79 | } |
@@ -6,30 +6,30 @@ |
||
6 | 6 | |
7 | 7 | class Notifications extends Migration |
8 | 8 | { |
9 | - /** |
|
10 | - * Run the migrations. |
|
11 | - * |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function up() |
|
15 | - { |
|
16 | - Schema::create('notifications', function (Blueprint $table) { |
|
17 | - $table->uuid('id')->primary(); |
|
18 | - $table->string('type'); |
|
19 | - $table->morphs('notifiable'); |
|
20 | - $table->text('data'); |
|
21 | - $table->timestamp('read_at')->nullable(); |
|
22 | - $table->timestamps(); |
|
23 | - }); |
|
24 | - } |
|
9 | + /** |
|
10 | + * Run the migrations. |
|
11 | + * |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function up() |
|
15 | + { |
|
16 | + Schema::create('notifications', function (Blueprint $table) { |
|
17 | + $table->uuid('id')->primary(); |
|
18 | + $table->string('type'); |
|
19 | + $table->morphs('notifiable'); |
|
20 | + $table->text('data'); |
|
21 | + $table->timestamp('read_at')->nullable(); |
|
22 | + $table->timestamps(); |
|
23 | + }); |
|
24 | + } |
|
25 | 25 | |
26 | - /** |
|
27 | - * Reverse the migrations. |
|
28 | - * |
|
29 | - * @return void |
|
30 | - */ |
|
31 | - public function down() |
|
32 | - { |
|
33 | - Schema::dropIfExists('notifications'); |
|
34 | - } |
|
26 | + /** |
|
27 | + * Reverse the migrations. |
|
28 | + * |
|
29 | + * @return void |
|
30 | + */ |
|
31 | + public function down() |
|
32 | + { |
|
33 | + Schema::dropIfExists('notifications'); |
|
34 | + } |
|
35 | 35 | } |
@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('notifications', function (Blueprint $table) { |
|
16 | + Schema::create('notifications', function(Blueprint $table) { |
|
17 | 17 | $table->uuid('id')->primary(); |
18 | 18 | $table->string('type'); |
19 | 19 | $table->morphs('notifiable'); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | Route::group([ |
55 | 55 | 'middleware' => 'web', |
56 | 56 | 'namespace' => $this->namespace, |
57 | - ], function ($router) { |
|
57 | + ], function($router) { |
|
58 | 58 | require module_path('core', 'Routes/web.php'); |
59 | 59 | }); |
60 | 60 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | 'middleware' => 'api', |
73 | 73 | 'namespace' => $this->namespace, |
74 | 74 | 'prefix' => 'api', |
75 | - ], function ($router) { |
|
75 | + ], function($router) { |
|
76 | 76 | require module_path('core', 'Routes/api.php'); |
77 | 77 | }); |
78 | 78 | } |
@@ -7,73 +7,73 @@ |
||
7 | 7 | |
8 | 8 | class RouteServiceProvider extends ServiceProvider |
9 | 9 | { |
10 | - /** |
|
11 | - * This namespace is applied to your controller routes. |
|
12 | - * |
|
13 | - * In addition, it is set as the URL generator's root namespace. |
|
14 | - * |
|
15 | - * @var string |
|
16 | - */ |
|
17 | - protected $namespace = 'App\Modules\Core\Http\Controllers'; |
|
10 | + /** |
|
11 | + * This namespace is applied to your controller routes. |
|
12 | + * |
|
13 | + * In addition, it is set as the URL generator's root namespace. |
|
14 | + * |
|
15 | + * @var string |
|
16 | + */ |
|
17 | + protected $namespace = 'App\Modules\Core\Http\Controllers'; |
|
18 | 18 | |
19 | - /** |
|
20 | - * Define your route model bindings, pattern filters, etc. |
|
21 | - * |
|
22 | - * @return void |
|
23 | - */ |
|
24 | - public function boot() |
|
25 | - { |
|
26 | - // |
|
19 | + /** |
|
20 | + * Define your route model bindings, pattern filters, etc. |
|
21 | + * |
|
22 | + * @return void |
|
23 | + */ |
|
24 | + public function boot() |
|
25 | + { |
|
26 | + // |
|
27 | 27 | |
28 | - parent::boot(); |
|
29 | - } |
|
28 | + parent::boot(); |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * Define the routes for the module. |
|
33 | - * |
|
34 | - * @return void |
|
35 | - */ |
|
36 | - public function map() |
|
37 | - { |
|
38 | - $this->mapWebRoutes(); |
|
31 | + /** |
|
32 | + * Define the routes for the module. |
|
33 | + * |
|
34 | + * @return void |
|
35 | + */ |
|
36 | + public function map() |
|
37 | + { |
|
38 | + $this->mapWebRoutes(); |
|
39 | 39 | |
40 | - $this->mapApiRoutes(); |
|
40 | + $this->mapApiRoutes(); |
|
41 | 41 | |
42 | - // |
|
43 | - } |
|
42 | + // |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * Define the "web" routes for the module. |
|
47 | - * |
|
48 | - * These routes all receive session state, CSRF protection, etc. |
|
49 | - * |
|
50 | - * @return void |
|
51 | - */ |
|
52 | - protected function mapWebRoutes() |
|
53 | - { |
|
54 | - Route::group([ |
|
55 | - 'middleware' => 'web', |
|
56 | - 'namespace' => $this->namespace, |
|
57 | - ], function ($router) { |
|
58 | - require module_path('core', 'Routes/web.php'); |
|
59 | - }); |
|
60 | - } |
|
45 | + /** |
|
46 | + * Define the "web" routes for the module. |
|
47 | + * |
|
48 | + * These routes all receive session state, CSRF protection, etc. |
|
49 | + * |
|
50 | + * @return void |
|
51 | + */ |
|
52 | + protected function mapWebRoutes() |
|
53 | + { |
|
54 | + Route::group([ |
|
55 | + 'middleware' => 'web', |
|
56 | + 'namespace' => $this->namespace, |
|
57 | + ], function ($router) { |
|
58 | + require module_path('core', 'Routes/web.php'); |
|
59 | + }); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * Define the "api" routes for the module. |
|
64 | - * |
|
65 | - * These routes are typically stateless. |
|
66 | - * |
|
67 | - * @return void |
|
68 | - */ |
|
69 | - protected function mapApiRoutes() |
|
70 | - { |
|
71 | - Route::group([ |
|
72 | - 'middleware' => 'api', |
|
73 | - 'namespace' => $this->namespace, |
|
74 | - 'prefix' => 'api', |
|
75 | - ], function ($router) { |
|
76 | - require module_path('core', 'Routes/api.php'); |
|
77 | - }); |
|
78 | - } |
|
62 | + /** |
|
63 | + * Define the "api" routes for the module. |
|
64 | + * |
|
65 | + * These routes are typically stateless. |
|
66 | + * |
|
67 | + * @return void |
|
68 | + */ |
|
69 | + protected function mapApiRoutes() |
|
70 | + { |
|
71 | + Route::group([ |
|
72 | + 'middleware' => 'api', |
|
73 | + 'namespace' => $this->namespace, |
|
74 | + 'prefix' => 'api', |
|
75 | + ], function ($router) { |
|
76 | + require module_path('core', 'Routes/api.php'); |
|
77 | + }); |
|
78 | + } |
|
79 | 79 | } |
@@ -28,10 +28,6 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
31 | - * @param string $uri |
|
32 | - * @param array $data |
|
33 | - * @param array $headers |
|
34 | - * @param string $content |
|
35 | 31 | * @return \Illuminate\Http\Response |
36 | 32 | */ |
37 | 33 | public function get() |
@@ -40,10 +36,6 @@ discard block |
||
40 | 36 | } |
41 | 37 | |
42 | 38 | /** |
43 | - * @param string $uri |
|
44 | - * @param array $data |
|
45 | - * @param array $headers |
|
46 | - * @param string $content |
|
47 | 39 | * @return \Illuminate\Http\Response |
48 | 40 | */ |
49 | 41 | public function post() |
@@ -52,10 +44,6 @@ discard block |
||
52 | 44 | } |
53 | 45 | |
54 | 46 | /** |
55 | - * @param string $uri |
|
56 | - * @param array $data |
|
57 | - * @param array $headers |
|
58 | - * @param string $content |
|
59 | 47 | * @return \Illuminate\Http\Response |
60 | 48 | */ |
61 | 49 | public function put() |
@@ -64,10 +52,6 @@ discard block |
||
64 | 52 | } |
65 | 53 | |
66 | 54 | /** |
67 | - * @param string $uri |
|
68 | - * @param array $data |
|
69 | - * @param array $headers |
|
70 | - * @param string $content |
|
71 | 55 | * @return \Illuminate\Http\Response |
72 | 56 | */ |
73 | 57 | public function delete() |
@@ -7,218 +7,218 @@ |
||
7 | 7 | class ApiConsumer |
8 | 8 | { |
9 | 9 | |
10 | - private $app; |
|
11 | - |
|
12 | - private $router; |
|
13 | - |
|
14 | - private $request; |
|
15 | - |
|
16 | - private $disableMiddleware = false; |
|
17 | - |
|
18 | - /** |
|
19 | - * @param \Illuminate\Foundation\Application $app |
|
20 | - * @param \Illuminate\Http\Request $request, |
|
21 | - * @param \Illuminate\Routing\Router $router |
|
22 | - */ |
|
23 | - public function __construct(Application $app, Request $request, LaravelRouter $router) |
|
24 | - { |
|
25 | - $this->app = $app; |
|
26 | - $this->request = $request; |
|
27 | - $this->router = $router; |
|
28 | - } |
|
29 | - |
|
30 | - /** |
|
31 | - * @param string $uri |
|
32 | - * @param array $data |
|
33 | - * @param array $headers |
|
34 | - * @param string $content |
|
35 | - * @return \Illuminate\Http\Response |
|
36 | - */ |
|
37 | - public function get() |
|
38 | - { |
|
39 | - return $this->quickCall('GET', func_get_args()); |
|
40 | - } |
|
41 | - |
|
42 | - /** |
|
43 | - * @param string $uri |
|
44 | - * @param array $data |
|
45 | - * @param array $headers |
|
46 | - * @param string $content |
|
47 | - * @return \Illuminate\Http\Response |
|
48 | - */ |
|
49 | - public function post() |
|
50 | - { |
|
51 | - return $this->quickCall('POST', func_get_args()); |
|
52 | - } |
|
53 | - |
|
54 | - /** |
|
55 | - * @param string $uri |
|
56 | - * @param array $data |
|
57 | - * @param array $headers |
|
58 | - * @param string $content |
|
59 | - * @return \Illuminate\Http\Response |
|
60 | - */ |
|
61 | - public function put() |
|
62 | - { |
|
63 | - return $this->quickCall('PUT', func_get_args()); |
|
64 | - } |
|
65 | - |
|
66 | - /** |
|
67 | - * @param string $uri |
|
68 | - * @param array $data |
|
69 | - * @param array $headers |
|
70 | - * @param string $content |
|
71 | - * @return \Illuminate\Http\Response |
|
72 | - */ |
|
73 | - public function delete() |
|
74 | - { |
|
75 | - return $this->quickCall('DELETE', func_get_args()); |
|
76 | - } |
|
77 | - |
|
78 | - /** |
|
79 | - * @param array $requests An array of requests |
|
80 | - * @return array |
|
81 | - */ |
|
82 | - public function batchRequest(array $requests) |
|
83 | - { |
|
84 | - foreach ($requests as $i => $request) { |
|
85 | - $requests[$i] = call_user_func_array([$this, 'singleRequest'], $request); |
|
86 | - } |
|
87 | - |
|
88 | - return $requests; |
|
89 | - } |
|
90 | - |
|
91 | - /** |
|
92 | - * @param string $method |
|
93 | - * @param array $args |
|
94 | - * @return \Illuminate\Http\Response |
|
95 | - */ |
|
96 | - public function quickCall($method, array $args) |
|
97 | - { |
|
98 | - array_unshift($args, $method); |
|
99 | - return call_user_func_array([$this, "singleRequest"], $args); |
|
100 | - } |
|
101 | - |
|
102 | - /** |
|
103 | - * @param string $method |
|
104 | - * @param string $uri |
|
105 | - * @param array $data |
|
106 | - * @param array $headers |
|
107 | - * @param string $content |
|
108 | - * @return \Illuminate\Http\Response |
|
109 | - */ |
|
110 | - public function singleRequest($method, $uri, array $data = [], array $headers = [], $content = null) |
|
111 | - { |
|
112 | - // Save the current request so we can reset the router back to it |
|
113 | - // after we've completed our internal request. |
|
114 | - $currentRequest = $this->request->instance()->duplicate(); |
|
115 | - |
|
116 | - $headers = $this->overrideHeaders($currentRequest->server->getHeaders(), $headers); |
|
117 | - |
|
118 | - if ($this->disableMiddleware) { |
|
119 | - $this->app->instance('middleware.disable', true); |
|
120 | - } |
|
121 | - |
|
122 | - $response = $this->request($method, $uri, $data, $headers, $content); |
|
123 | - |
|
124 | - if ($this->disableMiddleware) { |
|
125 | - $this->app->instance('middleware.disable', false); |
|
126 | - } |
|
127 | - |
|
128 | - // Once the request has completed we reset the currentRequest of the router |
|
129 | - // to match the original request. |
|
130 | - $this->request->instance()->initialize( |
|
131 | - $currentRequest->query->all(), |
|
132 | - $currentRequest->request->all(), |
|
133 | - $currentRequest->attributes->all(), |
|
134 | - $currentRequest->cookies->all(), |
|
135 | - $currentRequest->files->all(), |
|
136 | - $currentRequest->server->all(), |
|
137 | - $currentRequest->content |
|
138 | - ); |
|
139 | - |
|
140 | - return $response; |
|
141 | - } |
|
142 | - |
|
143 | - private function overrideHeaders(array $default, array $headers) |
|
144 | - { |
|
145 | - $headers = $this->transformHeadersToUppercaseUnderscoreType($headers); |
|
146 | - return array_merge($default, $headers); |
|
147 | - } |
|
148 | - |
|
149 | - public function enableMiddleware() |
|
150 | - { |
|
151 | - $this->disableMiddleware = false; |
|
152 | - } |
|
153 | - |
|
154 | - public function disableMiddleware() |
|
155 | - { |
|
156 | - $this->disableMiddleware = true; |
|
157 | - } |
|
158 | - |
|
159 | - /** |
|
160 | - * @param string $method |
|
161 | - * @param string $uri |
|
162 | - * @param array $data |
|
163 | - * @param array $headers |
|
164 | - * @param string $content |
|
165 | - * @return \Illuminate\Http\Response |
|
166 | - */ |
|
167 | - private function request($method, $uri, array $data = [], array $headers = [], $content = null) |
|
168 | - { |
|
169 | - // Create a new request object for the internal request |
|
170 | - $request = $this->createRequest($method, $uri, $data, $headers, $content); |
|
171 | - |
|
172 | - // Handle the request in the kernel and prepare a response |
|
173 | - $response = $this->router->prepareResponse($request, $this->app->handle($request)); |
|
174 | - |
|
175 | - return $response; |
|
176 | - } |
|
177 | - |
|
178 | - /** |
|
179 | - * @param string $method |
|
180 | - * @param string $uri |
|
181 | - * @param array $data |
|
182 | - * @param array $headers |
|
183 | - * @param string $content |
|
184 | - * @return \Illuminate\Http\Request |
|
185 | - */ |
|
186 | - private function createRequest($method, $uri, array $data = [], array $headers = [], $content = null) |
|
187 | - { |
|
188 | - $server = $this->transformHeadersToServerVariables($headers); |
|
189 | - |
|
190 | - return $this->request->create($uri, $method, $data, [], [], $server, $content); |
|
191 | - } |
|
192 | - |
|
193 | - private function transformHeadersToUppercaseUnderscoreType($headers) |
|
194 | - { |
|
195 | - $transformed = []; |
|
196 | - |
|
197 | - foreach ($headers as $headerType => $headerValue) { |
|
198 | - $headerType = strtoupper(str_replace('-', '_', $headerType)); |
|
199 | - |
|
200 | - $transformed[$headerType] = $headerValue; |
|
201 | - } |
|
202 | - |
|
203 | - return $transformed; |
|
204 | - } |
|
205 | - |
|
206 | - /** |
|
207 | - * https://github.com/symfony/symfony/issues/5074 |
|
208 | - * |
|
209 | - * @param array $headers |
|
210 | - * @return array |
|
211 | - */ |
|
212 | - private function transformHeadersToServerVariables($headers) |
|
213 | - { |
|
214 | - $server = []; |
|
215 | - |
|
216 | - foreach ($headers as $headerType => $headerValue) { |
|
217 | - $headerType = 'HTTP_' . $headerType; |
|
218 | - |
|
219 | - $server[$headerType] = $headerValue; |
|
220 | - } |
|
221 | - |
|
222 | - return $server; |
|
223 | - } |
|
10 | + private $app; |
|
11 | + |
|
12 | + private $router; |
|
13 | + |
|
14 | + private $request; |
|
15 | + |
|
16 | + private $disableMiddleware = false; |
|
17 | + |
|
18 | + /** |
|
19 | + * @param \Illuminate\Foundation\Application $app |
|
20 | + * @param \Illuminate\Http\Request $request, |
|
21 | + * @param \Illuminate\Routing\Router $router |
|
22 | + */ |
|
23 | + public function __construct(Application $app, Request $request, LaravelRouter $router) |
|
24 | + { |
|
25 | + $this->app = $app; |
|
26 | + $this->request = $request; |
|
27 | + $this->router = $router; |
|
28 | + } |
|
29 | + |
|
30 | + /** |
|
31 | + * @param string $uri |
|
32 | + * @param array $data |
|
33 | + * @param array $headers |
|
34 | + * @param string $content |
|
35 | + * @return \Illuminate\Http\Response |
|
36 | + */ |
|
37 | + public function get() |
|
38 | + { |
|
39 | + return $this->quickCall('GET', func_get_args()); |
|
40 | + } |
|
41 | + |
|
42 | + /** |
|
43 | + * @param string $uri |
|
44 | + * @param array $data |
|
45 | + * @param array $headers |
|
46 | + * @param string $content |
|
47 | + * @return \Illuminate\Http\Response |
|
48 | + */ |
|
49 | + public function post() |
|
50 | + { |
|
51 | + return $this->quickCall('POST', func_get_args()); |
|
52 | + } |
|
53 | + |
|
54 | + /** |
|
55 | + * @param string $uri |
|
56 | + * @param array $data |
|
57 | + * @param array $headers |
|
58 | + * @param string $content |
|
59 | + * @return \Illuminate\Http\Response |
|
60 | + */ |
|
61 | + public function put() |
|
62 | + { |
|
63 | + return $this->quickCall('PUT', func_get_args()); |
|
64 | + } |
|
65 | + |
|
66 | + /** |
|
67 | + * @param string $uri |
|
68 | + * @param array $data |
|
69 | + * @param array $headers |
|
70 | + * @param string $content |
|
71 | + * @return \Illuminate\Http\Response |
|
72 | + */ |
|
73 | + public function delete() |
|
74 | + { |
|
75 | + return $this->quickCall('DELETE', func_get_args()); |
|
76 | + } |
|
77 | + |
|
78 | + /** |
|
79 | + * @param array $requests An array of requests |
|
80 | + * @return array |
|
81 | + */ |
|
82 | + public function batchRequest(array $requests) |
|
83 | + { |
|
84 | + foreach ($requests as $i => $request) { |
|
85 | + $requests[$i] = call_user_func_array([$this, 'singleRequest'], $request); |
|
86 | + } |
|
87 | + |
|
88 | + return $requests; |
|
89 | + } |
|
90 | + |
|
91 | + /** |
|
92 | + * @param string $method |
|
93 | + * @param array $args |
|
94 | + * @return \Illuminate\Http\Response |
|
95 | + */ |
|
96 | + public function quickCall($method, array $args) |
|
97 | + { |
|
98 | + array_unshift($args, $method); |
|
99 | + return call_user_func_array([$this, "singleRequest"], $args); |
|
100 | + } |
|
101 | + |
|
102 | + /** |
|
103 | + * @param string $method |
|
104 | + * @param string $uri |
|
105 | + * @param array $data |
|
106 | + * @param array $headers |
|
107 | + * @param string $content |
|
108 | + * @return \Illuminate\Http\Response |
|
109 | + */ |
|
110 | + public function singleRequest($method, $uri, array $data = [], array $headers = [], $content = null) |
|
111 | + { |
|
112 | + // Save the current request so we can reset the router back to it |
|
113 | + // after we've completed our internal request. |
|
114 | + $currentRequest = $this->request->instance()->duplicate(); |
|
115 | + |
|
116 | + $headers = $this->overrideHeaders($currentRequest->server->getHeaders(), $headers); |
|
117 | + |
|
118 | + if ($this->disableMiddleware) { |
|
119 | + $this->app->instance('middleware.disable', true); |
|
120 | + } |
|
121 | + |
|
122 | + $response = $this->request($method, $uri, $data, $headers, $content); |
|
123 | + |
|
124 | + if ($this->disableMiddleware) { |
|
125 | + $this->app->instance('middleware.disable', false); |
|
126 | + } |
|
127 | + |
|
128 | + // Once the request has completed we reset the currentRequest of the router |
|
129 | + // to match the original request. |
|
130 | + $this->request->instance()->initialize( |
|
131 | + $currentRequest->query->all(), |
|
132 | + $currentRequest->request->all(), |
|
133 | + $currentRequest->attributes->all(), |
|
134 | + $currentRequest->cookies->all(), |
|
135 | + $currentRequest->files->all(), |
|
136 | + $currentRequest->server->all(), |
|
137 | + $currentRequest->content |
|
138 | + ); |
|
139 | + |
|
140 | + return $response; |
|
141 | + } |
|
142 | + |
|
143 | + private function overrideHeaders(array $default, array $headers) |
|
144 | + { |
|
145 | + $headers = $this->transformHeadersToUppercaseUnderscoreType($headers); |
|
146 | + return array_merge($default, $headers); |
|
147 | + } |
|
148 | + |
|
149 | + public function enableMiddleware() |
|
150 | + { |
|
151 | + $this->disableMiddleware = false; |
|
152 | + } |
|
153 | + |
|
154 | + public function disableMiddleware() |
|
155 | + { |
|
156 | + $this->disableMiddleware = true; |
|
157 | + } |
|
158 | + |
|
159 | + /** |
|
160 | + * @param string $method |
|
161 | + * @param string $uri |
|
162 | + * @param array $data |
|
163 | + * @param array $headers |
|
164 | + * @param string $content |
|
165 | + * @return \Illuminate\Http\Response |
|
166 | + */ |
|
167 | + private function request($method, $uri, array $data = [], array $headers = [], $content = null) |
|
168 | + { |
|
169 | + // Create a new request object for the internal request |
|
170 | + $request = $this->createRequest($method, $uri, $data, $headers, $content); |
|
171 | + |
|
172 | + // Handle the request in the kernel and prepare a response |
|
173 | + $response = $this->router->prepareResponse($request, $this->app->handle($request)); |
|
174 | + |
|
175 | + return $response; |
|
176 | + } |
|
177 | + |
|
178 | + /** |
|
179 | + * @param string $method |
|
180 | + * @param string $uri |
|
181 | + * @param array $data |
|
182 | + * @param array $headers |
|
183 | + * @param string $content |
|
184 | + * @return \Illuminate\Http\Request |
|
185 | + */ |
|
186 | + private function createRequest($method, $uri, array $data = [], array $headers = [], $content = null) |
|
187 | + { |
|
188 | + $server = $this->transformHeadersToServerVariables($headers); |
|
189 | + |
|
190 | + return $this->request->create($uri, $method, $data, [], [], $server, $content); |
|
191 | + } |
|
192 | + |
|
193 | + private function transformHeadersToUppercaseUnderscoreType($headers) |
|
194 | + { |
|
195 | + $transformed = []; |
|
196 | + |
|
197 | + foreach ($headers as $headerType => $headerValue) { |
|
198 | + $headerType = strtoupper(str_replace('-', '_', $headerType)); |
|
199 | + |
|
200 | + $transformed[$headerType] = $headerValue; |
|
201 | + } |
|
202 | + |
|
203 | + return $transformed; |
|
204 | + } |
|
205 | + |
|
206 | + /** |
|
207 | + * https://github.com/symfony/symfony/issues/5074 |
|
208 | + * |
|
209 | + * @param array $headers |
|
210 | + * @return array |
|
211 | + */ |
|
212 | + private function transformHeadersToServerVariables($headers) |
|
213 | + { |
|
214 | + $server = []; |
|
215 | + |
|
216 | + foreach ($headers as $headerType => $headerValue) { |
|
217 | + $headerType = 'HTTP_' . $headerType; |
|
218 | + |
|
219 | + $server[$headerType] = $headerValue; |
|
220 | + } |
|
221 | + |
|
222 | + return $server; |
|
223 | + } |
|
224 | 224 | } |
@@ -214,7 +214,7 @@ |
||
214 | 214 | $server = []; |
215 | 215 | |
216 | 216 | foreach ($headers as $headerType => $headerValue) { |
217 | - $headerType = 'HTTP_' . $headerType; |
|
217 | + $headerType = 'HTTP_'.$headerType; |
|
218 | 218 | |
219 | 219 | $server[$headerType] = $headerValue; |
220 | 220 | } |
@@ -1,13 +1,13 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | $factory->define(App\Modules\Notifications\Notification::class, function (Faker\Generator $faker) { |
4 | - return [ |
|
5 | - 'type' => '', |
|
6 | - 'notifiable_type' => '', |
|
7 | - 'notifiable_id' => '', |
|
8 | - 'data' => '', |
|
9 | - 'read_at' => null, |
|
10 | - 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
11 | - 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
12 | - ]; |
|
4 | + return [ |
|
5 | + 'type' => '', |
|
6 | + 'notifiable_type' => '', |
|
7 | + 'notifiable_id' => '', |
|
8 | + 'data' => '', |
|
9 | + 'read_at' => null, |
|
10 | + 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
11 | + 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
12 | + ]; |
|
13 | 13 | }); |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -$factory->define(App\Modules\Notifications\Notification::class, function (Faker\Generator $faker) { |
|
3 | +$factory->define(App\Modules\Notifications\Notification::class, function(Faker\Generator $faker) { |
|
4 | 4 | return [ |
5 | 5 | 'type' => '', |
6 | 6 | 'notifiable_type' => '', |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /** |
|
6 | - * Here goes your notification messages. |
|
7 | - */ |
|
5 | + /** |
|
6 | + * Here goes your notification messages. |
|
7 | + */ |
|
8 | 8 | |
9 | 9 | ]; |
@@ -4,65 +4,65 @@ |
||
4 | 4 | |
5 | 5 | class MakeNotificationsCommand extends GeneratorCommand |
6 | 6 | { |
7 | - /** |
|
8 | - * The name and signature of the console command. |
|
9 | - * |
|
10 | - * @var string |
|
11 | - */ |
|
12 | - protected $signature = 'make:module:notification |
|
7 | + /** |
|
8 | + * The name and signature of the console command. |
|
9 | + * |
|
10 | + * @var string |
|
11 | + */ |
|
12 | + protected $signature = 'make:module:notification |
|
13 | 13 | {name : The name of the notification class.}'; |
14 | - /** |
|
15 | - * The console command description. |
|
16 | - * |
|
17 | - * @var string |
|
18 | - */ |
|
19 | - protected $description = 'Create a new module notification class'; |
|
20 | - /** |
|
21 | - * String to store the command type. |
|
22 | - * |
|
23 | - * @var string |
|
24 | - */ |
|
25 | - protected $type = 'Module notification'; |
|
26 | - /** |
|
27 | - * Get the stub file for the generator. |
|
28 | - * |
|
29 | - * @return string |
|
30 | - */ |
|
31 | - protected function getStub() |
|
32 | - { |
|
33 | - return __DIR__.'/stubs/notification.stub'; |
|
34 | - } |
|
35 | - /** |
|
36 | - * Get the destination class path. |
|
37 | - * |
|
38 | - * @param string $name |
|
39 | - * |
|
40 | - * @return string |
|
41 | - */ |
|
42 | - protected function getPath($name) |
|
43 | - { |
|
44 | - return module_path('notifications', 'Notifications/'.$name.'.php'); |
|
45 | - } |
|
46 | - /** |
|
47 | - * Parse the name and format according to the root namespace. |
|
48 | - * |
|
49 | - * @param string $name |
|
50 | - * |
|
51 | - * @return string |
|
52 | - */ |
|
53 | - protected function qualifyClass($name) |
|
54 | - { |
|
55 | - return $name; |
|
56 | - } |
|
57 | - /** |
|
58 | - * Replace namespace in notification stub. |
|
59 | - * |
|
60 | - * @param string $name |
|
61 | - * |
|
62 | - * @return string |
|
63 | - */ |
|
64 | - protected function getNamespace($name) |
|
65 | - { |
|
66 | - return module_class('notifications', 'Notifications'); |
|
67 | - } |
|
14 | + /** |
|
15 | + * The console command description. |
|
16 | + * |
|
17 | + * @var string |
|
18 | + */ |
|
19 | + protected $description = 'Create a new module notification class'; |
|
20 | + /** |
|
21 | + * String to store the command type. |
|
22 | + * |
|
23 | + * @var string |
|
24 | + */ |
|
25 | + protected $type = 'Module notification'; |
|
26 | + /** |
|
27 | + * Get the stub file for the generator. |
|
28 | + * |
|
29 | + * @return string |
|
30 | + */ |
|
31 | + protected function getStub() |
|
32 | + { |
|
33 | + return __DIR__.'/stubs/notification.stub'; |
|
34 | + } |
|
35 | + /** |
|
36 | + * Get the destination class path. |
|
37 | + * |
|
38 | + * @param string $name |
|
39 | + * |
|
40 | + * @return string |
|
41 | + */ |
|
42 | + protected function getPath($name) |
|
43 | + { |
|
44 | + return module_path('notifications', 'Notifications/'.$name.'.php'); |
|
45 | + } |
|
46 | + /** |
|
47 | + * Parse the name and format according to the root namespace. |
|
48 | + * |
|
49 | + * @param string $name |
|
50 | + * |
|
51 | + * @return string |
|
52 | + */ |
|
53 | + protected function qualifyClass($name) |
|
54 | + { |
|
55 | + return $name; |
|
56 | + } |
|
57 | + /** |
|
58 | + * Replace namespace in notification stub. |
|
59 | + * |
|
60 | + * @param string $name |
|
61 | + * |
|
62 | + * @return string |
|
63 | + */ |
|
64 | + protected function getNamespace($name) |
|
65 | + { |
|
66 | + return module_class('notifications', 'Notifications'); |
|
67 | + } |
|
68 | 68 | } |
@@ -6,53 +6,53 @@ |
||
6 | 6 | class NotificationObserver |
7 | 7 | { |
8 | 8 | |
9 | - public function saving($model) |
|
10 | - { |
|
11 | - // |
|
12 | - } |
|
13 | - |
|
14 | - public function saved($model) |
|
15 | - { |
|
16 | - // |
|
17 | - } |
|
18 | - |
|
19 | - public function creating($model) |
|
20 | - { |
|
21 | - // |
|
22 | - } |
|
23 | - |
|
24 | - public function created($model) |
|
25 | - { |
|
26 | - // |
|
27 | - } |
|
28 | - |
|
29 | - public function updating($model) |
|
30 | - { |
|
31 | - // |
|
32 | - } |
|
33 | - |
|
34 | - public function updated($model) |
|
35 | - { |
|
36 | - // |
|
37 | - } |
|
38 | - |
|
39 | - public function deleting($model) |
|
40 | - { |
|
41 | - // |
|
42 | - } |
|
43 | - |
|
44 | - public function deleted($model) |
|
45 | - { |
|
46 | - // |
|
47 | - } |
|
48 | - |
|
49 | - public function restoring($model) |
|
50 | - { |
|
51 | - // |
|
52 | - } |
|
53 | - |
|
54 | - public function restored($model) |
|
55 | - { |
|
56 | - // |
|
57 | - } |
|
9 | + public function saving($model) |
|
10 | + { |
|
11 | + // |
|
12 | + } |
|
13 | + |
|
14 | + public function saved($model) |
|
15 | + { |
|
16 | + // |
|
17 | + } |
|
18 | + |
|
19 | + public function creating($model) |
|
20 | + { |
|
21 | + // |
|
22 | + } |
|
23 | + |
|
24 | + public function created($model) |
|
25 | + { |
|
26 | + // |
|
27 | + } |
|
28 | + |
|
29 | + public function updating($model) |
|
30 | + { |
|
31 | + // |
|
32 | + } |
|
33 | + |
|
34 | + public function updated($model) |
|
35 | + { |
|
36 | + // |
|
37 | + } |
|
38 | + |
|
39 | + public function deleting($model) |
|
40 | + { |
|
41 | + // |
|
42 | + } |
|
43 | + |
|
44 | + public function deleted($model) |
|
45 | + { |
|
46 | + // |
|
47 | + } |
|
48 | + |
|
49 | + public function restoring($model) |
|
50 | + { |
|
51 | + // |
|
52 | + } |
|
53 | + |
|
54 | + public function restored($model) |
|
55 | + { |
|
56 | + // |
|
57 | + } |
|
58 | 58 | } |