Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea
composer.lock
vendor
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"description": "Load guzzle service description from various file formats",
"require": {
"php": ">=5.5.0",
"symfony/config": "~3.0",
"symfony/yaml": "~3.0"
"symfony/config": "~3.0|^4.0",
"symfony/yaml": "~3.0|^4.0"
},
"license": "MIT",
"authors": [
Expand Down
169 changes: 0 additions & 169 deletions composer.lock

This file was deleted.

3 changes: 1 addition & 2 deletions src/FileLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ public function load($resource, $type = null)
foreach($configValues["imports"] as $file) {
$configValues = array_merge_recursive($configValues, $this->import($this->locator->locate($file)));
}
unset($configValues["imports"]);
}

unset($configValues["imports"]);

return $configValues;
}

Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/invalid.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
operations
certificates.add:
operations:
-certificates.add