Merge branch 'master' into width_fix

2022-02-05 11:23:37 +01:00 · 2022-02-05 11:23:37 +01:00 · 88afc3d411
commit 88afc3d411
parent a41040db71 5926207012
1 changed files with 2 additions and 2 deletions
--- a/src/Spout/Common/Helper/GlobalFunctionsHelper.php
+++ b/src/Spout/Common/Helper/GlobalFunctionsHelper.php
@ -243,10 +243,10 @@ class GlobalFunctionsHelper
     * @see basename()
     *
     * @param string $path
-     * @param string|null $suffix
+     * @param string $suffix
     * @return string
     */
-    public function basename($path, $suffix = null)
+    public function basename($path, $suffix = '')
    {
        return \basename($path, $suffix);
    }