shalvah 4 years ago
parent
commit
b2dba60725

+ 10 - 8
camel/Extraction/Parameter.php

@@ -7,13 +7,15 @@ use Knuckles\Camel\BaseDTO;
 
 class Parameter extends BaseDTO
 {
-    /** @var string */
-    public $name;
-    /** @var string|null */
-    public $description = null;
-    /** @var bool */
-    public $required = false;
+    public string $name;
+    public ?string $description = null;
+    public bool $required = false;
     public $example = null;
-    /** @var string */
-    public $type = 'string';
+    public string $type = 'string';
+
+    public function __construct(array $parameters = [])
+    {
+        unset($parameters['setter']);
+        parent::__construct($parameters);
+    }
 }

+ 4 - 4
camel/Output/Parameter.php

@@ -6,18 +6,18 @@ namespace Knuckles\Camel\Output;
 class Parameter extends \Knuckles\Camel\Extraction\Parameter
 {
     /** @var string */
-    public $name;
+    public string $name;
 
     /** @var string|null */
-    public $description = null;
+    public ?string $description = null;
 
     /** @var bool */
-    public $required = false;
+    public bool $required = false;
 
     public $example = null;
 
     /** @var string */
-    public $type = 'string';
+    public string $type = 'string';
 
     /** @var array */
     public $__fields = [];

+ 2 - 1
resources/views/partials/example-requests/bash.blade.php

@@ -18,7 +18,8 @@ curl --request {{$endpoint->httpMethods[0]}} \
 @endforeach
 @foreach($endpoint->fileParameters as $parameter => $value)
 @foreach(u::getParameterNamesAndValuesForFormData($parameter, $value) as $key => $file)
-    --form "{!! "$key=@".$file->path() !!}" @if(! ($loop->last))\@endif
+    --form "{!! "$key=@".$file->path() !!}" @if(!($loop->parent->last))\
+@endif
 @endforeach
 @endforeach
 @elseif(count($endpoint->cleanBodyParameters))

+ 0 - 1
src/Extracting/Extractor.php

@@ -14,7 +14,6 @@ use Illuminate\Support\Str;
 use Knuckles\Camel\Extraction\ResponseField;
 use Knuckles\Scribe\Extracting\Strategies\Strategy;
 use Knuckles\Scribe\Tools\DocumentationConfig;
-use Knuckles\Scribe\Tools\Utils as u;
 
 class Extractor
 {