diff --git a/src/Utilities/Composer.php b/src/Utilities/Composer.php index 1e423e8..24ee2ce 100644 --- a/src/Utilities/Composer.php +++ b/src/Utilities/Composer.php @@ -30,14 +30,9 @@ class Composer * @param string $nodeName Name of node who value should be returned * @return null|string */ - public static function getValue($composerJsonPath, $nodeName) + public static function getValue(string $composerJsonPath, string $nodeName): ?string { - $composerJsonString = is_string($composerJsonPath); - $composerJsonReadable = false; - - if ($composerJsonString) { - $composerJsonReadable = is_readable($composerJsonPath); - } + $composerJsonReadable = is_readable($composerJsonPath); /* * Provided path or name of node are invalid? @@ -46,12 +41,12 @@ class Composer * * Nothing to do */ - if (!$composerJsonString || !is_string($nodeName) || !$composerJsonReadable || empty($nodeName)) { + if (!$composerJsonReadable || empty($nodeName)) { return null; } $content = file_get_contents($composerJsonPath); - $data = json_decode($content); + $data = json_decode($content, false); /* * Unknown data from the composer.json file or there is no node with given name? diff --git a/tests/Utilities/ComposerTest.php b/tests/Utilities/ComposerTest.php index 7bf6602..c4a9252 100644 --- a/tests/Utilities/ComposerTest.php +++ b/tests/Utilities/ComposerTest.php @@ -35,23 +35,15 @@ class ComposerTest extends BaseTestCase static::assertHasNoConstructor(Composer::class); } - /** - * @param string $composerJsonPath Empty value, e.g. "" - * @dataProvider provideEmptyValue - */ - public function testGetValueNotExistingComposerJson($composerJsonPath) + public function testGetValueNotExistingComposerJson(): void { - self::assertNull(Composer::getValue($composerJsonPath, '')); + self::assertNull(Composer::getValue('', '')); self::assertNull(Composer::getValue('not/existing/composer.json', '')); } - /** - * @param string $nodeName Empty value, e.g. "" - * @dataProvider provideEmptyValue - */ - public function testGetValueNotExistingNode($nodeName) + public function testGetValueNotExistingNode(): void { - self::assertNull(Composer::getValue($this->composerJsonPath, $nodeName)); + self::assertNull(Composer::getValue($this->composerJsonPath, '')); self::assertNull(Composer::getValue($this->composerJsonPath, 'not_existing_node')); } @@ -61,7 +53,7 @@ class ComposerTest extends BaseTestCase * * @dataProvider getExistingNode */ - public function testGetValueExistingNode($nodeName, $nodeValue) + public function testGetValueExistingNode(string $nodeName, string $nodeValue): void { self::assertEquals($nodeValue, Composer::getValue($this->composerJsonPath, $nodeName)); } @@ -71,7 +63,7 @@ class ComposerTest extends BaseTestCase * * @return Generator */ - public function getExistingNode() + public function getExistingNode(): Generator { yield[ 'name',