From 5678b5b22a983d0e307fafb5872acb8093959688 Mon Sep 17 00:00:00 2001
From: Meritoo <github@meritoo.pl>
Date: Thu, 20 Jun 2019 18:58:20 +0200
Subject: [PATCH] Fix "Found a contradiction when evaluating $fullBundleName
 and trying to reconcile type 'string' to !string" bug pointed by Psalm

---
 src/Utilities/Bundle.php       |  6 +-----
 tests/Utilities/BundleTest.php | 10 ++--------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/Utilities/Bundle.php b/src/Utilities/Bundle.php
index dfbde0e..83eade3 100644
--- a/src/Utilities/Bundle.php
+++ b/src/Utilities/Bundle.php
@@ -61,14 +61,10 @@ class Bundle
      * @throws IncorrectBundleNameException
      * @return null|string
      */
-    public static function getShortBundleName($fullBundleName)
+    public static function getShortBundleName(string $fullBundleName): ?string
     {
         // Oops, given name of bundle is invalid
         if (!Regex::isValidBundleName($fullBundleName)) {
-            if (!is_string($fullBundleName)) {
-                $fullBundleName = gettype($fullBundleName);
-            }
-
             throw new IncorrectBundleNameException($fullBundleName);
         }
 
diff --git a/tests/Utilities/BundleTest.php b/tests/Utilities/BundleTest.php
index 12507ee..9e665dc 100644
--- a/tests/Utilities/BundleTest.php
+++ b/tests/Utilities/BundleTest.php
@@ -85,16 +85,10 @@ class BundleTest extends BaseTestCase
         self::assertEquals($expected, Bundle::getBundleViewPath($viewPath, $bundleName, $extension));
     }
 
-    /**
-     * @param mixed $emptyValue Empty value, e.g. ""
-     *
-     * @throws IncorrectBundleNameException
-     * @dataProvider provideEmptyValue
-     */
-    public function testGetShortBundleNameUsingEmptyValue($emptyValue)
+    public function testGetShortBundleNameUsingEmptyValue(): void
     {
         $this->expectException(IncorrectBundleNameException::class);
-        Bundle::getShortBundleName($emptyValue);
+        Bundle::getShortBundleName('');
     }
 
     /**