Merge pull request #25 from RonasIT/dpankratov/version-update

Dpankratov/version update

Author: DenTray

composer.json

@@ -18,7 +18,7 @@
   "require": {
     "php": ">=7.1.0",
     "laravel/framework": ">=5.3.0",
-    "minime/annotations": "2.3.1"
+    "minime/annotations": "~3.0"
   },
   "autoload": {
     "psr-4": {

src/Services/SwaggerService.php

@@ -536,8 +536,9 @@ protected function parseRequestName($request)
     {
         $explodedRequest = explode('\\', $request);
         $requestName = array_pop($explodedRequest);
+        $summaryName = str_replace('Request', '', $requestName);
 
-        $underscoreRequestName = $this->camelCaseToUnderScore($requestName);
+        $underscoreRequestName = $this->camelCaseToUnderScore($summaryName);
 
         return preg_replace('/[_]/', ' ', $underscoreRequestName);
     }
@@ -589,7 +590,7 @@ public function getDocFileContent()
         return $data;
     }
 
-    private function camelCaseToUnderScore($input)
+    protected function camelCaseToUnderScore($input)
     {
         preg_match_all('!([A-Z][A-Z0-9]*(?=$|[A-Z][a-z0-9])|[A-Za-z][a-z0-9]+)!', $input, $matches);
         $ret = $matches[0];
@@ -637,7 +638,7 @@ protected function replaceObjectValues($parameters)
      * We hope swagger developers will resolve this problem in next release of Swagger OpenAPI
      * */
 
-    private function replaceNullValues($parameters, $types, &$example)
+    protected function replaceNullValues($parameters, $types, &$example)
     {
         foreach ($parameters as $parameter => $value) {
             if (is_null($value) && in_array($parameter, $types)) {
@@ -650,7 +651,7 @@ private function replaceNullValues($parameters, $types, &$example)
         }
     }
 
-    private function getDefaultValueByType($type)
+    protected function getDefaultValueByType($type)
     {
         $values = [
             'object' => 'null',

src/Tests/AutoDocTestCaseTrait.php

@@ -7,30 +7,29 @@
 
 trait AutoDocTestCaseTrait
 {
-    protected $docService;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->docService = app(SwaggerService::class);
-    }
+    public $docService;
 
     public function createApplication()
     {
         parent::createApplication();
     }
 
     public function tearDown(): void
+    {
+        $this->saveDocumentation();
+
+        parent::tearDown();
+    }
+
+    public function saveDocumentation()
     {
         $currentTestCount = $this->getTestResultObject()->count();
         $allTestCount = $this->getTestResultObject()->topTestSuite()->count();
 
         if (($currentTestCount == $allTestCount) && (!$this->hasFailed())) {
-            $this->docService->saveProductionData();
+            $docService = $this->docService ??  app(SwaggerService::class);
+            $docService->saveProductionData();
         }
-
-        parent::tearDown();
     }
 
     /**