Fixed conflicts in Image.php and mimetypemapping.dist.json

Author: janisplayer

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,29 +7,29 @@ RUN apt-get update -y && \
     apt install -y apache2 vim software-properties-common sudo nano gnupg2
 
 RUN apt-get install --no-install-recommends -y \
-    php8.1 \
-    php8.1-common \
-    php8.1-gd \
-    php8.1-zip \
-    php8.1-curl \
-    php8.1-xml \
-    php8.1-xmlrpc \
-    php8.1-mbstring \
-    php8.1-sqlite \
-    php8.1-xdebug \
-    php8.1-pgsql \
-    php8.1-intl \
-    php8.1-imagick \
-    php8.1-gmp \
-    php8.1-apcu \
-    php8.1-bcmath \
-    php8.1-redis \
-    php8.1-soap \
-    php8.1-imap \
-    php8.1-opcache \
-    php8.1-cli \
-    php8.1-dev \
-    libmagickcore-6.q16-3-extra \
+    php8.3 \
+    php8.3-common \
+    php8.3-gd \
+    php8.3-zip \
+    php8.3-curl \
+    php8.3-xml \
+    php8.3-xmlrpc \
+    php8.3-mbstring \
+    php8.3-sqlite \
+    php8.3-xdebug \
+    php8.3-pgsql \
+    php8.3-intl \
+    php8.3-imagick \
+    php8.3-gmp \
+    php8.3-apcu \
+    php8.3-bcmath \
+    php8.3-redis \
+    php8.3-soap \
+    php8.3-imap \
+    php8.3-opcache \
+    php8.3-cli \
+    php8.3-dev \
+    libmagickcore-6.q16-7-extra \
     curl \
     lsof \
     make \
@@ -42,15 +42,18 @@ RUN curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php && \
     php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer && \
     rm /tmp/composer-setup.php /tmp/composer-setup.sig
 
-RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini && \
-    echo "xdebug.remote_autostart = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini && \
-	echo "apc.enable_cli=1" >> /etc/php/8.1/cli/conf.d/20-apcu.ini
+RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.3/cli/conf.d/20-xdebug.ini && \
+    echo "xdebug.remote_autostart = 1" >> /etc/php/8.3/cli/conf.d/20-xdebug.ini && \
+	echo "apc.enable_cli=1" >> /etc/php/8.3/cli/conf.d/20-apcu.ini
 
 # Autostart XDebug for apache
 RUN { \
 	echo "xdebug.mode=debug"; \
 	echo "xdebug.start_with_request=yes"; \
-} >> /etc/php/8.1/apache2/conf.d/20-xdebug.ini
+} >> /etc/php/8.3/apache2/conf.d/20-xdebug.ini
+
+# Increase PHP memory limit to 512mb
+RUN sed -i 's/memory_limit = .*/memory_limit = 512M/' /etc/php/8.3/apache2/php.ini
 
 # Docker
 RUN apt-get -y install \

.devcontainer/Dockerfile.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later

.devcontainer/README.md

@@ -1,3 +1,7 @@
+<!--
+  - SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 # Nextcloud DevContainer
 
 ## Usage

.devcontainer/codespace.config.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 $codespaceName = getenv('CODESPACE_NAME');
 $codespaceDomain = getenv('GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN');
 

.devcontainer/devcontainer.json.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later

.devcontainer/docker-compose.yml

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
 version: '3'
 services:
   nextclouddev:

.devcontainer/entrypoint.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
-
+#
+# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+#
 sudo service apache2 start
 
 while sleep 1000; do :; done

.devcontainer/launch.json.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later

.devcontainer/postStart.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
-
+#
+# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+#
 # Set git safe.directory
 git config --global --add safe.directory /var/www/html
 git config --global --add safe.directory /var/www/html/3rdparty

.devcontainer/setup.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+#
+# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+#
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )"
 
 cd $DIR/

.drone.yml

@@ -1,5 +1,8 @@
 # https://editorconfig.org
 
+# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
 root = true
 
 [*]
@@ -10,10 +13,6 @@ indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.feature]
-indent_size = 2
-indent_style = space
-
 [*.yml]
 indent_size = 2
 indent_style = space

.editorconfig

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
 # Ignoring folders for eslint
 node_modules/
 3rdparty/

.eslintignore

@@ -1,3 +1,7 @@
+/**
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 module.exports = {
 	globals: {
 		__webpack_nonce__: true,
@@ -31,5 +35,17 @@ module.exports = {
 		jsdoc: {
 			mode: 'typescript',
 		},
+		'import/resolver': {
+			typescript: {}, // this loads <rootdir>/tsconfig.json to eslint
+		},
 	},
+	overrides: [
+		// Allow any in tests
+		{
+			files: ['**/*.spec.ts'],
+			rules: {
+				'@typescript-eslint/no-explicit-any': 'warn',
+			},
+		},
+	],
 }

.eslintrc.js

@@ -0,0 +1,19 @@
+# .git-blame-ignore-revs
+
+# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# Format control structures
+caff1023ea72bb2ea94130e18a2a6e2ccf819e5f
+# Update to coding-standard 1.1.1
+aa5f037af71c915424c6dcfd5ad2dc82797dc0d6
+# Update to coding-standard 1.2.3
+af6de04e9e141466dc229e444ff3f146f4a34765
+0bd284cb81b6866338aaaa67aa1d81ef9bfbb2ab
+8af7ecb2576071f170ecbb0aa2311b26581e40e2
+# Update to coding-standard 1.3.1
+9836e9b16484582d309c8437ab46d82e34956941
+# Automated refactorings
+49dd79eabb2b8902559a7a4e8f8fcad54f46b604
+# @nextcloud/vue import paths
+b06f5ba4c47450f355a8903c1a93ac68e8c6cfc2

.git-blame-ignore-revs

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
 /dist/* binary
 /package-lock.json merge=binary
 /core/css/*.css* binary