Merge pull request #13 from arturskonfino/arturskonfino-patch-1

Fixed a bug with unexpected "action" key
thecodingmachine · Sep 9, 2022 · 1e57e34 · 1e57e34
2 parents c5d1580 + e57120d
commit 1e57e34
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/AssetOperation.php b/src/AssetOperation.php
@@ -94,12 +94,19 @@ public static function buildFromArray(array $array, string $package, string $pac
  } else {
  $metadata = [];
  }
+
+ if (isset($array['action'])) {
+ $action = $array['action'];
+ unset($array['action']);
+ } else {
+ $action = self::ADD;
+ }
 
  if (!empty($array)) {
  throw new JsonException(sprintf('Unexpected key(s) in discovery.json from package %s: "%s"', $package, implode(', ', array_keys($array))));
  }
 
- return new self(self::ADD, new Asset($value, $package, $packageDir, $priority, $metadata));
+ return new self($action, new Asset($value, $package, $packageDir, $priority, $metadata));
  }
 
  /**

diff --git a/tests/unitTests/AssetOperationTest.php b/tests/unitTests/AssetOperationTest.php
@@ -29,7 +29,8 @@ public function testBuildFromArray()
  'priority' => 99,
  'metadata' => [
  'foo' => 'bar'
- ]
+ ],
+ 'action' => 'add'
  ], 'bar/baz', 'vendor/bar/baz');
  $this->assertSame(AssetOperation::ADD, $assetOperation->getOperation());
  $this->assertSame('foo', $assetOperation->getAsset()->getValue());