From c1c234906066fc7d53b0f6551d94adf3b1668482 Mon Sep 17 00:00:00 2001 From: Shalvah Date: Tue, 30 Apr 2019 21:36:11 +0100 Subject: [PATCH 1/3] Update README.md --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 4178a5e..dd7b865 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,8 @@ Automatically generate your API documentation from your existing Laravel/Lumen/[ [![Build Status](https://travis-ci.org/mpociot/laravel-apidoc-generator.svg?branch=master)](https://travis-ci.org/mpociot/laravel-apidoc-generator) [![StyleCI](https://styleci.io/repos/57999295/shield?style=flat)](https://styleci.io/repos/57999295) -> Note: this is the documentation for version 3, which changes significantly from version 2. if you're on v2, you can check out its documentation [here](https://github.com/mpociot/laravel-apidoc-generator/blob/2.x/README.md). We strongly recommend you upgrade, though, as v3 is more robust and fixes a lot of the problems with v2. - ## Installation -> Note: PHP 7 and Laravel 5.5 or higher are required. +PHP 7 and Laravel 5.5 or higher are required. ```sh composer require mpociot/laravel-apidoc-generator @@ -42,7 +40,6 @@ $app->register(\Mpociot\ApiDoc\ApiDocGeneratorServiceProvider::class); $app->configure('apidoc'); ``` - ## Documentation Check out the documentation at [ReadTheDocs](http://laravel-apidoc-generator.readthedocs.io). From baf8eb8fad4df15831efede0e6560bba68cbac01 Mon Sep 17 00:00:00 2001 From: Faton Sopa Date: Wed, 1 May 2019 09:47:35 +0200 Subject: [PATCH 2/3] Add support for \Dingo\Api\Http\FormRequest --- src/Tools/Generator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tools/Generator.php b/src/Tools/Generator.php index 0b63748..5f71f19 100644 --- a/src/Tools/Generator.php +++ b/src/Tools/Generator.php @@ -106,7 +106,7 @@ class Generator continue; } - if (class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class)) { + if ( class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) { $formRequestDocBlock = new DocBlock($parameterClass->getDocComment()); $bodyParametersFromDocBlock = $this->getBodyParametersFromDocBlock($formRequestDocBlock->getTags()); @@ -181,7 +181,7 @@ class Generator continue; } - if (class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class)) { + if ( class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) { $formRequestDocBlock = new DocBlock($parameterClass->getDocComment()); $queryParametersFromDocBlock = $this->getQueryParametersFromDocBlock($formRequestDocBlock->getTags()); From 909ce2f92abf633a2fd5112f8bbe3280d40f5d83 Mon Sep 17 00:00:00 2001 From: Faton Sopa Date: Wed, 1 May 2019 10:00:36 +0200 Subject: [PATCH 3/3] fix spaces --- src/Tools/Generator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tools/Generator.php b/src/Tools/Generator.php index 5f71f19..e864a63 100644 --- a/src/Tools/Generator.php +++ b/src/Tools/Generator.php @@ -106,7 +106,7 @@ class Generator continue; } - if ( class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) { + if (class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) { $formRequestDocBlock = new DocBlock($parameterClass->getDocComment()); $bodyParametersFromDocBlock = $this->getBodyParametersFromDocBlock($formRequestDocBlock->getTags()); @@ -181,7 +181,7 @@ class Generator continue; } - if ( class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) { + if (class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) { $formRequestDocBlock = new DocBlock($parameterClass->getDocComment()); $queryParametersFromDocBlock = $this->getQueryParametersFromDocBlock($formRequestDocBlock->getTags());