8000 upgrade to laravel 5.5 components · Hydrane/tmp-laravel-framework@7018d57 · GitHub
[go: up one dir, main page]

Skip to content

Commit 7018d57

Browse files
committed
upgrade to laravel 5.5 components
1 parent 8ee5562 commit 7018d57

File tree

7 files changed

+495
-446
lines changed

7 files changed

+495
-446
lines changed

.DS_Store

6 KB
Binary file not shown.

src/Application.php

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ 10000
77
use Illuminate\Support\Str;
88
use Illuminate\Http\Request;
99
use Illuminate\Support\Composer;
10+
use Laravel\Lumen\Routing\Router;
1011
use Monolog\Handler\StreamHandler;
1112
use Illuminate\Container\Container;
1213
use Monolog\Formatter\LineFormatter;
@@ -72,6 +73,13 @@ class Application extends Container
7273
*/
7374
protected $namespace;
7475

76+
/**
77+
* The Router instance.
78+
*
79+
* @var \Laravel\Lumen\Routing\Router
80+
*/
81+
public $router;
82+
7583
/**
7684
* Create a new Lumen application instance.
7785
*
@@ -88,6 +96,7 @@ public function __construct($basePath = null)
8896

8997
$this->bootstrapContainer();
9098
$this->registerErrorHandling();
99+
$this->bootstrapRouter();
91100
}
92101

93102
/**
@@ -107,14 +116,24 @@ protected function bootstrapContainer()
107116
$this->registerContainerAliases();
108117
}
109118

119+
/**
120+
* Bootstrap the router instance.
121+
*
122+
* @return void
123+
*/
124+
public function bootstrapRouter()
125+
{
126+
$this->router = new Router($this);
127+
}
128+
110129
/**
111130
* Get the version number of the application.
112131
*
113132
* @return string
114133
*/
115134
public function version()
116135
{
117-
return 'Lumen (5.4.6) (Laravel Components 5.4.*)';
136+
return 'Lumen (5.5.0) (Laravel Components 5.5.*)';
118137
}
119138

120139
/**
@@ -194,9 +213,10 @@ public function registerDeferredProvider($provider)
194213
* Resolve the given type from the container.
195214
*
196215
* @param string $abstract
216+
* @param array $parameters
197217
* @return mixed
198218
*/
199-
public function make($abstract)
219+
public function make($abstract, array $parameters = [])
200220
{
201221
$abstract = $this->getAlias($abstract);
202222

@@ -207,7 +227,7 @@ public function make($abstract)
207227
$this->ranServiceBinders[$method] = true;
208228
}
209229

210-
return parent::make($abstract);
230+
return parent::make($abstract, $parameters);
211231
}
212232

213233
/**

0 commit comments

Comments
 (0)
0