clean up code

Author: taylorotwell

src/Illuminate/Routing/ImplicitRouteBinding.php

@@ -18,24 +18,33 @@ public static function resolveForRoute($container, $route)
         $parameters = $route->parameters();
 
         foreach ($route->signatureParameters(Model::class) as $parameter) {
-            $class = $parameter->getClass();
-
-            if (! $route->parameter($parameter->name) instanceof Model) {
-                $model = $container->make($class->name);
+            if ($route->parameter($parameter->name) instanceof Model) {
+                continue;
+            }
 
-                $parameterName = array_key_exists($parameter->name, $parameters) ? $parameter->name : null;
+            $model = $container->make($parameter->getClass()->name);
 
-                // check if parameter name used was camelized in routed callback method
-                if (! $parameterName) {
-                    $snakeParamName = snake_case($parameter->name);
-                    $parameterName = array_key_exists($snakeParamName, $parameters) ? $snakeParamName : null;
-                }
+            $parameterName = static::checkForParameter($parameter->name, $parameters) ?:
+                             static::checkForParameter(snake_case($parameter->name), $parameters);
 
-                if ($parameterName) {
-                    $value = $model->where($model->getRouteKeyName(), $parameters[$parameterName])->firstOrFail();
-                    $route->setParameter($parameterName, $value);
-                }
+            if ($parameterName) {
+                $route->setParameter($parameterName, $model->where(
+                    $model->getRouteKeyName(), $parameters[$parameterName]
+                )->firstOrFail());
             }
         }
     }
+
+    /**
+     * Return the parameter name if it exists in the given parameters.
+     *
+     * @param  string  $name
+     * @param  array  $parameters
+     * @return string|null
+     */
+    protected static function checkForParameter($name, $parameters)
+    {
+        return array_key_exists($name, $parameters)
+                        ? $name : null;
+    }
 }

tests/Routing/RoutingRouteTest.php

@@ -700,6 +700,9 @@ public function testModelBindingWithBindingClosure()
         $this->assertEquals('tayloralt', $router->dispatch(Request::create('foo/TAYLOR', 'GET'))->getContent());
     }
 
+    /**
+     * @group shit
+     */
     public function testModelBindingWithCompoundParameterName()
     {
         $router = $this->getRouter();