Merge remote-tracking branch 'origin/master' into 3.2.x

This commit is contained in:
William Cheng
2018-07-19 18:46:18 +08:00
102 changed files with 2398 additions and 1312 deletions

View File

@@ -29,6 +29,7 @@
namespace OpenAPI\Server\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller as BaseController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use OpenAPI\Server\Service\SerializerInterface;
@@ -42,7 +43,7 @@ use OpenAPI\Server\Service\ValidatorInterface;
* @author OpenAPI Generator team
* @link https://github.com/openapitools/openapi-generator
*/
class Controller
class Controller extends BaseController
{
protected $validator;
protected $serializer;