[5.4] Fixing Model Binding when you have a Route Binding with same name

[dbpolito]

When you have a Route Binding with the same compound name of the Model Binding, it colides, for example:

Route::model('foo_bar', FooBarModel::class);
Route::resource('foo-bar', FooBarController::class);

class FooBarController extends Controller {
    public function show(FooBarModel $fooBar) {
    }
}

This happens because at https://github.com/laravel/framework/blob/5.4/src/Illuminate/Routing/ImplicitRouteBinding.php#L21 the parameter is called fooBar and isn't found, but bellow at https://github.com/laravel/framework/blob/5.4/src/Illuminate/Routing/ImplicitRouteBinding.php#L27 it changes the parameter name to foo_bar and at https://github.com/laravel/framework/blob/5.4/src/Illuminate/Routing/ImplicitRouteBinding.php#L32 the parameter value is already a FooBarModel.

The use case is pretty specific, Route and Model Binding with same name AND compound name.

My PR fixes this problem.

[taylorotwell]

Can you describe what you mean by "collide". What error occurs?

[taylorotwell]

Nevermind I recreated it. Thanks.