Mirrors/wiosna-dev_common-library
1
0
Fork 1
mirror of https://github.com/wiosna-dev/common-library.git synced 2026-03-12 01:31:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Found a redundant condition when evaluating docblock-defined type $composerJsonPath and trying to reconcile type 'string' to string" bug pointed by Psalm

Browse Source
This commit is contained in:
Meritoo
2019-06-20 20:05:56 +02:00
parent 1ac1a221ec
commit 6efbf940a3
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Utilities/Composer.php
View File

@@ -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?

20
tests/Utilities/ComposerTest.php
View File

@@ -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',