Ensure file exists before looking size or type

locomotivemtl · Feb 26, 2020 · b20c8a9 · b20c8a9
1 parent 0c79a93
commit b20c8a9
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Charcoal/Property/FileProperty.php b/src/Charcoal/Property/FileProperty.php
@@ -282,10 +282,14 @@ public function mimetype()
      *
      * @uses   finfo
      * @param  string $file The file to check.
-     * @return string|false Returns the given file's MIME type or FALSE if an error occurred.
+     * @return string|null Returns the given file's MIME type or FALSE if an error occurred.
      */
     public function getMimetypeFor($file)
     {
+        if (!$this->fileExists($file)) {
+            return null;
+        }
+
         $info = new finfo(FILEINFO_MIME_TYPE);
 
         return $info->file($file);
@@ -380,7 +384,7 @@ public function getFilesize()
     {
         if (!$this->filesize) {
             $val = $this->val();
-            if (!$val || !file_exists($val) || !is_readable($val)) {
+            if (!$val || !$this->fileExists($val)) {
                 return 0;
             } else {
                 $this->filesize = filesize($val);
@@ -428,14 +432,14 @@ public function validateAcceptedMimetypes()
             $mimetype = $this->mimetype;
         } else {
             $val = $this->val();
-            if (!$val) {
+            if (!$val || !$this->fileExists($val)) {
                 return true;
             }
             $mimetype = $this->getMimetypeFor($val);
         }
         $valid = false;
         foreach ($acceptedMimetypes as $m) {
-            if ($m == $mimetype) {
+            if ($m === $mimetype) {
                 $valid = true;
                 break;
             }