Merge branch 'master' into patch-2

.editorconfig

@@ -1,6 +1,7 @@
 root = true
 
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 indent_style = space
@@ -10,5 +11,5 @@ trim_trailing_whitespace = true
 [tests/Fixtures/**]
 trim_trailing_whitespace = false
 
-[{*.yml, *.yaml}]
+[*.{yml,yaml,md,json,xsd}]
 indent_size = 2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -21,20 +21,20 @@ labels: kind/bug
 ### Runtime version
 
 <!--
-   Provide PHP CS Fixer version and PHP runtime by sharing result of this command:
-   $ php-cs-fixer -V
+  Provide PHP CS Fixer version and PHP runtime by sharing result of this command:
+  $ php-cs-fixer -V
 -->
 
 ### Used command
 
 <!--
-   Provide the command used to run PHP CS Fixer (run with `-vvv`).
+  Provide the command used to run PHP CS Fixer (run with `-vvv`).
 -->
 
 ### Configuration file
 
 <!--
-   Provide content of configuration file you used (.php-cs-fixer[.dist].php).
+  Provide content of configuration file you used (.php-cs-fixer[.dist].php).
 -->
 
 ### Code snippet that reproduces the problem

Dockerfile

@@ -12,20 +12,20 @@ ARG PHP_XDEBUG_VERSION
 COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
 
 RUN if [ ! -z "$DOCKER_GROUP_ID" ] && [ ! getent group "${DOCKER_GROUP_ID}" > /dev/null ]; \
-    then addgroup -S -g "${DOCKER_GROUP_ID}" devs; \
-  fi \
-  && if [ ! -z "$DOCKER_USER_ID" ] && [ ! -z "$DOCKER_GROUP_ID" ] && [ ! getent passwd "${DOCKER_USER_ID}" > /dev/null ]; \
-    then adduser -S -u "${DOCKER_USER_ID}" -G "$(getent group "${DOCKER_GROUP_ID}" | awk -F: '{printf $1}')" dev; \
-  fi \
-  # php extensions
-  && curl --location --output /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \
-  && chmod +x /usr/local/bin/install-php-extensions \
-  && sync \
-  && install-php-extensions \
-    pcntl \
-    xdebug-${PHP_XDEBUG_VERSION} \
-  # xdebug command
-  && curl --location --output /usr/local/bin/xdebug https://github.com/julienfalque/xdebug/releases/download/v2.0.0/xdebug \
-  && chmod +x /usr/local/bin/xdebug
+        then addgroup -S -g "${DOCKER_GROUP_ID}" devs; \
+    fi \
+    && if [ ! -z "$DOCKER_USER_ID" ] && [ ! -z "$DOCKER_GROUP_ID" ] && [ ! getent passwd "${DOCKER_USER_ID}" > /dev/null ]; \
+        then adduser -S -u "${DOCKER_USER_ID}" -G "$(getent group "${DOCKER_GROUP_ID}" | awk -F: '{printf $1}')" dev; \
+    fi \
+    # php extensions
+    && curl --location --output /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \
+    && chmod +x /usr/local/bin/install-php-extensions \
+    && sync \
+    && install-php-extensions \
+        pcntl \
+        xdebug-${PHP_XDEBUG_VERSION} \
+    # xdebug command
+    && curl --location --output /usr/local/bin/xdebug https://github.com/julienfalque/xdebug/releases/download/v2.0.0/xdebug \
+    && chmod +x /usr/local/bin/xdebug
 
 COPY docker/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini

dev-tools/mess-detector/phpmd.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
-<ruleset name="friendsofphp/php-cs-fixer"
-         xmlns="http://pmd.sf.net/ruleset/1.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
+<ruleset
+    name="friendsofphp/php-cs-fixer"
+    xmlns="http://pmd.sf.net/ruleset/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
 >
     <rule ref="rulesets/controversial.xml/CamelCaseClassName" />
     <rule ref="rulesets/controversial.xml/CamelCaseMethodName" />

doc/schemas/fix/checkstyle.xsd

@@ -41,4 +41,4 @@
     </xs:sequence>
     <xs:attribute type="xs:string" name="version"/>
   </xs:complexType>
-</xs:schema>
+</xs:schema>

doc/schemas/fix/xml.xsd

@@ -80,4 +80,4 @@
         </xs:complexType>
     </xs:element>
 
-</xs:schema>
+</xs:schema>