From b5f10f844f8077c28c220042b7c4ffc922b8729f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 14 Jan 2023 08:40:49 +0100
Subject: [PATCH] [ticket/17086] Add missing empty lines and remove extra
 whitespace

PHPBB3-17086
---
 .devcontainer/Dockerfile                 | 2 +-
 .devcontainer/devcontainer.json          | 2 +-
 .devcontainer/resources/phpbb-config.yml | 2 +-
 .devcontainer/resources/setup.sh         | 6 +++---
 .devcontainer/resources/xdebug.ini       | 2 +-
 .vscode/launch.json                      | 2 +-
 .vscode/settings.json                    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3d5b94426e..af0063b2ef 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -17,4 +17,4 @@ ADD resources/xdebug.ini /etc/php/8.1/apache2/conf.d/xdebug.ini
 
 # Configure Apache
 RUN echo "Listen 8080" >> /etc/apache2/ports.conf && \
-    a2enmod rewrite
\ No newline at end of file
+    a2enmod rewrite \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 33f13337fb..7bb0e9cc3a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -34,4 +34,4 @@
 	"features": {
 		"github-cli": "latest"
 	}
-}
\ No newline at end of file
+}
diff --git a/.devcontainer/resources/phpbb-config.yml b/.devcontainer/resources/phpbb-config.yml
index dd0cf9dbbc..9a9db6abff 100644
--- a/.devcontainer/resources/phpbb-config.yml
+++ b/.devcontainer/resources/phpbb-config.yml
@@ -35,4 +35,4 @@ installer:
         server_port: 80
         script_path: /
 
-    extensions: []
\ No newline at end of file
+    extensions: []
diff --git a/.devcontainer/resources/setup.sh b/.devcontainer/resources/setup.sh
index a2df6777f5..b871db11df 100644
--- a/.devcontainer/resources/setup.sh
+++ b/.devcontainer/resources/setup.sh
@@ -16,7 +16,7 @@ echo "$SSH_KEY" > /home/vscode/.ssh/id_rsa && chmod 600 /home/vscode/.ssh/id_rsa
 # Create a MySQL user to use
 echo "[Codespaces] Create MySQL user"
 sudo mysql -u root<<EOFMYSQL
-    CREATE USER 'phpbb'@'localhost' IDENTIFIED BY 'phpbb'; 
+    CREATE USER 'phpbb'@'localhost' IDENTIFIED BY 'phpbb';
     GRANT ALL PRIVILEGES ON *.* TO 'phpbb'@'localhost' WITH GRANT OPTION;
     CREATE DATABASE IF NOT EXISTS phpbb;
 EOFMYSQL
@@ -38,7 +38,7 @@ cp /workspaces/phpbb/.devcontainer/resources/phpbb-config.yml /workspaces/phpbb/
 echo "[Codespaces] Run phpBB CLI installation"
 cd /workspaces/phpbb/phpBB && composer install --no-interaction
 sudo php /workspaces/phpbb/phpBB/install/phpbbcli.php install /workspaces/phpbb/phpBB/install/install-config.yml
-rm -rf /workspaces/phpbb/phpBB/install 
+rm -rf /workspaces/phpbb/phpBB/install
 
 # Finished
-echo "[Codespaces] phpBB installation completed"
\ No newline at end of file
+echo "[Codespaces] phpBB installation completed"
diff --git a/.devcontainer/resources/xdebug.ini b/.devcontainer/resources/xdebug.ini
index 54a12716a1..59ffe3e809 100644
--- a/.devcontainer/resources/xdebug.ini
+++ b/.devcontainer/resources/xdebug.ini
@@ -7,4 +7,4 @@ xdebug.client_port=9003
 xdebug.start_with_request=yes
 xdebug.log='/var/log/xdebug/xdebug.log'
 xdebug.connect_timeout_ms=2000
-xdebug.idekey=VSCODE
\ No newline at end of file
+xdebug.idekey=VSCODE
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1de76f0106..46ce7fa44d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -15,4 +15,4 @@
             "log": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index fd2114bc1e..aec0651975 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
     "php.debug.ideKey": "VSCODE"
-}
\ No newline at end of file
+}