Fixes internal casting when find(null)

octobercms · Dec 14, 2021 · ed69c4e · ed69c4e
1 parent 97cd0e4
commit ed69c4e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Halcyon/Model.php b/src/Halcyon/Model.php
@@ -1323,17 +1323,19 @@ public function newCollection(array $models = [])
     }
 
     /**
-     * Returns the base file name and extension. Applies a default extension, if none found.
+     * getFileNameParts returns the base file name and extension.
+     * Applies a default extension, if none found.
      */
     public function getFileNameParts($fileName = null)
     {
         if ($fileName === null) {
             $fileName = $this->fileName;
         }
 
-        if (!strlen($extension = pathinfo($fileName, PATHINFO_EXTENSION))) {
+        $extension = pathinfo($fileName, PATHINFO_EXTENSION);
+        if (!strlen($extension)) {
             $extension = $this->defaultExtension;
-            $baseFile = $fileName;
+            $baseFile = (string) $fileName;
         }
         else {
             $pos = strrpos($fileName, '.');
@@ -1346,7 +1348,7 @@ public function getFileNameParts($fileName = null)
     /**
      * Get the datasource for the model.
      *
-     * @return \October\Rain\Halcyon\DatasourceInterface
+     * @return \October\Rain\Halcyon\Datasource\DatasourceInterface
      */
     public function getDatasource()
     {