Pārlūkot izejas kodu

Use proper name for subfields

shalvah 4 gadi atpakaļ
vecāks
revīzija
e678a1e844
2 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. 2 0
      src/Matching/RouteMatcher.php
  2. 1 2
      src/Writing/OpenAPISpecWriter.php

+ 2 - 0
src/Matching/RouteMatcher.php

@@ -49,6 +49,8 @@ class RouteMatcher implements RouteMatcherInterface
             return RouteFacade::getRoutes();
         }
 
+        /** @var \Dingo\Api\Routing\Router $router */
+        $router = app(\Dingo\Api\Routing\Router::class);
         $allRouteCollections = app(\Dingo\Api\Routing\Router::class)->getRoutes();
 
         return collect($allRouteCollections)

+ 1 - 2
src/Writing/OpenAPISpecWriter.php

@@ -461,8 +461,7 @@ class OpenAPISpecWriter
             ];
 
             if ($baseType === 'object' && !empty($field['__fields'])) {
-                foreach ($field['__fields'] as $subfield) {
-                    $fieldSimpleName = preg_replace("/^{$field['name']}\\[\]\\./", '', $subfield['name']);
+                foreach ($field['__fields'] as $fieldSimpleName => $subfield) {
                     $fieldData['items']['properties'][$fieldSimpleName] = $this->generateFieldData($subfield);
                     if ($subfield['required']) {
                         $fieldData['items']['required'][] = $fieldSimpleName;