7
7
use Illuminate \Support \Str ;
8
8
use Illuminate \Http \Request ;
9
9
use Illuminate \Support \Composer ;
10
+ use Laravel \Lumen \Routing \Router ;
10
11
use Monolog \Handler \StreamHandler ;
11
12
use Illuminate \Container \Container ;
12
13
use Monolog \Formatter \LineFormatter ;
@@ -72,6 +73,13 @@ class Application extends Container
72
73
*/
73
74
protected $ namespace ;
74
75
76
+ /**
77
+ * The Router instance.
78
+ *
79
+ * @var \Laravel\Lumen\Routing\Router
80
+ */
81
+ public $ router ;
82
+
75
83
/**
76
84
* Create a new Lumen application instance.
77
85
*
@@ -88,6 +96,7 @@ public function __construct($basePath = null)
88
96
89
97
$ this ->bootstrapContainer ();
90
98
$ this ->registerErrorHandling ();
99
+ $ this ->bootstrapRouter ();
91
100
}
92
101
93
102
/**
@@ -107,14 +116,24 @@ protected function bootstrapContainer()
107
116
$ this ->registerContainerAliases ();
108
117
}
109
118
119
+ /**
120
+ * Bootstrap the router instance.
121
+ *
122
+ * @return void
123
+ */
124
+ public function bootstrapRouter ()
125
+ {
126
+ $ this ->router = new Router ($ this );
127
+ }
128
+
110
129
/**
111
130
* Get the version number of the application.
112
131
*
113
132
* @return string
114
133
*/
115
134
public function version ()
116
135
{
117
- return 'Lumen (5.4.6 ) (Laravel Components 5.4 .*) ' ;
136
+ return 'Lumen (5.5.0 ) (Laravel Components 5.5 .*) ' ;
118
137
}
119
138
120
139
/**
@@ -194,9 +213,10 @@ public function registerDeferredProvider($provider)
194
213
* Resolve the given type from the container.
195
214
*
196
215
* @param string $abstract
216
+ * @param array $parameters
197
217
* @return mixed
198
218
*/
199
- public function make ($ abstract )
219
+ public function make ($ abstract, array $ parameters = [] )
200
220
{
201
221
$ abstract = $ this ->getAlias ($ abstract );
202
222
@@ -207,7 +227,7 @@ public function make($abstract)
207
227
$ this ->ranServiceBinders [$ method ] = true ;
208
228
}
209
229
210
- return parent ::make ($ abstract );
230
+ return parent ::make ($ abstract, $ parameters );
211
231
}
212
232
213
233
/**
0 commit comments