Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d854732143 | |||
|
9b021296eb
|
|||
|
d581afa793
|
|||
| 95ca655eb0 | |||
|
25887a47d3
|
|||
|
1f7816c917
|
|||
|
fb7b4baa32
|
|||
|
2c4eedbf8b
|
@@ -71,7 +71,7 @@ abstract class AbstractConverter implements ConverterContract
|
||||
*/
|
||||
protected function setVariables(): static
|
||||
{
|
||||
if ($this->collection->variable) {
|
||||
if (isset($this->collection?->variable)) {
|
||||
foreach ($this->collection->variable as $var) {
|
||||
$this->vars["{{{$var->key}}}"] = $var->value;
|
||||
}
|
||||
@@ -173,7 +173,7 @@ abstract class AbstractConverter implements ConverterContract
|
||||
*/
|
||||
protected function interpolate(string $content): string
|
||||
{
|
||||
if (empty($this->vars) && $this->env->hasVars()) {
|
||||
if (empty($this->vars) && !empty($this->env) && $this->env->hasVars()) {
|
||||
return $content;
|
||||
}
|
||||
$matches = [];
|
||||
|
||||
@@ -53,7 +53,7 @@ class WgetRequest extends AbstractRequest
|
||||
$output[] = http_build_query($params);
|
||||
return $output;
|
||||
default:
|
||||
return ["\t$this->body"];
|
||||
return ["\t'$this->body' \ "];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,7 +75,6 @@ class WgetRequest extends AbstractRequest
|
||||
$this->prepareHeaders(),
|
||||
$this->prepareBody()
|
||||
);
|
||||
$output[] = rtrim(array_pop($output), '\ ');
|
||||
$output[] = "\t'$this->url'";
|
||||
return implode(PHP_EOL, array_merge($output, ['']));
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ class Processor
|
||||
/**
|
||||
* Converter version
|
||||
*/
|
||||
public const VERSION = '1.2.1';
|
||||
public const VERSION = '1.2.3';
|
||||
|
||||
/**
|
||||
* @var string[] Paths to collection files
|
||||
@@ -229,6 +229,9 @@ class Processor
|
||||
*/
|
||||
protected function initEnv(): void
|
||||
{
|
||||
if (!isset($this->envFile)) {
|
||||
return;
|
||||
}
|
||||
$content = file_get_contents(FileSystem::normalizePath($this->envFile));
|
||||
$content = json_decode($content, flags: JSON_THROW_ON_ERROR);
|
||||
if (!property_exists($content, 'environment') || empty($content?->environment)) {
|
||||
|
||||
Reference in New Issue
Block a user