cleanup and minor bug fix

diff --git a/.gitignore b/.gitignore
index d82fc8c229555141a0a75b68f5329c11f150087b..c6438a2861c2acda048fb43df229f8276fcd0464 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ uguu.sq3
 composer.phar
 composer.lock
 docker/uguuForDocker.tar.gz
+!/.php-cs-fixer.cache

diff --git a/.node_version b/.node_version
deleted file mode 100644 (file)
index 2ff49b8..0000000
--- a/.node_version
+++ /dev/null
@@ -1 +0,0 @@
-v19.3.0

diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache
deleted file mode 100644 (file)
index de32d8a..0000000
--- a/.php-cs-fixer.cache
+++ /dev/null
@@ -1 +0,0 @@
-{"php":"8.1.13","version":"3.13.1","indent":"    ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true},"hashes":{"\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder3788\/src\/static\/php\/upload.php":"b626750d2d9ac4f2b2f98a8ec8219533","src\/static\/php\/upload.php":"2aa4d70e18ce7445ddd4ba0f76fa0621","\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder1142\/src\/static\/php\/upload.php":"b626750d2d9ac4f2b2f98a8ec8219533","\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder24\/src\/static\/php\/upload.php":"2aa4d70e18ce7445ddd4ba0f76fa0621","\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder1007\/src\/static\/php\/upload.php":"2aa4d70e18ce7445ddd4ba0f76fa0621","\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder3242\/src\/static\/php\/upload.php":"2aa4d70e18ce7445ddd4ba0f76fa0621","\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder681\/src\/static\/php\/upload.php":"2aa4d70e18ce7445ddd4ba0f76fa0621","\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder1535\/src\/static\/php\/upload.php":"2aa4d70e18ce7445ddd4ba0f76fa0621","\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder1163\/src\/static\/php\/upload.php":"2aa4d70e18ce7445ddd4ba0f76fa0621","\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder4666\/src\/static\/php\/upload.php":"2aa4d70e18ce7445ddd4ba0f76fa0621","\/private\/var\/folders\/5_\/px3cvvbs4rd5bjzl8py2mjnc0000gq\/T\/PHP CS Fixertemp_folder5333\/src\/static\/php\/upload.php":"dc38feb300c1c8ab4614639d5a7af4f7"}}
\ No newline at end of file

diff --git a/package.json b/package.json
index 0ad1dc99f2d3f1502acd8ae7bfe39ef50d832371..10c3cf9c9d46f4276b3e0ba4c4339cfa2a681772 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uguu",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "Uguu is a simple lightweight temporary file host with support for drop, paste, click and API uploading.",
   "homepage": "https://uguu.se",
   "repository": {
@@ -17,9 +17,9 @@
     "url": "https://github.com/nokonoko/uguu/issues"
   },
   "devDependencies": {
-    "minify": "^9.1.0",
-    "ejs": "^3.1.8",
-    "node-jq": "^2.3.4",
+    "minify": "^10.3.0",
+    "ejs": "^3.1.9",
+    "node-jq": "^4.0.1",
     "imagemin-cli": "^7.0.0",
     "imagemin-pngquant": "^9.0.2"
   }

diff --git a/src/Classes/Upload.php b/src/Classes/Upload.php
index e395c87541384aeccb12f8038e444698844c5544..2a3100ef964ddf4fbb40e8df34365c39406d2839 100644 (file)
--- a/src/Classes/Upload.php
+++ b/src/Classes/Upload.php
@@ -245,7 +245,7 @@
          *
          * @param $file array The file you want to get the extension from.
          *
-         * @return string The file extension of the file.
+         * @return string | bool The file extension of the file.
          */
         public function fileExtension(array $file):string | bool
         {
@@ -253,7 +253,6 @@
             $extension = explode('.', $file['name']);
             $dotCount = substr_count($file['name'], '.');    
             return match ($dotCount) {
-                1 => end($extension),
                 2 => $this->doubleDotExtension($extension),
                 default => end($extension)
             };

diff --git a/src/config.json b/src/config.json
index 6e76a907f6f4a229289903b67474d4d7151b2ba3..03178dd97e3f7a08b97c775de4253f40dc96cac1 100755 (executable)
--- a/src/config.json
+++ b/src/config.json
@@ -3,7 +3,7 @@
     "allowErrors": false
   },
   "dest": "dist",
-  "pkgVersion": "1.7.4",
+  "pkgVersion": "1.7.5",
   "pages": [
     "index.ejs",
     "faq.ejs",