Merge remote-tracking branch 'origin/merge-groups'

This commit is contained in:
shalvah
2019-08-25 22:03:45 +01:00
3 changed files with 4 additions and 3 deletions

View File

@@ -287,6 +287,7 @@ class Generator
$routeGroupParts = explode("\n", $tag->getContent());
$routeGroupName = array_shift($routeGroupParts);
$routeGroupDescription = implode("\n", $routeGroupParts);
return [$routeGroupName, $routeGroupDescription];
}
}
@@ -300,6 +301,7 @@ class Generator
$routeGroupParts = explode("\n", $tag->getContent());
$routeGroupName = array_shift($routeGroupParts);
$routeGroupDescription = implode("\n", $routeGroupParts);
return [$routeGroupName, $routeGroupDescription];
}
}

View File

@@ -9,7 +9,6 @@ namespace Mpociot\ApiDoc\Tests\Fixtures;
*/
class TestGroupController
{
/**
* Some endpoint.
*
@@ -20,7 +19,7 @@ class TestGroupController
}
/**
* Another endpoint
* Another endpoint.
*
* Here we specify a group. This is also in Group 1.
*

View File

@@ -11,8 +11,8 @@ use Illuminate\Support\Facades\Config;
use Mpociot\ApiDoc\Tests\Fixtures\TestController;
use Mpociot\ApiDoc\ApiDocGeneratorServiceProvider;
use Illuminate\Support\Facades\Route as RouteFacade;
use Mpociot\ApiDoc\Tests\Fixtures\TestResourceController;
use Mpociot\ApiDoc\Tests\Fixtures\TestGroupController;
use Mpociot\ApiDoc\Tests\Fixtures\TestResourceController;
use Mpociot\ApiDoc\Tests\Fixtures\TestPartialResourceController;
class GenerateDocumentationTest extends TestCase