From d79d2c87bc71ff5cccbfa460beed90377175f788 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Mon, 1 Jun 2020 15:13:21 +0200
Subject: [PATCH] More .editorconfig improvements

---
 .editorconfig                                 | 19 +++++++-
 DEVELOPMENT.md                                | 44 +++++++++---------
 phpunit.xml                                   |  9 ++--
 resources/views/layouts/parts/footer.twig     |  2 +-
 resources/views/macros/form.twig              | 46 ++++++++++---------
 resources/views/pages/login.twig              | 20 ++++----
 resources/views/pages/user-shifts.html        | 12 +++--
 .../Schedule/Assets/schedule-basic.xml        |  4 +-
 .../Schedule/Assets/schedule-extended.xml     |  4 +-
 9 files changed, 93 insertions(+), 67 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 9b1bb78b..c73db4c6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,17 +8,34 @@ root = true
 charset = utf-8
 end_of_line = lf
 indent_style = space
+indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 max_line_length = 120
 
+[{.babelrc,package.json}]
+indent_size = 2
+
+[docker/**.conf]
+indent_size = 2
+
+[*.{htm,html,twig}]
+indent_size = 4
+
+[*.{js,css,less,sass,scss}]
+indent_size = 2
+
+[{LICENSE,db/*.sql}]
+indent_size = unset
+
 [*.md]
 trim_trailing_whitespace = false
+indent_size = 2
 
 [*.php]
 indent_size = 4
 
-[*.{js,css,less,sass,scss}]
+[*.sh]
 indent_size = 2
 
 [*.{yml,yaml}]
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 8f6e17a6..69a9bd0c 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -11,28 +11,28 @@ Please also read the [CONTRIBUTING.md](CONTRIBUTING.md).
 ## Local build
 The following instructions explain how to get, build and run the latest Engelsystem version directly from the git master branch (may be unstable!).
 
- * Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git`
- * Install [Composer](https://getcomposer.org/download/) and [Yarn](https://yarnpkg.com/en/docs/install) (which requires [Node.js](https://nodejs.org/en/download/package-manager/))
- * Install project dependencies:
-     ```bash
-     composer install
-     yarn
-     ```
-    On production systems it is recommended to use
-    ```bash
-    composer install --no-dev
-    composer dump-autoload --optimize
-    ```
-    to install the Engelsystem
- * Build the frontend assets
-    ```bash
-    yarn build
-    ```
- * Optionally (for better performance)
-   * Generate translation files
-      ```bash
-      find resources/lang/ -type f -name '*.po' -exec sh -c 'file="{}"; msgfmt "${file%.*}.po" -o "${file%.*}.mo"' \;
-      ```
+* Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git`
+* Install [Composer](https://getcomposer.org/download/) and [Yarn](https://yarnpkg.com/en/docs/install) (which requires [Node.js](https://nodejs.org/en/download/package-manager/))
+* Install project dependencies:
+  ```bash
+  composer install
+  yarn
+  ```
+  On production systems it is recommended to use
+  ```bash
+  composer install --no-dev
+  composer dump-autoload --optimize
+  ```
+  to install the Engelsystem
+* Build the frontend assets
+```bash
+yarn build
+```
+* Optionally (for better performance)
+* Generate translation files
+  ```bash
+  find resources/lang/ -type f -name '*.po' -exec sh -c 'file="{}"; msgfmt "${file%.*}.po" -o "${file%.*}.mo"' \;
+  ```
 
 ## Testing
 To run the unit tests use
diff --git a/phpunit.xml b/phpunit.xml
index a5ae4cec..acaccec5 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,7 +1,8 @@
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
-         bootstrap="./includes/autoload.php"
-         colors="true"
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
+    bootstrap="./includes/autoload.php"
+    colors="true"
 >
     <testsuites>
         <testsuite name="Feature">
diff --git a/resources/views/layouts/parts/footer.twig b/resources/views/layouts/parts/footer.twig
index 827b635a..01fd5c1a 100644
--- a/resources/views/layouts/parts/footer.twig
+++ b/resources/views/layouts/parts/footer.twig
@@ -31,7 +31,7 @@
                 {{ __(name) }}
             </a> ·
         {% endfor %}
-          <a href="https://github.com/engelsystem/engelsystem/issues">{{ __('Bugs / Features') }}</a>
+        <a href="https://github.com/engelsystem/engelsystem/issues">{{ __('Bugs / Features') }}</a>
         · <a href="https://github.com/engelsystem/engelsystem/">{{ __('Development Platform') }}</a>
         · <a href="{{ url('credits') }}">{{ __('Credits') }}</a>
     </div>
diff --git a/resources/views/macros/form.twig b/resources/views/macros/form.twig
index a7a9a7a4..9e9a7483 100644
--- a/resources/views/macros/form.twig
+++ b/resources/views/macros/form.twig
@@ -3,18 +3,19 @@
         {% if label -%}
             <label for="{{ name }}"{% if opt.hide_label|default(false) %} class="sr-only"{% endif %}>{{ label }}</label>
         {%- endif %}
-        <input type="{{ type|default('text') }}" class="form-control"
-               id="{{ name }}" name="{{ name }}"
-               value="{{ opt.value|default('')|escape('html_attr') }}"
-                {%- if opt.required|default(false) %}
-                    required
-                {%- endif -%}
-                {%- if opt.disabled|default(false) %}
-                    disabled
-                {%- endif -%}
-                {%- if opt.readonly|default(false) %}
-                    readonly
-                {%- endif -%}
+        <input
+            type="{{ type|default('text') }}" class="form-control"
+            id="{{ name }}" name="{{ name }}"
+            value="{{ opt.value|default('')|escape('html_attr') }}"
+            {%- if opt.required|default(false) %}
+                required
+            {%- endif -%}
+            {%- if opt.disabled|default(false) %}
+                disabled
+            {%- endif -%}
+            {%- if opt.readonly|default(false) %}
+                readonly
+            {%- endif -%}
         >
     </div>
 {%- endmacro %}
@@ -25,12 +26,12 @@
             <label for="{{ name }}">{{ label }}</label>
         {%- endif %}
         <textarea class="form-control" id="{{ name }}" name="{{ name }}"
-                {%- if opt.required|default(false) %}
-                    required
-                {%- endif -%}
-                {%- if opt.rows|default(0) %}
-                    rows="{{ opt.rows }}"
-                {%- endif -%}
+            {%- if opt.required|default(false) %}
+                required
+            {%- endif -%}
+            {%- if opt.rows|default(0) %}
+                rows="{{ opt.rows }}"
+            {%- endif -%}
         >{{ opt.value|default('') }}</textarea>
     </div>
 {%- endmacro %}
@@ -52,7 +53,8 @@
     <div class="checkbox">
         <label>
             <input type="checkbox" id="{{ name }}" name="{{ name }}" value="{{ value|default('1') }}"
-                    {%- if checked|default(false) %} checked{% endif %}>
+                {%- if checked|default(false) %} checked{% endif %}
+            >
             {{ label }}
         </label>
     </div>
@@ -64,9 +66,9 @@
 
 {% macro button(label, opt) %}
     <button class="btn btn-{{ opt.btn_type|default('primary') }}"
-            {%- if opt.type is defined %} type="{{ opt.type }}"{% endif %}
-            {%- if opt.name is defined %} name="{{ opt.name }}"{% endif %}
-            {%- if opt.value is defined or opt.name is defined %} value="{{ opt.value|default('1') }}"{% endif -%}
+        {%- if opt.type is defined %} type="{{ opt.type }}"{% endif %}
+        {%- if opt.name is defined %} name="{{ opt.name }}"{% endif %}
+        {%- if opt.value is defined or opt.name is defined %} value="{{ opt.value|default('1') }}"{% endif -%}
     >
         {{ label }}
     </button>
diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig
index a6fb0934..399c97ea 100644
--- a/resources/views/pages/login.twig
+++ b/resources/views/pages/login.twig
@@ -40,21 +40,23 @@
                                 <div class="input-group">
                                     <span class="input-group-addon input-lg">{{ m.angel }}</span>
                                     <input
-                                            class="form-control input-lg"
-                                            id="form_nick"
-                                            type="text"
-                                            name="login"
-                                            value=""
-                                            placeholder="{{ __('Nick') }}"
-                                            autofocus>
+                                        class="form-control input-lg"
+                                        id="form_nick"
+                                        type="text"
+                                        name="login"
+                                        value=""
+                                        placeholder="{{ __('Nick') }}"
+                                        autofocus>
                                 </div>
                             </div>
 
                             <div class="form-group">
                                 <div class="input-group">
                                     <span class="input-group-addon input-lg">{{ m.glyphicon('lock') }}</span>
-                                    <input class="form-control input-lg" id="form_password"
-                                           type="password" name="password" value="" placeholder="{{ __('Password') }}">
+                                    <input
+                                        class="form-control input-lg" id="form_password"
+                                        type="password" name="password" value="" placeholder="{{ __('Password') }}"
+                                    >
                                 </div>
                             </div>
 
diff --git a/resources/views/pages/user-shifts.html b/resources/views/pages/user-shifts.html
index e6a0b213..ae92d1af 100644
--- a/resources/views/pages/user-shifts.html
+++ b/resources/views/pages/user-shifts.html
@@ -6,8 +6,10 @@
             <div class="form-group">%start_select%</div>
             <div class="form-group">
                 <div class="input-group time">
-                    <input type="time" class="form-control" id="start_time" name="start_time" size="5"
-                           pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%">
+                    <input
+                        type="time" class="form-control" id="start_time" name="start_time" size="5"
+                        pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%"
+                    >
                     <div class="input-group-btn">
                         <button class="btn btn-default" title="Now" type="button">
                             <span class="glyphicon glyphicon-time"></span>
@@ -19,8 +21,10 @@
             <div class="form-group">%end_select%</div>
             <div class="form-group">
                 <div class="input-group time">
-                    <input type="time" class="form-control" id="end_time" name="end_time" size="5"
-                           pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%">
+                    <input
+                        type="time" class="form-control" id="end_time" name="end_time" size="5"
+                        pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%"
+                    >
                     <div class="input-group-btn">
                         <button class="btn btn-default" title="Now" type="button">
                             <span class="glyphicon glyphicon-time"></span>
diff --git a/tests/Unit/Helpers/Schedule/Assets/schedule-basic.xml b/tests/Unit/Helpers/Schedule/Assets/schedule-basic.xml
index 6aa8c69d..516041d4 100644
--- a/tests/Unit/Helpers/Schedule/Assets/schedule-basic.xml
+++ b/tests/Unit/Helpers/Schedule/Assets/schedule-basic.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <schedule
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/voc/voctosched/master/schema/basic.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/voc/voctosched/master/schema/basic.xsd"
 >
     <version>dolor</version>
     <conference>
diff --git a/tests/Unit/Helpers/Schedule/Assets/schedule-extended.xml b/tests/Unit/Helpers/Schedule/Assets/schedule-extended.xml
index adb9fa6c..351eb819 100644
--- a/tests/Unit/Helpers/Schedule/Assets/schedule-extended.xml
+++ b/tests/Unit/Helpers/Schedule/Assets/schedule-extended.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <schedule
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/voc/voctosched/master/schema/extended.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/voc/voctosched/master/schema/extended.xsd"
 >
     <version>Some version string</version>
     <conference>