Merge pull request #679 from Frondor/return-validator-data

taylorotwell · web-flow · commit 84f04c12a923 · 2017-11-08T13:11:57.000-06:00
Implementation of Laravel 5.5 feature: Request Data From Validation
diff --git a/src/Routing/ProvidesConvenienceMethods.php b/src/Routing/ProvidesConvenienceMethods.php
@@ -54,7 +54,7 @@ public static function formatErrorsUsing(BaseClosure $callback)
      * @param  array  $rules
      * @param  array  $messages
      * @param  array  $customAttributes
-     * @return void
+     * @return array
      */
     public function validate(Request $request, array $rules, array $messages = [], array $customAttributes = [])
     {
@@ -63,6 +63,8 @@ public function validate(Request $request, array $rules, array $messages = [], a
         if ($validator->fails()) {
             $this->throwValidationException($request, $validator);
         }
+
+        return $validator->getData();
     }
 
     /**
diff --git a/tests/FullApplicationTest.php b/tests/FullApplicationTest.php
@@ -468,12 +468,19 @@ public function testValidationHelpers()
         $app = new Application;
 
         $app->router->get('/', function (Illuminate\Http\Request $request) {
-            $this->validate($request, ['name' => 'required']);
+            $data = $this->validate($request, ['name' => 'required']);
+
+            return $data;
         });
 
         $response = $app->handle(Request::create('/', 'GET'));
 
         $this->assertEquals(422, $response->getStatusCode());
+
+        $response = $app->handle(Request::create('/', 'GET', ['name' => 'Jon']));
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals($response->getContent(), '{"name":"Jon"}');
     }
 
     public function testRedirectResponse()

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static function formatErrorsUsing(BaseClosure $callback)`
`54`	`54`	`* @param array $rules`
`55`	`55`	`* @param array $messages`
`56`	`56`	`* @param array $customAttributes`
`57`		`- * @return void`
	`57`	`+ * @return array`
`58`	`58`	`*/`
`59`	`59`	`public function validate(Request $request, array $rules, array $messages = [], array $customAttributes = [])`
`60`	`60`	`{`
`@@ -63,6 +63,8 @@ public function validate(Request $request, array $rules, array $messages = [], a`
`63`	`63`	`if ($validator->fails()) {`
`64`	`64`	`$this->throwValidationException($request, $validator);`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ return $validator->getData();`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`/**`