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

Fix "Found a contradiction when evaluating $fullBundleName and trying to reconcile type 'string' to !string" bug pointed by Psalm

Browse Source
This commit is contained in:
Meritoo
2019-06-20 18:58:20 +02:00
parent 3b81d0d932
commit 5678b5b22a
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Utilities/Bundle.php
View File

@@ -61,14 +61,10 @@ class Bundle
* @throws IncorrectBundleNameException * @throws IncorrectBundleNameException
* @return null|string * @return null|string
*/ */
public static function getShortBundleName($fullBundleName) public static function getShortBundleName(string $fullBundleName): ?string
{ {
// Oops, given name of bundle is invalid // Oops, given name of bundle is invalid
if (!Regex::isValidBundleName($fullBundleName)) { if (!Regex::isValidBundleName($fullBundleName)) {
if (!is_string($fullBundleName)) {
$fullBundleName = gettype($fullBundleName);
}
throw new IncorrectBundleNameException($fullBundleName); throw new IncorrectBundleNameException($fullBundleName);
} }

10
tests/Utilities/BundleTest.php
View File

@@ -85,16 +85,10 @@ class BundleTest extends BaseTestCase
self::assertEquals($expected, Bundle::getBundleViewPath($viewPath, $bundleName, $extension)); self::assertEquals($expected, Bundle::getBundleViewPath($viewPath, $bundleName, $extension));
} }
/** public function testGetShortBundleNameUsingEmptyValue(): void
* @param mixed $emptyValue Empty value, e.g. ""
*
* @throws IncorrectBundleNameException
* @dataProvider provideEmptyValue
*/
public function testGetShortBundleNameUsingEmptyValue($emptyValue)
{ {
$this->expectException(IncorrectBundleNameException::class); $this->expectException(IncorrectBundleNameException::class);
Bundle::getShortBundleName($emptyValue); Bundle::getShortBundleName('');
} }
/** /**