From dbacd1210aa564afe7eb56d7718eacd1d56b2f23 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 10:35:45 +0200
Subject: [PATCH 01/60] Import strict ruleset

---
 .gitignore                         |   4 +
 README.md                          |   2 +-
 composer.json                      |  20 +-
 ruleset.xml                        |  23 --
 src/ZendCodingStandard/ruleset.xml | 379 +++++++++++++++++++++++++++++
 5 files changed, 401 insertions(+), 27 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 ruleset.xml
 create mode 100644 src/ZendCodingStandard/ruleset.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..46946e2b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+vendor/
+phpcs.xml
+composer.lock
+phpcs.log
diff --git a/README.md b/README.md
index 2a7e94a8..4f0b2e13 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Usage
   ```
 
 * To automatically fix many CS issues:
- 
+
   ```bash
   $ composer cs-fix
   ```
diff --git a/composer.json b/composer.json
index 89f82020..1425db1e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,26 @@
 {
     "name": "zendframework/zend-coding-standard",
-    "description": "Zend Framework coding standard",
-    "license": "BSD-3-Clause",
+    "type": "phpcodesniffer-standard",
+    "description": "Zend Framework Coding Standard",
     "keywords": [
         "zf",
         "coding standard"
     ],
+    "license": "BSD-3-Clause",
     "require": {
-        "squizlabs/php_codesniffer": "^2.7"
+        "php": "^7.1",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+        "slevomat/coding-standard": "^4.7.3",
+        "squizlabs/php_codesniffer": "^3.3.1"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "ZendCodingStandard\\Sniffs\\": "src/ZendCodingStandard/Sniffs"
+        }
     }
 }
diff --git a/ruleset.xml b/ruleset.xml
deleted file mode 100644
index 2e2536e0..00000000
--- a/ruleset.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Zend Framework Coding Standard">
-    <description>Zend Framework Coding Standard</description>
-
-    <!-- display progress -->
-    <arg value="p"/>
-    <arg name="colors"/>
-
-    <!-- inherit rules from: -->
-    <rule ref="PSR2"/>
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-    <rule ref="Generic.Formatting.SpaceAfterNot"/>
-    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
-        <properties>
-            <property name="ignoreNewlines" value="true"/>
-        </properties>
-    </rule>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
-        <properties>
-            <property name="ignoreBlankLines" value="false"/>
-        </properties>
-    </rule>
-</ruleset>
diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
new file mode 100644
index 00000000..d2feb76e
--- /dev/null
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../vendor/squizlabs/php_codesniffer/phpcs.xsd"
+         name="ZendCodingStandard">
+    <description>The ZendFramework coding standard.</description>
+
+    <!-- Import PSR-2 coding standard (base) -->
+    <rule ref="PSR2"/>
+
+    <!-- Force array element indentation with 4 spaces -->
+    <rule ref="Generic.Arrays.ArrayIndent"/>
+    <!-- Forbid `array(...)` -->
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <!-- Forbid duplicate classes -->
+    <rule ref="Generic.Classes.DuplicateClassName"/>
+    <!-- Forbid empty statements -->
+    <rule ref="Generic.CodeAnalysis.EmptyStatement">
+        <!-- But allow empty catch -->
+        <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedCatch"/>
+    </rule>
+    <!-- Forbid final methods in final classes -->
+    <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
+    <!-- Forbid useless empty method overrides -->
+    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
+    <!-- Forbid inline HTML in PHP code -->
+    <rule ref="Generic.Files.InlineHTML"/>
+    <!-- Align corresponding assignment statement tokens -->
+    <rule ref="Generic.Formatting.MultipleStatementAlignment">
+        <properties>
+            <property name="error" value="true"/>
+        </properties>
+    </rule>
+    <!-- Force whitespace after a type cast -->
+    <rule ref="Generic.Formatting.SpaceAfterCast"/>
+    <!-- Force whitespace after `!` -->
+    <rule ref="Generic.Formatting.SpaceAfterNot"/>
+    <!-- Forbid PHP 4 constructors -->
+    <rule ref="Generic.NamingConventions.ConstructorName"/>
+    <!-- Forbid any content before opening tag -->
+    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag"/>
+    <!-- Forbid deprecated functions -->
+    <rule ref="Generic.PHP.DeprecatedFunctions"/>
+    <!-- Forbid alias functions, i.e. `sizeof()`, `delete()` -->
+    <rule ref="Generic.PHP.ForbiddenFunctions">
+        <properties>
+            <property
+                name="forbiddenFunctions"
+                type="array"
+                value="
+                    chop => rtrim,
+                    close => closedir,
+                    compact => null,
+                    delete => unset,
+                    doubleval => floatval,
+                    extract => null,
+                    fputs => fwrite,
+                    ini_alter => ini_set,
+                    is_double => is_float,
+                    is_integer => is_int,
+                    is_long => is_int,
+                    is_null => null,
+                    is_real => is_float,
+                    is_writeable => is_writable,
+                    join => implode,
+                    key_exists => array_key_exists,
+                    pos => current,
+                    settype => null,
+                    show_source => highlight_file,
+                    sizeof => count,
+                    strchr => strstr
+                "/>
+        </properties>
+    </rule>
+    <!-- Forbid useless inline string concatenation -->
+    <rule ref="Generic.Strings.UnnecessaryStringConcat">
+        <!-- But multiline is useful for readability -->
+        <properties>
+            <property name="allowMultiline" value="true"/>
+        </properties>
+    </rule>
+    <!-- Forbid backtick operator -->
+    <rule ref="Generic.PHP.BacktickOperator"/>
+    <!-- Forbid short open tag -->
+    <rule ref="Generic.PHP.DisallowShortOpenTag"/>
+    <!-- Forbid `php_sapi_name()` function, use PHP_SAPI -->
+    <rule ref="Generic.PHP.SAPIUsage"/>
+    <!-- Force PHP 7 param and return types to be lowercased -->
+    <rule ref="Generic.PHP.LowerCaseType"/>
+    <!-- Forbid comments starting with # -->
+    <rule ref="PEAR.Commenting.InlineComment"/>
+    <!-- Disallow else if in favor of elseif -->
+    <rule ref="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed">
+        <type>error</type>
+    </rule>
+    <!-- Require comma after last element in multi-line array -->
+    <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
+    <!-- Require presence of constant visibility -->
+    <rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility">
+        <properties>
+            <property name="fixable" value="true"/>
+        </properties>
+    </rule>
+    <!-- Forbid uses of multiple traits separated by comma -->
+    <rule ref="SlevomatCodingStandard.Classes.TraitUseDeclaration"/>
+    <!-- Require no spaces before trait use, between trait uses and one space after trait uses -->
+    <rule ref="SlevomatCodingStandard.Classes.TraitUseSpacing">
+        <properties>
+            <property name="linesCountAfterLastUse" value="1"/>
+            <property name="linesCountAfterLastUseWhenLastInClass" value="0"/>
+            <property name="linesCountBeforeFirstUse" value="0"/>
+            <property name="linesCountBetweenUses" value="0"/>
+        </properties>
+    </rule>
+    <!-- Forbid dead code -->
+    <rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements"/>
+    <!-- Forbid useless annotations - Git and LICENCE file provide more accurate information -->
+    <rule ref="SlevomatCodingStandard.Commenting.ForbiddenAnnotations">
+        <properties>
+            <property
+                name="forbiddenAnnotations"
+                type="array"
+                value="
+                    @api,
+                    @author,
+                    @category,
+                    @created,
+                    @package,
+                    @since,
+                    @subpackage,
+                    @version
+                "
+            />
+        </properties>
+    </rule>
+    <!-- Forbid empty comments -->
+    <rule ref="SlevomatCodingStandard.Commenting.EmptyComment"/>
+    <!-- Forbid useless comments -->
+    <rule ref="SlevomatCodingStandard.Commenting.ForbiddenComments">
+        <properties>
+            <property
+                name="forbiddenCommentPatterns"
+                type="array"
+                value="
+                    ~^(?:(?!private|protected|static)\S+ )?(?:con|de)structor\.\z~i,
+                    ~^Created by \S+\.\z~i,
+                    ~^\S+ [gs]etter\.\z~i,
+                " />
+        </properties>
+    </rule>
+    <!-- report invalid format of inline phpDocs with @var -->
+    <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration"/>
+    <!-- Require comments with single line written as one-liners -->
+    <rule ref="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment"/>
+    <!-- Forbid fancy yoda conditions -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison"/>
+    <!-- Forbid weak comparisons -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
+    <!-- Require usage of early exit -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
+    <!-- Require language constructs without parentheses -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses"/>
+    <!-- Require new instances with parentheses -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.NewWithParentheses"/>
+    <!-- Require usage of null coalesce operator when possible -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/>
+    <!-- Forbid useless unreachable catch blocks -->
+    <rule ref="SlevomatCodingStandard.Exceptions.DeadCatch"/>
+    <!-- Require using Throwable instead of Exception -->
+    <rule ref="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly"/>
+    <!-- Forbid unused variables passed to closures via `use` -->
+    <rule ref="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure"/>
+    <!-- Require use statements to be alphabetically sorted -->
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
+    <!-- Forbid fancy group uses -->
+    <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse"/>
+    <!-- Forbid multiple use statements on same line -->
+    <rule ref="SlevomatCodingStandard.Namespaces.MultipleUsesPerLine"/>
+    <!-- Require newlines around namespace declaration -->
+    <rule ref="SlevomatCodingStandard.Namespaces.NamespaceSpacing"/>
+    <!-- Forbid using absolute class name references (except global ones) -->
+    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">
+        <properties>
+            <property name="allowFallbackGlobalConstants" value="false"/>
+            <property name="allowFallbackGlobalFunctions" value="false"/>
+            <property name="allowFullyQualifiedGlobalClasses" value="true"/>
+            <property name="allowFullyQualifiedGlobalConstants" value="false"/>
+            <property name="allowFullyQualifiedGlobalFunctions" value="false"/>
+            <property name="allowFullyQualifiedNameForCollidingClasses" value="true"/>
+            <property name="allowFullyQualifiedNameForCollidingConstants" value="true"/>
+            <property name="allowFullyQualifiedNameForCollidingFunctions" value="true"/>
+            <property name="searchAnnotations" value="true"/>
+        </properties>
+    </rule>
+    <!-- Forbid unused use statements -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+        <properties>
+            <property name="searchAnnotations" value="true"/>
+        </properties>
+    </rule>
+    <!-- Forbid superfluous leading backslash in use statements -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash"/>
+    <!-- Forbid useless uses of the same namespace -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace"/>
+    <!-- Require empty newlines before and after uses -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UseSpacing">
+        <properties>
+            <property name="linesCountAfterLastUse" value="1"/>
+            <property name="linesCountBeforeFirstUse" value="1"/>
+            <property name="linesCountBetweenUseTypes" value="0"/>
+        </properties>
+    </rule>
+    <!-- Forbid useless alias for classes, constants and functions -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UselessAlias"/>
+    <!-- Require the usage of assignment operators, eg `+=`, `.=` when possible -->
+    <rule ref="SlevomatCodingStandard.Operators.RequireCombinedAssignmentOperator"/>
+    <!-- Forbid `list(...)` syntax, use [...] instead -->
+    <rule ref="SlevomatCodingStandard.PHP.ShortList"/>
+    <!-- Forbid use of longhand cast operators -->
+    <rule ref="SlevomatCodingStandard.PHP.TypeCast"/>
+    <!-- Require presence of declare(strict_types=1) -->
+    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
+        <properties>
+            <property
+                name="newlinesCountBetweenOpenTagAndDeclare"
+                value="2"
+            />
+            <property
+                name="spacesCountAroundEqualsSign"
+                value="0"
+            />
+            <property
+                name="newlinesCountAfterDeclare"
+                value="2"
+            />
+        </properties>
+    </rule>
+    <!-- Forbid useless parentheses -->
+    <rule ref="SlevomatCodingStandard.PHP.UselessParentheses"/>
+    <!-- Forbid useless semicolon `;` -->
+    <rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
+    <!-- Require use of short versions of scalar types (i.e. int instead of integer) -->
+    <rule ref="SlevomatCodingStandard.TypeHints.LongTypeHints"/>
+    <!-- Require one space between typehint and variable, require no space between nullability sign and typehint -->
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing"/>
+    <!-- Require space around colon in return types -->
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing">
+        <properties>
+            <property name="spacesCountBeforeColon" value="1"/>
+        </properties>
+    </rule>
+    <!-- Forbid useless @var for constants -->
+    <rule ref="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint"/>
+    <!-- Forbid empty lines around type declarations -->
+    <rule ref="SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces">
+        <properties>
+            <property name="linesCountAfterOpeningBrace" value="0"/>
+            <property name="linesCountBeforeClosingBrace" value="0"/>
+        </properties>
+    </rule>
+    <!-- Forbid useless variables -->
+    <rule ref="SlevomatCodingStandard.Variables.UselessVariable"/>
+    <!-- Forbid spaces around square brackets -->
+    <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
+    <!-- Force array declaration structure -->
+    <rule ref="Squiz.Arrays.ArrayDeclaration">
+        <!-- Disable arrow alignment -->
+        <exclude name="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned"/>
+        <!-- Uses indentation of only single space -->
+        <exclude name="Squiz.Arrays.ArrayDeclaration.KeyNotAligned"/>
+        <!-- Allow multiple values on a single line -->
+        <exclude name="Squiz.Arrays.ArrayDeclaration.SingleLineNotAllowed"/>
+        <!-- Disable alignment of braces -->
+        <exclude name="Squiz.Arrays.ArrayDeclaration.CloseBraceNotAligned"/>
+        <!-- Disable alignment of values with opening brace -->
+        <exclude name="Squiz.Arrays.ArrayDeclaration.ValueNotAligned"/>
+        <!-- Checked by SlevomatCodingStandard.Arrays.TrailingArrayComma.MissingTrailingComma -->
+        <exclude name="Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast"/>
+    </rule>
+    <!-- Forbid class being in a file with different name -->
+    <rule ref="Squiz.Classes.ClassFileName"/>
+    <!-- Force `self::` for self-reference, force lower-case self, forbid spaces around `::` -->
+    <rule ref="Squiz.Classes.SelfMemberReference"/>
+    <!-- Force phpDoc alignment -->
+    <rule ref="Squiz.Commenting.DocCommentAlignment">
+        <!-- Allow extra spaces after star, i.e. for indented annotations -->
+        <exclude name="Squiz.Commenting.DocCommentAlignment.SpaceAfterStar"/>
+    </rule>
+    <!-- Force rules for function phpDoc -->
+    <rule ref="Squiz.Commenting.FunctionComment">
+        <!-- Allow `@throws` without description -->
+        <exclude name="Squiz.Commenting.FunctionComment.EmptyThrows"/>
+        <!-- Does not work properly with PHP 7 / short-named types -->
+        <exclude name="Squiz.Commenting.FunctionComment.IncorrectParamVarName"/>
+        <!-- Does not support collections, i.e. `string[]` -->
+        <exclude name="Squiz.Commenting.FunctionComment.IncorrectTypeHint"/>
+        <!-- Forces incorrect types -->
+        <exclude name="Squiz.Commenting.FunctionComment.InvalidReturn"/>
+        <!-- Breaks with compound return types, i.e. `string|null` -->
+        <exclude name="Squiz.Commenting.FunctionComment.InvalidReturnNotVoid"/>
+        <!-- Breaks when all params are not documented -->
+        <exclude name="Squiz.Commenting.FunctionComment.InvalidTypeHint"/>
+        <!-- Doc comment is not required for every method -->
+        <exclude name="Squiz.Commenting.FunctionComment.Missing"/>
+        <!-- Do not require comments for `@param` -->
+        <exclude name="Squiz.Commenting.FunctionComment.MissingParamComment"/>
+        <!-- Do not require `@param` for all parameters -->
+        <exclude name="Squiz.Commenting.FunctionComment.MissingParamTag"/>
+        <!-- Do not require `@return` for void methods -->
+        <exclude name="Squiz.Commenting.FunctionComment.MissingReturn"/>
+        <!-- Comments don't have to be sentences -->
+        <exclude name="Squiz.Commenting.FunctionComment.ParamCommentFullStop"/>
+        <!-- Comments don't have to be sentences -->
+        <exclude name="Squiz.Commenting.FunctionComment.ParamCommentNotCapital"/>
+        <!-- Breaks when all params are not documented -->
+        <exclude name="Squiz.Commenting.FunctionComment.ParamNameNoMatch"/>
+        <!-- Doesn't respect inheritance -->
+        <exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing"/>
+        <!-- Throws comments can start without a capital and doesn't need a full stop -->
+        <exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop"/>
+        <exclude name="Squiz.Commenting.FunctionComment.ThrowsNotCapital"/>
+        <!-- Doesn't work with self as typehint -->
+        <exclude name="Squiz.Commenting.FunctionComment.TypeHintMissing"/>
+    </rule>
+    <!-- Forbid global functions -->
+    <rule ref="Squiz.Functions.GlobalFunction"/>
+    <!-- Forbid `AND` and `OR`, require `&&` and `||` -->
+    <rule ref="Squiz.Operators.ValidLogicalOperators"/>
+    <!-- Forbid `global` -->
+    <rule ref="Squiz.PHP.GlobalKeyword"/>
+    <!-- Forbid functions inside functions -->
+    <rule ref="Squiz.PHP.InnerFunctions"/>
+    <!-- Require PHP function calls in lowercase -->
+    <rule ref="Squiz.PHP.LowercasePHPFunctions"/>
+    <!-- Forbid dead code -->
+    <rule ref="Squiz.PHP.NonExecutableCode"/>
+    <!-- Forbid `$this` inside static function -->
+    <rule ref="Squiz.Scope.StaticThisUsage"/>
+    <!-- Force whitespace before and after concatenation -->
+    <rule ref="Squiz.Strings.ConcatenationSpacing">
+        <properties>
+            <property name="spacing" value="1"/>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
+    <!-- Forbid strings in `"` unless necessary -->
+    <rule ref="Squiz.Strings.DoubleQuoteUsage"/>
+    <rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
+        <message>Variable "%s" not allowed in double quoted string; use sprintf() or concatenation instead</message>
+    </rule>
+    <!-- Forbid braces around string in `echo` -->
+    <rule ref="Squiz.Strings.EchoedStrings"/>
+    <!-- Forbid spaces in type casts -->
+    <rule ref="Squiz.WhiteSpace.CastSpacing"/>
+    <!-- Forbid blank line after function opening brace -->
+    <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace"/>
+    <!-- Require space after language constructs -->
+    <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
+    <!-- Require space around logical operators -->
+    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
+    <!-- Forbid spaces around `->` operator -->
+    <rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
+    <!-- Forbid spaces before semicolon `;` -->
+    <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
+    <!-- Forbid superfluous whitespaces -->
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
+        <properties>
+            <!-- turned on by PSR2 -> turning back off -->
+            <property name="ignoreBlankLines" value="false"/>
+        </properties>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
+        <!-- turned off by PSR2 -> turning back on -->
+        <severity>5</severity>
+    </rule>
+</ruleset>

From 5863c14c718dea9cb7821119789dcfad63e496cb Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 19:58:23 +0200
Subject: [PATCH 02/60] Allow functions inside functions

---
 src/ZendCodingStandard/ruleset.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index d2feb76e..5e98669c 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -327,8 +327,6 @@
     <rule ref="Squiz.Operators.ValidLogicalOperators"/>
     <!-- Forbid `global` -->
     <rule ref="Squiz.PHP.GlobalKeyword"/>
-    <!-- Forbid functions inside functions -->
-    <rule ref="Squiz.PHP.InnerFunctions"/>
     <!-- Require PHP function calls in lowercase -->
     <rule ref="Squiz.PHP.LowercasePHPFunctions"/>
     <!-- Forbid dead code -->

From 06a5606d26253ed1aea79b63538154acfc8a1316 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 19:58:53 +0200
Subject: [PATCH 03/60] Allow @var for constants

---
 src/ZendCodingStandard/ruleset.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 5e98669c..309b21f7 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -248,8 +248,6 @@
             <property name="spacesCountBeforeColon" value="1"/>
         </properties>
     </rule>
-    <!-- Forbid useless @var for constants -->
-    <rule ref="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint"/>
     <!-- Forbid empty lines around type declarations -->
     <rule ref="SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces">
         <properties>

From d27454daba42a408f3a1b9bbef8e836706d2fe3e Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 19:59:36 +0200
Subject: [PATCH 04/60] Allow @since for noting API additions

---
 src/ZendCodingStandard/ruleset.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 309b21f7..98cb4b9a 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -125,7 +125,6 @@
                     @category,
                     @created,
                     @package,
-                    @since,
                     @subpackage,
                     @version
                 "

From 646eea12ebed33899f30d5ded184e8f41829455a Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 20:00:30 +0200
Subject: [PATCH 05/60] Allow fancy yoda conditions as a defensive programming
 approach

---
 src/ZendCodingStandard/ruleset.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 98cb4b9a..c5ea631c 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -150,8 +150,6 @@
     <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration"/>
     <!-- Require comments with single line written as one-liners -->
     <rule ref="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment"/>
-    <!-- Forbid fancy yoda conditions -->
-    <rule ref="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison"/>
     <!-- Forbid weak comparisons -->
     <rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
     <!-- Require usage of early exit -->

From fa193f3a62538bb8c26105e088f4d8b747e27295 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 20:08:12 +0200
Subject: [PATCH 06/60] Forbid short open tag, but allow short echo tags for
 use in templates

---
 src/ZendCodingStandard/ruleset.xml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index c5ea631c..8c769ab1 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -11,6 +11,8 @@
     <rule ref="Generic.Arrays.ArrayIndent"/>
     <!-- Forbid `array(...)` -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <!-- Forbid backtick operator -->
+    <rule ref="Generic.PHP.BacktickOperator"/>
     <!-- Forbid duplicate classes -->
     <rule ref="Generic.Classes.DuplicateClassName"/>
     <!-- Forbid empty statements -->
@@ -22,6 +24,11 @@
     <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
     <!-- Forbid useless empty method overrides -->
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
+    <!-- Forbid short open tag -->
+    <rule ref="Generic.PHP.DisallowShortOpenTag">
+        <!-- But allow short echo tags -->
+        <exclude name="Generic.PHP.DisallowShortOpenTag.EchoFound"/>
+    </rule>
     <!-- Forbid inline HTML in PHP code -->
     <rule ref="Generic.Files.InlineHTML"/>
     <!-- Align corresponding assignment statement tokens -->
@@ -71,6 +78,11 @@
                 "/>
         </properties>
     </rule>
+    <!-- Force PHP 7 param and return types to be lowercased -->
+    <rule ref="Generic.PHP.LowerCaseType"/>
+    <!-- Forbid `php_sapi_name()` function, use PHP_SAPI -->
+    <rule ref="Generic.PHP.SAPIUsage"/>
+    <!-- Forbid comments starting with # -->
     <!-- Forbid useless inline string concatenation -->
     <rule ref="Generic.Strings.UnnecessaryStringConcat">
         <!-- But multiline is useful for readability -->
@@ -78,15 +90,6 @@
             <property name="allowMultiline" value="true"/>
         </properties>
     </rule>
-    <!-- Forbid backtick operator -->
-    <rule ref="Generic.PHP.BacktickOperator"/>
-    <!-- Forbid short open tag -->
-    <rule ref="Generic.PHP.DisallowShortOpenTag"/>
-    <!-- Forbid `php_sapi_name()` function, use PHP_SAPI -->
-    <rule ref="Generic.PHP.SAPIUsage"/>
-    <!-- Force PHP 7 param and return types to be lowercased -->
-    <rule ref="Generic.PHP.LowerCaseType"/>
-    <!-- Forbid comments starting with # -->
     <rule ref="PEAR.Commenting.InlineComment"/>
     <!-- Disallow else if in favor of elseif -->
     <rule ref="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed">
@@ -143,7 +146,7 @@
                     ~^(?:(?!private|protected|static)\S+ )?(?:con|de)structor\.\z~i,
                     ~^Created by \S+\.\z~i,
                     ~^\S+ [gs]etter\.\z~i,
-                " />
+                "/>
         </properties>
     </rule>
     <!-- report invalid format of inline phpDocs with @var -->

From f1cef3fee456cf3a4b215893e4ef90f52bcc9788 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 22:17:39 +0200
Subject: [PATCH 07/60] Add documentation structure

---
 .gitignore                            |  14 +-
 .travis.yml                           |  55 ++++++++
 LICENSE.md                            |   2 +-
 README.md                             |  15 +-
 composer.json                         |  11 +-
 CONDUCT.md => docs/CODE_OF_CONDUCT.md |   2 +-
 docs/CONTRIBUTING.md                  | 189 ++++++++++++++++++++++++++
 docs/ISSUE_TEMPLATE.md                |  19 +++
 docs/PULL_REQUEST_TEMPLATE.md         |  25 ++++
 docs/SUPPORT.md                       |  25 ++++
 docs/book/index.html                  |   9 ++
 docs/book/index.md                    |   1 +
 docs/book/v1/index.md                 |   1 +
 docs/book/v1/intro.md                 |  51 +++++++
 docs/book/v1/ruleset.md               |   7 +
 docs/book/v2/index.md                 |   1 +
 docs/book/v2/intro.md                 |  51 +++++++
 docs/book/v2/ruleset.md               |  12 ++
 mkdocs.yml                            |  17 +++
 19 files changed, 491 insertions(+), 16 deletions(-)
 create mode 100644 .travis.yml
 rename CONDUCT.md => docs/CODE_OF_CONDUCT.md (96%)
 create mode 100644 docs/CONTRIBUTING.md
 create mode 100644 docs/ISSUE_TEMPLATE.md
 create mode 100644 docs/PULL_REQUEST_TEMPLATE.md
 create mode 100644 docs/SUPPORT.md
 create mode 100644 docs/book/index.html
 create mode 100644 docs/book/index.md
 create mode 100644 docs/book/v1/index.md
 create mode 100644 docs/book/v1/intro.md
 create mode 100644 docs/book/v1/ruleset.md
 create mode 100644 docs/book/v2/index.md
 create mode 100644 docs/book/v2/intro.md
 create mode 100644 docs/book/v2/ruleset.md
 create mode 100644 mkdocs.yml

diff --git a/.gitignore b/.gitignore
index 46946e2b..b185393a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,10 @@
-vendor/
-phpcs.xml
-composer.lock
-phpcs.log
+/clover.xml
+/composer.lock
+/coveralls-upload.json
+/docs/html/
+/phpcs.log
+/phpcs.xml
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..1aeaccab
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,55 @@
+sudo: false
+
+language: php
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+env:
+  global:
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
+
+matrix:
+  include:
+    - php: 7.1
+      env:
+        - DEPS=lowest
+    - php: 7.1
+      env:
+        - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
+    - php: 7.1
+      env:
+        - DEPS=latest
+    - php: 7.2
+      env:
+        - DEPS=lowest
+    - php: 7.2
+      env:
+        - DEPS=locked
+    - php: 7.2
+      env:
+        - DEPS=latest
+
+before_install:
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+
+install:
+  - travis_retry composer install $COMPOSER_ARGS
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - stty cols 120 && composer show
+
+script:
+  - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
+
+after_script:
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
+
+notifications:
+  email: false
diff --git a/LICENSE.md b/LICENSE.md
index badc26ea..67ba2104 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2016, Zend Technologies USA, Inc.
+Copyright (c) 2016-2018, Zend Technologies USA, Inc.
 
 All rights reserved.
 
diff --git a/README.md b/README.md
index 4f0b2e13..c5aec180 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
-Zend Framework Coding Standard
-==============================
+# zend-coding-standard
 
-Repository with all coding standard ruleset for Zend Framework repositories.
+[![Build Status](https://secure.travis-ci.org/zendframework/zend-coding-standard.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-coding-standard)
 
+The coding standard ruleset for Zend Framework components.
 
-Installation
-------------
+## Installation
 
 1. Install the module via composer by running:
 
@@ -27,7 +26,7 @@ Installation
    ```xml
    <?xml version="1.0"?>
    <ruleset name="Zend Framework Coding Standard">
-       <rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>
+       <rule ref="ZendCodingStandard"/>
 
        <!-- Paths to check -->
        <file>config</file>
@@ -39,9 +38,7 @@ Installation
 You can add or exclude some locations in that file.
 For a reference please see: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
 
-
-Usage
------
+## Usage
 
 * To run checks only:
 
diff --git a/composer.json b/composer.json
index 1425db1e..052b3f43 100644
--- a/composer.json
+++ b/composer.json
@@ -2,11 +2,20 @@
     "name": "zendframework/zend-coding-standard",
     "type": "phpcodesniffer-standard",
     "description": "Zend Framework Coding Standard",
+    "license": "BSD-3-Clause",
     "keywords": [
         "zf",
+        "zendframework",
         "coding standard"
     ],
-    "license": "BSD-3-Clause",
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-coding-standard/",
+        "issues": "https://github.com/zendframework/zend-coding-standard/issues",
+        "source": "https://github.com/zendframework/zend-coding-standard",
+        "rss": "https://github.com/zendframework/zend-coding-standard/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
+    },
     "require": {
         "php": "^7.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
diff --git a/CONDUCT.md b/docs/CODE_OF_CONDUCT.md
similarity index 96%
rename from CONDUCT.md
rename to docs/CODE_OF_CONDUCT.md
index c663d2be..02fafcd1 100644
--- a/CONDUCT.md
+++ b/docs/CODE_OF_CONDUCT.md
@@ -1,6 +1,6 @@
 # Contributor Code of Conduct
 
-The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
+This project adheres to [The Code Manifesto](http://codemanifesto.com)
 as its guidelines for contributor interactions.
 
 ## The Code Manifesto
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
new file mode 100644
index 00000000..84009e8a
--- /dev/null
+++ b/docs/CONTRIBUTING.md
@@ -0,0 +1,189 @@
+# CONTRIBUTING
+
+## RESOURCES
+
+If you wish to contribute to this project, please be sure to
+read/subscribe to the following resources:
+
+ - [Coding Standards](https://github.com/zendframework/zend-coding-standard)
+ - [Forums](https://discourse.zendframework.com/c/contributors)
+ - [Chat](https://zendframework-slack.herokuapp.com)
+ - [Code of Conduct](CODE_OF_CONDUCT.md)
+
+If you are working on new features or refactoring
+[create a proposal](https://github.com/zendframework/zend-coding-standard/issues/new).
+
+## RUNNING TESTS
+
+To run tests:
+
+- Clone the repository:
+
+  ```console
+  $ git clone git://github.com/zendframework/zend-coding-standard.git
+  $ cd zend-coding-standard
+  ```
+
+- Install dependencies via composer:
+
+  ```console
+  $ composer install
+  ```
+
+  If you don't have `composer` installed, please download it from https://getcomposer.org/download/
+
+- Run the tests using the "test" command shipped in the `composer.json`:
+
+  ```console
+  $ composer test
+  ```
+
+You can turn on conditional tests with the `phpunit.xml` file.
+To do so:
+
+ -  Copy `phpunit.xml.dist` file to `phpunit.xml`
+ -  Edit `phpunit.xml` to enable any specific functionality you
+    want to test, as well as to provide test values to utilize.
+
+## Running Coding Standards Checks
+
+First, ensure you've installed dependencies via composer, per the previous
+section on running tests.
+
+To run CS checks only:
+
+```console
+$ composer cs-check
+```
+
+To attempt to automatically fix common CS issues:
+
+```console
+$ composer cs-fix
+```
+
+If the above fixes any CS issues, please re-run the tests to ensure
+they pass, and make sure you add and commit the changes after verification.
+
+## Recommended Workflow for Contributions
+
+Your first step is to establish a public repository from which we can
+pull your work into the master repository. We recommend using
+[GitHub](https://github.com), as that is where the component is already hosted.
+
+1. Setup a [GitHub account](https://github.com/), if you haven't yet
+2. Fork the repository (https://github.com/zendframework/zend-coding-standard)
+3. Clone the canonical repository locally and enter it.
+
+   ```console
+   $ git clone git://github.com/zendframework/zend-coding-standard.git
+   $ cd zend-coding-standard
+   ```
+
+4. Add a remote to your fork; substitute your GitHub username in the command
+   below.
+
+   ```console
+   $ git remote add {username} git@github.com:{username}/zend-coding-standard.git
+   $ git fetch {username}
+   ```
+
+### Keeping Up-to-Date
+
+Periodically, you should update your fork or personal repository to
+match the canonical ZF repository. Assuming you have setup your local repository
+per the instructions above, you can do the following:
+
+
+```console
+$ git checkout master
+$ git fetch origin
+$ git rebase origin/master
+# OPTIONALLY, to keep your remote up-to-date -
+$ git push {username} master:master
+```
+
+If you're tracking other branches -- for example, the "develop" branch, where
+new feature development occurs -- you'll want to do the same operations for that
+branch; simply substitute  "develop" for "master".
+
+### Working on a patch
+
+We recommend you do each new feature or bugfix in a new branch. This simplifies
+the task of code review as well as the task of merging your changes into the
+canonical repository.
+
+A typical workflow will then consist of the following:
+
+1. Create a new local branch based off either your master or develop branch.
+2. Switch to your new local branch. (This step can be combined with the
+   previous step with the use of `git checkout -b`.)
+3. Do some work, commit, repeat as necessary.
+4. Push the local branch to your remote repository.
+5. Send a pull request.
+
+The mechanics of this process are actually quite trivial. Below, we will
+create a branch for fixing an issue in the tracker.
+
+```console
+$ git checkout -b hotfix/9295
+Switched to a new branch 'hotfix/9295'
+```
+
+... do some work ...
+
+
+```console
+$ git commit
+```
+
+... write your log message ...
+
+
+```console
+$ git push {username} hotfix/9295:hotfix/9295
+Counting objects: 38, done.
+Delta compression using up to 2 threads.
+Compression objects: 100% (18/18), done.
+Writing objects: 100% (20/20), 8.19KiB, done.
+Total 20 (delta 12), reused 0 (delta 0)
+To ssh://git@github.com/{username}/zend-coding-standard.git
+   b5583aa..4f51698  HEAD -> master
+```
+
+To send a pull request, you have two options.
+
+If using GitHub, you can do the pull request from there. Navigate to
+your repository, select the branch you just created, and then select the
+"Pull Request" button in the upper right. Select the user/organization
+"zendframework" (or whatever the upstream organization is) as the recipient.
+
+#### What branch to issue the pull request against?
+
+Which branch should you issue a pull request against?
+
+- For fixes against the stable release, issue the pull request against the
+  "master" branch.
+- For new features, or fixes that introduce new elements to the public API (such
+  as new public methods or properties), issue the pull request against the
+  "develop" branch.
+
+### Branch Cleanup
+
+As you might imagine, if you are a frequent contributor, you'll start to
+get a ton of branches both locally and on your remote.
+
+Once you know that your changes have been accepted to the master
+repository, we suggest doing some cleanup of these branches.
+
+-  Local branch cleanup
+
+   ```console
+   $ git branch -d <branchname>
+   ```
+
+-  Remote branch removal
+
+   ```console
+   $ git push {username} :<branchname>
+   ```
diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..03ff5a14
--- /dev/null
+++ b/docs/ISSUE_TEMPLATE.md
@@ -0,0 +1,19 @@
+ - [ ] I was not able to find an [open](https://github.com/zendframework/zend-coding-standard/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-coding-standard/issues?q=is%3Aclosed) issue matching what I'm seeing.
+ - [ ] This is not a question. (Questions should be asked on [chat](https://zendframework.slack.com/) ([Signup here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).)
+
+Provide a narrative description of what you are trying to accomplish.
+
+### Code to reproduce the issue
+
+<!-- Please provide the minimum code necessary to recreate the issue -->
+
+```php
+```
+
+### Expected results
+
+<!-- What do you think should have happened? -->
+
+### Actual results
+
+<!-- What did you actually observe? -->
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..f00d90c0
--- /dev/null
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,25 @@
+Provide a narrative description of what you are trying to accomplish:
+
+- [ ] Are you fixing a bug?
+  - [ ] Detail how the bug is invoked currently.
+  - [ ] Detail the original, incorrect behavior.
+  - [ ] Detail the new, expected behavior.
+  - [ ] Base your feature on the `master` branch, and submit against that branch.
+  - [ ] Add a regression test that demonstrates the bug, and proves the fix.
+  - [ ] Add a `CHANGELOG.md` entry for the fix.
+
+- [ ] Are you creating a new feature?
+  - [ ] Why is the new feature needed? What purpose does it serve?
+  - [ ] How will users use the new feature?
+  - [ ] Base your feature on the `develop` branch, and submit against that branch.
+  - [ ] Add only one feature per pull request; split multiple features over multiple pull requests
+  - [ ] Add tests for the new feature.
+  - [ ] Add documentation for the new feature.
+  - [ ] Add a `CHANGELOG.md` entry for the new feature.
+
+- [ ] Is this related to quality assurance?
+  <!-- Detail why the changes are necessary -->
+
+- [ ] Is this related to documentation?
+  <!-- Is it a typographical and/or grammatical fix? -->
+  <!-- Is it new documentation? -->
diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md
new file mode 100644
index 00000000..369891d2
--- /dev/null
+++ b/docs/SUPPORT.md
@@ -0,0 +1,25 @@
+# Getting Support
+
+Zend Framework offers three support channels:
+
+- For real-time questions, use our
+  [chat](https://zendframework-slack.herokuapp.com)
+- For detailed questions (e.g., those requiring examples) use our
+  [forums](https://discourse.zendframework.com/c/questions/components)
+- To report issues, use this repository's
+  [issue tracker](https://github.com/zendframework/zend-coding-standard/issues/new)
+
+**DO NOT** use the issue tracker to ask questions; use chat or the forums for
+that. Questions posed to the issue tracker will be closed.
+
+When reporting an issue, please include the following details:
+
+- A narrative description of what you are trying to accomplish.
+- The minimum code necessary to reproduce the issue.
+- The expected results of exercising that code.
+- The actual results received.
+
+We may ask for additional details: what version of the library you are using,
+and what PHP version was used to reproduce the issue.
+
+You may also submit a failing test case as a pull request.
diff --git a/docs/book/index.html b/docs/book/index.html
new file mode 100644
index 00000000..ac90049e
--- /dev/null
+++ b/docs/book/index.html
@@ -0,0 +1,9 @@
+<div class="container">
+  <div class="jumbotron">
+    <h1>zend-coding-standard</h1>
+
+    <p>The coding standard ruleset for Zend Framework components.</p>
+
+    <pre><code class="language-bash">$ composer require zendframework/zend-coding-standard</code></pre>
+  </div>
+</div>
diff --git a/docs/book/index.md b/docs/book/index.md
new file mode 100644
index 00000000..fe840054
--- /dev/null
+++ b/docs/book/index.md
@@ -0,0 +1 @@
+../../README.md
\ No newline at end of file
diff --git a/docs/book/v1/index.md b/docs/book/v1/index.md
new file mode 100644
index 00000000..97635fa6
--- /dev/null
+++ b/docs/book/v1/index.md
@@ -0,0 +1 @@
+# The coding standard ruleset for Zend Framework components
diff --git a/docs/book/v1/intro.md b/docs/book/v1/intro.md
new file mode 100644
index 00000000..4a512141
--- /dev/null
+++ b/docs/book/v1/intro.md
@@ -0,0 +1,51 @@
+# zend-coding-standard
+
+This component provides the coding standard ruleset for Zend Framework components.
+
+## Installation
+
+1. Install the module via composer by running:
+
+   ```bash
+   $ composer require --dev zendframework/zend-coding-standard
+   ```
+
+2. Add composer scripts into your `composer.json`:
+
+   ```json
+   "scripts": {
+     "cs-check": "phpcs",
+     "cs-fix": "phpcbf"
+   }
+   ```
+
+3. Create file `phpcs.xml` on base path of your repository with content:
+
+   ```xml
+   <?xml version="1.0"?>
+   <ruleset name="Zend Framework Coding Standard">
+       <rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>
+
+       <!-- Paths to check -->
+       <file>config</file>
+       <file>src</file>
+       <file>test</file>
+   </ruleset>
+   ```
+
+You can add or exclude some locations in that file.
+For a reference please see: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
+
+## Usage
+
+* To run checks only:
+
+  ```bash
+  $ composer cs-check
+  ```
+
+* To automatically fix many CS issues:
+
+  ```bash
+  $ composer cs-fix
+  ```
diff --git a/docs/book/v1/ruleset.md b/docs/book/v1/ruleset.md
new file mode 100644
index 00000000..a012f055
--- /dev/null
+++ b/docs/book/v1/ruleset.md
@@ -0,0 +1,7 @@
+# Ruleset
+
+- PSR-2
+- Disallow long array syntax
+- Space after not operator
+- Whitespace around operators
+- Disallow superfluous whitespace
diff --git a/docs/book/v2/index.md b/docs/book/v2/index.md
new file mode 100644
index 00000000..97635fa6
--- /dev/null
+++ b/docs/book/v2/index.md
@@ -0,0 +1 @@
+# The coding standard ruleset for Zend Framework components
diff --git a/docs/book/v2/intro.md b/docs/book/v2/intro.md
new file mode 100644
index 00000000..f1f860fe
--- /dev/null
+++ b/docs/book/v2/intro.md
@@ -0,0 +1,51 @@
+# zend-coding-standard
+
+This component provides the coding standard ruleset for Zend Framework components.
+
+## Installation
+
+1. Install the module via composer by running:
+
+   ```bash
+   $ composer require --dev zendframework/zend-coding-standard
+   ```
+
+2. Add composer scripts into your `composer.json`:
+
+   ```json
+   "scripts": {
+     "cs-check": "phpcs",
+     "cs-fix": "phpcbf"
+   }
+   ```
+
+3. Create file `phpcs.xml` on base path of your repository with content:
+
+   ```xml
+   <?xml version="1.0"?>
+   <ruleset name="Zend Framework Coding Standard">
+       <rule ref="ZendCodingStandard"/>
+
+       <!-- Paths to check -->
+       <file>config</file>
+       <file>src</file>
+       <file>test</file>
+   </ruleset>
+   ```
+
+You can add or exclude some locations in that file.
+For a reference please see: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
+
+## Usage
+
+* To run checks only:
+
+  ```bash
+  $ composer cs-check
+  ```
+
+* To automatically fix many CS issues:
+
+  ```bash
+  $ composer cs-fix
+  ```
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
new file mode 100644
index 00000000..cadc5dd6
--- /dev/null
+++ b/docs/book/v2/ruleset.md
@@ -0,0 +1,12 @@
+# Ruleset
+
+- PSR-2
+- Disallow long array syntax
+- Space after not operator
+- Whitespace around operators
+- Disallow superfluous whitespace
+- 
+- 
+- TODO
+- 
+- 
diff --git a/mkdocs.yml b/mkdocs.yml
new file mode 100644
index 00000000..1121fa69
--- /dev/null
+++ b/mkdocs.yml
@@ -0,0 +1,17 @@
+docs_dir: docs/book
+site_dir: docs/html
+pages:
+    - index.md
+    - 'Introduction': v2/intro.md
+    - Reference:
+        - 'Ruleset': v2/ruleset.md
+    - v1:
+        - v1/index.md
+        - 'Introduction': v1/intro.md
+        - Reference:
+            - 'Ruleset': v1/ruleset.md
+
+site_name: Zend Coding Standard
+site_description: 'The coding standard ruleset for Zend Framework components.'
+repo_url: 'https://github.com/zendframework/zend-coding-standard'
+copyright: 'Copyright (c) 2016-2018 <a href="https://www.zend.com/">Zend Technologies USA Inc.</a>'

From 911065a40ad17a98eed229a7dd4d8a85efeb444f Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 22:28:07 +0200
Subject: [PATCH 08/60] Use xmllint to validate against schema

---
 .travis.yml | 66 +++++++++++++++++++----------------------------------
 1 file changed, 24 insertions(+), 42 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1aeaccab..ba5bda84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,55 +1,37 @@
+dist: trusty
 sudo: false
-
 language: php
 
+php:
+- 7.1
+- 7.2
+- nightly
+
 cache:
   directories:
-    - $HOME/.composer/cache
-
-env:
-  global:
-    - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="php-coveralls/php-coveralls"
-
-matrix:
-  include:
-    - php: 7.1
-      env:
-        - DEPS=lowest
-    - php: 7.1
-      env:
-        - DEPS=locked
-        - CS_CHECK=true
-        - TEST_COVERAGE=true
-    - php: 7.1
-      env:
-        - DEPS=latest
-    - php: 7.2
-      env:
-        - DEPS=lowest
-    - php: 7.2
-      env:
-        - DEPS=locked
-    - php: 7.2
-      env:
-        - DEPS=latest
+  - $HOME/.composer/cache
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+- phpenv config-rm xdebug.ini
+- composer self-update
+
+install: travis_retry composer update --prefer-dist
 
-install:
-  - travis_retry composer install $COMPOSER_ARGS
-  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
-  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
-  - stty cols 120 && composer show
+stages:
+- Validate against schema
+- Test
 
-script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
-  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
+jobs:
+  allow_failures:
+  - php: nightly
 
-after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
+  include:
+  - stage: Validate against schema
+    addons:
+      apt:
+        packages:
+        - libxml2-utils
+    script: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd src/ZendCodingStandard/ruleset.xml
 
 notifications:
   email: false

From 365acdfdc42e2bc43220258fd5110424d185208a Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 22:33:49 +0200
Subject: [PATCH 09/60] Remove copyright in mkdocs config as it's not being
 used anymore

---
 mkdocs.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 1121fa69..2a3dffe7 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -14,4 +14,3 @@ pages:
 site_name: Zend Coding Standard
 site_description: 'The coding standard ruleset for Zend Framework components.'
 repo_url: 'https://github.com/zendframework/zend-coding-standard'
-copyright: 'Copyright (c) 2016-2018 <a href="https://www.zend.com/">Zend Technologies USA Inc.</a>'

From b3146a6cc285013107ccceec83eea0420bd6c2d4 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 22:34:50 +0200
Subject: [PATCH 10/60] Remove index.html because it's generated by the theme

---
 docs/book/index.html | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 docs/book/index.html

diff --git a/docs/book/index.html b/docs/book/index.html
deleted file mode 100644
index ac90049e..00000000
--- a/docs/book/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="container">
-  <div class="jumbotron">
-    <h1>zend-coding-standard</h1>
-
-    <p>The coding standard ruleset for Zend Framework components.</p>
-
-    <pre><code class="language-bash">$ composer require zendframework/zend-coding-standard</code></pre>
-  </div>
-</div>

From 5c86655d6828803f2dff7d561b922ae282dac15a Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 5 Sep 2018 22:36:08 +0200
Subject: [PATCH 11/60] Disable phpunit tests until there is something to test

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ba5bda84..89443ac2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ install: travis_retry composer update --prefer-dist
 
 stages:
 - Validate against schema
-- Test
 
 jobs:
   allow_failures:

From ce7ae4af253be95899923f3e55a5bac61ae765e5 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 10:49:21 +0200
Subject: [PATCH 12/60] Use PSR-12 compatible imports

---
 src/ZendCodingStandard/ruleset.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 8c769ab1..abe8a7d5 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -82,7 +82,6 @@
     <rule ref="Generic.PHP.LowerCaseType"/>
     <!-- Forbid `php_sapi_name()` function, use PHP_SAPI -->
     <rule ref="Generic.PHP.SAPIUsage"/>
-    <!-- Forbid comments starting with # -->
     <!-- Forbid useless inline string concatenation -->
     <rule ref="Generic.Strings.UnnecessaryStringConcat">
         <!-- But multiline is useful for readability -->
@@ -90,6 +89,7 @@
             <property name="allowMultiline" value="true"/>
         </properties>
     </rule>
+    <!-- Forbid comments starting with # -->
     <rule ref="PEAR.Commenting.InlineComment"/>
     <!-- Disallow else if in favor of elseif -->
     <rule ref="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed">
@@ -170,7 +170,11 @@
     <!-- Forbid unused variables passed to closures via `use` -->
     <rule ref="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure"/>
     <!-- Require use statements to be alphabetically sorted -->
-    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
+        <properties>
+            <property name="psr12Compatible" value="true"/>
+        </properties>
+    </rule>
     <!-- Forbid fancy group uses -->
     <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse"/>
     <!-- Forbid multiple use statements on same line -->
@@ -206,7 +210,7 @@
         <properties>
             <property name="linesCountAfterLastUse" value="1"/>
             <property name="linesCountBeforeFirstUse" value="1"/>
-            <property name="linesCountBetweenUseTypes" value="0"/>
+            <property name="linesCountBetweenUseTypes" value="1"/>
         </properties>
     </rule>
     <!-- Forbid useless alias for classes, constants and functions -->

From 3f602fa1573118579454a8a314689a0ef4240963 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 10:51:48 +0200
Subject: [PATCH 13/60] Add rules to documentation

This is a very long list with a lot of useless info. Maybe a PHP-FIG
PSR-2 style guide is better.
---
 docs/book/v1/ruleset.md |  19 ++-
 docs/book/v2/ruleset.md | 363 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 367 insertions(+), 15 deletions(-)

diff --git a/docs/book/v1/ruleset.md b/docs/book/v1/ruleset.md
index a012f055..0e39c371 100644
--- a/docs/book/v1/ruleset.md
+++ b/docs/book/v1/ruleset.md
@@ -1,7 +1,16 @@
 # Ruleset
 
-- PSR-2
-- Disallow long array syntax
-- Space after not operator
-- Whitespace around operators
-- Disallow superfluous whitespace
+## Use PSR-2 coding standard as a base
+*PSR2*
+
+## Disallow long array syntax
+*Generic.Arrays.DisallowLongArraySyntax*
+
+## Force whitespace after `!`
+*Generic.Formatting.SpaceAfterNot*
+
+## Forbid spaces before semicolon `;`
+*Squiz.WhiteSpace.SemicolonSpacing*
+
+## Forbid superfluous whitespaces
+*Squiz.WhiteSpace.SuperfluousWhitespace, Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines*
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index cadc5dd6..e6a521d9 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -1,12 +1,355 @@
 # Ruleset
 
-- PSR-2
-- Disallow long array syntax
-- Space after not operator
-- Whitespace around operators
-- Disallow superfluous whitespace
-- 
-- 
-- TODO
-- 
-- 
+## Use PSR-2 coding standard as a base
+*PSR2*
+
+## Force array element indentation with 4 spaces
+*Generic.Arrays.ArrayIndent*
+
+## Forbid `array(...)`
+*Generic.Arrays.DisallowLongArraySyntax*
+
+## Forbid backtick operator
+*Generic.PHP.BacktickOperator*
+
+## Forbid duplicate classes
+*Generic.Classes.DuplicateClassName*
+
+## Forbid empty statements, but allow empty catch
+*Generic.CodeAnalysis.EmptyStatement, Generic.CodeAnalysis.EmptyStatement.DetectedCatch*
+
+## Forbid final methods in final classes
+*Generic.CodeAnalysis.UnnecessaryFinalModifier*
+
+## Forbid useless empty method overrides
+*Generic.CodeAnalysis.UselessOverridingMethod*
+
+## Forbid short open tag, but allow short echo tags
+*Generic.PHP.DisallowShortOpenTag*
+
+## Forbid inline HTML in PHP code
+*Generic.Files.InlineHTML*
+
+## Align corresponding assignment statement tokens
+*Generic.Formatting.MultipleStatementAlignment*
+
+## Force whitespace after a type cast
+*Generic.Formatting.SpaceAfterCast*
+
+## Force whitespace after `!`
+*Generic.Formatting.SpaceAfterNot*
+
+## Forbid PHP 4 constructors
+*Generic.NamingConventions.ConstructorName*
+
+## Forbid any content before opening tag
+*Generic.PHP.CharacterBeforePHPOpeningTag*
+
+## Forbid deprecated functions
+*Generic.PHP.DeprecatedFunctions*
+
+## Forbid alias functions, i.e. `sizeof()`, `delete()`
+*Generic.PHP.ForbiddenFunctions*
+    <properties>
+        <property
+            name="forbiddenFunctions"
+            type="array"
+            value="
+                chop => rtrim,
+                close => closedir,
+                compact => null,
+                delete => unset,
+                doubleval => floatval,
+                extract => null,
+                fputs => fwrite,
+                ini_alter => ini_set,
+                is_double => is_float,
+                is_integer => is_int,
+                is_long => is_int,
+                is_null => null,
+                is_real => is_float,
+                is_writeable => is_writable,
+                join => implode,
+                key_exists => array_key_exists,
+                pos => current,
+                settype => null,
+                show_source => highlight_file,
+                sizeof => count,
+                strchr => strstr
+            *
+    </properties>
+</rule>
+
+## Force PHP 7 param and return types to be lowercased
+*Generic.PHP.LowerCaseType*
+
+## Forbid `php_sapi_name()` function, use PHP_SAPI
+*Generic.PHP.SAPIUsage*
+
+## Forbid inline string concatenation, unless used in multiline for readability
+*Generic.Strings.UnnecessaryStringConcat*
+
+## Forbid comments starting with #
+*PEAR.Commenting.InlineComment*
+
+## Disallow else if in favor of elseif
+*PSR2.ControlStructures.ElseIfDeclaration.NotAllowed*
+
+## Require comma after last element in multi-line array
+*SlevomatCodingStandard.Arrays.TrailingArrayComma*
+
+## Require presence of constant visibility
+*SlevomatCodingStandard.Classes.ClassConstantVisibility*
+
+## Forbid uses of multiple traits separated by comma
+*SlevomatCodingStandard.Classes.TraitUseDeclaration*
+
+## Require no spaces before trait use, between trait uses and one space after trait uses
+
+## Forbid dead code
+*SlevomatCodingStandard.Classes.UnusedPrivateElements*
+
+## Forbid useless annotations
+*SlevomatCodingStandard.Commenting.ForbiddenAnnotations*
+
+Git commits provide accurate information for these forbidden annotations: @api, @author, @category, @created, @package, @subpackage, @version.
+
+## Forbid empty comments
+*SlevomatCodingStandard.Commenting.EmptyComment*
+
+## Forbid useless comments
+*SlevomatCodingStandard.Commenting.ForbiddenComments*
+
+Forbidden comments words: private, protected, static, constructor, deconstructor, Created by, getter, setter.
+
+## report invalid format of inline phpDocs with @var
+*SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration*
+
+## Require comments with single line written as one-liners
+*SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment*
+
+```
+/**
+ * @var array
+ */
+private $foo;
+```
+
+Should be written as
+
+```
+/** @var array */
+private $foo;
+```
+
+## Forbid weak comparisons
+*SlevomatCodingStandard.ControlStructures.DisallowEqualOperators*
+
+## Require usage of early exit
+*SlevomatCodingStandard.ControlStructures.EarlyExit*
+
+## Require language constructs without parentheses
+*SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses*
+
+## Require new instances with parentheses
+*SlevomatCodingStandard.ControlStructures.NewWithParentheses*
+
+## Require usage of null coalesce operator when possible
+*SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator*
+
+Use `$foo = $bar['id'] ?? '1';` where possbile.
+
+## Forbid useless unreachable catch blocks
+*SlevomatCodingStandard.Exceptions.DeadCatch*
+
+## Require using Throwable instead of Exception
+*SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly*
+
+## Forbid unused variables passed to closures via `use`
+*SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure*
+
+## Require use statements to be alphabetically sorted
+*SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses*
+
+## Forbid fancy group uses
+*SlevomatCodingStandard.Namespaces.DisallowGroupUse*
+
+## Forbid multiple use statements on same line
+*SlevomatCodingStandard.Namespaces.MultipleUsesPerLine*
+
+## Require newlines around namespace declaration
+*SlevomatCodingStandard.Namespaces.NamespaceSpacing*
+
+## Forbid using absolute class name references (except global ones)
+*SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly*
+
+## Forbid unused use statements
+*SlevomatCodingStandard.Namespaces.UnusedUses*
+
+## Forbid superfluous leading backslash in use statements
+*SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash*
+
+## Forbid useless uses of the same namespace
+*SlevomatCodingStandard.Namespaces.UseFromSameNamespace*
+
+## Require empty newlines before and after uses
+*SlevomatCodingStandard.Namespaces.UseSpacing*
+
+## Forbid useless alias for classes, constants and functions
+*SlevomatCodingStandard.Namespaces.UselessAlias*
+
+## Require the usage of assignment operators, eg `+=`, `.=` when possible
+*SlevomatCodingStandard.Operators.RequireCombinedAssignmentOperator*
+
+## Forbid `list(...)` syntax, use [...] instead
+*SlevomatCodingStandard.PHP.ShortList*
+
+## Forbid use of longhand cast operators
+*SlevomatCodingStandard.PHP.TypeCast*
+
+## Require presence of declare(strict_types=1)
+*SlevomatCodingStandard.TypeHints.DeclareStrictTypes*
+
+## Forbid useless parentheses
+*SlevomatCodingStandard.PHP.UselessParentheses*
+
+## Forbid useless semicolon `;`
+*SlevomatCodingStandard.PHP.UselessSemicolon*
+
+## Require use of short versions of scalar types (i.e. int instead of integer)
+*SlevomatCodingStandard.TypeHints.LongTypeHints*
+
+## Require one space between typehint and variable, require no space between nullability sign and typehint
+*SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing*
+
+## Require space around colon in return types
+*SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing*
+
+```php
+public function foo($bar) : array;
+```
+
+## Forbid empty lines around type declarations
+*SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces*
+
+## Forbid useless variables
+*SlevomatCodingStandard.Variables.UselessVariable*
+
+## Forbid spaces around square brackets
+*Squiz.Arrays.ArrayBracketSpacing*
+
+## Force array declaration structure
+*Squiz.Arrays.ArrayDeclaration*
+
+```php
+return [
+    ConfigAggregator::ENABLE_CACHE => true,
+    'debug'                        => false,
+    'zend-expressive' => [
+        'raise_throwables'      => true,
+        'programmatic_pipeline' => true,
+        'error_handler'         => [
+            'template_404'   => 'error::404',
+            'template_error' => 'error::error',
+        ],
+    ],
+];
+```
+
+## Forbid class being in a file with different name
+*Squiz.Classes.ClassFileName*
+
+## Force `self::` for self-reference, force lower-case self, forbid spaces around `::`
+*Squiz.Classes.SelfMemberReference*
+
+```php
+$foo = self::fromPayload($payload);
+```
+
+## Force phpDoc alignment
+*Squiz.Commenting.DocCommentAlignment*
+
+## Force rules for function phpDoc
+*Squiz.Commenting.FunctionComment*
+
+    ## Allow `@throws` without description
+    <exclude name="Squiz.Commenting.FunctionComment.EmptyThrows*
+    ## Does not work properly with PHP 7 / short-named types
+    <exclude name="Squiz.Commenting.FunctionComment.IncorrectParamVarName*
+    ## Does not support collections, i.e. `string[]`
+    <exclude name="Squiz.Commenting.FunctionComment.IncorrectTypeHint*
+    ## Forces incorrect types
+    <exclude name="Squiz.Commenting.FunctionComment.InvalidReturn*
+    ## Breaks with compound return types, i.e. `string|null`
+    <exclude name="Squiz.Commenting.FunctionComment.InvalidReturnNotVoid*
+    ## Breaks when all params are not documented
+    <exclude name="Squiz.Commenting.FunctionComment.InvalidTypeHint*
+    ## Doc comment is not required for every method
+    <exclude name="Squiz.Commenting.FunctionComment.Missing*
+    ## Do not require comments for `@param`
+    <exclude name="Squiz.Commenting.FunctionComment.MissingParamComment*
+    ## Do not require `@param` for all parameters
+    <exclude name="Squiz.Commenting.FunctionComment.MissingParamTag*
+    ## Do not require `@return` for void methods
+    <exclude name="Squiz.Commenting.FunctionComment.MissingReturn*
+    ## Comments don't have to be sentences
+    <exclude name="Squiz.Commenting.FunctionComment.ParamCommentFullStop*
+    ## Comments don't have to be sentences
+    <exclude name="Squiz.Commenting.FunctionComment.ParamCommentNotCapital*
+    ## Breaks when all params are not documented
+    <exclude name="Squiz.Commenting.FunctionComment.ParamNameNoMatch*
+    ## Doesn't respect inheritance
+    <exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing*
+    ## Throws comments can start without a capital and doesn't need a full stop
+    <exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop*
+    <exclude name="Squiz.Commenting.FunctionComment.ThrowsNotCapital*
+    ## Doesn't work with self as typehint
+    <exclude name="Squiz.Commenting.FunctionComment.TypeHintMissing*
+
+## Forbid global functions
+*Squiz.Functions.GlobalFunction*
+
+## Forbid `AND` and `OR`, require `&&` and `||`
+*Squiz.Operators.ValidLogicalOperators*
+
+## Forbid `global`
+*Squiz.PHP.GlobalKeyword*
+
+## Require PHP function calls in lowercase
+*Squiz.PHP.LowercasePHPFunctions*
+
+## Forbid dead code
+*Squiz.PHP.NonExecutableCode*
+
+## Forbid `$this` inside static function
+*Squiz.Scope.StaticThisUsage*
+
+## Force whitespace before and after concatenation
+*Squiz.Strings.ConcatenationSpacing*
+
+## Forbid strings in `"` unless necessary
+*Squiz.Strings.DoubleQuoteUsage, Squiz.Strings.DoubleQuoteUsage.ContainsVar*
+
+## Forbid braces around string in `echo`
+*Squiz.Strings.EchoedStrings*
+
+## Forbid spaces in type casts
+*Squiz.WhiteSpace.CastSpacing*
+
+## Forbid blank line after function opening brace
+*Squiz.WhiteSpace.FunctionOpeningBraceSpace*
+
+## Require space after language constructs
+*Squiz.WhiteSpace.LanguageConstructSpacing*
+
+## Require space around logical operators
+*Squiz.WhiteSpace.LogicalOperatorSpacing*
+
+## Forbid spaces around `->` operator
+*Squiz.WhiteSpace.ObjectOperatorSpacing*
+
+## Forbid spaces before semicolon `;`
+*Squiz.WhiteSpace.SemicolonSpacing*
+
+## Forbid superfluous whitespaces
+*Squiz.WhiteSpace.SuperfluousWhitespace, Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines*

From 39ba67a81de9f7bd3d5be59d0f9ecc3b2a61ad5e Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 13:33:27 +0200
Subject: [PATCH 14/60] Add some test cases

---
 .travis.yml                     | 27 +++++-----
 composer.json                   |  7 ++-
 docs/book/v2/ruleset.md         |  2 +-
 phpcs.xml.dist                  | 16 ++++++
 test/ArraysAndIndentation.php   | 40 ++++++++++++++
 test/Assets/AbstractFoo.php     |  9 ++++
 test/Assets/Foo.php             | 17 ++++++
 test/Assets/FooInterface.php    | 12 +++++
 test/ClassReferences.php        | 28 ++++++++++
 test/ExampleClass.php           | 92 +++++++++++++++++++++++++++++++++
 test/LowCaseTypes.php           | 18 +++++++
 test/PropertiesAndConstants.php | 27 ++++++++++
 12 files changed, 281 insertions(+), 14 deletions(-)
 create mode 100644 phpcs.xml.dist
 create mode 100644 test/ArraysAndIndentation.php
 create mode 100644 test/Assets/AbstractFoo.php
 create mode 100644 test/Assets/Foo.php
 create mode 100644 test/Assets/FooInterface.php
 create mode 100644 test/ClassReferences.php
 create mode 100644 test/ExampleClass.php
 create mode 100644 test/LowCaseTypes.php
 create mode 100644 test/PropertiesAndConstants.php

diff --git a/.travis.yml b/.travis.yml
index 89443ac2..c1ec680a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-dist: trusty
 sudo: false
 language: php
 
@@ -9,28 +8,32 @@ php:
 
 cache:
   directories:
-  - $HOME/.composer/cache
+    - $HOME/.composer/cache
 
 before_install:
-- phpenv config-rm xdebug.ini
-- composer self-update
+  - phpenv config-rm xdebug.ini
+  - composer self-update
 
 install: travis_retry composer update --prefer-dist
 
+script:
+  - vendor/bin/phpcs
+
 stages:
-- Validate against schema
+  - Validate against schema
+  - Test
 
 jobs:
   allow_failures:
-  - php: nightly
+    - php: nightly
 
   include:
-  - stage: Validate against schema
-    addons:
-      apt:
-        packages:
-        - libxml2-utils
-    script: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd src/ZendCodingStandard/ruleset.xml
+    - stage: Validate against schema
+      addons:
+        apt:
+          packages:
+          - libxml2-utils
+      script: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd src/ZendCodingStandard/ruleset.xml
 
 notifications:
   email: false
diff --git a/composer.json b/composer.json
index 052b3f43..97c8564d 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,12 @@
     },
     "autoload": {
         "psr-4": {
-            "ZendCodingStandard\\Sniffs\\": "src/ZendCodingStandard/Sniffs"
+            "ZendCodingStandard\\": "src/ZendCodingStandard"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ZendCodingStandardTest\\": "test/"
         }
     }
 }
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index e6a521d9..8f8c1289 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -50,6 +50,7 @@
 
 ## Forbid alias functions, i.e. `sizeof()`, `delete()`
 *Generic.PHP.ForbiddenFunctions*
+
     <properties>
         <property
             name="forbiddenFunctions"
@@ -78,7 +79,6 @@
                 strchr => strstr
             *
     </properties>
-</rule>
 
 ## Force PHP 7 param and return types to be lowercased
 *Generic.PHP.LowerCaseType*
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
new file mode 100644
index 00000000..8383b224
--- /dev/null
+++ b/phpcs.xml.dist
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset name="PHPCS Coding Standards for ZendCodingStandard"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
+    <description>The coding standard for ZendCodingStandard itself.</description>
+
+    <arg name="basepath" value="."/>
+    <arg name="extensions" value="php"/>
+    <arg name="colors"/>
+    <arg value="p"/>
+
+    <rule ref="ZendCodingStandard"/>
+
+    <file>src</file>
+    <file>test</file>
+</ruleset>
diff --git a/test/ArraysAndIndentation.php b/test/ArraysAndIndentation.php
new file mode 100644
index 00000000..747353db
--- /dev/null
+++ b/test/ArraysAndIndentation.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZendCodingStandardTest\Fixed;
+
+class ArraysAndIndentation
+{
+    public function array() : array
+    {
+        return [
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+        ];
+    }
+
+    public function singleLineArray() : array
+    {
+        return [1 => 2];
+    }
+
+    public function multiArray() : array
+    {
+        return [
+            '0' => [
+                '2' => 2,
+                1   => '1',
+            ],
+            4   => [
+                7,
+                8,
+                9,
+            ],
+        ];
+    }
+}
diff --git a/test/Assets/AbstractFoo.php b/test/Assets/AbstractFoo.php
new file mode 100644
index 00000000..8cd6fd0f
--- /dev/null
+++ b/test/Assets/AbstractFoo.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZendCodingStandardTest\Fixed;
+
+abstract class AbstractFoo
+{
+}
diff --git a/test/Assets/Foo.php b/test/Assets/Foo.php
new file mode 100644
index 00000000..438a0578
--- /dev/null
+++ b/test/Assets/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZendCodingStandardTest\Fixed;
+
+class Foo extends AbstractFoo implements FooInterface
+{
+    public function bar() : void
+    {
+    }
+
+    public static function baz() : array
+    {
+        return [];
+    }
+}
diff --git a/test/Assets/FooInterface.php b/test/Assets/FooInterface.php
new file mode 100644
index 00000000..5a610ab7
--- /dev/null
+++ b/test/Assets/FooInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZendCodingStandardTest\Fixed;
+
+interface FooInterface
+{
+    public function bar() : void;
+
+    public static function baz() : array;
+}
diff --git a/test/ClassReferences.php b/test/ClassReferences.php
new file mode 100644
index 00000000..08033dae
--- /dev/null
+++ b/test/ClassReferences.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZendCodingStandardTest\Fixed;
+
+use stdClass;
+
+use function get_called_class;
+use function get_class;
+use function get_parent_class;
+
+class ClassReferences
+{
+    /**
+     * @return string[]
+     */
+    public function names() : iterable
+    {
+        yield __CLASS__;
+        yield get_class();
+        yield get_class($this);
+        yield get_class(new stdClass());
+        yield get_parent_class();
+        yield get_called_class();
+        yield static::class;
+    }
+}
diff --git a/test/ExampleClass.php b/test/ExampleClass.php
new file mode 100644
index 00000000..b106e501
--- /dev/null
+++ b/test/ExampleClass.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * This file contains an example of coding styles.
+ */
+
+declare(strict_types=1);
+
+namespace ZendCodingStandardTest;
+
+use ArrayIterator;
+use InvalidArgumentException;
+use IteratorAggregate;
+
+use function assert;
+use function strlen as stringLength;
+use function substr;
+
+use const PHP_MINOR_VERSION;
+use const PHP_RELEASE_VERSION as PHP_PATCH_VERSION;
+use const PHP_VERSION;
+
+/**
+ * Description
+ */
+class ExampleClass implements IteratorAggregate
+{
+    private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
+
+    /** @var int|null */
+    private $foo;
+
+    /** @var string[] */
+    private $bar;
+
+    /** @var bool */
+    private $baz;
+
+    /** @var int|string|null */
+    private $baxBax;
+
+    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
+    {
+        $this->foo    = $foo;
+        $this->bar    = $bar;
+        $this->baz    = $baz;
+        $this->baxBax = $baxBax;
+    }
+
+    /**
+     * Description
+     */
+    public function getFoo() : ?int
+    {
+        return $this->foo;
+    }
+
+    /**
+     * @return iterable
+     */
+    public function getIterator() : array
+    {
+        assert($this->bar !== null);
+
+        return new ArrayIterator($this->bar);
+    }
+
+    public function isBaz() : bool
+    {
+        [$foo, $bar, $baz] = $this->bar;
+
+        return $this->baz;
+    }
+
+    public function mangleBar(int $length) : void
+    {
+        if (! $this->baz) {
+            throw new InvalidArgumentException('Error message');
+        }
+        $this->bar = (string) $this->baxBax ?? substr($this->bar, stringLength($this->bar - $length));
+    }
+
+    public static function getMinorVersion() : int
+    {
+        return self::VERSION;
+    }
+
+    public static function getTestCase() : TestCase
+    {
+        return new TestCase();
+    }
+}
diff --git a/test/LowCaseTypes.php b/test/LowCaseTypes.php
new file mode 100644
index 00000000..3f6478fe
--- /dev/null
+++ b/test/LowCaseTypes.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZendCodingStandardTest;
+
+class LowCaseTypes
+{
+    public function stringToInt(string $string) : int
+    {
+        return (int) $string;
+    }
+
+    public function returnString() : string
+    {
+        return 'foo';
+    }
+}
diff --git a/test/PropertiesAndConstants.php b/test/PropertiesAndConstants.php
new file mode 100644
index 00000000..c158eb8d
--- /dev/null
+++ b/test/PropertiesAndConstants.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ZendCodingStandardTest;
+
+class PropertiesAndConstants
+{
+    /** @var string */
+    public const FOO = 'bar';
+
+    /** @var string */
+    public $bar;
+
+    /** @var bool */
+    private $baz;
+
+    public function __construct(bool $baz)
+    {
+        $this->baz = $baz;
+    }
+
+    public function bar() : bool
+    {
+        return $this->baz;
+    }
+}

From e9d9a2d696652e3f63e1606230aa3a73501709ed Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 14:12:42 +0200
Subject: [PATCH 15/60] Update docs for alias functions

---
 docs/book/v2/ruleset.md | 52 +++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index 8f8c1289..32558058 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -51,34 +51,30 @@
 ## Forbid alias functions, i.e. `sizeof()`, `delete()`
 *Generic.PHP.ForbiddenFunctions*
 
-    <properties>
-        <property
-            name="forbiddenFunctions"
-            type="array"
-            value="
-                chop => rtrim,
-                close => closedir,
-                compact => null,
-                delete => unset,
-                doubleval => floatval,
-                extract => null,
-                fputs => fwrite,
-                ini_alter => ini_set,
-                is_double => is_float,
-                is_integer => is_int,
-                is_long => is_int,
-                is_null => null,
-                is_real => is_float,
-                is_writeable => is_writable,
-                join => implode,
-                key_exists => array_key_exists,
-                pos => current,
-                settype => null,
-                show_source => highlight_file,
-                sizeof => count,
-                strchr => strstr
-            *
-    </properties>
+Alias functions should not be used. This can't be fixed automatically and need to be done by hand.
+
+| Alias        | Replace with     |
+| ------------ | ---------------- |
+| chop         | rtrim            |
+| close        | closedir         |
+| compact      |                  |
+| delete       | unset            |
+| doubleval    | floatval         |
+| extract      |                  |
+| fputs        | fwrite           |
+| ini_alter    | ini_set          |
+| is_integer   | is_int           |
+| is_long      | is_int           |
+| is_null      | null ===         |
+| is_real      | is_float         |
+| is_writeable | is_writable      |
+| join         | implode          |
+| key_exists   | array_key_exists |
+| pos          | current          |
+| settype      |                  |
+| show_source  | highlight_file   |
+| sizeof       | count            |
+| strchr       | strstr           |
 
 ## Force PHP 7 param and return types to be lowercased
 *Generic.PHP.LowerCaseType*

From 2d2954341d49d09cadcf0a8c36bfa541d6a61902 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 14:20:35 +0200
Subject: [PATCH 16/60] Document the new way to ignore parts of a file
 phpcs:enable phpcs:disable

@see https://github.com/squizlabs/PHP_CodeSniffer/wiki/Advanced-Usage#ignoring-parts-of-a-file
---
 docs/book/v2/intro.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/book/v2/intro.md b/docs/book/v2/intro.md
index f1f860fe..3ac8244b 100644
--- a/docs/book/v2/intro.md
+++ b/docs/book/v2/intro.md
@@ -49,3 +49,27 @@ For a reference please see: https://github.com/squizlabs/PHP_CodeSniffer/wiki/An
   ```bash
   $ composer cs-fix
   ```
+
+## Ignoring parts of a File
+
+> Note: Before PHP_CodeSniffer version 3.2.0, `// @codingStandardsIgnoreStart` and `// @codingStandardsIgnoreEnd` were
+> used. These will be removed in PHP_CodeSniffer version 4.0.
+
+Disable parts of a file:
+```php
+$xmlPackage = new XMLPackage;
+// phpcs:disable
+$xmlPackage['error_code'] = get_default_error_code_value();
+$xmlPackage->send();
+// phpcs:enable
+```
+
+Disable a specific rule 
+```php
+// phpcs:disable Generic.Commenting.Todo.Found
+$xmlPackage = new XMLPackage;
+$xmlPackage['error_code'] = get_default_error_code_value();
+// TODO: Add an error message here.
+$xmlPackage->send();
+// phpcs:enable
+```

From 2397775faada65ac47307ccfc2b63c5e4b9a224f Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 17:51:58 +0200
Subject: [PATCH 17/60] Don't allow fully qualified classes from global space

(i.e. \DateTimeImmutable)
---
 src/ZendCodingStandard/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index abe8a7d5..6212138b 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -186,7 +186,7 @@
         <properties>
             <property name="allowFallbackGlobalConstants" value="false"/>
             <property name="allowFallbackGlobalFunctions" value="false"/>
-            <property name="allowFullyQualifiedGlobalClasses" value="true"/>
+            <property name="allowFullyQualifiedGlobalClasses" value="false"/>
             <property name="allowFullyQualifiedGlobalConstants" value="false"/>
             <property name="allowFullyQualifiedGlobalFunctions" value="false"/>
             <property name="allowFullyQualifiedNameForCollidingClasses" value="true"/>

From a0630513a28778db4580c24eca2ac10a864809f0 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 18:00:41 +0200
Subject: [PATCH 18/60] Add useful tests

---
 .gitignore                               |  2 +
 .travis.yml                              |  6 ++
 composer.json                            | 10 +++
 phpcs.xml.dist                           |  1 -
 test/ArraysAndIndentation.php            | 40 -----------
 test/Assets/AbstractFoo.php              |  9 ---
 test/Assets/Foo.php                      | 17 -----
 test/Assets/FooInterface.php             | 12 ----
 test/ClassReferences.php                 | 28 --------
 test/fixable/EarlyReturn.php             | 52 ++++++++++++++
 test/fixable/LowCaseTypes.php            | 18 +++++
 test/fixable/UnusedVariables.php         | 17 +++++
 test/fixable/array_indentation.php       | 28 ++++++++
 test/fixable/assignment-operators.php    | 11 +++
 test/fixable/concatenation_spacing.php   | 37 ++++++++++
 test/fixable/example-class.php           | 84 ++++++++++++++++++++++
 test/fixable/forbidden-comments.php      | 34 +++++++++
 test/fixable/forbidden-functions.php     | 30 ++++++++
 test/fixable/namespaces-spacing.php      | 18 +++++
 test/fixable/new_with_parentheses.php    | 28 ++++++++
 test/fixable/not_spacing.php             | 21 ++++++
 test/fixable/null_coalesce_operator.php  | 19 +++++
 test/fixable/return_type_on_closures.php | 68 ++++++++++++++++++
 test/fixable/return_type_on_methods.php  | 73 +++++++++++++++++++
 test/fixable/semicolon_spacing.php       | 13 ++++
 test/fixable/test-case.php               | 41 +++++++++++
 test/fixable/traits-uses.php             | 25 +++++++
 test/fixable/useless-semicolon.php       | 15 ++++
 test/fixed/EarlyReturn.php               | 52 ++++++++++++++
 test/{ => fixed}/LowCaseTypes.php        |  2 +-
 test/fixed/UnusedVariables.php           | 17 +++++
 test/fixed/array_indentation.php         | 26 +++++++
 test/fixed/assignment-operators.php      | 11 +++
 test/fixed/concatenation_spacing.php     | 37 ++++++++++
 test/fixed/example-class.php             | 89 ++++++++++++++++++++++++
 test/fixed/forbidden-comments.php        | 26 +++++++
 test/fixed/forbidden-functions.php       | 30 ++++++++
 test/fixed/namespaces-spacing.php        | 20 ++++++
 test/fixed/new_with_parentheses.php      | 28 ++++++++
 test/fixed/not_spacing.php               | 21 ++++++
 test/fixed/null_coalesce_operator.php    | 19 +++++
 test/fixed/return_type_on_closures.php   | 63 +++++++++++++++++
 test/fixed/return_type_on_methods.php    | 73 +++++++++++++++++++
 test/fixed/semicolon_spacing.php         | 11 +++
 test/fixed/test-case.php                 | 39 +++++++++++
 test/fixed/traits-uses.php               | 24 +++++++
 test/fixed/useless-semicolon.php         | 15 ++++
 47 files changed, 1252 insertions(+), 108 deletions(-)
 delete mode 100644 test/ArraysAndIndentation.php
 delete mode 100644 test/Assets/AbstractFoo.php
 delete mode 100644 test/Assets/Foo.php
 delete mode 100644 test/Assets/FooInterface.php
 delete mode 100644 test/ClassReferences.php
 create mode 100644 test/fixable/EarlyReturn.php
 create mode 100644 test/fixable/LowCaseTypes.php
 create mode 100644 test/fixable/UnusedVariables.php
 create mode 100644 test/fixable/array_indentation.php
 create mode 100644 test/fixable/assignment-operators.php
 create mode 100644 test/fixable/concatenation_spacing.php
 create mode 100644 test/fixable/example-class.php
 create mode 100644 test/fixable/forbidden-comments.php
 create mode 100644 test/fixable/forbidden-functions.php
 create mode 100644 test/fixable/namespaces-spacing.php
 create mode 100644 test/fixable/new_with_parentheses.php
 create mode 100644 test/fixable/not_spacing.php
 create mode 100644 test/fixable/null_coalesce_operator.php
 create mode 100644 test/fixable/return_type_on_closures.php
 create mode 100644 test/fixable/return_type_on_methods.php
 create mode 100644 test/fixable/semicolon_spacing.php
 create mode 100644 test/fixable/test-case.php
 create mode 100644 test/fixable/traits-uses.php
 create mode 100644 test/fixable/useless-semicolon.php
 create mode 100644 test/fixed/EarlyReturn.php
 rename test/{ => fixed}/LowCaseTypes.php (87%)
 create mode 100644 test/fixed/UnusedVariables.php
 create mode 100644 test/fixed/array_indentation.php
 create mode 100644 test/fixed/assignment-operators.php
 create mode 100644 test/fixed/concatenation_spacing.php
 create mode 100644 test/fixed/example-class.php
 create mode 100644 test/fixed/forbidden-comments.php
 create mode 100644 test/fixed/forbidden-functions.php
 create mode 100644 test/fixed/namespaces-spacing.php
 create mode 100644 test/fixed/new_with_parentheses.php
 create mode 100644 test/fixed/not_spacing.php
 create mode 100644 test/fixed/null_coalesce_operator.php
 create mode 100644 test/fixed/return_type_on_closures.php
 create mode 100644 test/fixed/return_type_on_methods.php
 create mode 100644 test/fixed/semicolon_spacing.php
 create mode 100644 test/fixed/test-case.php
 create mode 100644 test/fixed/traits-uses.php
 create mode 100644 test/fixed/useless-semicolon.php

diff --git a/.gitignore b/.gitignore
index b185393a..b01fd1d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,11 @@
 /composer.lock
 /coveralls-upload.json
 /docs/html/
+/mkdocs.site.yml
 /phpcs.log
 /phpcs.xml
 /phpunit.xml
+/test/fix/
 /vendor/
 /zf-mkdoc-theme.tgz
 /zf-mkdoc-theme/
diff --git a/.travis.yml b/.travis.yml
index c1ec680a..42478748 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ script:
 stages:
   - Validate against schema
   - Test
+  - Validate fixes
 
 jobs:
   allow_failures:
@@ -35,5 +36,10 @@ jobs:
           - libxml2-utils
       script: xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd src/ZendCodingStandard/ruleset.xml
 
+    - stage: Validate fixes
+      before_script:
+      - cp -R test/fixable/ tests/fix/
+      script: vendor/bin/phpcbf test/fix; diff test/fix test/fixed
+
 notifications:
   email: false
diff --git a/composer.json b/composer.json
index 97c8564d..df843c0d 100644
--- a/composer.json
+++ b/composer.json
@@ -36,5 +36,15 @@
         "psr-4": {
             "ZendCodingStandardTest\\": "test/"
         }
+    },
+    "scripts": {
+        "check": [
+            "@test-prepare",
+            "@test-fix",
+            "@test-diff"
+        ],
+        "test-prepare": "rm -rf test/fix/; cp -R test/fixable/ test/fix/;",
+        "test-fix": "phpcbf test/fix > /dev/null || true",
+        "test-diff": "diff test/fix test/fixed"
     }
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 8383b224..818edf17 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -12,5 +12,4 @@
     <rule ref="ZendCodingStandard"/>
 
     <file>src</file>
-    <file>test</file>
 </ruleset>
diff --git a/test/ArraysAndIndentation.php b/test/ArraysAndIndentation.php
deleted file mode 100644
index 747353db..00000000
--- a/test/ArraysAndIndentation.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ZendCodingStandardTest\Fixed;
-
-class ArraysAndIndentation
-{
-    public function array() : array
-    {
-        return [
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-        ];
-    }
-
-    public function singleLineArray() : array
-    {
-        return [1 => 2];
-    }
-
-    public function multiArray() : array
-    {
-        return [
-            '0' => [
-                '2' => 2,
-                1   => '1',
-            ],
-            4   => [
-                7,
-                8,
-                9,
-            ],
-        ];
-    }
-}
diff --git a/test/Assets/AbstractFoo.php b/test/Assets/AbstractFoo.php
deleted file mode 100644
index 8cd6fd0f..00000000
--- a/test/Assets/AbstractFoo.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ZendCodingStandardTest\Fixed;
-
-abstract class AbstractFoo
-{
-}
diff --git a/test/Assets/Foo.php b/test/Assets/Foo.php
deleted file mode 100644
index 438a0578..00000000
--- a/test/Assets/Foo.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ZendCodingStandardTest\Fixed;
-
-class Foo extends AbstractFoo implements FooInterface
-{
-    public function bar() : void
-    {
-    }
-
-    public static function baz() : array
-    {
-        return [];
-    }
-}
diff --git a/test/Assets/FooInterface.php b/test/Assets/FooInterface.php
deleted file mode 100644
index 5a610ab7..00000000
--- a/test/Assets/FooInterface.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ZendCodingStandardTest\Fixed;
-
-interface FooInterface
-{
-    public function bar() : void;
-
-    public static function baz() : array;
-}
diff --git a/test/ClassReferences.php b/test/ClassReferences.php
deleted file mode 100644
index 08033dae..00000000
--- a/test/ClassReferences.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ZendCodingStandardTest\Fixed;
-
-use stdClass;
-
-use function get_called_class;
-use function get_class;
-use function get_parent_class;
-
-class ClassReferences
-{
-    /**
-     * @return string[]
-     */
-    public function names() : iterable
-    {
-        yield __CLASS__;
-        yield get_class();
-        yield get_class($this);
-        yield get_class(new stdClass());
-        yield get_parent_class();
-        yield get_called_class();
-        yield static::class;
-    }
-}
diff --git a/test/fixable/EarlyReturn.php b/test/fixable/EarlyReturn.php
new file mode 100644
index 00000000..04998cd5
--- /dev/null
+++ b/test/fixable/EarlyReturn.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Example;
+
+class EarlyReturn
+{
+    public function bar() : bool
+    {
+        if ($bar === 'bar') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function foo() : ?string
+    {
+        foreach ($itens as $item) {
+            if (! ($item->isItem())) {
+                return 'There is an item that is not an item';
+            } else {
+                continue;
+            }
+        }
+
+        return null;
+    }
+
+    public function baz() : string
+    {
+        if ($number > 0) {
+            return 'Number is grater then 0';
+        } else {
+            exit;
+        }
+    }
+
+    public function quoox() : bool
+    {
+        if (true === 'true') {
+            if (false === false) {
+                return true;
+            }
+        } else {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/test/fixable/LowCaseTypes.php b/test/fixable/LowCaseTypes.php
new file mode 100644
index 00000000..41f8803b
--- /dev/null
+++ b/test/fixable/LowCaseTypes.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Types;
+
+class LowCaseTypes
+{
+    public function stringToInt(String $string) : int
+    {
+        return (int) $string;
+    }
+
+    public function returnString() : String
+    {
+        return 'foo';
+    }
+}
diff --git a/test/fixable/UnusedVariables.php b/test/fixable/UnusedVariables.php
new file mode 100644
index 00000000..a8b5c301
--- /dev/null
+++ b/test/fixable/UnusedVariables.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Example;
+
+class UnusedVariables
+{
+    public function unusedInheritedVariablePassedToClosure() : void
+    {
+        $foo = 'foo';
+
+        $bar = static function () use ($foo) : int {
+            return 1;
+        };
+    }
+}
diff --git a/test/fixable/array_indentation.php b/test/fixable/array_indentation.php
new file mode 100644
index 00000000..5866c10d
--- /dev/null
+++ b/test/fixable/array_indentation.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+$array = [
+0,
+ 1,
+  2,
+   3,
+    4,
+     5,
+];
+
+$multiArray = [
+'0' => [
+  '2' => 2,
+ 1 => '1',
+],
+    4 => [
+       7,
+        8,
+         9,
+    ],
+];
+
+$singleLine = [
+    1 => 2,
+];
diff --git a/test/fixable/assignment-operators.php b/test/fixable/assignment-operators.php
new file mode 100644
index 00000000..2136da78
--- /dev/null
+++ b/test/fixable/assignment-operators.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = $foo . '';
+
+$bar = $bar + Something::count();
+
+$baz = $baz ** 2;
+
+$quux = $quux | Something::FOO;
diff --git a/test/fixable/concatenation_spacing.php b/test/fixable/concatenation_spacing.php
new file mode 100644
index 00000000..e9ca8624
--- /dev/null
+++ b/test/fixable/concatenation_spacing.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+$string = 'Doctrine' . 'rulez';
+$string = 'Doctrine'. 'rulez';
+$string = 'Doctrine' .'rulez';
+$string = 'Doctrine'.'rulez';
+
+$doctrine = 'Doctrine';
+$rulez    = 'rulez';
+$string   = $doctrine . $rulez;
+$string   = $doctrine. $rulez;
+$string   = $doctrine .$rulez;
+$string   = $doctrine.$rulez;
+
+$string = 'Doctrine' . $rulez;
+$string = 'Doctrine'. $rulez;
+$string = 'Doctrine' .$rulez;
+$string = 'Doctrine'.$rulez;
+
+$string = $doctrine . 'rulez';
+$string = $doctrine .           'rulez';
+$string = $doctrine. 'rulez';
+$string = $doctrine .'rulez';
+$string = $doctrine.'rulez';
+
+$string = $doctrine . $rulez. 'even' .'more'.$string;
+
+$string.=$doctrine;
+$string .= $doctrine;
+$string .=$doctrine;
+
+$string = $doctrine.
+    $rulez .
+    'all'
+    .$string;
diff --git a/test/fixable/example-class.php b/test/fixable/example-class.php
new file mode 100644
index 00000000..494efd50
--- /dev/null
+++ b/test/fixable/example-class.php
@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Example;
+
+use function strlen as stringLength;
+use Fancy\TestCase as TestCase;
+use const PHP_RELEASE_VERSION as PHP_PATCH_VERSION;
+
+/**
+ * Description
+ * @author Invalid
+ */
+class Example implements \IteratorAggregate
+{
+    private const VERSION = \PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
+
+    /** @var null|int */
+    private $foo;
+
+    /** @var string[] */
+    private $bar;
+
+    /** @var bool */
+    private $baz;
+
+    /** @var int|string|null */
+    private $baxBax;
+
+    public function __construct(int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
+    {
+        $this->foo    = $foo;
+        $this->bar    = $bar;
+        $this->baz    = $baz;
+        $this->baxBax = $baxBax;
+    }
+
+    /**
+     * Description
+     * @return int|null
+     */
+    public function getFoo(): ? int
+    {
+        return $this->foo;
+    }
+
+    /**
+     * @return iterable
+     */
+    public function getIterator():array
+    {
+        assert($this->bar !== null);
+        return new \ArrayIterator($this->bar);
+    }
+
+    public function isBaz() : bool
+    {
+        list($foo, $bar, $baz) = $this->bar;
+
+        return $this->baz;
+    }
+
+    public function mangleBar(int $length) : void
+    {
+        if (!$this->baz) {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->bar = (string) $this->baxBax ?? \substr($this->bar, stringLength($this->bar - $length));
+    }
+
+    public static function getMinorVersion() : int
+    {
+        $version = self::VERSION;
+
+        return $version;
+    }
+
+    public static function getTestCase() : TestCase
+    {
+        return new TestCase();
+    }
+}
diff --git a/test/fixable/forbidden-comments.php b/test/fixable/forbidden-comments.php
new file mode 100644
index 00000000..24112344
--- /dev/null
+++ b/test/fixable/forbidden-comments.php
@@ -0,0 +1,34 @@
+<?php
+
+/** Created by PhpStorm. */
+
+declare(strict_types=1);
+
+namespace Test;
+
+class Foo
+{
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        echo 'Hello';
+    }
+
+    /**
+     * Bar getter.
+     */
+    public function getBar() : int
+    {
+        return 123;
+    }
+
+    /**
+     * Very important getter.
+     */
+    public function getBaz() : int
+    {
+        return 456;
+    }
+}
diff --git a/test/fixable/forbidden-functions.php b/test/fixable/forbidden-functions.php
new file mode 100644
index 00000000..f951ca36
--- /dev/null
+++ b/test/fixable/forbidden-functions.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Test;
+
+use function chop;
+use function compact;
+use function extract;
+use function is_null;
+use function settype;
+use function sizeof;
+use function var_dump;
+
+echo chop('abc ');
+echo sizeof([1, 2, 3]);
+echo is_null(456) ? 'y' : 'n';
+
+$foo = '1';
+settype($foo, 'int');
+var_dump($foo);
+
+$bar = [
+    'foo' => 1,
+    'bar' => 2,
+    'baz' => 3,
+];
+extract($bar);
+
+compact('foo', 'bar');
diff --git a/test/fixable/namespaces-spacing.php b/test/fixable/namespaces-spacing.php
new file mode 100644
index 00000000..430900ad
--- /dev/null
+++ b/test/fixable/namespaces-spacing.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Foo;
+
+use DateInterval;
+use DateTimeImmutable;
+use DateTimeZone;
+use const DATE_RFC3339;
+use function strrev;
+use function time;
+
+strrev(
+    (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
+        ->sub(new DateInterval('P1D'))
+        ->format(DATE_RFC3339)
+);
diff --git a/test/fixable/new_with_parentheses.php b/test/fixable/new_with_parentheses.php
new file mode 100644
index 00000000..56ee8ea9
--- /dev/null
+++ b/test/fixable/new_with_parentheses.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = new \DateTimeImmutable;
+
+$barClassName = 'Bar';
+$bar = new $barClassName;
+
+$classNamesInArray = ['Baz'];
+$foo = new $classNamesInArray[0];
+
+$classNamesInObject = new stdClass();
+$classNamesInObject->foo = 'Foo';
+$foo = new $classNamesInObject->foo;
+
+$whitespaceBetweenClassNameAndParentheses = new stdClass   ;
+
+$x = [
+    new stdClass,
+];
+
+$y = [new stdClass];
+
+$z = new stdClass ? new stdClass : new stdClass;
+
+$q = $q ?: new stdClass;
+$e = $e ?? new stdClass;
diff --git a/test/fixable/not_spacing.php b/test/fixable/not_spacing.php
new file mode 100644
index 00000000..78003e8f
--- /dev/null
+++ b/test/fixable/not_spacing.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+$test = 1;
+
+if (!$test > 0) {
+    echo 1;
+} elseif ( !$test === 0) {
+    echo 0;
+} else {
+    echo -1;
+}
+
+while (    !    true) {
+    echo 1;
+}
+
+do {
+    echo 1;
+} while (    !    true);
diff --git a/test/fixable/null_coalesce_operator.php b/test/fixable/null_coalesce_operator.php
new file mode 100644
index 00000000..823b01c5
--- /dev/null
+++ b/test/fixable/null_coalesce_operator.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = isset($_GET['foo']) ? $_GET['foo'] : 'foo';
+
+$bar = isset($bar) ? $bar : 'bar';
+
+$bar = isset($bar['baz']) ? $bar['baz'] : 'baz';
+
+if (isset($foo)) {
+    $bar = $foo;
+} else {
+    $bar = 'foo';
+}
+
+$fooBar = isset($foo, $bar) ? 'foo' : 'bar';
+
+$baz = ! isset($foo) ? 'foo' : 'baz';
diff --git a/test/fixable/return_type_on_closures.php b/test/fixable/return_type_on_closures.php
new file mode 100644
index 00000000..d1a75226
--- /dev/null
+++ b/test/fixable/return_type_on_closures.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+static function ():void
+{
+}
+
+static function (): void
+{
+}
+
+static function ():   void
+{
+}
+
+static function () :void
+{
+}
+
+static function ()   :void
+{
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+):void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+) :void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+)   :void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+): void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+):   void {
+}
diff --git a/test/fixable/return_type_on_methods.php b/test/fixable/return_type_on_methods.php
new file mode 100644
index 00000000..58bdb665
--- /dev/null
+++ b/test/fixable/return_type_on_methods.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Blah;
+
+class Test
+{
+    public function a():void
+    {
+    }
+
+    public function b(): void
+    {
+    }
+
+    public function c():     void
+    {
+    }
+
+    public function d() :void
+    {
+    }
+
+    public function e()     :void
+    {
+    }
+
+    public function f(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    ):void {
+    }
+
+    public function g(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    ) :void {
+    }
+
+    public function h(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    )     :void {
+    }
+
+    public function i(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    ): void {
+    }
+
+    public function j(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    ):     void {
+    }
+}
diff --git a/test/fixable/semicolon_spacing.php b/test/fixable/semicolon_spacing.php
new file mode 100644
index 00000000..169f8006
--- /dev/null
+++ b/test/fixable/semicolon_spacing.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+echo -1    ;
+
+echo 'foo'
+;
+
+$qb->select()
+    ->from()
+    ->where()
+;
diff --git a/test/fixable/test-case.php b/test/fixable/test-case.php
new file mode 100644
index 00000000..7f6521b4
--- /dev/null
+++ b/test/fixable/test-case.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fancy;
+
+use PHPUnit\Framework\TestCase as BaseTestCase;
+
+/**
+ * @package Quite useless
+ *
+ * @requires PHP 7.2
+ */
+final class TestCase extends BaseTestCase
+{
+    /**
+     * @beforeClass
+     * @afterClass
+     */
+    static public function doStuff(): void
+    {
+    }
+
+    /**
+     * @before
+     */
+    public function createDependencies()
+    {
+    }
+
+    /**
+     * @test
+     *
+     * @covers MyClass::test
+     *
+     * @uses MyClass::__construct
+     */
+    public function methodShouldDoStuff()
+    {
+    }
+}
diff --git a/test/fixable/traits-uses.php b/test/fixable/traits-uses.php
new file mode 100644
index 00000000..75aae4a5
--- /dev/null
+++ b/test/fixable/traits-uses.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TraitUses;
+
+class Foo
+{
+    use T1;
+
+}
+
+class Bar
+{
+    use T2, T3;
+
+    use T4 {
+        x as public;
+    }
+
+    use T5;
+    public function __construct()
+    {
+    }
+}
diff --git a/test/fixable/useless-semicolon.php b/test/fixable/useless-semicolon.php
new file mode 100644
index 00000000..66149f36
--- /dev/null
+++ b/test/fixable/useless-semicolon.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+while (! true) {
+    echo 1;
+};
+
+do {
+    echo 1;
+} while (! false);
+
+for (;;) {
+    echo 'To infity and beyond';
+};
diff --git a/test/fixed/EarlyReturn.php b/test/fixed/EarlyReturn.php
new file mode 100644
index 00000000..da856545
--- /dev/null
+++ b/test/fixed/EarlyReturn.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Example;
+
+class EarlyReturn
+{
+    public function bar() : bool
+    {
+        if ($bar === 'bar') {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function foo() : ?string
+    {
+        foreach ($itens as $item) {
+            if (! $item->isItem()) {
+                return 'There is an item that is not an item';
+            }
+
+            continue;
+        }
+
+        return null;
+    }
+
+    public function baz() : string
+    {
+        if ($number > 0) {
+            return 'Number is grater then 0';
+        }
+
+        exit;
+    }
+
+    public function quoox() : bool
+    {
+        if (true !== 'true') {
+            return false;
+        }
+
+        if (false === false) {
+            return true;
+        }
+
+        return true;
+    }
+}
diff --git a/test/LowCaseTypes.php b/test/fixed/LowCaseTypes.php
similarity index 87%
rename from test/LowCaseTypes.php
rename to test/fixed/LowCaseTypes.php
index 3f6478fe..4782ba1c 100644
--- a/test/LowCaseTypes.php
+++ b/test/fixed/LowCaseTypes.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ZendCodingStandardTest;
+namespace Types;
 
 class LowCaseTypes
 {
diff --git a/test/fixed/UnusedVariables.php b/test/fixed/UnusedVariables.php
new file mode 100644
index 00000000..67e8500e
--- /dev/null
+++ b/test/fixed/UnusedVariables.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Example;
+
+class UnusedVariables
+{
+    public function unusedInheritedVariablePassedToClosure() : void
+    {
+        $foo = 'foo';
+
+        $bar = static function () : int {
+            return 1;
+        };
+    }
+}
diff --git a/test/fixed/array_indentation.php b/test/fixed/array_indentation.php
new file mode 100644
index 00000000..7c7245a8
--- /dev/null
+++ b/test/fixed/array_indentation.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+$array = [
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+];
+
+$multiArray = [
+    '0' => [
+        '2' => 2,
+        1 => '1',
+    ],
+    4 => [
+        7,
+        8,
+        9,
+    ],
+];
+
+$singleLine = [1 => 2];
diff --git a/test/fixed/assignment-operators.php b/test/fixed/assignment-operators.php
new file mode 100644
index 00000000..3a85cf89
--- /dev/null
+++ b/test/fixed/assignment-operators.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$foo .= '';
+
+$bar += Something::count();
+
+$baz **= 2;
+
+$quux |= Something::FOO;
diff --git a/test/fixed/concatenation_spacing.php b/test/fixed/concatenation_spacing.php
new file mode 100644
index 00000000..3c71f119
--- /dev/null
+++ b/test/fixed/concatenation_spacing.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+$string = 'Doctrine' . 'rulez';
+$string = 'Doctrine' . 'rulez';
+$string = 'Doctrine' . 'rulez';
+$string = 'Doctrine' . 'rulez';
+
+$doctrine = 'Doctrine';
+$rulez    = 'rulez';
+$string   = $doctrine . $rulez;
+$string   = $doctrine . $rulez;
+$string   = $doctrine . $rulez;
+$string   = $doctrine . $rulez;
+
+$string = 'Doctrine' . $rulez;
+$string = 'Doctrine' . $rulez;
+$string = 'Doctrine' . $rulez;
+$string = 'Doctrine' . $rulez;
+
+$string = $doctrine . 'rulez';
+$string = $doctrine . 'rulez';
+$string = $doctrine . 'rulez';
+$string = $doctrine . 'rulez';
+$string = $doctrine . 'rulez';
+
+$string = $doctrine . $rulez . 'even' . 'more' . $string;
+
+$string .=$doctrine;
+$string .= $doctrine;
+$string .=$doctrine;
+
+$string = $doctrine .
+    $rulez .
+    'all'
+    . $string;
diff --git a/test/fixed/example-class.php b/test/fixed/example-class.php
new file mode 100644
index 00000000..99512a56
--- /dev/null
+++ b/test/fixed/example-class.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Example;
+
+use ArrayIterator;
+use Fancy\TestCase;
+use InvalidArgumentException;
+use IteratorAggregate;
+
+use function assert;
+use function strlen as stringLength;
+use function substr;
+
+use const PHP_MINOR_VERSION;
+use const PHP_RELEASE_VERSION as PHP_PATCH_VERSION;
+use const PHP_VERSION;
+
+/**
+ * Description
+ */
+class Example implements IteratorAggregate
+{
+    private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
+
+    /** @var null|int */
+    private $foo;
+
+    /** @var string[] */
+    private $bar;
+
+    /** @var bool */
+    private $baz;
+
+    /** @var int|string|null */
+    private $baxBax;
+
+    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
+    {
+        $this->foo    = $foo;
+        $this->bar    = $bar;
+        $this->baz    = $baz;
+        $this->baxBax = $baxBax;
+    }
+
+    /**
+     * Description
+     */
+    public function getFoo() : ?int
+    {
+        return $this->foo;
+    }
+
+    /**
+     * @return iterable
+     */
+    public function getIterator() : array
+    {
+        assert($this->bar !== null);
+        return new ArrayIterator($this->bar);
+    }
+
+    public function isBaz() : bool
+    {
+        [$foo, $bar, $baz] = $this->bar;
+
+        return $this->baz;
+    }
+
+    public function mangleBar(int $length) : void
+    {
+        if (! $this->baz) {
+            throw new InvalidArgumentException();
+        }
+
+        $this->bar = (string) $this->baxBax ?? substr($this->bar, stringLength($this->bar - $length));
+    }
+
+    public static function getMinorVersion() : int
+    {
+        return self::VERSION;
+    }
+
+    public static function getTestCase() : TestCase
+    {
+        return new TestCase();
+    }
+}
diff --git a/test/fixed/forbidden-comments.php b/test/fixed/forbidden-comments.php
new file mode 100644
index 00000000..67029f24
--- /dev/null
+++ b/test/fixed/forbidden-comments.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Test;
+
+class Foo
+{
+    public function __construct()
+    {
+        echo 'Hello';
+    }
+
+    public function getBar() : int
+    {
+        return 123;
+    }
+
+    /**
+     * Very important getter.
+     */
+    public function getBaz() : int
+    {
+        return 456;
+    }
+}
diff --git a/test/fixed/forbidden-functions.php b/test/fixed/forbidden-functions.php
new file mode 100644
index 00000000..f951ca36
--- /dev/null
+++ b/test/fixed/forbidden-functions.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Test;
+
+use function chop;
+use function compact;
+use function extract;
+use function is_null;
+use function settype;
+use function sizeof;
+use function var_dump;
+
+echo chop('abc ');
+echo sizeof([1, 2, 3]);
+echo is_null(456) ? 'y' : 'n';
+
+$foo = '1';
+settype($foo, 'int');
+var_dump($foo);
+
+$bar = [
+    'foo' => 1,
+    'bar' => 2,
+    'baz' => 3,
+];
+extract($bar);
+
+compact('foo', 'bar');
diff --git a/test/fixed/namespaces-spacing.php b/test/fixed/namespaces-spacing.php
new file mode 100644
index 00000000..d42bbfef
--- /dev/null
+++ b/test/fixed/namespaces-spacing.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Foo;
+
+use DateInterval;
+use DateTimeImmutable;
+use DateTimeZone;
+
+use function strrev;
+use function time;
+
+use const DATE_RFC3339;
+
+strrev(
+    (new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
+        ->sub(new DateInterval('P1D'))
+        ->format(DATE_RFC3339)
+);
diff --git a/test/fixed/new_with_parentheses.php b/test/fixed/new_with_parentheses.php
new file mode 100644
index 00000000..6e81bbe6
--- /dev/null
+++ b/test/fixed/new_with_parentheses.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = new DateTimeImmutable();
+
+$barClassName = 'Bar';
+$bar          = new $barClassName();
+
+$classNamesInArray = ['Baz'];
+$foo               = new $classNamesInArray[0]();
+
+$classNamesInObject      = new stdClass();
+$classNamesInObject->foo = 'Foo';
+$foo                     = new $classNamesInObject->foo();
+
+$whitespaceBetweenClassNameAndParentheses = new stdClass();
+
+$x = [
+    new stdClass(),
+];
+
+$y = [new stdClass()];
+
+$z = new stdClass() ? new stdClass() : new stdClass();
+
+$q = $q ?: new stdClass();
+$e = $e ?? new stdClass();
diff --git a/test/fixed/not_spacing.php b/test/fixed/not_spacing.php
new file mode 100644
index 00000000..0284b52a
--- /dev/null
+++ b/test/fixed/not_spacing.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+$test = 1;
+
+if (! $test > 0) {
+    echo 1;
+} elseif (! $test === 0) {
+    echo 0;
+} else {
+    echo -1;
+}
+
+while (! true) {
+    echo 1;
+}
+
+do {
+    echo 1;
+} while (! true);
diff --git a/test/fixed/null_coalesce_operator.php b/test/fixed/null_coalesce_operator.php
new file mode 100644
index 00000000..8846dd12
--- /dev/null
+++ b/test/fixed/null_coalesce_operator.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = $_GET['foo'] ?? 'foo';
+
+$bar = $bar ?? 'bar';
+
+$bar = $bar['baz'] ?? 'baz';
+
+if (isset($foo)) {
+    $bar = $foo;
+} else {
+    $bar = 'foo';
+}
+
+$fooBar = isset($foo, $bar) ? 'foo' : 'bar';
+
+$baz = ! isset($foo) ? 'foo' : 'baz';
diff --git a/test/fixed/return_type_on_closures.php b/test/fixed/return_type_on_closures.php
new file mode 100644
index 00000000..3e6e7a35
--- /dev/null
+++ b/test/fixed/return_type_on_closures.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+static function () : void {
+}
+
+static function () : void {
+}
+
+static function () : void {
+}
+
+static function () : void {
+}
+
+static function () : void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+) : void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+) : void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+) : void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+) : void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+) : void {
+}
diff --git a/test/fixed/return_type_on_methods.php b/test/fixed/return_type_on_methods.php
new file mode 100644
index 00000000..67c377fa
--- /dev/null
+++ b/test/fixed/return_type_on_methods.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Blah;
+
+class Test
+{
+    public function a() : void
+    {
+    }
+
+    public function b() : void
+    {
+    }
+
+    public function c() : void
+    {
+    }
+
+    public function d() : void
+    {
+    }
+
+    public function e() : void
+    {
+    }
+
+    public function f(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    ) : void {
+    }
+
+    public function g(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    ) : void {
+    }
+
+    public function h(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    ) : void {
+    }
+
+    public function i(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    ) : void {
+    }
+
+    public function j(
+        int $a,
+        int $c,
+        int $d,
+        int $e,
+        int $b
+    ) : void {
+    }
+}
diff --git a/test/fixed/semicolon_spacing.php b/test/fixed/semicolon_spacing.php
new file mode 100644
index 00000000..fa6c43ab
--- /dev/null
+++ b/test/fixed/semicolon_spacing.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+echo -1;
+
+echo 'foo';
+
+$qb->select()
+    ->from()
+    ->where();
diff --git a/test/fixed/test-case.php b/test/fixed/test-case.php
new file mode 100644
index 00000000..9158171e
--- /dev/null
+++ b/test/fixed/test-case.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fancy;
+
+use PHPUnit\Framework\TestCase as BaseTestCase;
+
+/**
+ * @requires PHP 7.2
+ */
+final class TestCase extends BaseTestCase
+{
+    /**
+     * @beforeClass
+     * @afterClass
+     */
+    public static function doStuff() : void
+    {
+    }
+
+    /**
+     * @before
+     */
+    public function createDependencies()
+    {
+    }
+
+    /**
+     * @test
+     *
+     * @covers MyClass::test
+     *
+     * @uses MyClass::__construct
+     */
+    public function methodShouldDoStuff()
+    {
+    }
+}
diff --git a/test/fixed/traits-uses.php b/test/fixed/traits-uses.php
new file mode 100644
index 00000000..e521e104
--- /dev/null
+++ b/test/fixed/traits-uses.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TraitUses;
+
+class Foo
+{
+    use T1;
+}
+
+class Bar
+{
+    use T2;
+    use T3;
+    use T4 {
+        x as public;
+    }
+    use T5;
+
+    public function __construct()
+    {
+    }
+}
diff --git a/test/fixed/useless-semicolon.php b/test/fixed/useless-semicolon.php
new file mode 100644
index 00000000..358277bd
--- /dev/null
+++ b/test/fixed/useless-semicolon.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+while (! true) {
+    echo 1;
+}
+
+do {
+    echo 1;
+} while (! false);
+
+for (;;) {
+    echo 'To infity and beyond';
+}

From 29b05a08da854e124e148e543b917084fc06dfc8 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 18:06:22 +0200
Subject: [PATCH 19/60] Fix typo in ci script

---
 .travis.yml                     |  2 +-
 test/ExampleClass.php           | 92 ---------------------------------
 test/PropertiesAndConstants.php | 27 ----------
 3 files changed, 1 insertion(+), 120 deletions(-)
 delete mode 100644 test/ExampleClass.php
 delete mode 100644 test/PropertiesAndConstants.php

diff --git a/.travis.yml b/.travis.yml
index 42478748..feca5882 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ jobs:
 
     - stage: Validate fixes
       before_script:
-      - cp -R test/fixable/ tests/fix/
+      - cp -R test/fixable/ test/fix/
       script: vendor/bin/phpcbf test/fix; diff test/fix test/fixed
 
 notifications:
diff --git a/test/ExampleClass.php b/test/ExampleClass.php
deleted file mode 100644
index b106e501..00000000
--- a/test/ExampleClass.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * This file contains an example of coding styles.
- */
-
-declare(strict_types=1);
-
-namespace ZendCodingStandardTest;
-
-use ArrayIterator;
-use InvalidArgumentException;
-use IteratorAggregate;
-
-use function assert;
-use function strlen as stringLength;
-use function substr;
-
-use const PHP_MINOR_VERSION;
-use const PHP_RELEASE_VERSION as PHP_PATCH_VERSION;
-use const PHP_VERSION;
-
-/**
- * Description
- */
-class ExampleClass implements IteratorAggregate
-{
-    private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
-
-    /** @var int|null */
-    private $foo;
-
-    /** @var string[] */
-    private $bar;
-
-    /** @var bool */
-    private $baz;
-
-    /** @var int|string|null */
-    private $baxBax;
-
-    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
-    {
-        $this->foo    = $foo;
-        $this->bar    = $bar;
-        $this->baz    = $baz;
-        $this->baxBax = $baxBax;
-    }
-
-    /**
-     * Description
-     */
-    public function getFoo() : ?int
-    {
-        return $this->foo;
-    }
-
-    /**
-     * @return iterable
-     */
-    public function getIterator() : array
-    {
-        assert($this->bar !== null);
-
-        return new ArrayIterator($this->bar);
-    }
-
-    public function isBaz() : bool
-    {
-        [$foo, $bar, $baz] = $this->bar;
-
-        return $this->baz;
-    }
-
-    public function mangleBar(int $length) : void
-    {
-        if (! $this->baz) {
-            throw new InvalidArgumentException('Error message');
-        }
-        $this->bar = (string) $this->baxBax ?? substr($this->bar, stringLength($this->bar - $length));
-    }
-
-    public static function getMinorVersion() : int
-    {
-        return self::VERSION;
-    }
-
-    public static function getTestCase() : TestCase
-    {
-        return new TestCase();
-    }
-}
diff --git a/test/PropertiesAndConstants.php b/test/PropertiesAndConstants.php
deleted file mode 100644
index c158eb8d..00000000
--- a/test/PropertiesAndConstants.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ZendCodingStandardTest;
-
-class PropertiesAndConstants
-{
-    /** @var string */
-    public const FOO = 'bar';
-
-    /** @var string */
-    public $bar;
-
-    /** @var bool */
-    private $baz;
-
-    public function __construct(bool $baz)
-    {
-        $this->baz = $baz;
-    }
-
-    public function bar() : bool
-    {
-        return $this->baz;
-    }
-}

From d35d34ed202720e73e8355f49ba6043f5de594d6 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 18:12:12 +0200
Subject: [PATCH 20/60] Don't remove xdebug as php nightly doesn't have it

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index feca5882..718410dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  - phpenv config-rm xdebug.ini
   - composer self-update
 
 install: travis_retry composer update --prefer-dist

From b4d915d785653ed7ad5a90893ec1465b05034bee Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 18:27:30 +0200
Subject: [PATCH 21/60] Test expected violations for fixable code

---
 .travis.yml              |  1 +
 composer.json            |  1 +
 test/expected-report.txt | 31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 test/expected-report.txt

diff --git a/.travis.yml b/.travis.yml
index 718410dd..95d5cb2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ install: travis_retry composer update --prefer-dist
 
 script:
   - vendor/bin/phpcs
+  - vendor/bin/phpcs $(find test/fixable/* | sort) --report=summary --report-file=phpcs.log; diff test/expected-report.txt phpcs.log
 
 stages:
   - Validate against schema
diff --git a/composer.json b/composer.json
index df843c0d..da23c181 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,7 @@
             "@test-fix",
             "@test-diff"
         ],
+        "create-report": "phpcs $(find test/fixable/* | sort) --report=summary --report-file=test/expected-report.txt",
         "test-prepare": "rm -rf test/fix/; cp -R test/fixable/ test/fix/;",
         "test-fix": "phpcbf test/fix > /dev/null || true",
         "test-diff": "diff test/fix test/fixed"
diff --git a/test/expected-report.txt b/test/expected-report.txt
new file mode 100644
index 00000000..48e5b54e
--- /dev/null
+++ b/test/expected-report.txt
@@ -0,0 +1,31 @@
+
+PHP CODE SNIFFER REPORT SUMMARY
+----------------------------------------------------------------------
+FILE                                                  ERRORS  WARNINGS
+----------------------------------------------------------------------
+test/fixable/array_indentation.php                    11      0
+test/fixable/assignment-operators.php                 4       0
+test/fixable/concatenation_spacing.php                24      0
+test/fixable/EarlyReturn.php                          5       0
+test/fixable/example-class.php                        21      0
+test/fixable/forbidden-comments.php                   4       0
+test/fixable/forbidden-functions.php                  6       0
+test/fixable/LowCaseTypes.php                         2       0
+test/fixable/namespaces-spacing.php                   3       0
+test/fixable/new_with_parentheses.php                 18      0
+test/fixable/not_spacing.php                          7       0
+test/fixable/null_coalesce_operator.php               3       0
+test/fixable/return_type_on_closures.php              21      0
+test/fixable/return_type_on_methods.php               17      0
+test/fixable/semicolon_spacing.php                    3       0
+test/fixable/test-case.php                            4       0
+test/fixable/traits-uses.php                          10      0
+test/fixable/UnusedVariables.php                      1       0
+test/fixable/useless-semicolon.php                    2       0
+----------------------------------------------------------------------
+A TOTAL OF 166 ERRORS AND 0 WARNINGS WERE FOUND IN 19 FILES
+----------------------------------------------------------------------
+PHPCBF CAN FIX 148 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+----------------------------------------------------------------------
+
+

From 45d14bd6650a700874726b300ea91ba9a3621300 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 22:24:40 +0200
Subject: [PATCH 22/60] Require ? when default value is null

---
 docs/book/v2/ruleset.md            | 14 ++++++++++++++
 src/ZendCodingStandard/ruleset.xml |  2 ++
 test/expected-report.txt           |  6 +++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index 32558058..a8834065 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -215,6 +215,20 @@ Use `$foo = $bar['id'] ?? '1';` where possbile.
 ## Require use of short versions of scalar types (i.e. int instead of integer)
 *SlevomatCodingStandard.TypeHints.LongTypeHints*
 
+## Require ? when default value is null
+*SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue*
+
+Checks whether the nullablity ? symbol is present before each nullable and optional parameter 
+(which are marked as = null):
+```php
+function foo(
+	int $foo = null, // ? missing
+	?int $bar = null // correct
+) {
+
+}
+```
+
 ## Require one space between typehint and variable, require no space between nullability sign and typehint
 *SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing*
 
diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 6212138b..df25a730 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -244,6 +244,8 @@
     <rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
     <!-- Require use of short versions of scalar types (i.e. int instead of integer) -->
     <rule ref="SlevomatCodingStandard.TypeHints.LongTypeHints"/>
+    <!-- Require ? when default value is null -->
+    <rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue"/>
     <!-- Require one space between typehint and variable, require no space between nullability sign and typehint -->
     <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing"/>
     <!-- Require space around colon in return types -->
diff --git a/test/expected-report.txt b/test/expected-report.txt
index 48e5b54e..57d000e1 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -7,7 +7,7 @@ test/fixable/array_indentation.php                    11      0
 test/fixable/assignment-operators.php                 4       0
 test/fixable/concatenation_spacing.php                24      0
 test/fixable/EarlyReturn.php                          5       0
-test/fixable/example-class.php                        21      0
+test/fixable/example-class.php                        22      0
 test/fixable/forbidden-comments.php                   4       0
 test/fixable/forbidden-functions.php                  6       0
 test/fixable/LowCaseTypes.php                         2       0
@@ -23,9 +23,9 @@ test/fixable/traits-uses.php                          10      0
 test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 ----------------------------------------------------------------------
-A TOTAL OF 166 ERRORS AND 0 WARNINGS WERE FOUND IN 19 FILES
+A TOTAL OF 167 ERRORS AND 0 WARNINGS WERE FOUND IN 19 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 148 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 149 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

From 5b009740478e0bb93670f1e4ea3d06a15cf49f64 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 6 Sep 2018 22:41:42 +0200
Subject: [PATCH 23/60] Improve documentation formatting

---
 docs/book/v2/ruleset.md | 48 ++++++-----------------------------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index a8834065..04c75952 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -79,16 +79,16 @@ Alias functions should not be used. This can't be fixed automatically and need t
 ## Force PHP 7 param and return types to be lowercased
 *Generic.PHP.LowerCaseType*
 
-## Forbid `php_sapi_name()` function, use PHP_SAPI
+## Forbid `php_sapi_name()` function, use `PHP_SAPI`
 *Generic.PHP.SAPIUsage*
 
 ## Forbid inline string concatenation, unless used in multiline for readability
 *Generic.Strings.UnnecessaryStringConcat*
 
-## Forbid comments starting with #
+## Forbid comments starting with `#`
 *PEAR.Commenting.InlineComment*
 
-## Disallow else if in favor of elseif
+## Disallow `else if` in favor of `elseif`
 *PSR2.ControlStructures.ElseIfDeclaration.NotAllowed*
 
 ## Require comma after last element in multi-line array
@@ -118,7 +118,7 @@ Git commits provide accurate information for these forbidden annotations: @api,
 
 Forbidden comments words: private, protected, static, constructor, deconstructor, Created by, getter, setter.
 
-## report invalid format of inline phpDocs with @var
+## Report invalid format of inline phpDocs with `@var`
 *SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration*
 
 ## Require comments with single line written as one-liners
@@ -197,13 +197,13 @@ Use `$foo = $bar['id'] ?? '1';` where possbile.
 ## Require the usage of assignment operators, eg `+=`, `.=` when possible
 *SlevomatCodingStandard.Operators.RequireCombinedAssignmentOperator*
 
-## Forbid `list(...)` syntax, use [...] instead
+## Forbid `list(...)` syntax, use `[...]` instead
 *SlevomatCodingStandard.PHP.ShortList*
 
 ## Forbid use of longhand cast operators
 *SlevomatCodingStandard.PHP.TypeCast*
 
-## Require presence of declare(strict_types=1)
+## Require presence of `declare(strict_types=1)`
 *SlevomatCodingStandard.TypeHints.DeclareStrictTypes*
 
 ## Forbid useless parentheses
@@ -215,7 +215,7 @@ Use `$foo = $bar['id'] ?? '1';` where possbile.
 ## Require use of short versions of scalar types (i.e. int instead of integer)
 *SlevomatCodingStandard.TypeHints.LongTypeHints*
 
-## Require ? when default value is null
+## Require `?` when default value is `null`
 *SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue*
 
 Checks whether the nullablity ? symbol is present before each nullable and optional parameter 
@@ -282,40 +282,6 @@ $foo = self::fromPayload($payload);
 ## Force rules for function phpDoc
 *Squiz.Commenting.FunctionComment*
 
-    ## Allow `@throws` without description
-    <exclude name="Squiz.Commenting.FunctionComment.EmptyThrows*
-    ## Does not work properly with PHP 7 / short-named types
-    <exclude name="Squiz.Commenting.FunctionComment.IncorrectParamVarName*
-    ## Does not support collections, i.e. `string[]`
-    <exclude name="Squiz.Commenting.FunctionComment.IncorrectTypeHint*
-    ## Forces incorrect types
-    <exclude name="Squiz.Commenting.FunctionComment.InvalidReturn*
-    ## Breaks with compound return types, i.e. `string|null`
-    <exclude name="Squiz.Commenting.FunctionComment.InvalidReturnNotVoid*
-    ## Breaks when all params are not documented
-    <exclude name="Squiz.Commenting.FunctionComment.InvalidTypeHint*
-    ## Doc comment is not required for every method
-    <exclude name="Squiz.Commenting.FunctionComment.Missing*
-    ## Do not require comments for `@param`
-    <exclude name="Squiz.Commenting.FunctionComment.MissingParamComment*
-    ## Do not require `@param` for all parameters
-    <exclude name="Squiz.Commenting.FunctionComment.MissingParamTag*
-    ## Do not require `@return` for void methods
-    <exclude name="Squiz.Commenting.FunctionComment.MissingReturn*
-    ## Comments don't have to be sentences
-    <exclude name="Squiz.Commenting.FunctionComment.ParamCommentFullStop*
-    ## Comments don't have to be sentences
-    <exclude name="Squiz.Commenting.FunctionComment.ParamCommentNotCapital*
-    ## Breaks when all params are not documented
-    <exclude name="Squiz.Commenting.FunctionComment.ParamNameNoMatch*
-    ## Doesn't respect inheritance
-    <exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing*
-    ## Throws comments can start without a capital and doesn't need a full stop
-    <exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop*
-    <exclude name="Squiz.Commenting.FunctionComment.ThrowsNotCapital*
-    ## Doesn't work with self as typehint
-    <exclude name="Squiz.Commenting.FunctionComment.TypeHintMissing*
-
 ## Forbid global functions
 *Squiz.Functions.GlobalFunction*
 

From dc11e2e1496d85ccc10f2591f71285e1218aa066 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Fri, 7 Sep 2018 00:10:22 +0200
Subject: [PATCH 24/60] Add PSR-12 test cases

---
 test/expected-report.txt                      | 25 ++++---
 test/fixable/anonymous-classes.php            | 19 ++++++
 ..._indentation.php => array-indentation.php} |  0
 test/fixable/assignment-operators.php         | 11 ---
 test/fixable/closures.php                     | 37 ++++++++++
 test/fixable/example-class.php                |  1 -
 .../extends-and-implements-multiline.php      | 20 ++++++
 test/fixable/extends-and-implements.php       | 17 +++++
 .../fixable/method-and-function-arguments.php | 38 +++++++++++
 test/fixable/method-and-function-calls.php    | 23 +++++++
 ...rentheses.php => new-with-parentheses.php} |  0
 .../{not_spacing.php => not-spacing.php}      |  0
 ...ll_coalesce_operator.php => operators.php} | 14 ++++
 ...methods.php => return-type-on-methods.php} |  0
 test/fixable/return_type_on_closures.php      | 68 -------------------
 ...olon_spacing.php => semicolon-spacing.php} |  0
 test/fixable/traits-uses.php                  | 10 +--
 test/fixable/visibility-declaration.php       | 17 +++++
 test/fixed/anonymous-classes.php              | 20 ++++++
 ..._indentation.php => array-indentation.php} |  0
 test/fixed/assignment-operators.php           | 11 ---
 test/fixed/closures.php                       | 35 ++++++++++
 .../extends-and-implements-multiline.php      | 18 +++++
 test/fixed/extends-and-implements.php         | 19 ++++++
 test/fixed/method-and-function-arguments.php  | 38 +++++++++++
 test/fixed/method-and-function-calls.php      | 21 ++++++
 ...rentheses.php => new-with-parentheses.php} |  0
 .../{not_spacing.php => not-spacing.php}      |  0
 ...ll_coalesce_operator.php => operators.php} | 14 ++++
 ...methods.php => return-type-on-methods.php} |  0
 test/fixed/return_type_on_closures.php        | 63 -----------------
 ...olon_spacing.php => semicolon-spacing.php} |  0
 test/fixed/traits-uses.php                    | 12 ++--
 test/fixed/visibility-declaration.php         | 17 +++++
 34 files changed, 393 insertions(+), 175 deletions(-)
 create mode 100644 test/fixable/anonymous-classes.php
 rename test/fixable/{array_indentation.php => array-indentation.php} (100%)
 delete mode 100644 test/fixable/assignment-operators.php
 create mode 100644 test/fixable/closures.php
 create mode 100644 test/fixable/extends-and-implements-multiline.php
 create mode 100644 test/fixable/extends-and-implements.php
 create mode 100644 test/fixable/method-and-function-arguments.php
 create mode 100644 test/fixable/method-and-function-calls.php
 rename test/fixable/{new_with_parentheses.php => new-with-parentheses.php} (100%)
 rename test/fixable/{not_spacing.php => not-spacing.php} (100%)
 rename test/fixable/{null_coalesce_operator.php => operators.php} (60%)
 rename test/fixable/{return_type_on_methods.php => return-type-on-methods.php} (100%)
 delete mode 100644 test/fixable/return_type_on_closures.php
 rename test/fixable/{semicolon_spacing.php => semicolon-spacing.php} (100%)
 create mode 100644 test/fixable/visibility-declaration.php
 create mode 100644 test/fixed/anonymous-classes.php
 rename test/fixed/{array_indentation.php => array-indentation.php} (100%)
 delete mode 100644 test/fixed/assignment-operators.php
 create mode 100644 test/fixed/closures.php
 create mode 100644 test/fixed/extends-and-implements-multiline.php
 create mode 100644 test/fixed/extends-and-implements.php
 create mode 100644 test/fixed/method-and-function-arguments.php
 create mode 100644 test/fixed/method-and-function-calls.php
 rename test/fixed/{new_with_parentheses.php => new-with-parentheses.php} (100%)
 rename test/fixed/{not_spacing.php => not-spacing.php} (100%)
 rename test/fixed/{null_coalesce_operator.php => operators.php} (58%)
 rename test/fixed/{return_type_on_methods.php => return-type-on-methods.php} (100%)
 delete mode 100644 test/fixed/return_type_on_closures.php
 rename test/fixed/{semicolon_spacing.php => semicolon-spacing.php} (100%)
 create mode 100644 test/fixed/visibility-declaration.php

diff --git a/test/expected-report.txt b/test/expected-report.txt
index 57d000e1..a552965e 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -3,29 +3,34 @@ PHP CODE SNIFFER REPORT SUMMARY
 ----------------------------------------------------------------------
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
-test/fixable/array_indentation.php                    11      0
-test/fixable/assignment-operators.php                 4       0
+test/fixable/anonymous-classes.php                    9       0
+test/fixable/array-indentation.php                    11      0
+test/fixable/closures.php                             19      0
 test/fixable/concatenation_spacing.php                24      0
 test/fixable/EarlyReturn.php                          5       0
 test/fixable/example-class.php                        22      0
+test/fixable/extends-and-implements-multiline.php     10      0
+test/fixable/extends-and-implements.php               5       1
 test/fixable/forbidden-comments.php                   4       0
 test/fixable/forbidden-functions.php                  6       0
 test/fixable/LowCaseTypes.php                         2       0
+test/fixable/method-and-function-arguments.php        11      0
+test/fixable/method-and-function-calls.php            14      0
 test/fixable/namespaces-spacing.php                   3       0
-test/fixable/new_with_parentheses.php                 18      0
-test/fixable/not_spacing.php                          7       0
-test/fixable/null_coalesce_operator.php               3       0
-test/fixable/return_type_on_closures.php              21      0
-test/fixable/return_type_on_methods.php               17      0
-test/fixable/semicolon_spacing.php                    3       0
+test/fixable/new-with-parentheses.php                 18      0
+test/fixable/not-spacing.php                          7       0
+test/fixable/operators.php                            7       0
+test/fixable/return-type-on-methods.php               17      0
+test/fixable/semicolon-spacing.php                    3       0
 test/fixable/test-case.php                            4       0
 test/fixable/traits-uses.php                          10      0
 test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
+test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 167 ERRORS AND 0 WARNINGS WERE FOUND IN 19 FILES
+A TOTAL OF 215 ERRORS AND 1 WARNING WERE FOUND IN 24 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 149 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 192 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/test/fixable/anonymous-classes.php b/test/fixable/anonymous-classes.php
new file mode 100644
index 00000000..d5a98641
--- /dev/null
+++ b/test/fixable/anonymous-classes.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+$instance = new class {};
+
+// Brace on the same line
+$instance = new class extends \Foo implements \HandleableInterface {
+    // Class content
+};
+
+// Brace on the next line
+$instance = new class extends \Foo implements
+    \ArrayAccess,
+    \Countable,
+    \Serializable
+{
+    // Class content
+};
diff --git a/test/fixable/array_indentation.php b/test/fixable/array-indentation.php
similarity index 100%
rename from test/fixable/array_indentation.php
rename to test/fixable/array-indentation.php
diff --git a/test/fixable/assignment-operators.php b/test/fixable/assignment-operators.php
deleted file mode 100644
index 2136da78..00000000
--- a/test/fixable/assignment-operators.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$foo = $foo . '';
-
-$bar = $bar + Something::count();
-
-$baz = $baz ** 2;
-
-$quux = $quux | Something::FOO;
diff --git a/test/fixable/closures.php b/test/fixable/closures.php
new file mode 100644
index 00000000..216bfe3a
--- /dev/null
+++ b/test/fixable/closures.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+$closureWithArgs = function( string $arg1, string $arg2 ) {
+    // body
+};
+
+$closureWithArgsAndVars = function ( int $arg1 , int $arg2 ) use ( $var1, $var2 ): int {
+    return $arg1 * $var1 + $arg2 * $var2;
+};
+
+static function ():void
+{
+}
+
+static function ()    :    void
+{
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+):void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+)   :   void {
+}
diff --git a/test/fixable/example-class.php b/test/fixable/example-class.php
index 494efd50..b61bd92f 100644
--- a/test/fixable/example-class.php
+++ b/test/fixable/example-class.php
@@ -38,7 +38,6 @@ public function __construct(int $foo = null, array $bar = [], bool $baz = false,
 
     /**
      * Description
-     * @return int|null
      */
     public function getFoo(): ? int
     {
diff --git a/test/fixable/extends-and-implements-multiline.php b/test/fixable/extends-and-implements-multiline.php
new file mode 100644
index 00000000..fa85e018
--- /dev/null
+++ b/test/fixable/extends-and-implements-multiline.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor\Package;
+
+use ParentClass;
+use BarClass as Bar;
+use OtherVendor\OtherPackage\BazClass;
+use ArrayAccess;
+use Countable;
+use Serializable;
+
+class ClassName extends ParentClass implements
+    \ArrayAccess,
+    \Countable,
+    \Serializable
+{
+    // constants, properties, methods
+}
diff --git a/test/fixable/extends-and-implements.php b/test/fixable/extends-and-implements.php
new file mode 100644
index 00000000..a010af65
--- /dev/null
+++ b/test/fixable/extends-and-implements.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Vendor\Package;
+
+use FooClass;
+use BarClass as Bar;
+use OtherVendor\OtherPackage\BazClass;
+
+class ClassName extends BazClass implements \ArrayAccess, \Countable
+{
+    public function __construct(FooClass $foo, Bar $bar)
+    {
+        // ...
+    }
+}
diff --git a/test/fixable/method-and-function-arguments.php b/test/fixable/method-and-function-arguments.php
new file mode 100644
index 00000000..31ff340f
--- /dev/null
+++ b/test/fixable/method-and-function-arguments.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MethodsAndFunctionArguments;
+
+class ClassName
+{
+    public function foo(int $arg1, &$arg2, $arg3 = []):void
+    {
+    }
+
+    public function aVeryLongMethodName(
+        ClassTypeHint $arg1,
+        &$arg2,
+        array $arg3 = []
+    )  :  array {
+        return [];
+    }
+
+    public function functionName(int $arg1, $arg2): string
+    {
+        return'foo';
+    }
+
+    public function anotherFunction(
+        string $foo,
+        string $bar,
+        int $baz
+    ) : string {
+        return 'foo';
+    }
+
+    public function returnTypeVariations(string $arg1 = null, string $arg2 = null):?string
+    {
+        return $arg1 ?? $arg2;
+    }
+}
diff --git a/test/fixable/method-and-function-calls.php b/test/fixable/method-and-function-calls.php
new file mode 100644
index 00000000..81f51280
--- /dev/null
+++ b/test/fixable/method-and-function-calls.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+bar ( );
+$foo->bar ( $arg1 );
+Foo::bar ($arg2 , $arg3) ;
+
+$foo->bar(
+    $longArgument,
+    $longerArgument,
+    $muchLongerArgument
+);
+
+somefunction($foo, $bar, [
+    // ...
+], $baz);
+
+$app->get ('/hello/{name}' , function ($name) use ($app) {
+
+    return 'Hello ' . $app->escape($name);
+
+});
diff --git a/test/fixable/new_with_parentheses.php b/test/fixable/new-with-parentheses.php
similarity index 100%
rename from test/fixable/new_with_parentheses.php
rename to test/fixable/new-with-parentheses.php
diff --git a/test/fixable/not_spacing.php b/test/fixable/not-spacing.php
similarity index 100%
rename from test/fixable/not_spacing.php
rename to test/fixable/not-spacing.php
diff --git a/test/fixable/null_coalesce_operator.php b/test/fixable/operators.php
similarity index 60%
rename from test/fixable/null_coalesce_operator.php
rename to test/fixable/operators.php
index 823b01c5..10758ba9 100644
--- a/test/fixable/null_coalesce_operator.php
+++ b/test/fixable/operators.php
@@ -2,6 +2,20 @@
 
 declare(strict_types=1);
 
+$foo = $foo . '';
+
+$bar = $bar + Something::count();
+
+$baz = $baz ** 2;
+
+$quux = $quux | Something::FOO;
+
+if ($a === $b) {
+    $foo = $bar ?? $a ?? $b;
+} elseif ($a > $b) {
+    $variable = $foo ? 'foo' : 'bar';
+}
+
 $foo = isset($_GET['foo']) ? $_GET['foo'] : 'foo';
 
 $bar = isset($bar) ? $bar : 'bar';
diff --git a/test/fixable/return_type_on_methods.php b/test/fixable/return-type-on-methods.php
similarity index 100%
rename from test/fixable/return_type_on_methods.php
rename to test/fixable/return-type-on-methods.php
diff --git a/test/fixable/return_type_on_closures.php b/test/fixable/return_type_on_closures.php
deleted file mode 100644
index d1a75226..00000000
--- a/test/fixable/return_type_on_closures.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-static function ():void
-{
-}
-
-static function (): void
-{
-}
-
-static function ():   void
-{
-}
-
-static function () :void
-{
-}
-
-static function ()   :void
-{
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-):void {
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-) :void {
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-)   :void {
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-): void {
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-):   void {
-}
diff --git a/test/fixable/semicolon_spacing.php b/test/fixable/semicolon-spacing.php
similarity index 100%
rename from test/fixable/semicolon_spacing.php
rename to test/fixable/semicolon-spacing.php
diff --git a/test/fixable/traits-uses.php b/test/fixable/traits-uses.php
index 75aae4a5..7db12ad3 100644
--- a/test/fixable/traits-uses.php
+++ b/test/fixable/traits-uses.php
@@ -2,23 +2,23 @@
 
 declare(strict_types=1);
 
-namespace TraitUses;
+namespace TraitsUses;
 
 class Foo
 {
-    use T1;
+    use FirstTrait;
 
 }
 
 class Bar
 {
-    use T2, T3;
+    use FirstTrait, SecondTrait;
 
-    use T4 {
+    use ThirdTrait {
         x as public;
     }
 
-    use T5;
+    use FourthTrait;
     public function __construct()
     {
     }
diff --git a/test/fixable/visibility-declaration.php b/test/fixable/visibility-declaration.php
new file mode 100644
index 00000000..bdba45df
--- /dev/null
+++ b/test/fixable/visibility-declaration.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VisibilityDeclaration;
+
+abstract class ClassName
+{
+    protected static $foo;
+
+    abstract protected function zim() : string;
+
+    final public static function bar() : ClassName
+    {
+        // method body
+    }
+}
diff --git a/test/fixed/anonymous-classes.php b/test/fixed/anonymous-classes.php
new file mode 100644
index 00000000..8fcfaa95
--- /dev/null
+++ b/test/fixed/anonymous-classes.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+$instance = new class {
+};
+
+// Brace on the same line
+$instance = new class extends Foo implements HandleableInterface {
+    // Class content
+};
+
+// Brace on the next line
+$instance = new class extends Foo implements
+    ArrayAccess,
+    Countable,
+    Serializable
+{
+    // Class content
+};
diff --git a/test/fixed/array_indentation.php b/test/fixed/array-indentation.php
similarity index 100%
rename from test/fixed/array_indentation.php
rename to test/fixed/array-indentation.php
diff --git a/test/fixed/assignment-operators.php b/test/fixed/assignment-operators.php
deleted file mode 100644
index 3a85cf89..00000000
--- a/test/fixed/assignment-operators.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$foo .= '';
-
-$bar += Something::count();
-
-$baz **= 2;
-
-$quux |= Something::FOO;
diff --git a/test/fixed/closures.php b/test/fixed/closures.php
new file mode 100644
index 00000000..9fde60bc
--- /dev/null
+++ b/test/fixed/closures.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+$closureWithArgs = function (string $arg1, string $arg2) {
+    // body
+};
+
+$closureWithArgsAndVars = function (int $arg1, int $arg2) use ($var1, $var2) : int {
+    return $arg1 * $var1 + $arg2 * $var2;
+};
+
+static function () : void {
+}
+
+static function () : void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+) : void {
+}
+
+static function (
+    int $a,
+    int $c,
+    int $d,
+    int $e,
+    int $b
+) : void {
+}
diff --git a/test/fixed/extends-and-implements-multiline.php b/test/fixed/extends-and-implements-multiline.php
new file mode 100644
index 00000000..7de04ad8
--- /dev/null
+++ b/test/fixed/extends-and-implements-multiline.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor\Package;
+
+use ArrayAccess;
+use Countable;
+use ParentClass;
+use Serializable;
+
+class ClassName extends ParentClass implements
+    ArrayAccess,
+    Countable,
+    Serializable
+{
+    // constants, properties, methods
+}
diff --git a/test/fixed/extends-and-implements.php b/test/fixed/extends-and-implements.php
new file mode 100644
index 00000000..2a8a2800
--- /dev/null
+++ b/test/fixed/extends-and-implements.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor\Package;
+
+use ArrayAccess;
+use BarClass as Bar;
+use Countable;
+use FooClass;
+use OtherVendor\OtherPackage\BazClass;
+
+class ClassName extends BazClass implements ArrayAccess, Countable
+{
+    public function __construct(FooClass $foo, Bar $bar)
+    {
+        // ...
+    }
+}
diff --git a/test/fixed/method-and-function-arguments.php b/test/fixed/method-and-function-arguments.php
new file mode 100644
index 00000000..c2d6ac79
--- /dev/null
+++ b/test/fixed/method-and-function-arguments.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MethodsAndFunctionArguments;
+
+class ClassName
+{
+    public function foo(int $arg1, &$arg2, $arg3 = []) : void
+    {
+    }
+
+    public function aVeryLongMethodName(
+        ClassTypeHint $arg1,
+        &$arg2,
+        array $arg3 = []
+    ) : array {
+        return [];
+    }
+
+    public function functionName(int $arg1, $arg2) : string
+    {
+        return 'foo';
+    }
+
+    public function anotherFunction(
+        string $foo,
+        string $bar,
+        int $baz
+    ) : string {
+        return 'foo';
+    }
+
+    public function returnTypeVariations(?string $arg1 = null, ?string $arg2 = null) : ?string
+    {
+        return $arg1 ?? $arg2;
+    }
+}
diff --git a/test/fixed/method-and-function-calls.php b/test/fixed/method-and-function-calls.php
new file mode 100644
index 00000000..5f90cf36
--- /dev/null
+++ b/test/fixed/method-and-function-calls.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+bar();
+$foo->bar($arg1);
+Foo::bar($arg2, $arg3);
+
+$foo->bar(
+    $longArgument,
+    $longerArgument,
+    $muchLongerArgument
+);
+
+somefunction($foo, $bar, [
+    // ...
+], $baz);
+
+$app->get('/hello/{name}', function ($name) use ($app) {
+    return 'Hello ' . $app->escape($name);
+});
diff --git a/test/fixed/new_with_parentheses.php b/test/fixed/new-with-parentheses.php
similarity index 100%
rename from test/fixed/new_with_parentheses.php
rename to test/fixed/new-with-parentheses.php
diff --git a/test/fixed/not_spacing.php b/test/fixed/not-spacing.php
similarity index 100%
rename from test/fixed/not_spacing.php
rename to test/fixed/not-spacing.php
diff --git a/test/fixed/null_coalesce_operator.php b/test/fixed/operators.php
similarity index 58%
rename from test/fixed/null_coalesce_operator.php
rename to test/fixed/operators.php
index 8846dd12..6addab0b 100644
--- a/test/fixed/null_coalesce_operator.php
+++ b/test/fixed/operators.php
@@ -2,6 +2,20 @@
 
 declare(strict_types=1);
 
+$foo .= '';
+
+$bar += Something::count();
+
+$baz **= 2;
+
+$quux |= Something::FOO;
+
+if ($a === $b) {
+    $foo = $bar ?? $a ?? $b;
+} elseif ($a > $b) {
+    $variable = $foo ? 'foo' : 'bar';
+}
+
 $foo = $_GET['foo'] ?? 'foo';
 
 $bar = $bar ?? 'bar';
diff --git a/test/fixed/return_type_on_methods.php b/test/fixed/return-type-on-methods.php
similarity index 100%
rename from test/fixed/return_type_on_methods.php
rename to test/fixed/return-type-on-methods.php
diff --git a/test/fixed/return_type_on_closures.php b/test/fixed/return_type_on_closures.php
deleted file mode 100644
index 3e6e7a35..00000000
--- a/test/fixed/return_type_on_closures.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-static function () : void {
-}
-
-static function () : void {
-}
-
-static function () : void {
-}
-
-static function () : void {
-}
-
-static function () : void {
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-) : void {
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-) : void {
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-) : void {
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-) : void {
-}
-
-static function (
-    int $a,
-    int $c,
-    int $d,
-    int $e,
-    int $b
-) : void {
-}
diff --git a/test/fixed/semicolon_spacing.php b/test/fixed/semicolon-spacing.php
similarity index 100%
rename from test/fixed/semicolon_spacing.php
rename to test/fixed/semicolon-spacing.php
diff --git a/test/fixed/traits-uses.php b/test/fixed/traits-uses.php
index e521e104..d071db8b 100644
--- a/test/fixed/traits-uses.php
+++ b/test/fixed/traits-uses.php
@@ -2,21 +2,21 @@
 
 declare(strict_types=1);
 
-namespace TraitUses;
+namespace TraitsUses;
 
 class Foo
 {
-    use T1;
+    use FirstTrait;
 }
 
 class Bar
 {
-    use T2;
-    use T3;
-    use T4 {
+    use FirstTrait;
+    use SecondTrait;
+    use ThirdTrait {
         x as public;
     }
-    use T5;
+    use FourthTrait;
 
     public function __construct()
     {
diff --git a/test/fixed/visibility-declaration.php b/test/fixed/visibility-declaration.php
new file mode 100644
index 00000000..bdba45df
--- /dev/null
+++ b/test/fixed/visibility-declaration.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace VisibilityDeclaration;
+
+abstract class ClassName
+{
+    protected static $foo;
+
+    abstract protected function zim() : string;
+
+    final public static function bar() : ClassName
+    {
+        // method body
+    }
+}

From 6dc1801189e9a2f50dd43e0ce01cee05d3e93c42 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Fri, 7 Sep 2018 00:34:08 +0200
Subject: [PATCH 25/60] Update concatenation spacing test

---
 test/fixable/concatenation-spacing.php | 37 ++++++++++++++++++++++++++
 test/fixable/concatenation_spacing.php | 37 --------------------------
 test/fixed/concatenation-spacing.php   | 37 ++++++++++++++++++++++++++
 test/fixed/concatenation_spacing.php   | 37 --------------------------
 4 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100644 test/fixable/concatenation-spacing.php
 delete mode 100644 test/fixable/concatenation_spacing.php
 create mode 100644 test/fixed/concatenation-spacing.php
 delete mode 100644 test/fixed/concatenation_spacing.php

diff --git a/test/fixable/concatenation-spacing.php b/test/fixable/concatenation-spacing.php
new file mode 100644
index 00000000..e7fc3578
--- /dev/null
+++ b/test/fixable/concatenation-spacing.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+$string = 'foo'.'bar';
+$string = 'foo'. 'bar';
+$string = 'foo' .'bar';
+$string = 'foo' . 'bar';
+
+$foo = 'foo';
+$bar    = 'bar';
+$string   = $foo.$bar;
+$string   = $foo. $bar;
+$string   = $foo .$bar;
+$string   = $foo . $bar;
+
+$string = 'foo'.$bar;
+$string = 'foo'. $bar;
+$string = 'foo' .$bar;
+$string = 'foo' . $bar;
+
+$string = $foo.'bar';
+$string = $foo. 'bar';
+$string = $foo .'bar';
+$string = $foo . 'bar';
+$string = $foo   .   'bar';
+
+$string = $foo . $bar. 'baz' .'quux'.$string;
+
+$string.=$foo;
+$string .= $foo;
+$string .=$foo;
+
+$string = $foo .
+    $bar .
+    'baz'
+    .$string;
diff --git a/test/fixable/concatenation_spacing.php b/test/fixable/concatenation_spacing.php
deleted file mode 100644
index e9ca8624..00000000
--- a/test/fixable/concatenation_spacing.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$string = 'Doctrine' . 'rulez';
-$string = 'Doctrine'. 'rulez';
-$string = 'Doctrine' .'rulez';
-$string = 'Doctrine'.'rulez';
-
-$doctrine = 'Doctrine';
-$rulez    = 'rulez';
-$string   = $doctrine . $rulez;
-$string   = $doctrine. $rulez;
-$string   = $doctrine .$rulez;
-$string   = $doctrine.$rulez;
-
-$string = 'Doctrine' . $rulez;
-$string = 'Doctrine'. $rulez;
-$string = 'Doctrine' .$rulez;
-$string = 'Doctrine'.$rulez;
-
-$string = $doctrine . 'rulez';
-$string = $doctrine .           'rulez';
-$string = $doctrine. 'rulez';
-$string = $doctrine .'rulez';
-$string = $doctrine.'rulez';
-
-$string = $doctrine . $rulez. 'even' .'more'.$string;
-
-$string.=$doctrine;
-$string .= $doctrine;
-$string .=$doctrine;
-
-$string = $doctrine.
-    $rulez .
-    'all'
-    .$string;
diff --git a/test/fixed/concatenation-spacing.php b/test/fixed/concatenation-spacing.php
new file mode 100644
index 00000000..0e3b4710
--- /dev/null
+++ b/test/fixed/concatenation-spacing.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+$string = 'foo' . 'bar';
+$string = 'foo' . 'bar';
+$string = 'foo' . 'bar';
+$string = 'foo' . 'bar';
+
+$foo    = 'foo';
+$bar    = 'bar';
+$string = $foo . $bar;
+$string = $foo . $bar;
+$string = $foo . $bar;
+$string = $foo . $bar;
+
+$string = 'foo' . $bar;
+$string = 'foo' . $bar;
+$string = 'foo' . $bar;
+$string = 'foo' . $bar;
+
+$string = $foo . 'bar';
+$string = $foo . 'bar';
+$string = $foo . 'bar';
+$string = $foo . 'bar';
+$string = $foo . 'bar';
+
+$string = $foo . $bar . 'baz' . 'quux' . $string;
+
+$string .=$foo;
+$string .= $foo;
+$string .=$foo;
+
+$string = $foo .
+    $bar .
+    'baz'
+    . $string;
diff --git a/test/fixed/concatenation_spacing.php b/test/fixed/concatenation_spacing.php
deleted file mode 100644
index 3c71f119..00000000
--- a/test/fixed/concatenation_spacing.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$string = 'Doctrine' . 'rulez';
-$string = 'Doctrine' . 'rulez';
-$string = 'Doctrine' . 'rulez';
-$string = 'Doctrine' . 'rulez';
-
-$doctrine = 'Doctrine';
-$rulez    = 'rulez';
-$string   = $doctrine . $rulez;
-$string   = $doctrine . $rulez;
-$string   = $doctrine . $rulez;
-$string   = $doctrine . $rulez;
-
-$string = 'Doctrine' . $rulez;
-$string = 'Doctrine' . $rulez;
-$string = 'Doctrine' . $rulez;
-$string = 'Doctrine' . $rulez;
-
-$string = $doctrine . 'rulez';
-$string = $doctrine . 'rulez';
-$string = $doctrine . 'rulez';
-$string = $doctrine . 'rulez';
-$string = $doctrine . 'rulez';
-
-$string = $doctrine . $rulez . 'even' . 'more' . $string;
-
-$string .=$doctrine;
-$string .= $doctrine;
-$string .=$doctrine;
-
-$string = $doctrine .
-    $rulez .
-    'all'
-    . $string;

From c7718be1f1efd7207fa6ebee5f5658fa650e05d0 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Fri, 7 Sep 2018 00:40:34 +0200
Subject: [PATCH 26/60] Update expected phpcs report

---
 test/expected-report.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/expected-report.txt b/test/expected-report.txt
index a552965e..d7edc5ea 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -6,7 +6,7 @@ FILE                                                  ERRORS  WARNINGS
 test/fixable/anonymous-classes.php                    9       0
 test/fixable/array-indentation.php                    11      0
 test/fixable/closures.php                             19      0
-test/fixable/concatenation_spacing.php                24      0
+test/fixable/concatenation-spacing.php                28      0
 test/fixable/EarlyReturn.php                          5       0
 test/fixable/example-class.php                        22      0
 test/fixable/extends-and-implements-multiline.php     10      0
@@ -28,9 +28,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 215 ERRORS AND 1 WARNING WERE FOUND IN 24 FILES
+A TOTAL OF 219 ERRORS AND 1 WARNING WERE FOUND IN 24 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 192 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 196 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

From 7367ecdc8baa94bae547b0885d59845a9807e077 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Fri, 7 Sep 2018 18:52:17 +0200
Subject: [PATCH 27/60] Improve concatenation tests

---
 test/expected-report.txt               |  8 ++---
 test/fixable/concatenation-spacing.php | 38 ++++++++---------------
 test/fixed/concatenation-spacing.php   | 42 +++++++++-----------------
 3 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/test/expected-report.txt b/test/expected-report.txt
index d7edc5ea..942d16e3 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -6,11 +6,11 @@ FILE                                                  ERRORS  WARNINGS
 test/fixable/anonymous-classes.php                    9       0
 test/fixable/array-indentation.php                    11      0
 test/fixable/closures.php                             19      0
-test/fixable/concatenation-spacing.php                28      0
+test/fixable/concatenation-spacing.php                18      0
 test/fixable/EarlyReturn.php                          5       0
 test/fixable/example-class.php                        22      0
 test/fixable/extends-and-implements-multiline.php     10      0
-test/fixable/extends-and-implements.php               5       1
+test/fixable/extends-and-implements.php               5       0
 test/fixable/forbidden-comments.php                   4       0
 test/fixable/forbidden-functions.php                  6       0
 test/fixable/LowCaseTypes.php                         2       0
@@ -28,9 +28,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 219 ERRORS AND 1 WARNING WERE FOUND IN 24 FILES
+A TOTAL OF 209 ERRORS AND 0 WARNINGS WERE FOUND IN 24 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 196 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 188 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/test/fixable/concatenation-spacing.php b/test/fixable/concatenation-spacing.php
index e7fc3578..ba9ee0f5 100644
--- a/test/fixable/concatenation-spacing.php
+++ b/test/fixable/concatenation-spacing.php
@@ -2,36 +2,24 @@
 
 declare(strict_types=1);
 
-$string = 'foo'.'bar';
-$string = 'foo'. 'bar';
-$string = 'foo' .'bar';
-$string = 'foo' . 'bar';
+$string = 'Hello'.$there.'. How are'.$you.$going.   "today $okay";
+$string = 'Hello' . $there . '. How are' . $you . $going . "today $okay";
+$string = 'Hello'.$there;
+$string = 'Hello'. $there;
+$string = 'Hello' .$there;
 
 $foo = 'foo';
 $bar    = 'bar';
-$string   = $foo.$bar;
-$string   = $foo. $bar;
-$string   = $foo .$bar;
-$string   = $foo . $bar;
-
-$string = 'foo'.$bar;
-$string = 'foo'. $bar;
-$string = 'foo' .$bar;
-$string = 'foo' . $bar;
-
-$string = $foo.'bar';
-$string = $foo. 'bar';
-$string = $foo .'bar';
-$string = $foo . 'bar';
-$string = $foo   .   'bar';
 
 $string = $foo . $bar. 'baz' .'quux'.$string;
-
 $string.=$foo;
 $string .= $foo;
-$string .=$foo;
+$string  .=$foo;
+
+$string = '1'
+          . '2'
+      . '3';
 
-$string = $foo .
-    $bar .
-    'baz'
-    .$string;
+$string = '1' .
+          '2' .
+          '3';
diff --git a/test/fixed/concatenation-spacing.php b/test/fixed/concatenation-spacing.php
index 0e3b4710..2b0c5552 100644
--- a/test/fixed/concatenation-spacing.php
+++ b/test/fixed/concatenation-spacing.php
@@ -2,36 +2,24 @@
 
 declare(strict_types=1);
 
-$string = 'foo' . 'bar';
-$string = 'foo' . 'bar';
-$string = 'foo' . 'bar';
-$string = 'foo' . 'bar';
+$string = 'Hello' . $there . '. How are' . $you . $going . "today $okay";
+$string = 'Hello' . $there . '. How are' . $you . $going . "today $okay";
+$string = 'Hello' . $there;
+$string = 'Hello' . $there;
+$string = 'Hello' . $there;
 
-$foo    = 'foo';
-$bar    = 'bar';
-$string = $foo . $bar;
-$string = $foo . $bar;
-$string = $foo . $bar;
-$string = $foo . $bar;
-
-$string = 'foo' . $bar;
-$string = 'foo' . $bar;
-$string = 'foo' . $bar;
-$string = 'foo' . $bar;
-
-$string = $foo . 'bar';
-$string = $foo . 'bar';
-$string = $foo . 'bar';
-$string = $foo . 'bar';
-$string = $foo . 'bar';
-
-$string = $foo . $bar . 'baz' . 'quux' . $string;
+$foo = 'foo';
+$bar = 'bar';
 
+$string  = $foo . $bar . 'baz' . 'quux' . $string;
 $string .=$foo;
 $string .= $foo;
 $string .=$foo;
 
-$string = $foo .
-    $bar .
-    'baz'
-    . $string;
+$string = '1'
+          . '2'
+      . '3';
+
+$string = '1' .
+          '2' .
+          '3';

From a88527c925e2d7e44acdc82a413b066b854c336b Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Fri, 7 Sep 2018 18:53:14 +0200
Subject: [PATCH 28/60] Add phpcs cache for speed improvement

---
 .gitignore     | 1 +
 phpcs.xml.dist | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index b01fd1d7..adb2b52c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/.phpcs-cache
 /clover.xml
 /composer.lock
 /coveralls-upload.json
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 818edf17..c13f0a96 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -5,11 +5,12 @@
     <description>The coding standard for ZendCodingStandard itself.</description>
 
     <arg name="basepath" value="."/>
-    <arg name="extensions" value="php"/>
+    <arg name="cache" value=".phpcs-cache"/>
     <arg name="colors"/>
-    <arg value="p"/>
-
-    <rule ref="ZendCodingStandard"/>
+    <arg name="extensions" value="php"/>
+    <arg name="parallel" value="80"/>
 
     <file>src</file>
+
+    <rule ref="ZendCodingStandard"/>
 </ruleset>

From c15e28eb06111ea8a023e4dae046d3bddc997052 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Fri, 7 Sep 2018 18:59:24 +0200
Subject: [PATCH 29/60] Document the coding standard and all rules

All used rules are documented in ruleset.md.
coding-style-guide.md contains extends the PSR-1 and PSR-12
documentation and only mentions the differences/extras. Links to the
PSR-12 documentation is added for easy reference.

I've left plenty of typo's, inconsistencies and mistakes for others to
discover. Some rules in the ruleset.md file need examples.
---
 docs/book/v2/coding-style-guide.md | 384 ++++++++++++++++
 docs/book/v2/intro.md              |  42 +-
 docs/book/v2/ruleset.md            | 715 ++++++++++++++++++++++-------
 3 files changed, 956 insertions(+), 185 deletions(-)
 create mode 100644 docs/book/v2/coding-style-guide.md

diff --git a/docs/book/v2/coding-style-guide.md b/docs/book/v2/coding-style-guide.md
new file mode 100644
index 00000000..41020a36
--- /dev/null
+++ b/docs/book/v2/coding-style-guide.md
@@ -0,0 +1,384 @@
+# Zend Framework Coding Style Guide
+
+This specification extends and expands [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md), 
+the extended coding style guide and requires adherence to [PSR-1](https://www.php-fig.org/psr/psr-1), 
+the basic coding standard.
+
+> Note: PSR-12 is not finalized. e.g. The `!` operator and `:` placement for return values are still under  discussion. 
+We will change these rules, and, when PSR-12 is finalized, adapt them.
+
+## General
+
+### Basic Coding Standard
+
+Code MUST follow all rules outlined in [PSR-1](https://www.php-fig.org/psr/psr-1) and
+[PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md), except in 
+specific cases outlined in this specification, until PSR-12 is accepted os a standard.
+
+### Indenting and Alignment
+
+- There should be one space on either side of an equals sign used to assign a value to a variable. In the case of a 
+  block of related assignments, more space may be inserted before the equal sign to promote readability.
+  [*](ruleset.md#genericformattingmultiplestatementalignment)
+
+```php
+<?php
+
+$shortVar        = (1 + 2);
+$veryLongVarName = 'string';
+$var             = foo($bar, $baz, $quux);
+```
+
+- Short array syntax must be used to define arrays. [*](ruleset.md#genericarraysdisallowlongarraysyntax)
+- All values in multiline arrays must be indented with 4 spaces. [*](ruleset.md#genericarraysarrayindent)
+- All array values must be followed by a comma, including the final value. [*](ruleset.md#slevomatcodingstandardarraystrailingarraycomma)
+- Whitespace is not allowed around the opening bracket or before the closing bracket when referencing an array.
+  [*](ruleset.md#squizarraysarraybracketspacing)
+- All double arrow symbols must be aligned to one space after the longest array key. [*](ruleset.md#squizarraysarraydeclaration)
+
+```php
+<?php
+
+$array = [
+    'key1'      => 'value1',
+    'key2'      => 'value2',
+    'keyTwenty' => 'value3',
+]; 
+
+$var = [
+    'one'   => function() {
+        $foo    = [1,2,3];
+        $barBar = [
+            1,
+            2,
+            3,
+        ];
+    },
+    'longer' => 2,
+    /* three */ 3 => 'three',
+];
+```
+
+### PHP Keywords, Types, Constants and Functions
+
+- The `global` keyword may not be used. [*](ruleset.md#squizphpglobalkeyword)
+- The `PHP_SAPI` constant must be used instead of the `php_sapi_name()` function. [*](ruleset.md#genericphpsapiusage)
+- PHP function calls must be in lowercase. [*](ruleset.md#squizphplowercasephpfunctions)
+- PHP functions which are an alias may not be used. [*](ruleset.md#genericphpforbiddenfunctions)
+- Deprecated functions should not be used. [*](ruleset.md#genericphpdeprecatedfunctions)
+
+### Commenting
+
+- Comments may not start with `#`. [*](ruleset.md#pearcommentinginlinecomment)
+- Comments may not be empty. [*](ruleset.md#slevomatcodingstandardcommentingemptycomment)
+- To keep comments clean, specific words in comments may not be used: _private_, _protected_, _static_, _constructor_, 
+  _deconstructor_, _Created by_, _getter_, _setter_. [*](ruleset.md#slevomatcodingstandardcommentingforbiddencomments)
+- Comments may not contain useless annotations: `@api`, `@author`, `@category`, `@created`, `@package`, `@subpackage`,
+  `@version`. Git commits provide accurate information. [*](ruleset.md#slevomatcodingstandardcommentingforbiddenannotations)
+- The asterisks in a doc comment should align, and there should be one space between the asterisk and tag.
+  [*](ruleset.md#squizcommentingdoccommentalignment)
+- If a function throws any exceptions, they should be documented in a `@throws` tag.
+  [*](ruleset.md#squizcommentingfunctioncomment)
+- Use valid format of inline phpDocs with `@var`. [*](ruleset.md#slevomatcodingstandardcommentinginlinedoccommentdeclaration)
+- Comments with single-line content should be written as one-liners. [*](ruleset.md#slevomatcodingstandardcommentingrequireonelinepropertydoccomment)
+- Shorthand scalar typehint variants must be used in docblocks: `bool` instead of `boolean`, `int` instead of `integer`, 
+  etc. [*](ruleset.md#slevomatcodingstandardtypehintslongtypehints)
+
+## Declare Statements, Namespace, and Import Statements
+
+In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#3-declare-statements-namespace-and-import-statements):
+
+- Each php file should have a page level docblock with `@see`, `@copyright` and `@license`. The copyright date should
+  only be adjusted if the file has changed.
+- Each PHP file should have a strict type declaration at the top after the page level docblock. [*](ruleset.md#slevomatcodingstandardtypehintsdeclarestricttypes)
+- Import statements should be alphabetically sorted. [*](ruleset.md#slevomatcodingstandardnamespacesalphabeticallysorteduses)
+- Import statements should not be grouped. [*](ruleset.md#slevomatcodingstandardnamespacesdisallowgroupuse)
+- Each import statement should be on its own line. [*](ruleset.md#slevomatcodingstandardnamespacesmultipleusesperline)
+- Absolute class name references, functions and constants should be imported. [*](ruleset.md#slevomatcodingstandardnamespacesreferenceusednamesonly)
+- Unused import statements are not allowed. [*](ruleset.md#slevomatcodingstandardnamespacesunuseduses)
+- Classes and function within the same namespace should not be imported. [*](ruleset.md#slevomatcodingstandardnamespacesusefromsamenamespace)
+- Imports should not have an alias with the same name. [*](ruleset.md#slevomatcodingstandardnamespacesuselessalias)
+- A class should not have unused private constants, (or write-only) properties and methods. [*](ruleset.md#slevomatcodingstandardclassesunusedprivateelements)
+
+```php
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-coding-standard for the canonical source repository
+ * @copyright Copyright (c) 2016-2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-coding-standard/blob/master/LICENSE.md New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace Vendor\Package;
+
+Use InvalidArgumentException;
+use Vendor\Package\ClassA;
+use Vendor\Package\SomeNamespace\ClassB as B;
+
+use function Another\Vendor\functionB;
+use function file_get_contents;
+use function Vendor\Package\functionA;
+
+use const Another\Vendor\CONSTANT_B;
+use const PASSWORD_DEFAULT;
+use const Vendor\Package\CONSTANT_A;
+
+/** FooBar is an example class. */
+class FooBar
+{
+    // ... additional PHP code ...
+}
+```
+
+## Classes, Properties, and Methods
+
+In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#4-classes-properties-and-methods):
+
+- Methods may not have the final declaration classes declared as final. [*](ruleset.md#genericcodeanalysisunnecessaryfinalmodifier)
+- The colon used with return type declarations MUST be surrounded with 1 space. [*](ruleset.md#slevomatcodingstandardtypehintsreturntypehintspacing)
+- Nullable and optional arguments, which are marked as `= null`, must have the nullablity `?` symbol present. [*](ruleset.md#slevomatcodingstandardtypehintsnullabletypefornulldefaultvalue)
+
+```php
+<?php
+
+namespace Vendor\Package;
+
+use ArrayAccess;
+use Countable;
+use Vendor\AnotherPackage\FirstInterface;
+use Vendor\AnotherPackage\Traits\ThirdTrait;
+
+class ClassName extends ParentClass implements ArrayAccess, Countable
+{
+    use FirstTrait;
+    use SecondTrait;
+    use ThirdTrait;
+    
+    public const CONSTANT = 'constant';
+    
+    private $property;
+    
+    public function fooBarBaz(int $arg1, &$arg2, array $arg3 = [], ?$arg4 = null) : void
+    {
+        return;
+    }
+    
+    public function aVeryLongMethodName(
+        FirstInterface $arg1,
+        &$arg2,
+        array $arg3 = [],
+        ?$arg4 = null
+    ) : string {
+        return 'foo';
+    }
+}
+```
+
+## Control Structures
+
+In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#5-control-structures):
+
+- Control Structures must have at least one statement inside of the body. [*](ruleset.md#genericcodeanalysisemptystatement)
+
+### if, elseif, else
+```php
+<?php
+
+if ($expr1) {
+    // if body
+} elseif ($expr2) {
+    // elseif body
+} else {
+    // else body;
+}
+```
+
+### switch, case
+```php
+<?php
+
+switch ($expr) {
+    case 0:
+        echo 'First case, with a break';
+        break;
+    case 1:
+        echo 'Second case, which falls through';
+        // no break
+    case 2:
+    case 3:
+    case 4:
+        echo 'Third case, return instead of break';
+        return;
+    default:
+        echo 'Default case';
+        break;
+}
+```
+
+### while, do while
+```php
+<?php
+
+while ($expr) {
+    // structure body
+}
+```
+
+```php
+<?php
+
+do {
+    // structure body;
+} while ($expr);
+```
+
+### for
+```php
+<?php
+
+for ($i = 0; $i < 10; $i++) {
+    // for body
+}
+```
+
+### foreach
+```php
+<?php
+
+foreach ($iterable as $key => $value) {
+    // foreach body
+}
+```
+
+### try, catch, finally
+
+- Catch blocks may be empty. [*](ruleset.md#genericcodeanalysisemptystatementdetectedcatch)
+- Catch blocks should be reachable. [*](ruleset.md#slevomatcodingstandardexceptionsdeadcatch)
+- Catch blocks must use `Throwable` instead of `Exception`. [*](ruleset.md#slevomatcodingstandardexceptionsreferencethrowableonly)
+
+```php
+<?php
+
+try {
+    // May not be empty
+} catch (FirstThrowableType $e) {
+} catch (OtherThrowableType $e) {
+    // Optionally do something
+} finally {
+    // Finally body
+}
+```
+
+## Operators
+
+In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#6-operators):
+
+- The not (`!`) operator must be followed by exactly one space. [*](ruleset.md#genericformattingspaceafternot)
+- The `&&` and `||` operators must be used instead of `&&` and `||`. [*](ruleset.md#squizoperatorsvalidlogicaloperators)
+- The null coalesce operator should be used when possible. [*](ruleset.md#slevomatcodingstandardcontrolstructuresrequirenullcoalesceoperator)
+- Assignment operators (eg `+=`, `.=`) should be used when possible. [*](ruleset.md#slevomatcodingstandardoperatorsrequirecombinedassignmentoperator)
+
+```php
+<?php
+
+if ($a === $b) {
+    $foo = $bar ?? $a ?? $b;
+} elseif (! $a || $b > $c) {
+    $variable = $foo ? 'foo' : 'bar';
+}
+
+$var           = 'foo';
+$aVeryLongName = 'bar';
+$function      = function ($arg1, $arg2) {};
+```
+
+## Closures
+
+In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#7-closures):
+
+- Unused variables should not be passed to closures via `use`. [*](ruleset.md#slevomatcodingstandardfunctionsunusedinheritedvariablepassedtoclosure)
+
+```php
+<?php
+
+$closureWithArgs = function ($arg1, $arg2) {
+    // body
+};
+
+$closureWithArgsAndVars = function ($arg1, $arg2) use ($var1, $var2) {
+    // body
+};
+
+$longArgsAndLongVars = function (
+    $longArgument,
+    $longerArgument,
+    $muchLongerArgument
+) use (
+    $longVar1,
+    $longerVar2,
+    $muchLongerVar3
+) {
+   // body
+};
+```
+
+## Anonymous Classes
+
+In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#8-anonymous-classes):
+
+```php
+<?php
+
+$instance = new class {};
+
+// Brace on the same line
+$instance = new class extends Foo implements HandleableInterface {
+    // Class content
+};
+
+// Brace on the next line
+$instance = new class extends Foo implements
+    ArrayAccess,
+    Countable,
+    Serializable
+{
+    // Class content
+};
+```
+
+## Miscellaneous
+
+- The code may not contain unreachable code. [*](ruleset.md#squizphpnonexecutablecode)
+- The backtick operator may not be used for execution of shell commands. [*](ruleset.md#genericphpbacktickoperator)
+- Class and Interface names should be unique in a project. They should never be duplicated. [*](ruleset.md#genericclassesduplicateclassname)
+- Methods should not be defined that only call the parent method. [*](ruleset.md#genericcodeanalysisuselessoverridingmethod)
+- Files that contain php code should only have php code and should not have any _"inline html"_. [*](ruleset.md#genericfilesinlinehtml)
+- There must be exactly one space after a cast. [*](ruleset.md#genericformattingspaceaftercast)
+- Constructors should be named `__construct`, not after the class. [*](ruleset.md#genericnamingconventionsconstructorname)
+- The opening php tag should be the first item in the file. [*](ruleset.md#genericphpcharacterbeforephpopeningtag)
+- Strings should not be concatenated together, unless used in multiline for readability. [*](ruleset.md#genericstringsunnecessarystringconcat)
+- Loose `==` and `!=` comparison operators should not be used. Use `===` and `!==` instead, they are much more secure 
+  and predictable. [*](ruleset.md#slevomatcodingstandardcontrolstructuresdisallowequaloperators)
+- An early exit strategy should be used where possible to reduce the level of control structures.
+  [*](ruleset.md#slevomatcodingstandardcontrolstructuresearlyexit)
+- Language constructs must be used without parentheses where possible. [*](ruleset.md#slevomatcodingstandardcontrolstructureslanguageconstructwithparentheses)
+- Short list syntax `[...]` should be used instead of `list(...)`. [*](ruleset.md#slevomatcodingstandardphpshortlist)
+- Short form of type keywords must be used. i.e. `bool` instead of `boolean`, `int` instead of `integer`, etc.
+  The `binary` and `unset` cast operators are not allowed. [*](ruleset.md#slevomatcodingstandardphptypecast)
+- Unneeded parentheses should not be used. [*](ruleset.md#slevomatcodingstandardphpuselessparentheses)
+- Semicolons `;` should not be used if they are not needed. [*](ruleset.md#slevomatcodingstandardphpuselesssemicolon)
+- Variables should be returned directly instead of assigned to a variable which is not used. [*](ruleset.md#slevomatcodingstandardvariablesuselessvariable)
+- The self keyword should be used instead of the current class name, and should not have spaces around `::`.
+  [*](ruleset.md#squizclassesselfmemberreference)
+- Global functions should not be used. [*](ruleset.md#squizfunctionsglobalfunction)
+- Static methods should not use $this. [*](ruleset.md#squizscopestaticthisusage)
+- Double quote strings may only be used if it contains variables. [*](ruleset.md#squizstringsdoublequoteusage)
+- Simple strings should not be enclosed in parentheses when being echoed. [*](ruleset.md#squizstringsechoedstrings)
+- Casts should not have whitespace inside the parentheses. [*](ruleset.md#squizwhitespacecastspacing)
+- The opening brace for functions should be on a new line with no blank lines surrounding it. [*](ruleset.md#squizwhitespacefunctionopeningbracespace)
+- The php constructs `echo`, `print`, `return`, `include`, `include_once`, `require`, `require_once`, and `new` should 
+  have one space after them. [*](ruleset.md#squizwhitespacelanguageconstructspacing)
+- The object operator (`->`) should not have any space around it. [*](ruleset.md#squizwhitespaceobjectoperatorspacing)
+- Semicolons should not have spaces before them. [*](ruleset.md#squizwhitespacesemicolonspacing)
+- The code should not superfluous whitespaces. e.g. multiple empty lines, trailing spaces, etc. [*](ruleset.md#squizwhitespacesuperfluouswhitespace)
diff --git a/docs/book/v2/intro.md b/docs/book/v2/intro.md
index 3ac8244b..4200c27b 100644
--- a/docs/book/v2/intro.md
+++ b/docs/book/v2/intro.md
@@ -2,6 +2,22 @@
 
 This component provides the coding standard ruleset for Zend Framework components.
 
+PSR-1, PSR-2 and PSR-12 are _minimal_ sets and don't address a lot of factors, including things like:
+
+- whitespace around operators
+- alignment of array keys and operators
+- alignment of object operations
+- how to format multi-line conditionals
+- what and what not to import, and how
+- etc.
+
+Contributors have different coding styles and so do the maintainers. During code reviews there are regularly 
+discussions about spaces and alignments, where and when was said that a function needs to be imported. And 
+that's where this coding standard comes in: To have internal consistency in a component and between components.
+
+> Note: PSR-12 is not finalized. e.g. The `!` operator and `:` placement for return values are still under  discussion. 
+We will change these rules, and, when PSR-12 is finalized, adapt them.
+
 ## Installation
 
 1. Install the module via composer by running:
@@ -19,22 +35,34 @@ This component provides the coding standard ruleset for Zend Framework component
    }
    ```
 
-3. Create file `phpcs.xml` on base path of your repository with content:
+3. Create file `phpcs.xml.dist` on base path of your repository with content:
 
    ```xml
    <?xml version="1.0"?>
-   <ruleset name="Zend Framework Coding Standard">
-       <rule ref="ZendCodingStandard"/>
-
+   <ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
+   
+       <arg name="basepath" value="."/>
+       <arg name="cache" value=".phpcs-cache"/>
+       <arg name="colors"/>
+       <arg name="extensions" value="php"/>
+       <arg name="parallel" value="80"/>
+       
+       <!-- Show progress -->
+       <arg value="p"/>
+   
        <!-- Paths to check -->
        <file>config</file>
        <file>src</file>
        <file>test</file>
+   
+       <!-- Include all rules from the Zend Coding Standard -->
+       <rule ref="ZendCodingStandard"/>
    </ruleset>
    ```
 
-You can add or exclude some locations in that file.
-For a reference please see: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
+You can add your own rules or exclude rules. For a reference please see: 
+[PHP_CodeSniffer Annotated Ruleset](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset)
 
 ## Usage
 
@@ -53,7 +81,7 @@ For a reference please see: https://github.com/squizlabs/PHP_CodeSniffer/wiki/An
 ## Ignoring parts of a File
 
 > Note: Before PHP_CodeSniffer version 3.2.0, `// @codingStandardsIgnoreStart` and `// @codingStandardsIgnoreEnd` were
-> used. These will be removed in PHP_CodeSniffer version 4.0.
+> used. These are deprecated and will be removed in PHP_CodeSniffer version 4.0.
 
 Disable parts of a file:
 ```php
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index 04c75952..fb84fee0 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -1,57 +1,156 @@
 # Ruleset
 
-## Use PSR-2 coding standard as a base
-*PSR2*
+## PSR2
+Use PSR-2 coding standard as a base
 
-## Force array element indentation with 4 spaces
-*Generic.Arrays.ArrayIndent*
+### PSR2.ControlStructures.ElseIfDeclaration.NotAllowed
+_PSR-12:_ The keyword `elseif` should be used instead of `else if` so that all control keywords look like single words.
 
-## Forbid `array(...)`
-*Generic.Arrays.DisallowLongArraySyntax*
 
-## Forbid backtick operator
-*Generic.PHP.BacktickOperator*
 
-## Forbid duplicate classes
-*Generic.Classes.DuplicateClassName*
+## Generic
 
-## Forbid empty statements, but allow empty catch
-*Generic.CodeAnalysis.EmptyStatement, Generic.CodeAnalysis.EmptyStatement.DetectedCatch*
+### Generic.Arrays.ArrayIndent
+All values in multiline arrays must be indented with 4 spaces.
 
-## Forbid final methods in final classes
-*Generic.CodeAnalysis.UnnecessaryFinalModifier*
+### Generic.Arrays.DisallowLongArraySyntax
+Short array syntax must be used to define arrays.
+```php
+$foo = [...];
+```
+
+### Generic.PHP.BacktickOperator
+The backtick operator may not be used for execution of shell commands.
+
+### Generic.Classes.DuplicateClassName
+Class and Interface names should be unique in a project. They should never be duplicated.
+
+### Generic.CodeAnalysis.EmptyStatement
+Control Structures must have at least one statement inside of the body.
+
+#### Generic.CodeAnalysis.EmptyStatement.DetectedCatch
+Catch blocks may be empty.
+```php
+try {
+    // Try block
+} catch (SomeThrowableType $e) {
+}
+```
+
+### Generic.CodeAnalysis.UnnecessaryFinalModifier
+Methods may not have the final declaration classes declared as final.
+
+### Generic.CodeAnalysis.UselessOverridingMethod
+Methods should not be defined that only call the parent method.
+
+```php
+// Valid: A method that extends functionality on a parent method.
+final class Foo
+{
+    public function bar() : void
+    {
+        parent::bar();
+        $this->doSomethingElse();
+    }
+}
+
+// Invalid: An overriding method that only calls the parent.
+final class Foo
+{
+    public function bar() : void
+    {
+       parent::bar();
+    }
+}
+```
+
+### Generic.Files.InlineHTML
+Files that contain php code should only have php code and should not have any _"inline html"_.
+```php
+<?php
+// Valid: A php file with only php code in it.
+$foo = 'bar';
+echo $foo . 'baz';
+```
 
-## Forbid useless empty method overrides
-*Generic.CodeAnalysis.UselessOverridingMethod*
+```php
+<!-- Invalid: A php file with html in it outside of the php tags. -->
+<em>some string here</em>
+<?php
+$foo = 'bar';
+echo $foo . 'baz';
+```
 
-## Forbid short open tag, but allow short echo tags
-*Generic.PHP.DisallowShortOpenTag*
+### Generic.Formatting.MultipleStatementAlignment
+There should be one space on either side of an equals sign used to assign a value to a variable. In the case of a 
+block of related assignments, more space may be inserted before the equal sign to promote readability.
+```php
+<?php
+
+$shortVar        = (1 + 2);
+$veryLongVarName = 'string';
+$var             = foo($bar, $baz, $quux);
+```
+
+### Generic.Formatting.SpaceAfterCast
+There must be exactly one space after a cast.
+
+```php
+// Valid: A cast operator is followed by one space.
+$foo = (string) 1;
+
+// Invalid: A cast operator is not followed by whitespace.
+$foo = (string)1;
+```
 
-## Forbid inline HTML in PHP code
-*Generic.Files.InlineHTML*
+### Generic.Formatting.SpaceAfterNot
+The not (`!`) operator must be followed by exactly one space.
 
-## Align corresponding assignment statement tokens
-*Generic.Formatting.MultipleStatementAlignment*
+### Generic.NamingConventions.ConstructorName
+Constructors should be named `__construct`, not after the class.
 
-## Force whitespace after a type cast
-*Generic.Formatting.SpaceAfterCast*
+```php
+// Valid: The constructor is named __construct.
+class Foo
+{
+    function <em>__construct</em>()
+    {
+    }
+}
 
-## Force whitespace after `!`
-*Generic.Formatting.SpaceAfterNot*
+// Invalid: The old style class name constructor is used.
+class Foo
+{
+    function <em>Foo</em>()
+    {
+    }
+}
+```
 
-## Forbid PHP 4 constructors
-*Generic.NamingConventions.ConstructorName*
+### Generic.PHP.CharacterBeforePHPOpeningTag
+The opening php tag should be the first item in the file.
+```php
+<?php // Valid: A file starting with an opening php tag.
+echo 'Foo';
+```
 
-## Forbid any content before opening tag
-*Generic.PHP.CharacterBeforePHPOpeningTag*
+```php
+// Invalid: A file with content before the opening php tag.
+<em>Beginning content</em>
+<?php
+echo 'Foo';
+```
 
-## Forbid deprecated functions
-*Generic.PHP.DeprecatedFunctions*
+### Generic.PHP.DeprecatedFunctions
+Deprecated functions should not be used.
 
-## Forbid alias functions, i.e. `sizeof()`, `delete()`
-*Generic.PHP.ForbiddenFunctions*
+### Generic.PHP.DisallowShortOpenTag
+#### Generic.PHP.DisallowShortOpenTag.EchoFound
+_PSR-1:_ PHP code must use the long `<?php ?>` tags or the short-echo `<?= ?>` tags; it must not use the other tag 
+variations.
 
-Alias functions should not be used. This can't be fixed automatically and need to be done by hand.
+### Generic.PHP.ForbiddenFunctions
+PHP functions which are an alias may not be used. _This can't be fixed automatically and need to be done manually._
 
 | Alias        | Replace with     |
 | ------------ | ---------------- |
@@ -76,181 +175,334 @@ Alias functions should not be used. This can't be fixed automatically and need t
 | sizeof       | count            |
 | strchr       | strstr           |
 
-## Force PHP 7 param and return types to be lowercased
-*Generic.PHP.LowerCaseType*
+### Generic.PHP.LowerCaseType
+_PSR-12:_ Any new types and keywords added to future PHP versions must be in lower case.
 
-## Forbid `php_sapi_name()` function, use `PHP_SAPI`
-*Generic.PHP.SAPIUsage*
+### Generic.PHP.SAPIUsage
+The `PHP_SAPI` constant must be used instead of the `php_sapi_name()` function.
 
-## Forbid inline string concatenation, unless used in multiline for readability
-*Generic.Strings.UnnecessaryStringConcat*
+### Generic.Strings.UnnecessaryStringConcat
+Strings should not be concatenated together, unless used in multiline for readability.
+```php
+// Valid: A string can be concatenated with an expression.
+echo '5 + 2 = ' . (5 + 2);
 
-## Forbid comments starting with `#`
-*PEAR.Commenting.InlineComment*
+// Invalid: Strings should not be concatenated together.
+echo 'Hello' . ' ' . 'World';
+```
 
-## Disallow `else if` in favor of `elseif`
-*PSR2.ControlStructures.ElseIfDeclaration.NotAllowed*
+## PEAR
 
-## Require comma after last element in multi-line array
-*SlevomatCodingStandard.Arrays.TrailingArrayComma*
+### PEAR.Commenting.InlineComment
+Comments may not start with `#`.
 
-## Require presence of constant visibility
-*SlevomatCodingStandard.Classes.ClassConstantVisibility*
 
-## Forbid uses of multiple traits separated by comma
-*SlevomatCodingStandard.Classes.TraitUseDeclaration*
 
-## Require no spaces before trait use, between trait uses and one space after trait uses
+## SlevomatCodingStandard
 
-## Forbid dead code
-*SlevomatCodingStandard.Classes.UnusedPrivateElements*
+### SlevomatCodingStandard.Arrays.TrailingArrayComma
+All array values must be followed by a comma, including the final value. Commas after last element in an array make 
+adding a new element easier and result in a cleaner versioning diff.
 
-## Forbid useless annotations
-*SlevomatCodingStandard.Commenting.ForbiddenAnnotations*
+### SlevomatCodingStandard.Classes.ClassConstantVisibility
+_PSR-12:_ Visibility MUST be declared on all constants if your project PHP minimum version supports constant visibilities 
+(PHP 7.1 or later).
 
-Git commits provide accurate information for these forbidden annotations: @api, @author, @category, @created, @package, @subpackage, @version.
+### SlevomatCodingStandard.Classes.TraitUseDeclaration
+_PSR-12:_ Each individual Trait that is imported into a class MUST be included one-per-line.
 
-## Forbid empty comments
-*SlevomatCodingStandard.Commenting.EmptyComment*
+### SlevomatCodingStandard.Classes.UnusedPrivateElements
+A class should not have unused private constants, (or write-only) properties and methods.
 
-## Forbid useless comments
-*SlevomatCodingStandard.Commenting.ForbiddenComments*
+### SlevomatCodingStandard.Commenting.ForbiddenAnnotations
+Comments may not contain useless annotations: `@api`, `@author`, `@category`, `@created`, `@package`, `@subpackage`,
+`@version`. Git commits provide accurate information.
 
-Forbidden comments words: private, protected, static, constructor, deconstructor, Created by, getter, setter.
+### SlevomatCodingStandard.Commenting.EmptyComment
+Comments may not be empty.
 
-## Report invalid format of inline phpDocs with `@var`
-*SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration*
+### SlevomatCodingStandard.Commenting.ForbiddenComments
+To keep comments clean, specific words in comments may not be used: _private_, _protected_, _static_, _constructor_, 
+_deconstructor_, _Created by_, _getter_, _setter_.
 
-## Require comments with single line written as one-liners
-*SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment*
+### SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration
+Use valid format of inline phpDocs with `@var`.
 
+### SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment
+Comments with single-line content should be written as one-liners.
 ```
 /**
  * @var array
  */
 private $foo;
 ```
-
 Should be written as
-
 ```
 /** @var array */
 private $foo;
 ```
 
-## Forbid weak comparisons
-*SlevomatCodingStandard.ControlStructures.DisallowEqualOperators*
+### SlevomatCodingStandard.ControlStructures.DisallowEqualOperators
+Loose `==` and `!=` comparison operators should not be used. Use `===` and `!==` instead, they are much more secure 
+and predictable.
 
-## Require usage of early exit
-*SlevomatCodingStandard.ControlStructures.EarlyExit*
+### SlevomatCodingStandard.ControlStructures.EarlyExit
+An early exit strategy should be used where possible to reduce the level of control structures.
+```php
+// Valid: Exit early.
+function () : bool {
+	if (! true) {
+		return false;
+	}
+	// Do something
+};
+
+// Invalid: unneeded control structure
+function () : bool {
+	if (true) {
+		// Do something
+	} else {
+		return false;
+	}
+};
+```
 
-## Require language constructs without parentheses
-*SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses*
+### SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses
+Language constructs must be used without parentheses where possible.
 
-## Require new instances with parentheses
-*SlevomatCodingStandard.ControlStructures.NewWithParentheses*
+```php
+// Valid: Use language constructs without parentheses.
+continue 1;
+break 1;
+echo 'a';
+print 'b';
+include 'file.php';
+return 'foo';
+yield [];
+throw new Exception();
+exit;
+
+// Invalid: Language constructs with parentheses.
+continue(1);
+break(1);
+echo('a');
+print('b');
+include('file.php');
+return('foo');
+yield([]);
+throw(new Exception());
+exit();
+```
 
-## Require usage of null coalesce operator when possible
-*SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator*
+### SlevomatCodingStandard.ControlStructures.NewWithParentheses
+_PSR-12:_ When instantiating a new class, parenthesis MUST always be present even when there are no arguments passed to 
+the constructor.
+```php
+new Foo();
+```
 
-Use `$foo = $bar['id'] ?? '1';` where possbile.
+### SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator
+The null coalesce operator should be used when possible.
+```php
+$foo = $bar['id'] ?? '1';
+```
 
-## Forbid useless unreachable catch blocks
-*SlevomatCodingStandard.Exceptions.DeadCatch*
+### SlevomatCodingStandard.Exceptions.DeadCatch
+Catch blocks should be reachable.
+```php
+try {
+	doStuff();
+} catch (Throwable $e) {
+	log($e);
+} catch (InvalidArgumentException $e) {
+	// Unreachable because `Throwable` catches everything!
+}
+```
 
-## Require using Throwable instead of Exception
-*SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly*
+### SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly
+Catch blocks must use `Throwable` instead of `Exception`.
+```php
+try {
+	// ...
+} catch (Throwable $e) {
 
-## Forbid unused variables passed to closures via `use`
-*SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure*
+}
+```
 
-## Require use statements to be alphabetically sorted
-*SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses*
+### SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure
+Unused variables should not be passed to closures via `use`.
 
-## Forbid fancy group uses
-*SlevomatCodingStandard.Namespaces.DisallowGroupUse*
+### SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses
+Import statements should be alphabetically sorted.
 
-## Forbid multiple use statements on same line
-*SlevomatCodingStandard.Namespaces.MultipleUsesPerLine*
+### SlevomatCodingStandard.Namespaces.DisallowGroupUse
+Import statements should not be grouped.
 
-## Require newlines around namespace declaration
-*SlevomatCodingStandard.Namespaces.NamespaceSpacing*
+### SlevomatCodingStandard.Namespaces.MultipleUsesPerLine
+Each import statement should be on its own line.
 
-## Forbid using absolute class name references (except global ones)
-*SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly*
+### SlevomatCodingStandard.Namespaces.NamespaceSpacing
+Require newlines around namespace declaration
 
-## Forbid unused use statements
-*SlevomatCodingStandard.Namespaces.UnusedUses*
+### SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly
+Absolute class name references, functions and constants should be imported.
 
-## Forbid superfluous leading backslash in use statements
-*SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash*
+### SlevomatCodingStandard.Namespaces.UnusedUses
+Unused import statements are not allowed.
 
-## Forbid useless uses of the same namespace
-*SlevomatCodingStandard.Namespaces.UseFromSameNamespace*
+### SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash
+_PSR-12:_ Import statements MUST never begin with a leading backslash as they must always be fully qualified.
 
-## Require empty newlines before and after uses
-*SlevomatCodingStandard.Namespaces.UseSpacing*
+### SlevomatCodingStandard.Namespaces.UseFromSameNamespace
+Classes and function within the same namespace should not be imported.
+```php
+use Foo\Bar as Bar; // Same name as imported class
+use Foo\Bar;        // Correct
+```
 
-## Forbid useless alias for classes, constants and functions
-*SlevomatCodingStandard.Namespaces.UselessAlias*
+### SlevomatCodingStandard.Namespaces.UseSpacing
+_PSR-12:_ Require empty newlines before and after uses
 
-## Require the usage of assignment operators, eg `+=`, `.=` when possible
-*SlevomatCodingStandard.Operators.RequireCombinedAssignmentOperator*
+### SlevomatCodingStandard.Namespaces.UselessAlias
+Imports should not have an alias with the same name.
 
-## Forbid `list(...)` syntax, use `[...]` instead
-*SlevomatCodingStandard.PHP.ShortList*
+### SlevomatCodingStandard.Operators.RequireCombinedAssignmentOperator
+Assignment operators (eg `+=`, `.=`) should be used when possible.
 
-## Forbid use of longhand cast operators
-*SlevomatCodingStandard.PHP.TypeCast*
+```php
+self::$a &= 2;
+static::$a |= 4;
+self::$$parameter .= '';
+parent::${'a'} /= 10;
+self::${'a'}[0] -= 100;
+Anything::$a **= 2;
+Something\Anything::$a %= 2;
+\Something\Anything::$a *= 1000;
+self::$a::$b += 4;
+$this::$a <<= 2;
+$this->a >>= 2;
+$this->$$parameter ^= 10;
+$this->{'a'} += 10;
+```
 
-## Require presence of `declare(strict_types=1)`
-*SlevomatCodingStandard.TypeHints.DeclareStrictTypes*
+### SlevomatCodingStandard.PHP.ShortList
+Short list syntax `[...]` should be used instead of `list(...)`.
 
-## Forbid useless parentheses
-*SlevomatCodingStandard.PHP.UselessParentheses*
+### SlevomatCodingStandard.PHP.TypeCast
+Short form of type keywords must be used. i.e. `bool` instead of `boolean`, `int` instead of `integer`, etc.
+The `binary` and `unset` cast operators are not allowed.
 
-## Forbid useless semicolon `;`
-*SlevomatCodingStandard.PHP.UselessSemicolon*
+### SlevomatCodingStandard.TypeHints.DeclareStrictTypes
+_PSR-12:_ Declare statements MUST contain no spaces and MUST be exactly `declare(strict_types=1)`.
+Each PHP file should have a strict type declaration at the top after the page level docblock.
+```php
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-coding-standard for the canonical source repository
+ * @copyright Copyright (c) 2016-2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-coding-standard/blob/master/LICENSE.md New BSD License
+ */
+
+declare(strict_types=1);
+
+// ...
+```
+
+### SlevomatCodingStandard.PHP.UselessParentheses
+Unneeded parentheses should not be used.
+
+```php
+// Valid: No parentheses used.
+$x = $y !== null ? true : false;
+$a = $b ? 1 : 0;
+$c = $d ? 1 : 0;
+$x = self::$a;
+$x = Something\Anything::$a;
+$x = self::$a::$b;
+
+// Invalid: Unneeded parentheses.
+$x = ($y !== null) ? true : false;
+$a = ($b) ? 1 : 0;
+$c = (   $d    ) ? 1 : 0;
+$x = (self::$a);
+$x = (Something\Anything::$a);
+$x = (self::$a::$b);
+```
+
+### SlevomatCodingStandard.PHP.UselessSemicolon
+Semicolons `;` should not be used if they are not needed.
+```php
+// Valid: Semicolon used where needed.
+foo();
+class Whatever {
+}
+
+// Invalid: Unneeded semicolons used.
+foo();;
+class Whatever {
+};
+```
 
-## Require use of short versions of scalar types (i.e. int instead of integer)
-*SlevomatCodingStandard.TypeHints.LongTypeHints*
 
-## Require `?` when default value is `null`
-*SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue*
+### SlevomatCodingStandard.TypeHints.LongTypeHints
+Shorthand scalar typehint variants must be used in docblocks: `bool` instead of `boolean`, `int` instead of `integer`, 
+etc. This is for consistency with native scalar typehints which also allow shorthand variants only.
 
-Checks whether the nullablity ? symbol is present before each nullable and optional parameter 
-(which are marked as = null):
+### SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue
+Nullable and optional arguments, which are marked as `= null`, must have the nullablity `?` symbol present.
 ```php
 function foo(
 	int $foo = null, // ? missing
 	?int $bar = null // correct
 ) {
-
 }
 ```
 
-## Require one space between typehint and variable, require no space between nullability sign and typehint
-*SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing*
-
-## Require space around colon in return types
-*SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing*
+### SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing
+_PSR-12:_ Method and function arguments must have one space between typehint and variable. Between the nullability sign 
+and typehint may not be a space. 
 
+### SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing
+The colon used with return type declarations MUST be surrounded with 1 space. This is different with the draft PSR-12 
+proposal and will be adjusted if needed when PSR-12 is accepted.
 ```php
 public function foo($bar) : array;
 ```
 
-## Forbid empty lines around type declarations
-*SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces*
+### SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces
+- _PSR-12:_ The opening brace for the class MUST go on its own line; the closing brace for the class MUST go on the 
+  next line after the body.
+- _PSR-12:_ Any closing brace MUST NOT be followed by any comment or statement on the same line.
+- _PSR-12:_ Opening braces MUST be on their own line and MUST NOT be preceded or followed by a blank line.
+- _PSR-12:_ Closing braces MUST be on their own line and MUST NOT be preceded by a blank line.
+
+### SlevomatCodingStandard.Variables.UselessVariable
+Variables should be returned directly instead of assigned to a variable which is not used.
+```php
+// Valid: The value is returned directly.
+function () {
+	return true;
+};
+
+// Invalid: An extra variable is used where its value could be returned directly.
+function () {
+	$a = true;
+	return $a;
+};
+```
+
 
-## Forbid useless variables
-*SlevomatCodingStandard.Variables.UselessVariable*
 
-## Forbid spaces around square brackets
-*Squiz.Arrays.ArrayBracketSpacing*
+## Squiz
 
-## Force array declaration structure
-*Squiz.Arrays.ArrayDeclaration*
+### Squiz.Arrays.ArrayBracketSpacing
+Whitespace is not allowed around the opening bracket or before the closing bracket when referencing an array.
+```php
+$foo['bar'];
+```
 
+### Squiz.Arrays.ArrayDeclaration
+All double arrow symbols must be aligned to one space after the longest array key.
 ```php
 return [
     ConfigAggregator::ENABLE_CACHE => true,
@@ -266,66 +518,173 @@ return [
 ];
 ```
 
-## Forbid class being in a file with different name
-*Squiz.Classes.ClassFileName*
+### Squiz.Classes.ClassFileName
+_PSR-4:_ The class name must correspond to a file name ending in .php. The file name MUST match the case of the 
+terminating class name.
 
-## Force `self::` for self-reference, force lower-case self, forbid spaces around `::`
-*Squiz.Classes.SelfMemberReference*
+### Squiz.Classes.SelfMemberReference
+The self keyword should be used instead of the current class name, and should not have spaces around `::`.
+```php
+class Foo
+{
+    public static function bar()
+    {
+    }
+
+    public static function baz()
+    {
+        self::bar();
+    }
+}
+```
 
+### Squiz.Commenting.DocCommentAlignment
+The asterisks in a doc comment should align, and there should be one space between the asterisk and tag.
 ```php
-$foo = self::fromPayload($payload);
+/**
+ * These lines are aligned.
+ * 
+ * @var array
+ */
 ```
 
-## Force phpDoc alignment
-*Squiz.Commenting.DocCommentAlignment*
+### Squiz.Commenting.FunctionComment
+If a function throws any exceptions, they should be documented in a `@throws` tag.
+```php
+/** @throws Exception all the time */
+function foo() : void
+{
+    throw new Exception('Danger!');
+}
+```
+### Squiz.Functions.GlobalFunction
+Global functions should not be used.
 
-## Force rules for function phpDoc
-*Squiz.Commenting.FunctionComment*
+### Squiz.Operators.ValidLogicalOperators
+The `&&` and `||` operators must be used instead of `&&` and `||`.
 
-## Forbid global functions
-*Squiz.Functions.GlobalFunction*
+### Squiz.PHP.GlobalKeyword
+The `global` keyword may not be used.
 
-## Forbid `AND` and `OR`, require `&&` and `||`
-*Squiz.Operators.ValidLogicalOperators*
+### Squiz.PHP.LowercasePHPFunctions
+PHP function calls must be in lowercase.
 
-## Forbid `global`
-*Squiz.PHP.GlobalKeyword*
+### Squiz.PHP.NonExecutableCode
+The code may not contain unreachable code.
 
-## Require PHP function calls in lowercase
-*Squiz.PHP.LowercasePHPFunctions*
+### Squiz.Scope.StaticThisUsage
+Static methods should not use $this.
+```php
+// Valid: Using self:: to access static variables.
+class Foo
+{
+    public static function bar()
+    {
+        return self::$staticMember;
+    }
+}
 
-## Forbid dead code
-*Squiz.PHP.NonExecutableCode*
+// Invalid: Using $this-> to access static variables.
+class Foo
+{
+    public static function bar()
+    {
+        return $this->$staticMember;
+    }
+}
+```
 
-## Forbid `$this` inside static function
-*Squiz.Scope.StaticThisUsage*
+### Squiz.Strings.ConcatenationSpacing
+Force whitespace before and after concatenation
 
-## Force whitespace before and after concatenation
-*Squiz.Strings.ConcatenationSpacing*
+### Squiz.Strings.DoubleQuoteUsage
+#### Squiz.Strings.DoubleQuoteUsage.ContainsVar
+Double quote strings may only be used if it contains variables.
+```php
+// Valid: Double quote strings are only used when it contains a variable.
+$string = "Hello There\r\n";
+$string = "Hello $there";
+$string = 'Hello There';
+$string = 'Hello'.' There'."\n";
+$string = '\$var';
+
+// Invalid: There are no variables inside double quote strings.
+$string = "Hello There";
+$string = "Hello"." There"."\n";
+$string = "\$var";
+```
 
-## Forbid strings in `"` unless necessary
-*Squiz.Strings.DoubleQuoteUsage, Squiz.Strings.DoubleQuoteUsage.ContainsVar*
+### Squiz.Strings.EchoedStrings
+Simple strings should not be enclosed in parentheses when being echoed.
+```php
+// "Valid: Using echo without parentheses.
+echo 'Hello';
 
-## Forbid braces around string in `echo`
-*Squiz.Strings.EchoedStrings*
+// Invalid: Using echo with parentheses.
+echo('Hello');
+```
 
-## Forbid spaces in type casts
-*Squiz.WhiteSpace.CastSpacing*
+### Squiz.WhiteSpace.CastSpacing
+Casts should not have whitespace inside the parentheses.
+```php
+// Valid: No spaces.
+$foo = (int) '42';
 
-## Forbid blank line after function opening brace
-*Squiz.WhiteSpace.FunctionOpeningBraceSpace*
+// Invalid: Whitespace used inside parentheses.
+$foo = ( int ) '42';
+```
 
-## Require space after language constructs
-*Squiz.WhiteSpace.LanguageConstructSpacing*
+### Squiz.WhiteSpace.FunctionOpeningBraceSpace
+The opening brace for functions should be on a new line with no blank lines surrounding it.
+```php
+// Valid: Opening brace is on a new line.
+function foo() : int
+{
+    return 42;
+}
 
-## Require space around logical operators
-*Squiz.WhiteSpace.LogicalOperatorSpacing*
+// Invalid: Opening brace is on the same line as the function declaration and a blank line after the opening brace.
+function foo() {
 
-## Forbid spaces around `->` operator
-*Squiz.WhiteSpace.ObjectOperatorSpacing*
+    return 42;
+}
+```
+
+### Squiz.WhiteSpace.LanguageConstructSpacing
+The php constructs `echo`, `print`, `return`, `include`, `include_once`, `require`, `require_once`, and `new` should 
+have one space after them.
+
+```php
+// Valid: echo statement with a single space after it.
+echo 'hi';
+
+// Invalid: echo statement with no space after it.
+echo'hi';
+```
+
+### Squiz.WhiteSpace.LogicalOperatorSpacing
+_PSR-12:_ There must be one space around logical operators.
 
-## Forbid spaces before semicolon `;`
-*Squiz.WhiteSpace.SemicolonSpacing*
+### Squiz.WhiteSpace.ObjectOperatorSpacing
+The object operator (`->`) should not have any space around it.
+```php
+// Valid: No spaces around the object operator.
+$foo->bar();
+
+// Invalid: Whitespace surrounding the object operator.
+$foo -> bar();
+```
+
+### Squiz.WhiteSpace.SemicolonSpacing
+Semicolons should not have spaces before them.
+```php
+// Valid: No space before the semicolon.
+echo 'hi';
+
+// Valid: Invalid: Space before the semicolon.
+echo 'hi' ;
+```
 
-## Forbid superfluous whitespaces
-*Squiz.WhiteSpace.SuperfluousWhitespace, Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines*
+### Squiz.WhiteSpace.SuperfluousWhitespace
+#### Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines
+The code should not superfluous whitespaces. e.g. multiple empty lines, trailing spaces, etc.

From d044763fd16490499d887f96363814ff032eac3f Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Fri, 7 Sep 2018 22:41:27 +0200
Subject: [PATCH 30/60] First set of documentation improvements and fixes

---
 docs/book/v2/coding-style-guide.md | 53 ++++++++++++------------
 docs/book/v2/ruleset.md            | 65 +++++++++++++++++++-----------
 2 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/docs/book/v2/coding-style-guide.md b/docs/book/v2/coding-style-guide.md
index 41020a36..2b95efda 100644
--- a/docs/book/v2/coding-style-guide.md
+++ b/docs/book/v2/coding-style-guide.md
@@ -13,11 +13,11 @@ We will change these rules, and, when PSR-12 is finalized, adapt them.
 
 Code MUST follow all rules outlined in [PSR-1](https://www.php-fig.org/psr/psr-1) and
 [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md), except in 
-specific cases outlined in this specification, until PSR-12 is accepted os a standard.
+specific cases outlined in this specification, until PSR-12 is accepted as a standard.
 
 ### Indenting and Alignment
 
-- There should be one space on either side of an equals sign used to assign a value to a variable. In the case of a 
+- There should be one space on either side of an equals sign used to assign a value to a variable. In case of a 
   block of related assignments, more space may be inserted before the equal sign to promote readability.
   [*](ruleset.md#genericformattingmultiplestatementalignment)
 
@@ -31,7 +31,7 @@ $var             = foo($bar, $baz, $quux);
 
 - Short array syntax must be used to define arrays. [*](ruleset.md#genericarraysdisallowlongarraysyntax)
 - All values in multiline arrays must be indented with 4 spaces. [*](ruleset.md#genericarraysarrayindent)
-- All array values must be followed by a comma, including the final value. [*](ruleset.md#slevomatcodingstandardarraystrailingarraycomma)
+- All array values must be followed by a comma, including the last value. [*](ruleset.md#slevomatcodingstandardarraystrailingarraycomma)
 - Whitespace is not allowed around the opening bracket or before the closing bracket when referencing an array.
   [*](ruleset.md#squizarraysarraybracketspacing)
 - All double arrow symbols must be aligned to one space after the longest array key. [*](ruleset.md#squizarraysarraydeclaration)
@@ -69,20 +69,20 @@ $var = [
 
 ### Commenting
 
+- Comments may be omitted and should not be used for typehinted arguments.
 - Comments may not start with `#`. [*](ruleset.md#pearcommentinginlinecomment)
 - Comments may not be empty. [*](ruleset.md#slevomatcodingstandardcommentingemptycomment)
-- To keep comments clean, specific words in comments may not be used: _private_, _protected_, _static_, _constructor_, 
-  _deconstructor_, _Created by_, _getter_, _setter_. [*](ruleset.md#slevomatcodingstandardcommentingforbiddencomments)
-- Comments may not contain useless annotations: `@api`, `@author`, `@category`, `@created`, `@package`, `@subpackage`,
-  `@version`. Git commits provide accurate information. [*](ruleset.md#slevomatcodingstandardcommentingforbiddenannotations)
+- The words _private_, _protected_, _static_, _constructor_, _deconstructor_, _Created by_, _getter_ and _setter_, 
+  may not be used in comments. [*](ruleset.md#slevomatcodingstandardcommentingforbiddencomments)
+- The annotations `@api`, `@author`, `@category`, `@created`, `@package`, `@subpackage` and `@version` may not
+  be used in comments. Git commits provide accurate information. [*](ruleset.md#slevomatcodingstandardcommentingforbiddenannotations)
 - The asterisks in a doc comment should align, and there should be one space between the asterisk and tag.
   [*](ruleset.md#squizcommentingdoccommentalignment)
-- If a function throws any exceptions, they should be documented in a `@throws` tag.
+- If a function throws any exceptions, they should be documented in `@throws` tags.
   [*](ruleset.md#squizcommentingfunctioncomment)
-- Use valid format of inline phpDocs with `@var`. [*](ruleset.md#slevomatcodingstandardcommentinginlinedoccommentdeclaration)
+- The `@var` tag may be used in inline comments to document the _Type_ of properties. [*](ruleset.md#slevomatcodingstandardcommentinginlinedoccommentdeclaration)
 - Comments with single-line content should be written as one-liners. [*](ruleset.md#slevomatcodingstandardcommentingrequireonelinepropertydoccomment)
-- Shorthand scalar typehint variants must be used in docblocks: `bool` instead of `boolean`, `int` instead of `integer`, 
-  etc. [*](ruleset.md#slevomatcodingstandardtypehintslongtypehints)
+- Shorthand scalar typehint variants must be used in docblocks. [*](ruleset.md#slevomatcodingstandardtypehintslongtypehints)
 
 ## Declare Statements, Namespace, and Import Statements
 
@@ -135,7 +135,7 @@ class FooBar
 
 In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#4-classes-properties-and-methods):
 
-- Methods may not have the final declaration classes declared as final. [*](ruleset.md#genericcodeanalysisunnecessaryfinalmodifier)
+- Methods may not have the final declaration in classes declared as final. [*](ruleset.md#genericcodeanalysisunnecessaryfinalmodifier)
 - The colon used with return type declarations MUST be surrounded with 1 space. [*](ruleset.md#slevomatcodingstandardtypehintsreturntypehintspacing)
 - Nullable and optional arguments, which are marked as `= null`, must have the nullablity `?` symbol present. [*](ruleset.md#slevomatcodingstandardtypehintsnullabletypefornulldefaultvalue)
 
@@ -254,7 +254,7 @@ foreach ($iterable as $key => $value) {
 ### try, catch, finally
 
 - Catch blocks may be empty. [*](ruleset.md#genericcodeanalysisemptystatementdetectedcatch)
-- Catch blocks should be reachable. [*](ruleset.md#slevomatcodingstandardexceptionsdeadcatch)
+- Catch blocks must be reachable. [*](ruleset.md#slevomatcodingstandardexceptionsdeadcatch)
 - Catch blocks must use `Throwable` instead of `Exception`. [*](ruleset.md#slevomatcodingstandardexceptionsreferencethrowableonly)
 
 ```php
@@ -275,7 +275,7 @@ try {
 In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#6-operators):
 
 - The not (`!`) operator must be followed by exactly one space. [*](ruleset.md#genericformattingspaceafternot)
-- The `&&` and `||` operators must be used instead of `&&` and `||`. [*](ruleset.md#squizoperatorsvalidlogicaloperators)
+- The `&&` and `||` operators must be used instead of `AND` and `OR`. [*](ruleset.md#squizoperatorsvalidlogicaloperators)
 - The null coalesce operator should be used when possible. [*](ruleset.md#slevomatcodingstandardcontrolstructuresrequirenullcoalesceoperator)
 - Assignment operators (eg `+=`, `.=`) should be used when possible. [*](ruleset.md#slevomatcodingstandardoperatorsrequirecombinedassignmentoperator)
 
@@ -352,33 +352,32 @@ $instance = new class extends Foo implements
 - The code may not contain unreachable code. [*](ruleset.md#squizphpnonexecutablecode)
 - The backtick operator may not be used for execution of shell commands. [*](ruleset.md#genericphpbacktickoperator)
 - Class and Interface names should be unique in a project. They should never be duplicated. [*](ruleset.md#genericclassesduplicateclassname)
-- Methods should not be defined that only call the parent method. [*](ruleset.md#genericcodeanalysisuselessoverridingmethod)
+- Methods that only call the parent method should not be defined. [*](ruleset.md#genericcodeanalysisuselessoverridingmethod)
 - Files that contain php code should only have php code and should not have any _"inline html"_. [*](ruleset.md#genericfilesinlinehtml)
-- There must be exactly one space after a cast. [*](ruleset.md#genericformattingspaceaftercast)
+- There must be exactly one space after a type cast. [*](ruleset.md#genericformattingspaceaftercast)
 - Constructors should be named `__construct`, not after the class. [*](ruleset.md#genericnamingconventionsconstructorname)
 - The opening php tag should be the first item in the file. [*](ruleset.md#genericphpcharacterbeforephpopeningtag)
 - Strings should not be concatenated together, unless used in multiline for readability. [*](ruleset.md#genericstringsunnecessarystringconcat)
-- Loose `==` and `!=` comparison operators should not be used. Use `===` and `!==` instead, they are much more secure 
-  and predictable. [*](ruleset.md#slevomatcodingstandardcontrolstructuresdisallowequaloperators)
+- Loose `==` and `!=` comparison operators should not be used. Use `===` and `!==` instead. [*](ruleset.md#slevomatcodingstandardcontrolstructuresdisallowequaloperators)
 - An early exit strategy should be used where possible to reduce the level of control structures.
   [*](ruleset.md#slevomatcodingstandardcontrolstructuresearlyexit)
 - Language constructs must be used without parentheses where possible. [*](ruleset.md#slevomatcodingstandardcontrolstructureslanguageconstructwithparentheses)
 - Short list syntax `[...]` should be used instead of `list(...)`. [*](ruleset.md#slevomatcodingstandardphpshortlist)
 - Short form of type keywords must be used. i.e. `bool` instead of `boolean`, `int` instead of `integer`, etc.
   The `binary` and `unset` cast operators are not allowed. [*](ruleset.md#slevomatcodingstandardphptypecast)
-- Unneeded parentheses should not be used. [*](ruleset.md#slevomatcodingstandardphpuselessparentheses)
-- Semicolons `;` should not be used if they are not needed. [*](ruleset.md#slevomatcodingstandardphpuselesssemicolon)
+- Parentheses should not be used if they can be omitted. [*](ruleset.md#slevomatcodingstandardphpuselessparentheses)
+- Semicolons `;` should not be used if they can be omitted. [*](ruleset.md#slevomatcodingstandardphpuselesssemicolon)
 - Variables should be returned directly instead of assigned to a variable which is not used. [*](ruleset.md#slevomatcodingstandardvariablesuselessvariable)
 - The self keyword should be used instead of the current class name, and should not have spaces around `::`.
   [*](ruleset.md#squizclassesselfmemberreference)
 - Global functions should not be used. [*](ruleset.md#squizfunctionsglobalfunction)
-- Static methods should not use $this. [*](ruleset.md#squizscopestaticthisusage)
-- Double quote strings may only be used if it contains variables. [*](ruleset.md#squizstringsdoublequoteusage)
-- Simple strings should not be enclosed in parentheses when being echoed. [*](ruleset.md#squizstringsechoedstrings)
-- Casts should not have whitespace inside the parentheses. [*](ruleset.md#squizwhitespacecastspacing)
+- Static methods should not use `$this`. [*](ruleset.md#squizscopestaticthisusage)
+- Double quote strings may only be used if they contain variables. [*](ruleset.md#squizstringsdoublequoteusage)
+- Strings should not be enclosed in parentheses when being echoed. [*](ruleset.md#squizstringsechoedstrings)
+- Type casts should not have whitespace inside the parentheses. [*](ruleset.md#squizwhitespacecastspacing)
 - The opening brace for functions should be on a new line with no blank lines surrounding it. [*](ruleset.md#squizwhitespacefunctionopeningbracespace)
-- The php constructs `echo`, `print`, `return`, `include`, `include_once`, `require`, `require_once`, and `new` should 
+- The php constructs `echo`, `print`, `return`, `include`, `include_once`, `require`, `require_once`, and `new`, should 
   have one space after them. [*](ruleset.md#squizwhitespacelanguageconstructspacing)
-- The object operator (`->`) should not have any space around it. [*](ruleset.md#squizwhitespaceobjectoperatorspacing)
+- The object operator `->` should not have any spaces around it. [*](ruleset.md#squizwhitespaceobjectoperatorspacing)
 - Semicolons should not have spaces before them. [*](ruleset.md#squizwhitespacesemicolonspacing)
-- The code should not superfluous whitespaces. e.g. multiple empty lines, trailing spaces, etc. [*](ruleset.md#squizwhitespacesuperfluouswhitespace)
+- The code should not contain superfluous whitespaces. e.g. multiple empty lines, trailing spaces, etc. [*](ruleset.md#squizwhitespacesuperfluouswhitespace)
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index fb84fee0..7522cb6e 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -41,7 +41,7 @@ try {
 Methods may not have the final declaration classes declared as final.
 
 ### Generic.CodeAnalysis.UselessOverridingMethod
-Methods should not be defined that only call the parent method.
+Methods that only call the parent method should not be defined.
 
 ```php
 // Valid: A method that extends functionality on a parent method.
@@ -82,7 +82,7 @@ echo $foo . 'baz';
 ```
 
 ### Generic.Formatting.MultipleStatementAlignment
-There should be one space on either side of an equals sign used to assign a value to a variable. In the case of a 
+There should be one space on either side of an equals sign used to assign a value to a variable. In case of a 
 block of related assignments, more space may be inserted before the equal sign to promote readability.
 ```php
 <?php
@@ -93,7 +93,7 @@ $var             = foo($bar, $baz, $quux);
 ```
 
 ### Generic.Formatting.SpaceAfterCast
-There must be exactly one space after a cast.
+There must be exactly one space after a type cast.
 
 ```php
 // Valid: A cast operator is followed by one space.
@@ -113,7 +113,7 @@ Constructors should be named `__construct`, not after the class.
 // Valid: The constructor is named __construct.
 class Foo
 {
-    function <em>__construct</em>()
+    function __construct()
     {
     }
 }
@@ -121,7 +121,7 @@ class Foo
 // Invalid: The old style class name constructor is used.
 class Foo
 {
-    function <em>Foo</em>()
+    function Foo()
     {
     }
 }
@@ -201,7 +201,7 @@ Comments may not start with `#`.
 ## SlevomatCodingStandard
 
 ### SlevomatCodingStandard.Arrays.TrailingArrayComma
-All array values must be followed by a comma, including the final value. Commas after last element in an array make 
+All array values must be followed by a comma, including the last value. Commas after last element in an array make 
 adding a new element easier and result in a cleaner versioning diff.
 
 ### SlevomatCodingStandard.Classes.ClassConstantVisibility
@@ -215,29 +215,47 @@ _PSR-12:_ Each individual Trait that is imported into a class MUST be included o
 A class should not have unused private constants, (or write-only) properties and methods.
 
 ### SlevomatCodingStandard.Commenting.ForbiddenAnnotations
-Comments may not contain useless annotations: `@api`, `@author`, `@category`, `@created`, `@package`, `@subpackage`,
-`@version`. Git commits provide accurate information.
+The annotations `@api`, `@author`, `@category`, `@created`, `@package`, `@subpackage` and `@version` may not
+be used in comments. Git commits provide accurate information. 
 
 ### SlevomatCodingStandard.Commenting.EmptyComment
 Comments may not be empty.
 
 ### SlevomatCodingStandard.Commenting.ForbiddenComments
-To keep comments clean, specific words in comments may not be used: _private_, _protected_, _static_, _constructor_, 
-_deconstructor_, _Created by_, _getter_, _setter_.
+To keep comments clean, the words _private_, _protected_, _static_, _constructor_, _deconstructor_, _Created by_, 
+_getter_ and _setter_ may not be used in comments
 
 ### SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration
-Use valid format of inline phpDocs with `@var`.
+The `@var` tag may be used in inline comments to document the _Type_ of properties, sometimes called class variables.
+```php
+class Foo
+{
+	/** @var string */
+	private $foo;
+	
+	public function __construct()
+	{
+        /** @var string $f */
+        foreach ($e as $f) {
+            // ...
+        }
+        
+        /** @var string[] $a */
+        $a = $this->get();
+    }
+}
+```
 
 ### SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment
 Comments with single-line content should be written as one-liners.
-```
+```php
 /**
  * @var array
  */
 private $foo;
 ```
 Should be written as
-```
+```php
 /** @var array */
 private $foo;
 ```
@@ -308,7 +326,7 @@ $foo = $bar['id'] ?? '1';
 ```
 
 ### SlevomatCodingStandard.Exceptions.DeadCatch
-Catch blocks should be reachable.
+Catch blocks must be reachable.
 ```php
 try {
 	doStuff();
@@ -409,8 +427,7 @@ declare(strict_types=1);
 ```
 
 ### SlevomatCodingStandard.PHP.UselessParentheses
-Unneeded parentheses should not be used.
-
+Parentheses should not be used if they can be omitted.
 ```php
 // Valid: No parentheses used.
 $x = $y !== null ? true : false;
@@ -430,7 +447,7 @@ $x = (self::$a::$b);
 ```
 
 ### SlevomatCodingStandard.PHP.UselessSemicolon
-Semicolons `;` should not be used if they are not needed.
+Semicolons `;` should not be used if they can be omitted.
 ```php
 // Valid: Semicolon used where needed.
 foo();
@@ -549,7 +566,7 @@ The asterisks in a doc comment should align, and there should be one space betwe
 ```
 
 ### Squiz.Commenting.FunctionComment
-If a function throws any exceptions, they should be documented in a `@throws` tag.
+If a function throws any exceptions, they should be documented in `@throws` tags.
 ```php
 /** @throws Exception all the time */
 function foo() : void
@@ -573,7 +590,7 @@ PHP function calls must be in lowercase.
 The code may not contain unreachable code.
 
 ### Squiz.Scope.StaticThisUsage
-Static methods should not use $this.
+Static methods should not use `$this`.
 ```php
 // Valid: Using self:: to access static variables.
 class Foo
@@ -599,7 +616,7 @@ Force whitespace before and after concatenation
 
 ### Squiz.Strings.DoubleQuoteUsage
 #### Squiz.Strings.DoubleQuoteUsage.ContainsVar
-Double quote strings may only be used if it contains variables.
+Double quote strings may only be used if they contain variables.
 ```php
 // Valid: Double quote strings are only used when it contains a variable.
 $string = "Hello There\r\n";
@@ -615,7 +632,7 @@ $string = "\$var";
 ```
 
 ### Squiz.Strings.EchoedStrings
-Simple strings should not be enclosed in parentheses when being echoed.
+Strings should not be enclosed in parentheses when being echoed.
 ```php
 // "Valid: Using echo without parentheses.
 echo 'Hello';
@@ -625,7 +642,7 @@ echo('Hello');
 ```
 
 ### Squiz.WhiteSpace.CastSpacing
-Casts should not have whitespace inside the parentheses.
+Type casts should not have whitespace inside the parentheses.
 ```php
 // Valid: No spaces.
 $foo = (int) '42';
@@ -666,7 +683,7 @@ echo'hi';
 _PSR-12:_ There must be one space around logical operators.
 
 ### Squiz.WhiteSpace.ObjectOperatorSpacing
-The object operator (`->`) should not have any space around it.
+The object operator `->` should not have any spaces around it.
 ```php
 // Valid: No spaces around the object operator.
 $foo->bar();
@@ -687,4 +704,4 @@ echo 'hi' ;
 
 ### Squiz.WhiteSpace.SuperfluousWhitespace
 #### Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines
-The code should not superfluous whitespaces. e.g. multiple empty lines, trailing spaces, etc.
+The code should not contain superfluous whitespaces. e.g. multiple empty lines, trailing spaces, etc.

From f722edd207f11bdc54d8ac625e08b890f0fb8a3f Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 8 Sep 2018 07:16:26 +0200
Subject: [PATCH 31/60] More grammar fixes

---
 docs/book/v2/coding-style-guide.md | 18 +++++++++---------
 docs/book/v2/ruleset.md            | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/book/v2/coding-style-guide.md b/docs/book/v2/coding-style-guide.md
index 2b95efda..4a613f44 100644
--- a/docs/book/v2/coding-style-guide.md
+++ b/docs/book/v2/coding-style-guide.md
@@ -4,7 +4,7 @@ This specification extends and expands [PSR-12](https://github.com/php-fig/fig-s
 the extended coding style guide and requires adherence to [PSR-1](https://www.php-fig.org/psr/psr-1), 
 the basic coding standard.
 
-> Note: PSR-12 is not finalized. e.g. The `!` operator and `:` placement for return values are still under  discussion. 
+> Note: PSR-12 is not finalized. e.g. The `!` operator and `:` placement for return values are still under discussion. 
 We will change these rules, and, when PSR-12 is finalized, adapt them.
 
 ## General
@@ -88,7 +88,7 @@ $var = [
 
 In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#3-declare-statements-namespace-and-import-statements):
 
-- Each php file should have a page level docblock with `@see`, `@copyright` and `@license`. The copyright date should
+- Each PHP file should have a page level docblock with `@see`, `@copyright` and `@license`. The copyright date should
   only be adjusted if the file has changed.
 - Each PHP file should have a strict type declaration at the top after the page level docblock. [*](ruleset.md#slevomatcodingstandardtypehintsdeclarestricttypes)
 - Import statements should be alphabetically sorted. [*](ruleset.md#slevomatcodingstandardnamespacesalphabeticallysorteduses)
@@ -137,7 +137,7 @@ In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/pro
 
 - Methods may not have the final declaration in classes declared as final. [*](ruleset.md#genericcodeanalysisunnecessaryfinalmodifier)
 - The colon used with return type declarations MUST be surrounded with 1 space. [*](ruleset.md#slevomatcodingstandardtypehintsreturntypehintspacing)
-- Nullable and optional arguments, which are marked as `= null`, must have the nullablity `?` symbol present. [*](ruleset.md#slevomatcodingstandardtypehintsnullabletypefornulldefaultvalue)
+- Nullable and optional arguments, which are marked as `= null`, must have the `?` symbol present. [*](ruleset.md#slevomatcodingstandardtypehintsnullabletypefornulldefaultvalue)
 
 ```php
 <?php
@@ -276,7 +276,7 @@ In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/pro
 
 - The not (`!`) operator must be followed by exactly one space. [*](ruleset.md#genericformattingspaceafternot)
 - The `&&` and `||` operators must be used instead of `AND` and `OR`. [*](ruleset.md#squizoperatorsvalidlogicaloperators)
-- The null coalesce operator should be used when possible. [*](ruleset.md#slevomatcodingstandardcontrolstructuresrequirenullcoalesceoperator)
+- The null  coalescing operator `??` should be used when possible. [*](ruleset.md#slevomatcodingstandardcontrolstructuresrequirenullcoalesceoperator)
 - Assignment operators (eg `+=`, `.=`) should be used when possible. [*](ruleset.md#slevomatcodingstandardoperatorsrequirecombinedassignmentoperator)
 
 ```php
@@ -353,11 +353,11 @@ $instance = new class extends Foo implements
 - The backtick operator may not be used for execution of shell commands. [*](ruleset.md#genericphpbacktickoperator)
 - Class and Interface names should be unique in a project. They should never be duplicated. [*](ruleset.md#genericclassesduplicateclassname)
 - Methods that only call the parent method should not be defined. [*](ruleset.md#genericcodeanalysisuselessoverridingmethod)
-- Files that contain php code should only have php code and should not have any _"inline html"_. [*](ruleset.md#genericfilesinlinehtml)
+- Files that contain PHP code should only have PHP code and should not have any _"inline HTML"_. [*](ruleset.md#genericfilesinlinehtml)
 - There must be exactly one space after a type cast. [*](ruleset.md#genericformattingspaceaftercast)
 - Constructors should be named `__construct`, not after the class. [*](ruleset.md#genericnamingconventionsconstructorname)
-- The opening php tag should be the first item in the file. [*](ruleset.md#genericphpcharacterbeforephpopeningtag)
-- Strings should not be concatenated together, unless used in multiline for readability. [*](ruleset.md#genericstringsunnecessarystringconcat)
+- The opening PHP tag should be the first item in the file. [*](ruleset.md#genericphpcharacterbeforephpopeningtag)
+- Strings should not be concatenated together unless used in multiline for readability. [*](ruleset.md#genericstringsunnecessarystringconcat)
 - Loose `==` and `!=` comparison operators should not be used. Use `===` and `!==` instead. [*](ruleset.md#slevomatcodingstandardcontrolstructuresdisallowequaloperators)
 - An early exit strategy should be used where possible to reduce the level of control structures.
   [*](ruleset.md#slevomatcodingstandardcontrolstructuresearlyexit)
@@ -368,7 +368,7 @@ $instance = new class extends Foo implements
 - Parentheses should not be used if they can be omitted. [*](ruleset.md#slevomatcodingstandardphpuselessparentheses)
 - Semicolons `;` should not be used if they can be omitted. [*](ruleset.md#slevomatcodingstandardphpuselesssemicolon)
 - Variables should be returned directly instead of assigned to a variable which is not used. [*](ruleset.md#slevomatcodingstandardvariablesuselessvariable)
-- The self keyword should be used instead of the current class name, and should not have spaces around `::`.
+- The `self` keyword should be used instead of the current class name, and should not have spaces around `::`.
   [*](ruleset.md#squizclassesselfmemberreference)
 - Global functions should not be used. [*](ruleset.md#squizfunctionsglobalfunction)
 - Static methods should not use `$this`. [*](ruleset.md#squizscopestaticthisusage)
@@ -376,7 +376,7 @@ $instance = new class extends Foo implements
 - Strings should not be enclosed in parentheses when being echoed. [*](ruleset.md#squizstringsechoedstrings)
 - Type casts should not have whitespace inside the parentheses. [*](ruleset.md#squizwhitespacecastspacing)
 - The opening brace for functions should be on a new line with no blank lines surrounding it. [*](ruleset.md#squizwhitespacefunctionopeningbracespace)
-- The php constructs `echo`, `print`, `return`, `include`, `include_once`, `require`, `require_once`, and `new`, should 
+- The PHP constructs `echo`, `print`, `return`, `include`, `include_once`, `require`, `require_once`, and `new`, should 
   have one space after them. [*](ruleset.md#squizwhitespacelanguageconstructspacing)
 - The object operator `->` should not have any spaces around it. [*](ruleset.md#squizwhitespaceobjectoperatorspacing)
 - Semicolons should not have spaces before them. [*](ruleset.md#squizwhitespacesemicolonspacing)
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index 7522cb6e..743fff17 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -65,7 +65,7 @@ final class Foo
 ```
 
 ### Generic.Files.InlineHTML
-Files that contain php code should only have php code and should not have any _"inline html"_.
+Files that contain PHP code should only have PHP code and should not have any _"inline HTML"_.
 ```php
 <?php
 // Valid: A php file with only php code in it.
@@ -128,7 +128,7 @@ class Foo
 ```
 
 ### Generic.PHP.CharacterBeforePHPOpeningTag
-The opening php tag should be the first item in the file.
+The opening PHP tag should be the first item in the file.
 ```php
 <?php // Valid: A file starting with an opening php tag.
 echo 'Foo';
@@ -182,7 +182,7 @@ _PSR-12:_ Any new types and keywords added to future PHP versions must be in low
 The `PHP_SAPI` constant must be used instead of the `php_sapi_name()` function.
 
 ### Generic.Strings.UnnecessaryStringConcat
-Strings should not be concatenated together, unless used in multiline for readability.
+Strings should not be concatenated together unless used in multiline for readability.
 ```php
 // Valid: A string can be concatenated with an expression.
 echo '5 + 2 = ' . (5 + 2);
@@ -320,7 +320,7 @@ new Foo();
 ```
 
 ### SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator
-The null coalesce operator should be used when possible.
+The null  coalescing operator `??` should be used when possible.
 ```php
 $foo = $bar['id'] ?? '1';
 ```
@@ -466,7 +466,7 @@ Shorthand scalar typehint variants must be used in docblocks: `bool` instead of
 etc. This is for consistency with native scalar typehints which also allow shorthand variants only.
 
 ### SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue
-Nullable and optional arguments, which are marked as `= null`, must have the nullablity `?` symbol present.
+Nullable and optional arguments, which are marked as `= null`, must have the `?` symbol present.
 ```php
 function foo(
 	int $foo = null, // ? missing
@@ -540,7 +540,7 @@ _PSR-4:_ The class name must correspond to a file name ending in .php. The file
 terminating class name.
 
 ### Squiz.Classes.SelfMemberReference
-The self keyword should be used instead of the current class name, and should not have spaces around `::`.
+The `self` keyword should be used instead of the current class name, and should not have spaces around `::`.
 ```php
 class Foo
 {
@@ -668,7 +668,7 @@ function foo() {
 ```
 
 ### Squiz.WhiteSpace.LanguageConstructSpacing
-The php constructs `echo`, `print`, `return`, `include`, `include_once`, `require`, `require_once`, and `new` should 
+The PHP constructs `echo`, `print`, `return`, `include`, `include_once`, `require`, `require_once`, and `new` should 
 have one space after them.
 
 ```php

From ba703a4e28e0630f0f4c367832c70b163423bd1c Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 8 Sep 2018 07:17:30 +0200
Subject: [PATCH 32/60] Reorder rules and disable double rules

---
 src/ZendCodingStandard/ruleset.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index df25a730..8c52be8a 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -5,14 +5,17 @@
     <description>The ZendFramework coding standard.</description>
 
     <!-- Import PSR-2 coding standard (base) -->
-    <rule ref="PSR2"/>
+    <rule ref="PSR2">
+        <!-- checked by SlevomatCodingStandard.Namespaces.UseSpacing -->
+        <exclude name="PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse"/>
+        <!-- checked by SlevomatCodingStandard.Namespaces.NamespaceSpacing -->
+        <exclude name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
+    </rule>
 
     <!-- Force array element indentation with 4 spaces -->
     <rule ref="Generic.Arrays.ArrayIndent"/>
     <!-- Forbid `array(...)` -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-    <!-- Forbid backtick operator -->
-    <rule ref="Generic.PHP.BacktickOperator"/>
     <!-- Forbid duplicate classes -->
     <rule ref="Generic.Classes.DuplicateClassName"/>
     <!-- Forbid empty statements -->
@@ -24,11 +27,6 @@
     <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
     <!-- Forbid useless empty method overrides -->
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
-    <!-- Forbid short open tag -->
-    <rule ref="Generic.PHP.DisallowShortOpenTag">
-        <!-- But allow short echo tags -->
-        <exclude name="Generic.PHP.DisallowShortOpenTag.EchoFound"/>
-    </rule>
     <!-- Forbid inline HTML in PHP code -->
     <rule ref="Generic.Files.InlineHTML"/>
     <!-- Align corresponding assignment statement tokens -->
@@ -43,10 +41,17 @@
     <rule ref="Generic.Formatting.SpaceAfterNot"/>
     <!-- Forbid PHP 4 constructors -->
     <rule ref="Generic.NamingConventions.ConstructorName"/>
+    <!-- Forbid backtick operator -->
+    <rule ref="Generic.PHP.BacktickOperator"/>
     <!-- Forbid any content before opening tag -->
     <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag"/>
     <!-- Forbid deprecated functions -->
     <rule ref="Generic.PHP.DeprecatedFunctions"/>
+    <!-- Forbid short open tag -->
+    <rule ref="Generic.PHP.DisallowShortOpenTag">
+        <!-- But allow short echo tags -->
+        <exclude name="Generic.PHP.DisallowShortOpenTag.EchoFound"/>
+    </rule>
     <!-- Forbid alias functions, i.e. `sizeof()`, `delete()` -->
     <rule ref="Generic.PHP.ForbiddenFunctions">
         <properties>
@@ -172,6 +177,7 @@
     <!-- Require use statements to be alphabetically sorted -->
     <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
         <properties>
+            <!-- Force PSR-12 order: classes, functions, constants with 1 emty line in between -->
             <property name="psr12Compatible" value="true"/>
         </properties>
     </rule>

From 2702288f7ff24e5738e208249a771b382ce92d96 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 8 Sep 2018 07:42:52 +0200
Subject: [PATCH 33/60] Add missing rule: Class name resolution via ::class

---
 docs/book/v2/coding-style-guide.md     |  2 ++
 docs/book/v2/ruleset.md                |  4 +++
 src/ZendCodingStandard/ruleset.xml     |  6 ++--
 test/expected-report.txt               |  5 ++--
 test/fixable/class-name-resolution.php | 40 ++++++++++++++++++++++++++
 test/fixed/class-name-resolution.php   | 40 ++++++++++++++++++++++++++
 6 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 test/fixable/class-name-resolution.php
 create mode 100644 test/fixed/class-name-resolution.php

diff --git a/docs/book/v2/coding-style-guide.md b/docs/book/v2/coding-style-guide.md
index 4a613f44..81f29621 100644
--- a/docs/book/v2/coding-style-guide.md
+++ b/docs/book/v2/coding-style-guide.md
@@ -135,6 +135,8 @@ class FooBar
 
 In addition to [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md#4-classes-properties-and-methods):
 
+- Class name resolution via `::class` should be used instead of `__CLASS__`, `get_class()`, `get_class($this)`, 
+  `get_called_class()` and `get_parent_class()`. [*](ruleset.md#slevomatcodingstandardclassesmodernclassnamereference)
 - Methods may not have the final declaration in classes declared as final. [*](ruleset.md#genericcodeanalysisunnecessaryfinalmodifier)
 - The colon used with return type declarations MUST be surrounded with 1 space. [*](ruleset.md#slevomatcodingstandardtypehintsreturntypehintspacing)
 - Nullable and optional arguments, which are marked as `= null`, must have the `?` symbol present. [*](ruleset.md#slevomatcodingstandardtypehintsnullabletypefornulldefaultvalue)
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index 743fff17..4ed1d9ce 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -208,6 +208,10 @@ adding a new element easier and result in a cleaner versioning diff.
 _PSR-12:_ Visibility MUST be declared on all constants if your project PHP minimum version supports constant visibilities 
 (PHP 7.1 or later).
 
+### SlevomatCodingStandard.Classes.ModernClassNameReference
+Class name resolution via `::class` should be used instead of `__CLASS__`, `get_class()`, `get_class($this)`, 
+`get_called_class()` and `get_parent_class()`.
+
 ### SlevomatCodingStandard.Classes.TraitUseDeclaration
 _PSR-12:_ Each individual Trait that is imported into a class MUST be included one-per-line.
 
diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 8c52be8a..d49bacfa 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -6,9 +6,9 @@
 
     <!-- Import PSR-2 coding standard (base) -->
     <rule ref="PSR2">
-        <!-- checked by SlevomatCodingStandard.Namespaces.UseSpacing -->
+        <!-- Checked by SlevomatCodingStandard.Namespaces.UseSpacing -->
         <exclude name="PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse"/>
-        <!-- checked by SlevomatCodingStandard.Namespaces.NamespaceSpacing -->
+        <!-- Checked by SlevomatCodingStandard.Namespaces.NamespaceSpacing -->
         <exclude name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
     </rule>
 
@@ -108,6 +108,8 @@
             <property name="fixable" value="true"/>
         </properties>
     </rule>
+    <!-- Require usage of ::class instead of __CLASS__, get_class(), get_class($this), get_called_class() and get_parent_class() -->
+    <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference"/>
     <!-- Forbid uses of multiple traits separated by comma -->
     <rule ref="SlevomatCodingStandard.Classes.TraitUseDeclaration"/>
     <!-- Require no spaces before trait use, between trait uses and one space after trait uses -->
diff --git a/test/expected-report.txt b/test/expected-report.txt
index 942d16e3..50740dd0 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -5,6 +5,7 @@ FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 test/fixable/anonymous-classes.php                    9       0
 test/fixable/array-indentation.php                    11      0
+test/fixable/class-name-resolution.php                12      0
 test/fixable/closures.php                             19      0
 test/fixable/concatenation-spacing.php                18      0
 test/fixable/EarlyReturn.php                          5       0
@@ -28,9 +29,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 209 ERRORS AND 0 WARNINGS WERE FOUND IN 24 FILES
+A TOTAL OF 221 ERRORS AND 0 WARNINGS WERE FOUND IN 25 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 188 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 195 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/test/fixable/class-name-resolution.php b/test/fixable/class-name-resolution.php
new file mode 100644
index 00000000..5d228873
--- /dev/null
+++ b/test/fixable/class-name-resolution.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+class Anything
+{
+}
+
+class Whatever extends Anything
+{
+    public function magicConstant() : string
+    {
+        return __CLASS__;
+    }
+
+    public function getClassWithoutArguments() : string
+    {
+        return get_class();
+    }
+
+    public function getClassWithThis() : string
+    {
+        return get_class($this);
+    }
+
+    public function getParentClass() : string
+    {
+        return get_parent_class();
+    }
+
+    public function getCalledClass() : string
+    {
+        return get_called_class();
+    }
+
+    public function getMethodWithFullyQualifiedName() : string
+    {
+        return \get_called_class();
+    }
+}
diff --git a/test/fixed/class-name-resolution.php b/test/fixed/class-name-resolution.php
new file mode 100644
index 00000000..0ffdd44b
--- /dev/null
+++ b/test/fixed/class-name-resolution.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+class Anything
+{
+}
+
+class Whatever extends Anything
+{
+    public function magicConstant() : string
+    {
+        return self::class;
+    }
+
+    public function getClassWithoutArguments() : string
+    {
+        return self::class;
+    }
+
+    public function getClassWithThis() : string
+    {
+        return static::class;
+    }
+
+    public function getParentClass() : string
+    {
+        return parent::class;
+    }
+
+    public function getCalledClass() : string
+    {
+        return static::class;
+    }
+
+    public function getMethodWithFullyQualifiedName() : string
+    {
+        return static::class;
+    }
+}

From b9509c8d48ced18e5568f173c960ceb46fe5ffab Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 8 Sep 2018 07:50:13 +0200
Subject: [PATCH 34/60] Add coding-style-guide to mkdocs config

---
 mkdocs.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 2a3dffe7..fe94352d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -3,12 +3,13 @@ site_dir: docs/html
 pages:
     - index.md
     - 'Introduction': v2/intro.md
-    - Reference:
+    - 'Coding Style Guide': v2/coding-style-guide.md
+    - 'Reference':
         - 'Ruleset': v2/ruleset.md
     - v1:
         - v1/index.md
         - 'Introduction': v1/intro.md
-        - Reference:
+        - 'Reference':
             - 'Ruleset': v1/ruleset.md
 
 site_name: Zend Coding Standard

From 4da57721d1ad71891544aa930f3cb4a414119b67 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 8 Sep 2018 08:17:47 +0200
Subject: [PATCH 35/60] Add changelog for #5

---
 CHANGELOG.md | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7fd6df6..76f59fd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,144 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.0.0 - TBD
+
+### Added
+
+- [#5](https://github.com/zendframework/zend-coding-standard/pull/5) adds 
+  online documentation: https://docs.zendframework.com/zend-coding-standard/
+- [#5](https://github.com/zendframework/zend-coding-standard/pull/5) adds 
+  PSR-12 rules.
+  
+  *NOTE:* PSR-12 is not finalized. e.g. The `!` operator and `:` placement for
+  return values are still under discussion. We will change these rules, and, 
+  when PSR-12 is finalized, adapt them.
+- [#5](https://github.com/zendframework/zend-coding-standard/pull/5) extends 
+  PSR-12 with ZendFramework specific rules:
+  
+  *NOTE:* Most of these rules should look familiar as they are already being
+  used in components rewritten for PHP 7.1. 
+    
+  - There should be one space on either side of an equals sign used to assign 
+    a value to a variable. In case of a block of related assignments, more 
+    space may be inserted before the equal sign to promote readability.
+  - Short array syntax must be used to define arrays. 
+  - All values in multiline arrays must be indented with 4 spaces. 
+  - All array values must be followed by a comma, including the last value. 
+  - Whitespace is not allowed around the opening bracket or before the 
+    closing bracket when referencing an array.
+  - All double arrow symbols must be aligned to one space after the longest 
+    array key.
+  - The `global` keyword may not be used.
+  - The `PHP_SAPI` constant must be used instead of the `php_sapi_name()` 
+    function.
+  - PHP function calls must be in lowercase.
+  - PHP functions which are an alias may not be used.
+  - Deprecated functions should not be used.
+  - Comments may be omitted and should not be used for typehinted arguments.
+  - Comments may not start with `#`.
+  - Comments may not be empty.
+  - The words _private_, _protected_, _static_, _constructor_, _deconstructor_,
+    _Created by_, _getter_ and _setter_, may not be used in comments.
+  - The annotations `@api`, `@author`, `@category`, `@created`, `@package`,
+    `@subpackage` and `@version` may not be used in comments. Git commits 
+    provide accurate information.
+  - The asterisks in a doc comment should align, and there should be one space 
+    between the asterisk and tag.
+  - If a function throws any exceptions, they should be documented in `@throws` 
+    tags.
+  - The `@var` tag may be used in inline comments to document the _Type_ of 
+    properties.
+  - Comments with single-line content should be written as one-liners.
+  - Shorthand scalar typehint variants must be used in docblocks.
+  - Each PHP file should have a page level docblock with `@see`, `@copyright` 
+    and `@license`. The copyright date should only be adjusted if the file has 
+    changed.
+  - Each PHP file should have a strict type declaration at the top after the 
+    page level docblock.
+  - Import statements should be alphabetically sorted.
+  - Import statements should not be grouped.
+  - Each import statement should be on its own line.
+  - Absolute class name references, functions and constants should be imported.
+  - Unused import statements are not allowed.
+  - Classes and function within the same namespace should not be imported.
+  - Imports should not have an alias with the same name.
+  - A class should not have unused private constants, (or write-only) 
+    properties and methods.
+  - Class name resolution via `::class` should be used instead of 
+    `__CLASS__`, `get_class()`, `get_class($this)`, `get_called_class()` and 
+    `get_parent_class()`.
+  - Methods may not have the final declaration in classes declared as final.
+  - The colon used with return type declarations MUST be surrounded with 1 
+    space.
+  - Nullable and optional arguments, which are marked as `= null`, must have 
+    the `?` symbol present.
+  - Control Structures must have at least one statement inside of the body.    
+  - Catch blocks may be empty.
+  - Catch blocks must be reachable.
+  - Catch blocks must use `Throwable` instead of `Exception`.    
+  - The not (`!`) operator must be followed by exactly one space.
+  - The `&&` and `||` operators must be used instead of `AND` and `OR`.
+  - The null  coalescing operator `??` should be used when possible.
+  - Assignment operators (eg `+=`, `.=`) should be used when possible.
+  - Unused variables should not be passed to closures via `use`.    
+  - The code may not contain unreachable code.
+  - The backtick operator may not be used for execution of shell commands.
+  - Class and Interface names should be unique in a project. They should 
+    never be duplicated.
+  - Methods that only call the parent method should not be defined.
+  - Files that contain PHP code should only have PHP code and should not have
+    any _"inline HTML"_.
+  - There must be exactly one space after a type cast. 
+  - Constructors should be named `__construct`, not after the class.
+  - The opening PHP tag should be the first item in the file. 
+  - Strings should not be concatenated together unless used in multiline for 
+    readability. 
+  - Loose `==` and `!=` comparison operators should not be used. Use `===` 
+    and `!==` instead.
+  - An early exit strategy should be used where possible to reduce the level 
+    of control structures.
+  - Language constructs must be used without parentheses where possible.
+  - Short list syntax `[...]` should be used instead of `list(...)`.
+  - Short form of type keywords must be used. i.e. `bool` instead of 
+    `boolean`, `int` instead of `integer`, etc. The `binary` and `unset` cast 
+    operators are not allowed.
+  - Parentheses should not be used if they can be omitted.
+  - Semicolons `;` should not be used if they can be omitted.
+  - Variables should be returned directly instead of assigned to a variable 
+    which is not used.
+  - The `self` keyword should be used instead of the current class name, and 
+    should not have spaces around `::`.
+  - Global functions should not be used.
+  - Static methods should not use `$this`. 
+  - Double quote strings may only be used if they contain variables. 
+  - Strings should not be enclosed in parentheses when being echoed.
+  - Type casts should not have whitespace inside the parentheses.
+  - The opening brace for functions should be on a new line with no blank 
+    lines surrounding it.
+  - The PHP constructs `echo`, `print`, `return`, `include`, `include_once`, 
+    `require`, `require_once`, and `new`, should have one space after them.
+  - The object operator `->` should not have any spaces around it.
+  - Semicolons should not have spaces before them.
+  - The code should not contain superfluous whitespaces. e.g. multiple empty
+    lines, trailing spaces, etc.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.0.0 - 2016-11-09
 
 Initial public release. Incorporates rules for:

From 9737c95af244f4c2b0c4bee6268ad97fd6a3577f Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 8 Sep 2018 08:50:00 +0200
Subject: [PATCH 36/60] Improve wording and add example for
 Generic.Classes.DuplicateClassName

---
 CHANGELOG.md                       |  4 ++--
 docs/book/v2/coding-style-guide.md |  2 +-
 docs/book/v2/ruleset.md            | 36 +++++++++++++++++++++++++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76f59fd1..30e8390a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,8 +85,8 @@ All notable changes to this project will be documented in this file, in reverse
   - Unused variables should not be passed to closures via `use`.    
   - The code may not contain unreachable code.
   - The backtick operator may not be used for execution of shell commands.
-  - Class and Interface names should be unique in a project. They should 
-    never be duplicated.
+  - Class and Interface names should be unique in a project and must have a 
+    unique fully qualified name.
   - Methods that only call the parent method should not be defined.
   - Files that contain PHP code should only have PHP code and should not have
     any _"inline HTML"_.
diff --git a/docs/book/v2/coding-style-guide.md b/docs/book/v2/coding-style-guide.md
index 81f29621..a76dcda6 100644
--- a/docs/book/v2/coding-style-guide.md
+++ b/docs/book/v2/coding-style-guide.md
@@ -353,7 +353,7 @@ $instance = new class extends Foo implements
 
 - The code may not contain unreachable code. [*](ruleset.md#squizphpnonexecutablecode)
 - The backtick operator may not be used for execution of shell commands. [*](ruleset.md#genericphpbacktickoperator)
-- Class and Interface names should be unique in a project. They should never be duplicated. [*](ruleset.md#genericclassesduplicateclassname)
+- Class and Interface names should be unique in a project and must have a unique fully qualified name. [*](ruleset.md#genericclassesduplicateclassname)
 - Methods that only call the parent method should not be defined. [*](ruleset.md#genericcodeanalysisuselessoverridingmethod)
 - Files that contain PHP code should only have PHP code and should not have any _"inline HTML"_. [*](ruleset.md#genericfilesinlinehtml)
 - There must be exactly one space after a type cast. [*](ruleset.md#genericformattingspaceaftercast)
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index 4ed1d9ce..7cc7347c 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -23,7 +23,41 @@ $foo = [...];
 The backtick operator may not be used for execution of shell commands.
 
 ### Generic.Classes.DuplicateClassName
-Class and Interface names should be unique in a project. They should never be duplicated.
+Class and Interface names should be unique in a project and must have a unique fully qualified name. They should never 
+be duplicated.
+```php
+<?php // Valid: Unique class names.
+// src/Vendor/Package/Foo.php
+namespace Vendor\Package {
+    class Foo
+    {
+    }
+}
+
+// src/Vendor/AnotherPackage/Foo.php
+namespace Vendor\AnotherPackage {
+    class Foo
+    {
+    }
+}
+```
+
+```php
+<?php // Invalid: A class duplicated across multiple files.
+// src/Vendor/Package/Foo.php
+namespace Vendor\Package {
+    class Foo
+    {
+    }
+}
+
+// app/Vendor/Package/Foo.php
+namespace Vendor\Package {
+    class Foo
+    {
+    }
+}
+```
 
 ### Generic.CodeAnalysis.EmptyStatement
 Control Structures must have at least one statement inside of the body.

From 7ea79cca94eb0ce191b36db35ba563e7ccaa540d Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 8 Sep 2018 10:47:42 +0200
Subject: [PATCH 37/60] It's raining outside, so more examples and improved
 formatting

---
 docs/book/v2/ruleset.md | 561 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 493 insertions(+), 68 deletions(-)

diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index 7cc7347c..3eecff17 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -15,18 +15,28 @@ All values in multiline arrays must be indented with 4 spaces.
 
 ### Generic.Arrays.DisallowLongArraySyntax
 Short array syntax must be used to define arrays.
+
 ```php
-$foo = [...];
+<?php
+$foo = ['foo' => 'bar'];
 ```
 
 ### Generic.PHP.BacktickOperator
 The backtick operator may not be used for execution of shell commands.
 
+*Invalid: Using the backtick operator.*
+```php
+<?php
+$output = `ls -al`;
+```
+
 ### Generic.Classes.DuplicateClassName
 Class and Interface names should be unique in a project and must have a unique fully qualified name. They should never 
 be duplicated.
+
+*Valid: Unique class names.*
 ```php
-<?php // Valid: Unique class names.
+<?php
 // src/Vendor/Package/Foo.php
 namespace Vendor\Package {
     class Foo
@@ -42,8 +52,9 @@ namespace Vendor\AnotherPackage {
 }
 ```
 
+*Invalid: A class duplicated across multiple files.*
 ```php
-<?php // Invalid: A class duplicated across multiple files.
+<?php
 // src/Vendor/Package/Foo.php
 namespace Vendor\Package {
     class Foo
@@ -62,11 +73,26 @@ namespace Vendor\Package {
 ### Generic.CodeAnalysis.EmptyStatement
 Control Structures must have at least one statement inside of the body.
 
+*Valid:*
+```php
+<?php
+for ($i; $i > 0; $i--) { 
+    echo 'hello';
+}
+```
+
+*Invalid:*
+```php
+<?php
+if ($something) echo 'hello';
+```
 #### Generic.CodeAnalysis.EmptyStatement.DetectedCatch
 Catch blocks may be empty.
+
 ```php
+<?php
 try {
-    // Try block
+    // Do something
 } catch (SomeThrowableType $e) {
 }
 ```
@@ -74,11 +100,34 @@ try {
 ### Generic.CodeAnalysis.UnnecessaryFinalModifier
 Methods may not have the final declaration classes declared as final.
 
+*Valid: Only the class is marked as final.*
+```php
+<?php
+final class Foo
+{
+    public function bar()
+    {
+    }
+}
+```
+
+*Invalid: A method in a final class is also marked final.*
+```php
+<?php
+final class Foo
+{
+    final public function bar()
+    {
+    }
+}
+```
+
 ### Generic.CodeAnalysis.UselessOverridingMethod
 Methods that only call the parent method should not be defined.
 
+*Valid: A method that extends functionality on a parent method.*
 ```php
-// Valid: A method that extends functionality on a parent method.
+<?php
 final class Foo
 {
     public function bar() : void
@@ -87,8 +136,11 @@ final class Foo
         $this->doSomethingElse();
     }
 }
+```
 
-// Invalid: An overriding method that only calls the parent.
+*Invalid: An overriding method that only calls the parent.*
+```php
+<?php
 final class Foo
 {
     public function bar() : void
@@ -100,16 +152,17 @@ final class Foo
 
 ### Generic.Files.InlineHTML
 Files that contain PHP code should only have PHP code and should not have any _"inline HTML"_.
+
+*Valid: A php file with only php code in it.*
 ```php
 <?php
-// Valid: A php file with only php code in it.
 $foo = 'bar';
 echo $foo . 'baz';
 ```
 
+*Invalid: A php file with html in it outside of the php tags.*
 ```php
-<!-- Invalid: A php file with html in it outside of the php tags. -->
-<em>some string here</em>
+<strong>some string here</strong>
 <?php
 $foo = 'bar';
 echo $foo . 'baz';
@@ -118,41 +171,76 @@ echo $foo . 'baz';
 ### Generic.Formatting.MultipleStatementAlignment
 There should be one space on either side of an equals sign used to assign a value to a variable. In case of a 
 block of related assignments, more space may be inserted before the equal sign to promote readability.
+
+*Valid: Equal signs are aligned in related blocks.*
 ```php
 <?php
-
 $shortVar        = (1 + 2);
 $veryLongVarName = 'string';
-$var             = foo($bar, $baz, $quux);
+
+$foo    = $bar;
+$result = foo($bar, $baz, $quux);
+```
+
+*Invalid: Equal signs are not aligned.*
+```php
+<?php
+$shortVar = (1 + 2);
+$veryLongVarName = 'string';
+
+$foo = $bar;
+$result = foo($bar, $baz, $quux);
 ```
 
 ### Generic.Formatting.SpaceAfterCast
 There must be exactly one space after a type cast.
 
+*Valid: A cast operator is followed by one space.*
 ```php
-// Valid: A cast operator is followed by one space.
+<?php
 $foo = (string) 1;
+```
 
-// Invalid: A cast operator is not followed by whitespace.
+*Invalid: A cast operator is not followed by whitespace.*
+```php
+<?php
 $foo = (string)1;
 ```
 
 ### Generic.Formatting.SpaceAfterNot
-The not (`!`) operator must be followed by exactly one space.
+The not `!` operator must be followed by exactly one space.
+
+*Valid: One space after `!`.*
+```php
+<?php
+if (! foo() && (! $x || true)) {}
+$var = ! ($x || $y);
+```
+
+*Invalid: No space after `!` or a space before.*
+```php
+<?php
+if (!foo() && ( ! $x || true)) {}
+$var = !($x || $y);
+```
 
 ### Generic.NamingConventions.ConstructorName
 Constructors should be named `__construct`, not after the class.
 
+*Valid: The constructor is named __construct.*
 ```php
-// Valid: The constructor is named __construct.
+<?php
 class Foo
 {
     function __construct()
     {
     }
 }
+```
 
-// Invalid: The old style class name constructor is used.
+*Invalid: The PHP4 style class name constructor is used.*
+```php
+<?php
 class Foo
 {
     function Foo()
@@ -163,14 +251,16 @@ class Foo
 
 ### Generic.PHP.CharacterBeforePHPOpeningTag
 The opening PHP tag should be the first item in the file.
+
+*Valid: A file starting with an opening php tag.*
 ```php
-<?php // Valid: A file starting with an opening php tag.
+<?php
 echo 'Foo';
 ```
 
+*Invalid: A file with content before the opening php tag.*
 ```php
-// Invalid: A file with content before the opening php tag.
-<em>Beginning content</em>
+<strong>Beginning content</em>
 <?php
 echo 'Foo';
 ```
@@ -178,6 +268,18 @@ echo 'Foo';
 ### Generic.PHP.DeprecatedFunctions
 Deprecated functions should not be used.
 
+*Valid: A non-deprecated function is used.*
+```php
+<?php
+$foo = explode('a', $bar);
+```
+
+*Invalid: A deprecated function is used.*
+```php
+<?php
+$foo = split('a', $bar);
+```
+
 ### Generic.PHP.DisallowShortOpenTag
 #### Generic.PHP.DisallowShortOpenTag.EchoFound
 _PSR-1:_ PHP code must use the long `<?php ?>` tags or the short-echo `<?= ?>` tags; it must not use the other tag 
@@ -215,22 +317,53 @@ _PSR-12:_ Any new types and keywords added to future PHP versions must be in low
 ### Generic.PHP.SAPIUsage
 The `PHP_SAPI` constant must be used instead of the `php_sapi_name()` function.
 
+*Valid: PHP_SAPI is used.*
+```php
+<?php
+if (PHP_SAPI === 'cli') {
+    echo 'Hello, CLI user.';
+}
+```
+
+*Invalid: php_sapi_name() is used.*
+```php
+<?php
+if (php_sapi_name() === 'cli') {
+    echo 'Hello, CLI user.';
+}
+```
+
 ### Generic.Strings.UnnecessaryStringConcat
 Strings should not be concatenated together unless used in multiline for readability.
+
+*Valid: A string can be concatenated with an expression.*
 ```php
-// Valid: A string can be concatenated with an expression.
+<?php
 echo '5 + 2 = ' . (5 + 2);
+```
 
-// Invalid: Strings should not be concatenated together.
+*Invalid: Strings should not be concatenated together.*
+```php
+<?php
 echo 'Hello' . ' ' . 'World';
 ```
 
 ## PEAR
 
 ### PEAR.Commenting.InlineComment
-Comments may not start with `#`.
+Perl-style `#` comments are not allowed.
 
+*Valid: A `//` style comment.*
+```php
+<?php
+// A comment.
+```
 
+*Invalid: A `#` style comment.*
+```php
+<?php
+# An invalid comment.
+```
 
 ## SlevomatCodingStandard
 
@@ -265,7 +398,9 @@ _getter_ and _setter_ may not be used in comments
 
 ### SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration
 The `@var` tag may be used in inline comments to document the _Type_ of properties, sometimes called class variables.
+
 ```php
+<?php
 class Foo
 {
 	/** @var string */
@@ -286,34 +421,60 @@ class Foo
 
 ### SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment
 Comments with single-line content should be written as one-liners.
+
+*Valid: One-line comment*
 ```php
+<?php
+/** @var array */
+private $foo;
+```
+
+*Invalid: Multiple lines for a single comment*
+```php
+<?php
 /**
  * @var array
  */
 private $foo;
 ```
-Should be written as
+
+### SlevomatCodingStandard.ControlStructures.DisallowEqualOperators
+Loose `==` and `!=` comparison operators should not be used. Use strict comparison `===` and `!==` instead, they are 
+much more secure and predictable.
+
+*Valid: Strict comparison is used.*
 ```php
-/** @var array */
-private $foo;
+<?php
+if ($a === $b || $c !== $d) {
+    // ...
+}
 ```
 
-### SlevomatCodingStandard.ControlStructures.DisallowEqualOperators
-Loose `==` and `!=` comparison operators should not be used. Use `===` and `!==` instead, they are much more secure 
-and predictable.
+*Invalid: Loose comparison used.*
+```php
+<?php
+if ($a == $b || $c != $d) {
+    // ...
+}
+```
 
 ### SlevomatCodingStandard.ControlStructures.EarlyExit
 An early exit strategy should be used where possible to reduce the level of control structures.
+
+*Valid: Exit early.*
 ```php
-// Valid: Exit early.
+<?php
 function () : bool {
 	if (! true) {
 		return false;
 	}
 	// Do something
 };
+```
 
-// Invalid: unneeded control structure
+*Invalid: unneeded control structure*
+```php
+<?php
 function () : bool {
 	if (true) {
 		// Do something
@@ -326,8 +487,9 @@ function () : bool {
 ### SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses
 Language constructs must be used without parentheses where possible.
 
+*Valid: Use language constructs without parentheses.*
 ```php
-// Valid: Use language constructs without parentheses.
+<?php
 continue 1;
 break 1;
 echo 'a';
@@ -337,8 +499,11 @@ return 'foo';
 yield [];
 throw new Exception();
 exit;
+```
 
-// Invalid: Language constructs with parentheses.
+*Invalid: Language constructs with parentheses.*
+```php
+<?php
 continue(1);
 break(1);
 echo('a');
@@ -353,19 +518,52 @@ exit();
 ### SlevomatCodingStandard.ControlStructures.NewWithParentheses
 _PSR-12:_ When instantiating a new class, parenthesis MUST always be present even when there are no arguments passed to 
 the constructor.
+
+*Valid: Parenthesis are used for instantiating a new class.*
 ```php
+<?php
 new Foo();
 ```
 
+*Invalid: Missing parenthesis.*
+```php
+<?php
+new Foo;
+```
+
 ### SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator
-The null  coalescing operator `??` should be used when possible.
+The null coalescing operator `??` should be used when possible.
+
+*Valid: Used the null coalescing operator.*
 ```php
-$foo = $bar['id'] ?? '1';
+<?php
+$username = $user['name'] ?? 'nobody';
+```
+
+*Invalid: Using isset to check if a variable is set and return it.*
+```php
+<?php
+$username = isset($user['name']) ? $user['name'] : 'nobody';
 ```
 
 ### SlevomatCodingStandard.Exceptions.DeadCatch
 Catch blocks must be reachable.
+
+*Valid: All catch blocks are reachable.*
+```php
+<?php
+try {
+	doStuff();
+} catch (InvalidArgumentException $e) {
+	log($e);
+} catch (Throwable $e) {
+	// Reachable
+}
+```
+
+*Invalid: Last catch block is unreachable.*
 ```php
+<?php
 try {
 	doStuff();
 } catch (Throwable $e) {
@@ -377,26 +575,99 @@ try {
 
 ### SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly
 Catch blocks must use `Throwable` instead of `Exception`.
+
+*Valid: Throwable is used to catch all errors and exceptions.*
 ```php
+<?php
 try {
 	// ...
 } catch (Throwable $e) {
+    // ...
+}
+```
 
+*Invalid: Exception is used and will not catch other Throwables. e.g. internal PHP errors*
+```php
+<?php
+try {
+	// ...
+} catch (Exception $e) {
+    // ...
 }
 ```
 
 ### SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure
 Unused variables should not be passed to closures via `use`.
 
+*Valid: All variables passed via `use` are used.*
+```php
+<?php
+$closure = function (string $arg1, string $arg2) use ($var1) : string {
+    return $arg1 . $arg2 . $var1;
+};
+```
+
+*Invalid: Un unused variable `$var2` is passed via `use`.*
+```php
+<?php
+$closure = function (string $arg1, string $arg2) use ($var1, $var2) : string {
+    return $arg1 . $arg2 . $var1;
+};
+```
+
 ### SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses
 Import statements should be alphabetically sorted.
 
+*Valid: The import statements are sorted alphabetically.*
+```php
+<?php
+use Example\A;
+use Example\B;
+use Vendor\Package\C;
+```
+
+*Invalid: The import statements are in a random order.*
+```php
+<?php
+use Example\A;
+use Vendor\Package\C;
+use Example\B;
+```
+
 ### SlevomatCodingStandard.Namespaces.DisallowGroupUse
 Import statements should not be grouped.
 
+*Valid: Each import statement on its own line.*
+```php
+<?php
+use Example\A;
+use Example\B;
+use Vendor\Package\C;
+```
+
+*Invalid: Using import groups.*
+```php
+<?php
+use Example\{A, B};
+use Vendor\Package\C;
+```
+
 ### SlevomatCodingStandard.Namespaces.MultipleUsesPerLine
 Each import statement should be on its own line.
 
+*Valid: Each import statement on its own line.*
+```php
+<?php
+use Bar;
+use Foo;
+```
+
+*Invalid: Multiple imports on one line.*
+```php
+<?php
+use Foo, Bar;
+```
+
 ### SlevomatCodingStandard.Namespaces.NamespaceSpacing
 Require newlines around namespace declaration
 
@@ -411,9 +682,30 @@ _PSR-12:_ Import statements MUST never begin with a leading backslash as they mu
 
 ### SlevomatCodingStandard.Namespaces.UseFromSameNamespace
 Classes and function within the same namespace should not be imported.
+
+*Valid: `Bar` is not imported.*
 ```php
-use Foo\Bar as Bar; // Same name as imported class
-use Foo\Bar;        // Correct
+<?php
+namespace Example;
+
+use Example\More\Baz;
+
+class Foo extends Bar
+{
+}
+```
+
+*Invalid: `Bar` is in the same namespace as `Foo`.*
+```php
+<?php
+namespace Example;
+
+use Example\Bar;
+use Example\More\Baz;
+
+class Foo extends Bar
+{
+}
 ```
 
 ### SlevomatCodingStandard.Namespaces.UseSpacing
@@ -422,10 +714,23 @@ _PSR-12:_ Require empty newlines before and after uses
 ### SlevomatCodingStandard.Namespaces.UselessAlias
 Imports should not have an alias with the same name.
 
+*Valid: The alias and imported class name are different.*
+```php
+<?php
+use Foo\Bar as MyBar; 
+```
+
+*Invalid: Alias has same name as imported class.*
+```php
+<?php
+use Foo\Bar as Bar;
+```
+
 ### SlevomatCodingStandard.Operators.RequireCombinedAssignmentOperator
 Assignment operators (eg `+=`, `.=`) should be used when possible.
 
 ```php
+<?php
 self::$a &= 2;
 static::$a |= 4;
 self::$$parameter .= '';
@@ -444,13 +749,30 @@ $this->{'a'} += 10;
 ### SlevomatCodingStandard.PHP.ShortList
 Short list syntax `[...]` should be used instead of `list(...)`.
 
+*Valid: The short list syntax is used for array destructuring assignment.*
+```php
+<?php
+[$a, $b, $c] = $array;
+['a' => $a, 'b' => $b, 'c' => $c] = $array;
+```
+
+*Invalid: Usage of `list`.*
+```php
+<?php
+list($a, $b, $c) = $array;
+list('a' => $a, 'b' => $b, 'c' => $c) = $array;
+```
+
 ### SlevomatCodingStandard.PHP.TypeCast
-Short form of type keywords must be used. i.e. `bool` instead of `boolean`, `int` instead of `integer`, etc.
+_PSR-12:_ Short form of type keywords must be used. i.e. `bool` instead of `boolean`, `int` instead of `integer`, etc.
+
 The `binary` and `unset` cast operators are not allowed.
 
 ### SlevomatCodingStandard.TypeHints.DeclareStrictTypes
-_PSR-12:_ Declare statements MUST contain no spaces and MUST be exactly `declare(strict_types=1)`.
 Each PHP file should have a strict type declaration at the top after the page level docblock.
+
+_PSR-12:_ Declare statements MUST contain no spaces and MUST be exactly `declare(strict_types=1)`.
+
 ```php
 <?php
 /**
@@ -466,16 +788,21 @@ declare(strict_types=1);
 
 ### SlevomatCodingStandard.PHP.UselessParentheses
 Parentheses should not be used if they can be omitted.
+
+*Valid: No parentheses used.*
 ```php
-// Valid: No parentheses used.
+<?php
 $x = $y !== null ? true : false;
 $a = $b ? 1 : 0;
 $c = $d ? 1 : 0;
 $x = self::$a;
 $x = Something\Anything::$a;
 $x = self::$a::$b;
+```
 
-// Invalid: Unneeded parentheses.
+*Invalid: Unneeded parentheses.*
+```php
+<?php
 $x = ($y !== null) ? true : false;
 $a = ($b) ? 1 : 0;
 $c = (   $d    ) ? 1 : 0;
@@ -486,30 +813,43 @@ $x = (self::$a::$b);
 
 ### SlevomatCodingStandard.PHP.UselessSemicolon
 Semicolons `;` should not be used if they can be omitted.
+
+*Valid: Semicolon used where needed.*
 ```php
-// Valid: Semicolon used where needed.
+<?php
 foo();
+
 class Whatever {
 }
+```
 
-// Invalid: Unneeded semicolons used.
+*Invalid: Unneeded semicolons used.*
+```php
+<?php
 foo();;
+
 class Whatever {
 };
 ```
 
-
 ### SlevomatCodingStandard.TypeHints.LongTypeHints
 Shorthand scalar typehint variants must be used in docblocks: `bool` instead of `boolean`, `int` instead of `integer`, 
-etc. This is for consistency with native scalar typehints which also allow shorthand variants only.
+etc. This is for consistency with _PSR-12_ native scalar typehints which also allow shorthand variants only.
 
 ### SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue
 Nullable and optional arguments, which are marked as `= null`, must have the `?` symbol present.
+
+*Valid: Nullable argument has the `?` symbol.*
+```php
+<?php
+function foo(?int $bar = null) {
+}
+```
+
+*Invalid: Missing `?` before `int`*
 ```php
-function foo(
-	int $foo = null, // ? missing
-	?int $bar = null // correct
-) {
+<?php
+function foo(int $foo = null) {
 }
 ```
 
@@ -533,13 +873,18 @@ public function foo($bar) : array;
 
 ### SlevomatCodingStandard.Variables.UselessVariable
 Variables should be returned directly instead of assigned to a variable which is not used.
+
+*Valid: The value is returned directly.*
 ```php
-// Valid: The value is returned directly.
+<?php
 function () {
 	return true;
 };
+```
 
-// Invalid: An extra variable is used where its value could be returned directly.
+*Invalid: An extra variable is used where its value could be returned directly.*
+```php
+<?php
 function () {
 	$a = true;
 	return $a;
@@ -552,13 +897,25 @@ function () {
 
 ### Squiz.Arrays.ArrayBracketSpacing
 Whitespace is not allowed around the opening bracket or before the closing bracket when referencing an array.
+
+*Valid: No extra spaces used.*
 ```php
+<?php
 $foo['bar'];
 ```
 
+*Invalid: Extra spaces.*
+```php
+<?php
+$foo [ 'bar' ] ;
+```
+
 ### Squiz.Arrays.ArrayDeclaration
 All double arrow symbols must be aligned to one space after the longest array key.
+
+*Valid: Array is aligned.*
 ```php
+<?php
 return [
     ConfigAggregator::ENABLE_CACHE => true,
     'debug'                        => false,
@@ -573,13 +930,33 @@ return [
 ];
 ```
 
+*Invalid: Double arrow symbols are not aligned.*
+```php
+<?php
+return [
+    ConfigAggregator::ENABLE_CACHE => true,
+    'debug' => false,
+    'zend-expressive' => [
+        'raise_throwables' => true,
+        'programmatic_pipeline' => true,
+        'error_handler' => [
+            'template_404' => 'error::404',
+            'template_error' => 'error::error',
+        ],
+    ],
+];
+```
+
 ### Squiz.Classes.ClassFileName
 _PSR-4:_ The class name must correspond to a file name ending in .php. The file name MUST match the case of the 
 terminating class name.
 
 ### Squiz.Classes.SelfMemberReference
 The `self` keyword should be used instead of the current class name, and should not have spaces around `::`.
+
+*Valid:*
 ```php
+<?php
 class Foo
 {
     public static function bar()
@@ -595,7 +972,10 @@ class Foo
 
 ### Squiz.Commenting.DocCommentAlignment
 The asterisks in a doc comment should align, and there should be one space between the asterisk and tag.
+
+*Valid:*
 ```php
+<?php
 /**
  * These lines are aligned.
  * 
@@ -605,18 +985,22 @@ The asterisks in a doc comment should align, and there should be one space betwe
 
 ### Squiz.Commenting.FunctionComment
 If a function throws any exceptions, they should be documented in `@throws` tags.
+
+*Valid:*
 ```php
+<?php
 /** @throws Exception all the time */
 function foo() : void
 {
     throw new Exception('Danger!');
 }
 ```
+
 ### Squiz.Functions.GlobalFunction
 Global functions should not be used.
 
 ### Squiz.Operators.ValidLogicalOperators
-The `&&` and `||` operators must be used instead of `&&` and `||`.
+The `&&` and `||` operators must be used instead of `AND` and `OR`.
 
 ### Squiz.PHP.GlobalKeyword
 The `global` keyword may not be used.
@@ -629,8 +1013,10 @@ The code may not contain unreachable code.
 
 ### Squiz.Scope.StaticThisUsage
 Static methods should not use `$this`.
+
+*Valid: Using `self::` to access static variables.*
 ```php
-// Valid: Using self:: to access static variables.
+<?php
 class Foo
 {
     public static function bar()
@@ -638,8 +1024,11 @@ class Foo
         return self::$staticMember;
     }
 }
+```
 
-// Invalid: Using $this-> to access static variables.
+*Invalid: Using `$this->` to access static variables.*
+```php
+<?php
 class Foo
 {
     public static function bar()
@@ -654,16 +1043,23 @@ Force whitespace before and after concatenation
 
 ### Squiz.Strings.DoubleQuoteUsage
 #### Squiz.Strings.DoubleQuoteUsage.ContainsVar
-Double quote strings may only be used if they contain variables.
+Double quote strings may only be used if they contain variables. SQL queries containing single quotes are an exception 
+to the rule.
+
+*Valid: Double quote strings are only used when it contains a variable.*
 ```php
-// Valid: Double quote strings are only used when it contains a variable.
+<?php
 $string = "Hello There\r\n";
 $string = "Hello $there";
 $string = 'Hello There';
 $string = 'Hello'.' There'."\n";
 $string = '\$var';
+$query = "SELECT * FROM table WHERE name =''";
+```
 
-// Invalid: There are no variables inside double quote strings.
+*Invalid: There are no variables inside double quote strings.*
+```php
+<?php
 $string = "Hello There";
 $string = "Hello"." There"."\n";
 $string = "\$var";
@@ -671,34 +1067,49 @@ $string = "\$var";
 
 ### Squiz.Strings.EchoedStrings
 Strings should not be enclosed in parentheses when being echoed.
+
+*Valid: Using echo without parentheses.*
 ```php
-// "Valid: Using echo without parentheses.
+<?php
 echo 'Hello';
+```
 
-// Invalid: Using echo with parentheses.
+*Invalid: Using echo with parentheses.*
+```php
+<?php
 echo('Hello');
 ```
 
 ### Squiz.WhiteSpace.CastSpacing
 Type casts should not have whitespace inside the parentheses.
+
+*Valid: No spaces.*
 ```php
-// Valid: No spaces.
+<?php
 $foo = (int) '42';
+```
 
-// Invalid: Whitespace used inside parentheses.
+*Invalid: Whitespace used inside parentheses.*
+```php
+<?php
 $foo = ( int ) '42';
 ```
 
 ### Squiz.WhiteSpace.FunctionOpeningBraceSpace
 The opening brace for functions should be on a new line with no blank lines surrounding it.
+
+*Valid: Opening brace is on a new line.*
 ```php
-// Valid: Opening brace is on a new line.
+<?php
 function foo() : int
 {
     return 42;
 }
+```
 
-// Invalid: Opening brace is on the same line as the function declaration and a blank line after the opening brace.
+*Invalid: Opening brace is on the same line as the function declaration and a blank line after the opening brace.*
+```php
+<?php
 function foo() {
 
     return 42;
@@ -709,11 +1120,15 @@ function foo() {
 The PHP constructs `echo`, `print`, `return`, `include`, `include_once`, `require`, `require_once`, and `new` should 
 have one space after them.
 
+*Valid: echo statement with a single space after it.*
 ```php
-// Valid: echo statement with a single space after it.
+<?php
 echo 'hi';
+```
 
-// Invalid: echo statement with no space after it.
+*Invalid: echo statement with no space after it.*
+```php
+<?php
 echo'hi';
 ```
 
@@ -722,21 +1137,31 @@ _PSR-12:_ There must be one space around logical operators.
 
 ### Squiz.WhiteSpace.ObjectOperatorSpacing
 The object operator `->` should not have any spaces around it.
+
+*Valid: No spaces around the object operator.*
 ```php
-// Valid: No spaces around the object operator.
+<?php
 $foo->bar();
+```
 
-// Invalid: Whitespace surrounding the object operator.
+*Invalid: Whitespace surrounding the object operator.*
+```php
+<?php
 $foo -> bar();
 ```
 
 ### Squiz.WhiteSpace.SemicolonSpacing
 Semicolons should not have spaces before them.
+
+*Valid: No space before the semicolon.*
 ```php
-// Valid: No space before the semicolon.
+<?php
 echo 'hi';
+```
 
-// Valid: Invalid: Space before the semicolon.
+*Valid: Invalid: Space before the semicolon.*
+```php
+<?php
 echo 'hi' ;
 ```
 

From 70b63afafb1ce77aee872c8a8207f56d1a9f0a95 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 8 Sep 2018 15:43:22 +0200
Subject: [PATCH 38/60] Update phpcs config in readme

---
 README.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c5aec180..9a63374b 100644
--- a/README.md
+++ b/README.md
@@ -25,13 +25,25 @@ The coding standard ruleset for Zend Framework components.
 
    ```xml
    <?xml version="1.0"?>
-   <ruleset name="Zend Framework Coding Standard">
-       <rule ref="ZendCodingStandard"/>
-
+   <ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
+   
+       <arg name="basepath" value="."/>
+       <arg name="cache" value=".phpcs-cache"/>
+       <arg name="colors"/>
+       <arg name="extensions" value="php"/>
+       <arg name="parallel" value="80"/>
+       
+       <!-- Show progress -->
+       <arg value="p"/>
+   
        <!-- Paths to check -->
        <file>config</file>
        <file>src</file>
        <file>test</file>
+   
+       <!-- Include all rules from the Zend Coding Standard -->
+       <rule ref="ZendCodingStandard"/>
    </ruleset>
    ```
 

From f93740be2b4dd5d7ed61f6f958c01d8739998a9c Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sun, 9 Sep 2018 09:20:04 +0200
Subject: [PATCH 39/60] Update array indentation test

---
 test/expected-report.txt           |  6 +++---
 test/fixable/array-indentation.php | 29 +++++++++++++++++------------
 test/fixed/array-indentation.php   | 27 ++++++++++++++++-----------
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/test/expected-report.txt b/test/expected-report.txt
index 50740dd0..07210a0c 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -4,7 +4,7 @@ PHP CODE SNIFFER REPORT SUMMARY
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 test/fixable/anonymous-classes.php                    9       0
-test/fixable/array-indentation.php                    11      0
+test/fixable/array-indentation.php                    8       0
 test/fixable/class-name-resolution.php                12      0
 test/fixable/closures.php                             19      0
 test/fixable/concatenation-spacing.php                18      0
@@ -29,9 +29,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 221 ERRORS AND 0 WARNINGS WERE FOUND IN 25 FILES
+A TOTAL OF 218 ERRORS AND 0 WARNINGS WERE FOUND IN 25 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 195 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 192 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/test/fixable/array-indentation.php b/test/fixable/array-indentation.php
index 5866c10d..fbf5794b 100644
--- a/test/fixable/array-indentation.php
+++ b/test/fixable/array-indentation.php
@@ -11,18 +11,23 @@
      5,
 ];
 
-$multiArray = [
-'0' => [
-  '2' => 2,
- 1 => '1',
-],
-    4 => [
-       7,
-        8,
-         9,
-    ],
-];
-
 $singleLine = [
     1 => 2,
 ];
+$singleLine2 =  [ 'foo' => 'bar' ] ;
+
+$serializedRequest = [
+    'method' => 'POST',
+    'request_target' => '/foo/bar?baz=bat',
+    'uri' => 'http://example.com/foo/bar?baz=bat',
+    'protocol_version' => '1.1',
+    'headers' => [
+        'Host' => ['example.com'],
+        'Accept' => ['application/json'],
+        'X-Foo-Bar' => [
+            'Baz',
+            'Bat',
+        ],
+    ],
+    'body' => '{"test":"value"}',
+];
diff --git a/test/fixed/array-indentation.php b/test/fixed/array-indentation.php
index 7c7245a8..468b1229 100644
--- a/test/fixed/array-indentation.php
+++ b/test/fixed/array-indentation.php
@@ -11,16 +11,21 @@
     5,
 ];
 
-$multiArray = [
-    '0' => [
-        '2' => 2,
-        1 => '1',
-    ],
-    4 => [
-        7,
-        8,
-        9,
+$singleLine  = [1 => 2];
+$singleLine2 =  [ 'foo' => 'bar' ];
+
+$serializedRequest = [
+    'method' => 'POST',
+    'request_target' => '/foo/bar?baz=bat',
+    'uri' => 'http://example.com/foo/bar?baz=bat',
+    'protocol_version' => '1.1',
+    'headers' => [
+        'Host' => ['example.com'],
+        'Accept' => ['application/json'],
+        'X-Foo-Bar' => [
+            'Baz',
+            'Bat',
+        ],
     ],
+    'body' => '{"test":"value"}',
 ];
-
-$singleLine = [1 => 2];

From c531490b1f7bdccd7569cfd28d3b6faeed014f1a Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Tue, 11 Sep 2018 08:39:08 +0200
Subject: [PATCH 40/60] Don't align equal statements, double arrow arrays or
 phpdoc comment tags

---
 docs/book/v2/coding-style-guide.md     |   4 +-
 docs/book/v2/ruleset.md                |  56 ++++++++----
 src/ZendCodingStandard/ruleset.xml     |  15 +++-
 test/expected-report.txt               |  12 +--
 test/fixable/commenting.php            | 118 +++++++++++++++++++++++++
 test/fixable/concatenation-spacing.php |   6 +-
 test/fixable/example-class.php         |  16 +++-
 test/fixable/not-spacing.php           |   2 +-
 test/fixable/semicolon-spacing.php     |   2 +-
 test/fixable/statement-alignment.php   |  16 ++++
 test/fixed/array-indentation.php       |   4 +-
 test/fixed/commenting.php              | 112 +++++++++++++++++++++++
 test/fixed/concatenation-spacing.php   |   6 +-
 test/fixed/example-class.php           |   6 +-
 test/fixed/new-with-parentheses.php    |   8 +-
 test/fixed/not-spacing.php             |   2 +-
 test/fixed/semicolon-spacing.php       |   2 +-
 test/fixed/statement-alignment.php     |  16 ++++
 18 files changed, 357 insertions(+), 46 deletions(-)
 create mode 100644 test/fixable/commenting.php
 create mode 100644 test/fixable/statement-alignment.php
 create mode 100644 test/fixed/commenting.php
 create mode 100644 test/fixed/statement-alignment.php

diff --git a/docs/book/v2/coding-style-guide.md b/docs/book/v2/coding-style-guide.md
index a76dcda6..eb37cdd8 100644
--- a/docs/book/v2/coding-style-guide.md
+++ b/docs/book/v2/coding-style-guide.md
@@ -78,10 +78,12 @@ $var = [
   be used in comments. Git commits provide accurate information. [*](ruleset.md#slevomatcodingstandardcommentingforbiddenannotations)
 - The asterisks in a doc comment should align, and there should be one space between the asterisk and tag.
   [*](ruleset.md#squizcommentingdoccommentalignment)
+- Comment tags `@param`, `@throws` and `@return` should not be aligned or contain multiple spaces between the tag, 
+  type and description. [*](ruleset.md#squizcommentingfunctioncomment)
 - If a function throws any exceptions, they should be documented in `@throws` tags.
   [*](ruleset.md#squizcommentingfunctioncomment)
 - The `@var` tag may be used in inline comments to document the _Type_ of properties. [*](ruleset.md#slevomatcodingstandardcommentinginlinedoccommentdeclaration)
-- Comments with single-line content should be written as one-liners. [*](ruleset.md#slevomatcodingstandardcommentingrequireonelinepropertydoccomment)
+- Single-line comments with a `@var` tag should be written as one-liners. [*](ruleset.md#slevomatcodingstandardcommentingrequireonelinepropertydoccomment)
 - Shorthand scalar typehint variants must be used in docblocks. [*](ruleset.md#slevomatcodingstandardtypehintslongtypehints)
 
 ## Declare Statements, Namespace, and Import Statements
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index 3eecff17..ca0edbf6 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -169,26 +169,25 @@ echo $foo . 'baz';
 ```
 
 ### Generic.Formatting.MultipleStatementAlignment
-There should be one space on either side of an equals sign used to assign a value to a variable. In case of a 
-block of related assignments, more space may be inserted before the equal sign to promote readability.
+There should be one space on either side of an equals sign used to assign a value to a variable.
 
-*Valid: Equal signs are aligned in related blocks.*
+*Valid: Equal signs are surrounded by one space.*
 ```php
 <?php
-$shortVar        = (1 + 2);
+$shortVar = (1 + 2);
 $veryLongVarName = 'string';
 
-$foo    = $bar;
+$foo = $bar;
 $result = foo($bar, $baz, $quux);
 ```
 
-*Invalid: Equal signs are not aligned.*
+*Invalid: Equal signs are aligned.*
 ```php
 <?php
-$shortVar = (1 + 2);
+$shortVar        = (1 + 2);
 $veryLongVarName = 'string';
 
-$foo = $bar;
+$foo    = $bar;
 $result = foo($bar, $baz, $quux);
 ```
 
@@ -420,7 +419,7 @@ class Foo
 ```
 
 ### SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment
-Comments with single-line content should be written as one-liners.
+Single-line comments with a `@var` tag should be written as one-liners.
 
 *Valid: One-line comment*
 ```php
@@ -984,16 +983,27 @@ The asterisks in a doc comment should align, and there should be one space betwe
 ```
 
 ### Squiz.Commenting.FunctionComment
-If a function throws any exceptions, they should be documented in `@throws` tags.
+A function comment should be kept to a bare minimum. If the function and its arguments are self describing and have
+proper typehinting, tags like `@param`, `@throws`, and `@return` can be omitted.
+
+There should be no multiple spaces between the tag, type and description.
 
 *Valid:*
 ```php
 <?php
-/** @throws Exception all the time */
-function foo() : void
-{
-    throw new Exception('Danger!');
-}
+/**
+ * This is a summary
+ *
+ * This is a description.
+ * 
+ * @see http://example.com/my/bar URL to documentation.
+ * 
+ * @param array $argument1 This is the description.
+ * @param string $arg2 This is the description.
+ * @param null|string $longerArgument3 This is the description.
+ * @throws InvalidArgumentException on any invalid element.
+ * @return null|int Indicates the number of items.
+ */
 ```
 
 ### Squiz.Functions.GlobalFunction
@@ -1150,6 +1160,22 @@ $foo->bar();
 $foo -> bar();
 ```
 
+### Squiz.WhiteSpace.ObjectOperatorSpacing
+There should be one space before and after an operators.
+
+*Valid: One space around the operator.*
+```php
+<?php
+$foo = 'bar';
+```
+
+*Invalid: Multiple or none spaces around the operator.*
+```php
+<?php
+$foo  =  'bar';
+$bar='foo';
+```
+
 ### Squiz.WhiteSpace.SemicolonSpacing
 Semicolons should not have spaces before them.
 
diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index d49bacfa..31c08c12 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -29,10 +29,11 @@
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
     <!-- Forbid inline HTML in PHP code -->
     <rule ref="Generic.Files.InlineHTML"/>
-    <!-- Align corresponding assignment statement tokens -->
+    <!-- Allow 1 space around operators -->
     <rule ref="Generic.Formatting.MultipleStatementAlignment">
         <properties>
             <property name="error" value="true"/>
+            <property name="maxPadding" value="1" />
         </properties>
     </rule>
     <!-- Force whitespace after a type cast -->
@@ -158,7 +159,7 @@
     </rule>
     <!-- report invalid format of inline phpDocs with @var -->
     <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration"/>
-    <!-- Require comments with single line written as one-liners -->
+    <!-- Require comments with single line @var written as one-liners -->
     <rule ref="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment"/>
     <!-- Forbid weak comparisons -->
     <rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
@@ -327,6 +328,10 @@
         <exclude name="Squiz.Commenting.FunctionComment.ParamNameNoMatch"/>
         <!-- Doesn't respect inheritance -->
         <exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing"/>
+        <!-- No spacing after @param name -->
+        <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamName"/>
+        <!-- No spacing after @param type -->
+        <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
         <!-- Throws comments can start without a capital and doesn't need a full stop -->
         <exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop"/>
         <exclude name="Squiz.Commenting.FunctionComment.ThrowsNotCapital"/>
@@ -373,6 +378,12 @@
             <property name="ignoreNewlines" value="true"/>
         </properties>
     </rule>
+    <!-- Forbid multiple spaces before and after operators -->
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true" />
+        </properties>
+    </rule>
     <!-- Forbid spaces before semicolon `;` -->
     <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
     <!-- Forbid superfluous whitespaces -->
diff --git a/test/expected-report.txt b/test/expected-report.txt
index 07210a0c..4d4477ab 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -7,9 +7,10 @@ test/fixable/anonymous-classes.php                    9       0
 test/fixable/array-indentation.php                    8       0
 test/fixable/class-name-resolution.php                12      0
 test/fixable/closures.php                             19      0
-test/fixable/concatenation-spacing.php                18      0
+test/fixable/commenting.php                           9       0
+test/fixable/concatenation-spacing.php                16      0
 test/fixable/EarlyReturn.php                          5       0
-test/fixable/example-class.php                        22      0
+test/fixable/example-class.php                        29      0
 test/fixable/extends-and-implements-multiline.php     10      0
 test/fixable/extends-and-implements.php               5       0
 test/fixable/forbidden-comments.php                   4       0
@@ -18,20 +19,21 @@ test/fixable/LowCaseTypes.php                         2       0
 test/fixable/method-and-function-arguments.php        11      0
 test/fixable/method-and-function-calls.php            14      0
 test/fixable/namespaces-spacing.php                   3       0
-test/fixable/new-with-parentheses.php                 18      0
+test/fixable/new-with-parentheses.php                 14      0
 test/fixable/not-spacing.php                          7       0
 test/fixable/operators.php                            7       0
 test/fixable/return-type-on-methods.php               17      0
 test/fixable/semicolon-spacing.php                    3       0
+test/fixable/statement-alignment.php                  18      0
 test/fixable/test-case.php                            4       0
 test/fixable/traits-uses.php                          10      0
 test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 218 ERRORS AND 0 WARNINGS WERE FOUND IN 25 FILES
+A TOTAL OF 246 ERRORS AND 0 WARNINGS WERE FOUND IN 27 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 192 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 213 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/test/fixable/commenting.php b/test/fixable/commenting.php
new file mode 100644
index 00000000..53453dc2
--- /dev/null
+++ b/test/fixable/commenting.php
@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Provides a test for comments and indentation.
+ *
+ * Lorem ipsum dolor sit amet, ei usu mundi similique. Malis regione voluptatum ei vel, per no labore blandit, at
+ * duo aeque vivendo vituperata. Eu his augue postea. Dicit praesent consulatu id per, eos propriae omnesque
+ * facilisis an.
+ */
+class Commenting
+{
+    /**
+     * Sub-delimiters used in user info, query strings and fragments.
+     *
+     * @const string
+     */
+    public const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
+
+    /**
+     *
+     * @var int[] Array indexed by valid scheme names to their corresponding ports.
+     *
+     */
+    protected $allowedSchemes = [];
+
+    /**
+     * @var string
+     */
+    private $scheme = '';
+
+    /**
+     * generated uri string cache
+     *
+     * @var string|null
+     */
+    private $uriString;
+
+    /**
+     * @param string|resource|StreamInterface $body Stream identifier and/or actual stream resource
+     * @param int $status Status code for the response, if any.
+     * @param array $headers Headers for the response, if any.
+     * @throws Exception\InvalidArgumentException on any invalid element.
+     */
+    public function __construct($body = 'php://memory', int $status = 200, array $headers = [])
+    {
+        // ..
+    }
+
+    /**
+     * Create a request from the supplied superglobal values.
+     *
+     * If any argument is not supplied, the corresponding superglobal value will
+     * be used.
+     *
+     * The ServerRequest created is then passed to the fromServer() method in
+     * order to marshal the request URI and headers.
+     *
+     * @see fromServer()
+     * @param array $server $_SERVER superglobal
+     * @param array $query $_GET superglobal
+     * @param array $body $_POST superglobal
+     * @param array $cookies $_COOKIE superglobal
+     * @param array $files $_FILES superglobal
+     * @return ServerRequest
+     */
+    public static function fromGlobals(
+        ?array $server = null,
+        ?array $query = null,
+        ?array $body = null,
+        ?array $cookies = null,
+        ?array $files = null
+    ) : ServerRequest {
+        // ...
+    }
+
+    /**
+     * Is a given port non-standard for the current scheme?
+     */
+    private function isNonStandardPort(string $scheme, string $host, ?int $port) : bool
+    {
+        // ...
+    }
+
+    /**
+     * Retrieve the user-info part of the URI.
+     *
+     * This value is percent-encoded, per RFC 3986 Section 3.2.1.
+     *
+     * {@inheritdoc}
+     */
+    public function getUserInfo() : string
+    {
+        // ...
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHost() : string
+    {
+        // ...
+    }
+
+    /**
+     * Filters a part of user info in a URI to ensure it is properly encoded.
+     *
+     * @param string $part
+     * @return string
+     */
+    private function filterUserInfoPart(string $part) : string
+    {
+        // Note the addition of `%` to initial charset; this allows `|` portion
+        // to match and thus prevent double-encoding.
+        return 'foo';
+    }
+}
diff --git a/test/fixable/concatenation-spacing.php b/test/fixable/concatenation-spacing.php
index ba9ee0f5..2fb62d07 100644
--- a/test/fixable/concatenation-spacing.php
+++ b/test/fixable/concatenation-spacing.php
@@ -11,10 +11,10 @@
 $foo = 'foo';
 $bar    = 'bar';
 
-$string = $foo . $bar. 'baz' .'quux'.$string;
-$string.=$foo;
+$string  = $foo . $bar. 'baz' .'quux'.$string;
+$string .= $foo;
+$string .= $foo;
 $string .= $foo;
-$string  .=$foo;
 
 $string = '1'
           . '2'
diff --git a/test/fixable/example-class.php b/test/fixable/example-class.php
index b61bd92f..69c0dd00 100644
--- a/test/fixable/example-class.php
+++ b/test/fixable/example-class.php
@@ -16,16 +16,24 @@ class Example implements \IteratorAggregate
 {
     private const VERSION = \PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
 
-    /** @var null|int */
+    /**
+     * @var null|int
+     */
     private $foo;
 
-    /** @var string[] */
+    /**
+     * @var string[]
+     */
     private $bar;
 
-    /** @var bool */
+    /**
+     * @var bool
+     */
     private $baz;
 
-    /** @var int|string|null */
+    /**
+     * @var int|string|null
+     */
     private $baxBax;
 
     public function __construct(int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
diff --git a/test/fixable/not-spacing.php b/test/fixable/not-spacing.php
index 78003e8f..d172d8b3 100644
--- a/test/fixable/not-spacing.php
+++ b/test/fixable/not-spacing.php
@@ -9,7 +9,7 @@
 } elseif ( !$test === 0) {
     echo 0;
 } else {
-    echo -1;
+    echo 2;
 }
 
 while (    !    true) {
diff --git a/test/fixable/semicolon-spacing.php b/test/fixable/semicolon-spacing.php
index 169f8006..679f8100 100644
--- a/test/fixable/semicolon-spacing.php
+++ b/test/fixable/semicolon-spacing.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-echo -1    ;
+echo 1    ;
 
 echo 'foo'
 ;
diff --git a/test/fixable/statement-alignment.php b/test/fixable/statement-alignment.php
new file mode 100644
index 00000000..14f5a601
--- /dev/null
+++ b/test/fixable/statement-alignment.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+$shortVar    = (1 + 2);
+$veryLongVarName   = 'string';
+
+$value      =     (string) $value;
+$length     =     strlen($value);
+$string     =     '';
+
+$headerNames[$normalized]   =   $header;
+$headers[$header]=   $value;
+
+$normalized   =strtolower($header);
+$original=$headerNames[$normalized];
diff --git a/test/fixed/array-indentation.php b/test/fixed/array-indentation.php
index 468b1229..a9e684ef 100644
--- a/test/fixed/array-indentation.php
+++ b/test/fixed/array-indentation.php
@@ -11,8 +11,8 @@
     5,
 ];
 
-$singleLine  = [1 => 2];
-$singleLine2 =  [ 'foo' => 'bar' ];
+$singleLine = [1 => 2];
+$singleLine2 = [ 'foo' => 'bar' ];
 
 $serializedRequest = [
     'method' => 'POST',
diff --git a/test/fixed/commenting.php b/test/fixed/commenting.php
new file mode 100644
index 00000000..adb93849
--- /dev/null
+++ b/test/fixed/commenting.php
@@ -0,0 +1,112 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Provides a test for comments and indentation.
+ *
+ * Lorem ipsum dolor sit amet, ei usu mundi similique. Malis regione voluptatum ei vel, per no labore blandit, at
+ * duo aeque vivendo vituperata. Eu his augue postea. Dicit praesent consulatu id per, eos propriae omnesque
+ * facilisis an.
+ */
+class Commenting
+{
+    /**
+     * Sub-delimiters used in user info, query strings and fragments.
+     *
+     * @const string
+     */
+    public const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
+
+    /** @var int[] Array indexed by valid scheme names to their corresponding ports. */
+    protected $allowedSchemes = [];
+
+    /** @var string */
+    private $scheme = '';
+
+    /**
+     * generated uri string cache
+     *
+     * @var string|null
+     */
+    private $uriString;
+
+    /**
+     * @param string|resource|StreamInterface $body Stream identifier and/or actual stream resource
+     * @param int $status Status code for the response, if any.
+     * @param array $headers Headers for the response, if any.
+     * @throws Exception\InvalidArgumentException on any invalid element.
+     */
+    public function __construct($body = 'php://memory', int $status = 200, array $headers = [])
+    {
+        // ..
+    }
+
+    /**
+     * Create a request from the supplied superglobal values.
+     *
+     * If any argument is not supplied, the corresponding superglobal value will
+     * be used.
+     *
+     * The ServerRequest created is then passed to the fromServer() method in
+     * order to marshal the request URI and headers.
+     *
+     * @see fromServer()
+     * @param array $server $_SERVER superglobal
+     * @param array $query $_GET superglobal
+     * @param array $body $_POST superglobal
+     * @param array $cookies $_COOKIE superglobal
+     * @param array $files $_FILES superglobal
+     * @return ServerRequest
+     */
+    public static function fromGlobals(
+        ?array $server = null,
+        ?array $query = null,
+        ?array $body = null,
+        ?array $cookies = null,
+        ?array $files = null
+    ) : ServerRequest {
+        // ...
+    }
+
+    /**
+     * Is a given port non-standard for the current scheme?
+     */
+    private function isNonStandardPort(string $scheme, string $host, ?int $port) : bool
+    {
+        // ...
+    }
+
+    /**
+     * Retrieve the user-info part of the URI.
+     *
+     * This value is percent-encoded, per RFC 3986 Section 3.2.1.
+     *
+     * {@inheritdoc}
+     */
+    public function getUserInfo() : string
+    {
+        // ...
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHost() : string
+    {
+        // ...
+    }
+
+    /**
+     * Filters a part of user info in a URI to ensure it is properly encoded.
+     *
+     * @param string $part
+     * @return string
+     */
+    private function filterUserInfoPart(string $part) : string
+    {
+        // Note the addition of `%` to initial charset; this allows `|` portion
+        // to match and thus prevent double-encoding.
+        return 'foo';
+    }
+}
diff --git a/test/fixed/concatenation-spacing.php b/test/fixed/concatenation-spacing.php
index 2b0c5552..43850232 100644
--- a/test/fixed/concatenation-spacing.php
+++ b/test/fixed/concatenation-spacing.php
@@ -11,10 +11,10 @@
 $foo = 'foo';
 $bar = 'bar';
 
-$string  = $foo . $bar . 'baz' . 'quux' . $string;
-$string .=$foo;
+$string = $foo . $bar . 'baz' . 'quux' . $string;
+$string .= $foo;
+$string .= $foo;
 $string .= $foo;
-$string .=$foo;
 
 $string = '1'
           . '2'
diff --git a/test/fixed/example-class.php b/test/fixed/example-class.php
index 99512a56..6e35bbc2 100644
--- a/test/fixed/example-class.php
+++ b/test/fixed/example-class.php
@@ -38,9 +38,9 @@ class Example implements IteratorAggregate
 
     public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
     {
-        $this->foo    = $foo;
-        $this->bar    = $bar;
-        $this->baz    = $baz;
+        $this->foo = $foo;
+        $this->bar = $bar;
+        $this->baz = $baz;
         $this->baxBax = $baxBax;
     }
 
diff --git a/test/fixed/new-with-parentheses.php b/test/fixed/new-with-parentheses.php
index 6e81bbe6..17ddde8f 100644
--- a/test/fixed/new-with-parentheses.php
+++ b/test/fixed/new-with-parentheses.php
@@ -5,14 +5,14 @@
 $foo = new DateTimeImmutable();
 
 $barClassName = 'Bar';
-$bar          = new $barClassName();
+$bar = new $barClassName();
 
 $classNamesInArray = ['Baz'];
-$foo               = new $classNamesInArray[0]();
+$foo = new $classNamesInArray[0]();
 
-$classNamesInObject      = new stdClass();
+$classNamesInObject = new stdClass();
 $classNamesInObject->foo = 'Foo';
-$foo                     = new $classNamesInObject->foo();
+$foo = new $classNamesInObject->foo();
 
 $whitespaceBetweenClassNameAndParentheses = new stdClass();
 
diff --git a/test/fixed/not-spacing.php b/test/fixed/not-spacing.php
index 0284b52a..b0942488 100644
--- a/test/fixed/not-spacing.php
+++ b/test/fixed/not-spacing.php
@@ -9,7 +9,7 @@
 } elseif (! $test === 0) {
     echo 0;
 } else {
-    echo -1;
+    echo 2;
 }
 
 while (! true) {
diff --git a/test/fixed/semicolon-spacing.php b/test/fixed/semicolon-spacing.php
index fa6c43ab..3b198671 100644
--- a/test/fixed/semicolon-spacing.php
+++ b/test/fixed/semicolon-spacing.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-echo -1;
+echo 1;
 
 echo 'foo';
 
diff --git a/test/fixed/statement-alignment.php b/test/fixed/statement-alignment.php
new file mode 100644
index 00000000..52d7fa97
--- /dev/null
+++ b/test/fixed/statement-alignment.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+$shortVar = (1 + 2);
+$veryLongVarName = 'string';
+
+$value = (string) $value;
+$length = strlen($value);
+$string = '';
+
+$headerNames[$normalized] = $header;
+$headers[$header] = $value;
+
+$normalized = strtolower($header);
+$original = $headerNames[$normalized];

From aba1c3aa47ab41e84a29cbe5072814604560cd3c Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Tue, 11 Sep 2018 08:44:23 +0200
Subject: [PATCH 41/60] Remove early exit rule as it is overly aggressive when
 "fixing" the code

---
 docs/book/v2/coding-style-guide.md |  2 --
 docs/book/v2/ruleset.md            | 26 ---------------
 src/ZendCodingStandard/ruleset.xml |  2 --
 test/expected-report.txt           |  5 ++-
 test/fixable/EarlyReturn.php       | 52 ------------------------------
 test/fixed/EarlyReturn.php         | 52 ------------------------------
 6 files changed, 2 insertions(+), 137 deletions(-)
 delete mode 100644 test/fixable/EarlyReturn.php
 delete mode 100644 test/fixed/EarlyReturn.php

diff --git a/docs/book/v2/coding-style-guide.md b/docs/book/v2/coding-style-guide.md
index eb37cdd8..822e56d8 100644
--- a/docs/book/v2/coding-style-guide.md
+++ b/docs/book/v2/coding-style-guide.md
@@ -363,8 +363,6 @@ $instance = new class extends Foo implements
 - The opening PHP tag should be the first item in the file. [*](ruleset.md#genericphpcharacterbeforephpopeningtag)
 - Strings should not be concatenated together unless used in multiline for readability. [*](ruleset.md#genericstringsunnecessarystringconcat)
 - Loose `==` and `!=` comparison operators should not be used. Use `===` and `!==` instead. [*](ruleset.md#slevomatcodingstandardcontrolstructuresdisallowequaloperators)
-- An early exit strategy should be used where possible to reduce the level of control structures.
-  [*](ruleset.md#slevomatcodingstandardcontrolstructuresearlyexit)
 - Language constructs must be used without parentheses where possible. [*](ruleset.md#slevomatcodingstandardcontrolstructureslanguageconstructwithparentheses)
 - Short list syntax `[...]` should be used instead of `list(...)`. [*](ruleset.md#slevomatcodingstandardphpshortlist)
 - Short form of type keywords must be used. i.e. `bool` instead of `boolean`, `int` instead of `integer`, etc.
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index ca0edbf6..6aa3a0b3 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -457,32 +457,6 @@ if ($a == $b || $c != $d) {
 }
 ```
 
-### SlevomatCodingStandard.ControlStructures.EarlyExit
-An early exit strategy should be used where possible to reduce the level of control structures.
-
-*Valid: Exit early.*
-```php
-<?php
-function () : bool {
-	if (! true) {
-		return false;
-	}
-	// Do something
-};
-```
-
-*Invalid: unneeded control structure*
-```php
-<?php
-function () : bool {
-	if (true) {
-		// Do something
-	} else {
-		return false;
-	}
-};
-```
-
 ### SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses
 Language constructs must be used without parentheses where possible.
 
diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 31c08c12..687f5847 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -163,8 +163,6 @@
     <rule ref="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment"/>
     <!-- Forbid weak comparisons -->
     <rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
-    <!-- Require usage of early exit -->
-    <rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
     <!-- Require language constructs without parentheses -->
     <rule ref="SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses"/>
     <!-- Require new instances with parentheses -->
diff --git a/test/expected-report.txt b/test/expected-report.txt
index 4d4477ab..c5ae8a56 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -9,7 +9,6 @@ test/fixable/class-name-resolution.php                12      0
 test/fixable/closures.php                             19      0
 test/fixable/commenting.php                           9       0
 test/fixable/concatenation-spacing.php                16      0
-test/fixable/EarlyReturn.php                          5       0
 test/fixable/example-class.php                        29      0
 test/fixable/extends-and-implements-multiline.php     10      0
 test/fixable/extends-and-implements.php               5       0
@@ -31,9 +30,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 246 ERRORS AND 0 WARNINGS WERE FOUND IN 27 FILES
+A TOTAL OF 241 ERRORS AND 0 WARNINGS WERE FOUND IN 26 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 213 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 208 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/test/fixable/EarlyReturn.php b/test/fixable/EarlyReturn.php
deleted file mode 100644
index 04998cd5..00000000
--- a/test/fixable/EarlyReturn.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Example;
-
-class EarlyReturn
-{
-    public function bar() : bool
-    {
-        if ($bar === 'bar') {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public function foo() : ?string
-    {
-        foreach ($itens as $item) {
-            if (! ($item->isItem())) {
-                return 'There is an item that is not an item';
-            } else {
-                continue;
-            }
-        }
-
-        return null;
-    }
-
-    public function baz() : string
-    {
-        if ($number > 0) {
-            return 'Number is grater then 0';
-        } else {
-            exit;
-        }
-    }
-
-    public function quoox() : bool
-    {
-        if (true === 'true') {
-            if (false === false) {
-                return true;
-            }
-        } else {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/test/fixed/EarlyReturn.php b/test/fixed/EarlyReturn.php
deleted file mode 100644
index da856545..00000000
--- a/test/fixed/EarlyReturn.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Example;
-
-class EarlyReturn
-{
-    public function bar() : bool
-    {
-        if ($bar === 'bar') {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function foo() : ?string
-    {
-        foreach ($itens as $item) {
-            if (! $item->isItem()) {
-                return 'There is an item that is not an item';
-            }
-
-            continue;
-        }
-
-        return null;
-    }
-
-    public function baz() : string
-    {
-        if ($number > 0) {
-            return 'Number is grater then 0';
-        }
-
-        exit;
-    }
-
-    public function quoox() : bool
-    {
-        if (true !== 'true') {
-            return false;
-        }
-
-        if (false === false) {
-            return true;
-        }
-
-        return true;
-    }
-}

From a276b18df81731e862e7ff0059075326dd2d5939 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Tue, 11 Sep 2018 08:49:52 +0200
Subject: [PATCH 42/60] Add references

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 9a63374b..3cdd64a7 100644
--- a/README.md
+++ b/README.md
@@ -63,3 +63,10 @@ For a reference please see: https://github.com/squizlabs/PHP_CodeSniffer/wiki/An
   ```bash
   $ composer cs-fix
   ```
+
+## Reference
+
+- [Coding Standard Tutorial](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Coding-Standard-Tutorial)
+- [Configuration Options](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Configuration-Options)
+- [Customisable Sniff Properties](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Customisable-Sniff-Properties)
+- [Slevomat Coding Standard](https://github.com/slevomat/coding-standard)

From bf0d951f4dda2caa1936d739e074ea637fec9c8c Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Tue, 11 Sep 2018 08:55:17 +0200
Subject: [PATCH 43/60] Update changelog with latest changes

---
 CHANGELOG.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30e8390a..8b72b4ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,8 +28,6 @@ All notable changes to this project will be documented in this file, in reverse
   - All array values must be followed by a comma, including the last value. 
   - Whitespace is not allowed around the opening bracket or before the 
     closing bracket when referencing an array.
-  - All double arrow symbols must be aligned to one space after the longest 
-    array key.
   - The `global` keyword may not be used.
   - The `PHP_SAPI` constant must be used instead of the `php_sapi_name()` 
     function.
@@ -46,11 +44,13 @@ All notable changes to this project will be documented in this file, in reverse
     provide accurate information.
   - The asterisks in a doc comment should align, and there should be one space 
     between the asterisk and tag.
+  - Comment tags `@param`, `@throws` and `@return` should not be aligned or 
+    contain multiple spaces between the tag, type and description.
   - If a function throws any exceptions, they should be documented in `@throws` 
     tags.
   - The `@var` tag may be used in inline comments to document the _Type_ of 
     properties.
-  - Comments with single-line content should be written as one-liners.
+  - Single-line comments with a `@var` tag should be written as one-liners.
   - Shorthand scalar typehint variants must be used in docblocks.
   - Each PHP file should have a page level docblock with `@see`, `@copyright` 
     and `@license`. The copyright date should only be adjusted if the file has 
@@ -97,8 +97,6 @@ All notable changes to this project will be documented in this file, in reverse
     readability. 
   - Loose `==` and `!=` comparison operators should not be used. Use `===` 
     and `!==` instead.
-  - An early exit strategy should be used where possible to reduce the level 
-    of control structures.
   - Language constructs must be used without parentheses where possible.
   - Short list syntax `[...]` should be used instead of `list(...)`.
   - Short form of type keywords must be used. i.e. `bool` instead of 

From 3386b02298d3081f6c12e902c0fd20ce5ab01bb1 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Tue, 11 Sep 2018 15:48:59 +0200
Subject: [PATCH 44/60] Update intro and readme

---
 README.md             | 69 ++++++++++++++++++++++++++++++++++++++++++-
 docs/book/v2/intro.md | 45 ++++++++++++++++++++++++----
 2 files changed, 107 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 3cdd64a7..8ca9125d 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,24 @@
 
 The coding standard ruleset for Zend Framework components.
 
+This specification extends and expands [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md), 
+the extended coding style guide and requires adherence to [PSR-1](https://www.php-fig.org/psr/psr-1), 
+the basic coding standard. These are minimal specifications and don't address all factors, including things like:
+
+- whitespace around operators
+- alignment of array keys and operators
+- alignment of object operations
+- how to format multi-line conditionals
+- what and what not to import, and how
+- etc.
+
+Contributors have different coding styles and so do the maintainers. During code reviews there are regularly 
+discussions about spaces and alignments, where and when was said that a function needs to be imported. And 
+that's where this coding standard comes in: To have internal consistency in a component and between components.
+
+> Note: PSR-12 is not finalized. e.g. The `!` operator and `:` placement for return values are still under  discussion. 
+We will change these rules, and, when PSR-12 is finalized, adapt them.
+
 ## Installation
 
 1. Install the module via composer by running:
@@ -21,7 +39,7 @@ The coding standard ruleset for Zend Framework components.
    }
    ```
 
-3. Create file `phpcs.xml` on base path of your repository with content:
+3. Create file `phpcs.xml` on base path of your repository with this content:
 
    ```xml
    <?xml version="1.0"?>
@@ -64,9 +82,58 @@ For a reference please see: https://github.com/squizlabs/PHP_CodeSniffer/wiki/An
   $ composer cs-fix
   ```
 
+## Ignoring parts of a File
+
+> Note: Before PHP_CodeSniffer version 3.2.0, `// @codingStandardsIgnoreStart` and `// @codingStandardsIgnoreEnd` were
+> used. These are deprecated and will be removed in PHP_CodeSniffer version 4.0.
+
+Disable parts of a file:
+```php
+$xmlPackage = new XMLPackage;
+// phpcs:disable
+$xmlPackage['error_code'] = get_default_error_code_value();
+$xmlPackage->send();
+// phpcs:enable
+```
+
+Disable a specific rule:
+```php
+// phpcs:disable Generic.Commenting.Todo.Found
+$xmlPackage = new XMLPackage;
+$xmlPackage['error_code'] = get_default_error_code_value();
+// TODO: Add an error message here.
+$xmlPackage->send();
+// phpcs:enable
+```
+
+## Development
+
+> **New rules or Sniffs may not be introduced in minor or bugfix releases and should always be based on the develop 
+branch and queued for the next major release, unless considered a bugfix for existing rules.**
+
+If you want to test changes against ZendFramework components or your own projects, install your forked 
+zend-coding-standard globally with composer: 
+```bash
+$ composer global config repositories.zend-coding-standard vcs git@github.com:<FORK_NAMESPACE>/zend-coding-standard.git
+$ composer global require --dev zendframework/zend-coding-standard:dev-<FORKED_BRANCH>
+
+# For this to work, add this to your path: ~/.composer/vendor/bin
+# Using `-s` prints the rules that triggered the errors so they can be reviewed easily. `-p` is for progress display.
+$ phpcs -sp --standard=ZendCodingStandard src test
+```
+Make sure you remove the global installation after testing from your global composer.json file!!!
+
+Documentation can be previewed locally by installing [MkDocs](https://www.mkdocs.org/#installation) and run 
+`mkdocs serve`. This will start a server where you can read the docs.
+
 ## Reference
 
+Rules can be added, excluded or tweaked locally, depending on your preferences. More information on how to do this can
+be found here:
+
 - [Coding Standard Tutorial](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Coding-Standard-Tutorial)
 - [Configuration Options](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Configuration-Options)
+- [Selectively Applying Rules](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset#selectively-applying-rules)
 - [Customisable Sniff Properties](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Customisable-Sniff-Properties)
 - [Slevomat Coding Standard](https://github.com/slevomat/coding-standard)
+
diff --git a/docs/book/v2/intro.md b/docs/book/v2/intro.md
index 4200c27b..7e19599f 100644
--- a/docs/book/v2/intro.md
+++ b/docs/book/v2/intro.md
@@ -1,8 +1,10 @@
 # zend-coding-standard
 
-This component provides the coding standard ruleset for Zend Framework components.
+The coding standard ruleset for Zend Framework components.
 
-PSR-1, PSR-2 and PSR-12 are _minimal_ sets and don't address a lot of factors, including things like:
+This specification extends and expands [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md), 
+the extended coding style guide and requires adherence to [PSR-1](https://www.php-fig.org/psr/psr-1), 
+the basic coding standard. These are minimal specifications and don't address all factors, including things like:
 
 - whitespace around operators
 - alignment of array keys and operators
@@ -35,7 +37,7 @@ We will change these rules, and, when PSR-12 is finalized, adapt them.
    }
    ```
 
-3. Create file `phpcs.xml.dist` on base path of your repository with content:
+3. Create file `phpcs.xml` on base path of your repository with this content:
 
    ```xml
    <?xml version="1.0"?>
@@ -61,8 +63,8 @@ We will change these rules, and, when PSR-12 is finalized, adapt them.
    </ruleset>
    ```
 
-You can add your own rules or exclude rules. For a reference please see: 
-[PHP_CodeSniffer Annotated Ruleset](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset)
+You can add or exclude some locations in that file.
+For a reference please see: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
 
 ## Usage
 
@@ -92,7 +94,7 @@ $xmlPackage->send();
 // phpcs:enable
 ```
 
-Disable a specific rule 
+Disable a specific rule:
 ```php
 // phpcs:disable Generic.Commenting.Todo.Found
 $xmlPackage = new XMLPackage;
@@ -101,3 +103,34 @@ $xmlPackage['error_code'] = get_default_error_code_value();
 $xmlPackage->send();
 // phpcs:enable
 ```
+
+## Development
+
+> **New rules or Sniffs may not be introduced in minor or bugfix releases and should always be based on the develop 
+branch and queued for the next major release, unless considered a bugfix for existing rules.**
+
+If you want to test changes against ZendFramework components or your own projects, install your forked 
+zend-coding-standard globally with composer: 
+```bash
+$ composer global config repositories.zend-coding-standard vcs git@github.com:<FORK_NAMESPACE>/zend-coding-standard.git
+$ composer global require --dev zendframework/zend-coding-standard:dev-<FORKED_BRANCH>
+
+# For this to work, add this to your path: ~/.composer/vendor/bin
+# Using `-s` prints the rules that triggered the errors so they can be reviewed easily. `-p` is for progress display.
+$ phpcs -sp --standard=ZendCodingStandard src test
+```
+Make sure you remove the global installation after testing from your global composer.json file!!!
+
+Documentation can be previewed locally by installing [MkDocs](https://www.mkdocs.org/#installation) and run 
+`mkdocs serve`. This will start a server where you can read the docs.
+
+## Reference
+
+Rules can be added, excluded or tweaked locally, depending on your preferences. More information on how to do this can
+be found here:
+
+- [Coding Standard Tutorial](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Coding-Standard-Tutorial)
+- [Configuration Options](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Configuration-Options)
+- [Selectively Applying Rules](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset#selectively-applying-rules)
+- [Customisable Sniff Properties](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Customisable-Sniff-Properties)
+- [Slevomat Coding Standard](https://github.com/slevomat/coding-standard)

From 300e6134c6936bc80e252ceaf0d3ee8e1723a061 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Tue, 11 Sep 2018 19:24:46 +0200
Subject: [PATCH 45/60] Fix creation of double trailing commas on specific
 arrays

---
 src/ZendCodingStandard/ruleset.xml | 17 +++++++++++++----
 test/expected-report.txt           |  6 +++---
 test/fixable/array-indentation.php |  9 +++++++++
 test/fixed/array-indentation.php   | 11 +++++++++++
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 687f5847..fd0a3654 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -13,7 +13,10 @@
     </rule>
 
     <!-- Force array element indentation with 4 spaces -->
-    <rule ref="Generic.Arrays.ArrayIndent"/>
+    <rule ref="Generic.Arrays.ArrayIndent">
+        <!-- multiline items causes evaluation as multiline array https://github.com/squizlabs/PHP_CodeSniffer/issues/1791 -->
+        <exclude name="Squiz.Arrays.ArrayDeclaration.SpaceBeforeDoubleArrow"/>
+    </rule>
     <!-- Forbid `array(...)` -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
     <!-- Forbid duplicate classes -->
@@ -271,21 +274,27 @@
     <!-- Forbid useless variables -->
     <rule ref="SlevomatCodingStandard.Variables.UselessVariable"/>
     <!-- Forbid spaces around square brackets -->
-    <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
+    <rule ref="Squiz.Arrays.ArrayBracketSpacing">
+        <!-- does not handle nested array access across multiple lines -->
+        <exclude name="Squiz.Arrays.ArrayBracketSpacing.SpaceBeforeBracket"/>
+    </rule>
     <!-- Force array declaration structure -->
     <rule ref="Squiz.Arrays.ArrayDeclaration">
+        <!-- Disable alignment of braces -->
+        <exclude name="Squiz.Arrays.ArrayDeclaration.CloseBraceNotAligned"/>
         <!-- Disable arrow alignment -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned"/>
         <!-- Uses indentation of only single space -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.KeyNotAligned"/>
         <!-- Allow multiple values on a single line -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.SingleLineNotAllowed"/>
-        <!-- Disable alignment of braces -->
-        <exclude name="Squiz.Arrays.ArrayDeclaration.CloseBraceNotAligned"/>
         <!-- Disable alignment of values with opening brace -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.ValueNotAligned"/>
         <!-- Checked by SlevomatCodingStandard.Arrays.TrailingArrayComma.MissingTrailingComma -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast"/>
+        <!-- Does not handle nested array access with complex keys on multiple lines and creates double commas !!! -->
+        <!-- Checked by SlevomatCodingStandard.Arrays.TrailingArrayComma -->
+        <exclude name="Squiz.Arrays.ArrayDeclaration.NoComma"/>
     </rule>
     <!-- Forbid class being in a file with different name -->
     <rule ref="Squiz.Classes.ClassFileName"/>
diff --git a/test/expected-report.txt b/test/expected-report.txt
index c5ae8a56..9ba2e449 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -4,7 +4,7 @@ PHP CODE SNIFFER REPORT SUMMARY
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 test/fixable/anonymous-classes.php                    9       0
-test/fixable/array-indentation.php                    8       0
+test/fixable/array-indentation.php                    12      0
 test/fixable/class-name-resolution.php                12      0
 test/fixable/closures.php                             19      0
 test/fixable/commenting.php                           9       0
@@ -30,9 +30,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 241 ERRORS AND 0 WARNINGS WERE FOUND IN 26 FILES
+A TOTAL OF 245 ERRORS AND 0 WARNINGS WERE FOUND IN 26 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 208 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 212 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/test/fixable/array-indentation.php b/test/fixable/array-indentation.php
index fbf5794b..bb79d14d 100644
--- a/test/fixable/array-indentation.php
+++ b/test/fixable/array-indentation.php
@@ -31,3 +31,12 @@
     ],
     'body' => '{"test":"value"}',
 ];
+
+// https://github.com/zendframework/zend-diactoros/blob/69dc20275fb8b9f7f8e05d556f6c0da5f36cac64/test/ServerRequestFactoryTest.php#L392-L398
+$files              = [ 'files' => [
+    'tmp_name' => 'php://temp',
+    'size'     => 0,
+    'error'    => 0,
+    'name'     => 'foo.bar',
+    'type'     => 'text/plain',
+]];
diff --git a/test/fixed/array-indentation.php b/test/fixed/array-indentation.php
index a9e684ef..c05da8af 100644
--- a/test/fixed/array-indentation.php
+++ b/test/fixed/array-indentation.php
@@ -29,3 +29,14 @@
     ],
     'body' => '{"test":"value"}',
 ];
+
+// https://github.com/zendframework/zend-diactoros/blob/69dc20275fb8b9f7f8e05d556f6c0da5f36cac64/test/ServerRequestFactoryTest.php#L392-L398
+$files = [
+    'files' => [
+        'tmp_name' => 'php://temp',
+        'size'     => 0,
+        'error'    => 0,
+        'name'     => 'foo.bar',
+        'type'     => 'text/plain',
+    ],
+];

From 61f3bc5e0f56d6ca4e7c126fcd4a794f29e85ba1 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Tue, 11 Sep 2018 19:33:18 +0200
Subject: [PATCH 46/60] PSR-12: Force Unix LF (linefeed) line ending

Rule: All PHP files MUST use the Unix LF (linefeed) line ending only.
---
 docs/book/v2/ruleset.md            | 3 +++
 src/ZendCodingStandard/ruleset.xml | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index 6aa3a0b3..ee190565 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -168,6 +168,9 @@ $foo = 'bar';
 echo $foo . 'baz';
 ```
 
+### Generic.Files.LineEndings
+_PSR-12:_ All PHP files MUST use the Unix LF (linefeed) line ending only.
+
 ### Generic.Formatting.MultipleStatementAlignment
 There should be one space on either side of an equals sign used to assign a value to a variable.
 
diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index fd0a3654..74a82517 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -32,6 +32,12 @@
     <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
     <!-- Forbid inline HTML in PHP code -->
     <rule ref="Generic.Files.InlineHTML"/>
+    <!-- Force Unix LF (linefeed) line ending -->
+    <rule ref="Generic.Files.LineEndings">
+        <properties>
+            <property name="eolChar" value="\n"/>
+        </properties>
+    </rule>
     <!-- Allow 1 space around operators -->
     <rule ref="Generic.Formatting.MultipleStatementAlignment">
         <properties>

From ea3de201619e9ac96201f37ad6bd62e6b117fa26 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Tue, 11 Sep 2018 19:36:53 +0200
Subject: [PATCH 47/60] Allow global functions

Caused warnings in zend-diactoros like:

`Consider putting global function "parseCookieHeader" in a static class.`
---
 CHANGELOG.md                       | 1 -
 docs/book/v2/coding-style-guide.md | 1 -
 docs/book/v2/ruleset.md            | 3 ---
 src/ZendCodingStandard/ruleset.xml | 2 --
 4 files changed, 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b72b4ce..2508c7df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -108,7 +108,6 @@ All notable changes to this project will be documented in this file, in reverse
     which is not used.
   - The `self` keyword should be used instead of the current class name, and 
     should not have spaces around `::`.
-  - Global functions should not be used.
   - Static methods should not use `$this`. 
   - Double quote strings may only be used if they contain variables. 
   - Strings should not be enclosed in parentheses when being echoed.
diff --git a/docs/book/v2/coding-style-guide.md b/docs/book/v2/coding-style-guide.md
index 822e56d8..aa23087b 100644
--- a/docs/book/v2/coding-style-guide.md
+++ b/docs/book/v2/coding-style-guide.md
@@ -372,7 +372,6 @@ $instance = new class extends Foo implements
 - Variables should be returned directly instead of assigned to a variable which is not used. [*](ruleset.md#slevomatcodingstandardvariablesuselessvariable)
 - The `self` keyword should be used instead of the current class name, and should not have spaces around `::`.
   [*](ruleset.md#squizclassesselfmemberreference)
-- Global functions should not be used. [*](ruleset.md#squizfunctionsglobalfunction)
 - Static methods should not use `$this`. [*](ruleset.md#squizscopestaticthisusage)
 - Double quote strings may only be used if they contain variables. [*](ruleset.md#squizstringsdoublequoteusage)
 - Strings should not be enclosed in parentheses when being echoed. [*](ruleset.md#squizstringsechoedstrings)
diff --git a/docs/book/v2/ruleset.md b/docs/book/v2/ruleset.md
index ee190565..b470c39e 100644
--- a/docs/book/v2/ruleset.md
+++ b/docs/book/v2/ruleset.md
@@ -983,9 +983,6 @@ There should be no multiple spaces between the tag, type and description.
  */
 ```
 
-### Squiz.Functions.GlobalFunction
-Global functions should not be used.
-
 ### Squiz.Operators.ValidLogicalOperators
 The `&&` and `||` operators must be used instead of `AND` and `OR`.
 
diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 74a82517..54f17502 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -351,8 +351,6 @@
         <!-- Doesn't work with self as typehint -->
         <exclude name="Squiz.Commenting.FunctionComment.TypeHintMissing"/>
     </rule>
-    <!-- Forbid global functions -->
-    <rule ref="Squiz.Functions.GlobalFunction"/>
     <!-- Forbid `AND` and `OR`, require `&&` and `||` -->
     <rule ref="Squiz.Operators.ValidLogicalOperators"/>
     <!-- Forbid `global` -->

From 53a7dcdb5402c0f0e7d416ca49fdd5709dfa716f Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 19 Sep 2018 16:02:56 +0200
Subject: [PATCH 48/60] Align comments, statements and arrays

Doing open source while sitting on the backseat with 200 kmh on the
Autobahn :)
---
 src/ZendCodingStandard/ruleset.xml   |  8 +-------
 test/expected-report.txt             | 16 ++++++++--------
 test/fixed/array-indentation.php     | 18 +++++++++---------
 test/fixed/commenting.php            | 14 +++++++-------
 test/fixed/concatenation-spacing.php |  2 +-
 test/fixed/example-class.php         |  7 ++++---
 test/fixed/new-with-parentheses.php  |  8 ++++----
 test/fixed/statement-alignment.php   |  8 ++++----
 8 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 54f17502..a37119cd 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -42,7 +42,7 @@
     <rule ref="Generic.Formatting.MultipleStatementAlignment">
         <properties>
             <property name="error" value="true"/>
-            <property name="maxPadding" value="1" />
+            <property name="maxPadding" value="50" />
         </properties>
     </rule>
     <!-- Force whitespace after a type cast -->
@@ -290,8 +290,6 @@
         <exclude name="Squiz.Arrays.ArrayDeclaration.CloseBraceNotAligned"/>
         <!-- Disable arrow alignment -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned"/>
-        <!-- Uses indentation of only single space -->
-        <exclude name="Squiz.Arrays.ArrayDeclaration.KeyNotAligned"/>
         <!-- Allow multiple values on a single line -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.SingleLineNotAllowed"/>
         <!-- Disable alignment of values with opening brace -->
@@ -341,10 +339,6 @@
         <exclude name="Squiz.Commenting.FunctionComment.ParamNameNoMatch"/>
         <!-- Doesn't respect inheritance -->
         <exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing"/>
-        <!-- No spacing after @param name -->
-        <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamName"/>
-        <!-- No spacing after @param type -->
-        <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
         <!-- Throws comments can start without a capital and doesn't need a full stop -->
         <exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop"/>
         <exclude name="Squiz.Commenting.FunctionComment.ThrowsNotCapital"/>
diff --git a/test/expected-report.txt b/test/expected-report.txt
index 9ba2e449..c69c19e3 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -4,21 +4,21 @@ PHP CODE SNIFFER REPORT SUMMARY
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 test/fixable/anonymous-classes.php                    9       0
-test/fixable/array-indentation.php                    12      0
+test/fixable/array-indentation.php                    27      0
 test/fixable/class-name-resolution.php                12      0
 test/fixable/closures.php                             19      0
-test/fixable/commenting.php                           9       0
-test/fixable/concatenation-spacing.php                16      0
-test/fixable/example-class.php                        29      0
+test/fixable/commenting.php                           17      0
+test/fixable/concatenation-spacing.php                15      0
+test/fixable/example-class.php                        26      0
 test/fixable/extends-and-implements-multiline.php     10      0
 test/fixable/extends-and-implements.php               5       0
 test/fixable/forbidden-comments.php                   4       0
-test/fixable/forbidden-functions.php                  6       0
+test/fixable/forbidden-functions.php                  9       0
 test/fixable/LowCaseTypes.php                         2       0
 test/fixable/method-and-function-arguments.php        11      0
 test/fixable/method-and-function-calls.php            14      0
 test/fixable/namespaces-spacing.php                   3       0
-test/fixable/new-with-parentheses.php                 14      0
+test/fixable/new-with-parentheses.php                 18      0
 test/fixable/not-spacing.php                          7       0
 test/fixable/operators.php                            7       0
 test/fixable/return-type-on-methods.php               17      0
@@ -30,9 +30,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 245 ERRORS AND 0 WARNINGS WERE FOUND IN 26 FILES
+A TOTAL OF 271 ERRORS AND 0 WARNINGS WERE FOUND IN 26 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 212 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 238 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/test/fixed/array-indentation.php b/test/fixed/array-indentation.php
index c05da8af..408ec45e 100644
--- a/test/fixed/array-indentation.php
+++ b/test/fixed/array-indentation.php
@@ -11,23 +11,23 @@
     5,
 ];
 
-$singleLine = [1 => 2];
-$singleLine2 = [ 'foo' => 'bar' ];
+$singleLine  = [1 => 2];
+$singleLine2 = ['foo' => 'bar'];
 
 $serializedRequest = [
-    'method' => 'POST',
-    'request_target' => '/foo/bar?baz=bat',
-    'uri' => 'http://example.com/foo/bar?baz=bat',
+    'method'           => 'POST',
+    'request_target'   => '/foo/bar?baz=bat',
+    'uri'              => 'http://example.com/foo/bar?baz=bat',
     'protocol_version' => '1.1',
-    'headers' => [
-        'Host' => ['example.com'],
-        'Accept' => ['application/json'],
+    'headers'          => [
+        'Host'      => ['example.com'],
+        'Accept'    => ['application/json'],
         'X-Foo-Bar' => [
             'Baz',
             'Bat',
         ],
     ],
-    'body' => '{"test":"value"}',
+    'body'             => '{"test":"value"}',
 ];
 
 // https://github.com/zendframework/zend-diactoros/blob/69dc20275fb8b9f7f8e05d556f6c0da5f36cac64/test/ServerRequestFactoryTest.php#L392-L398
diff --git a/test/fixed/commenting.php b/test/fixed/commenting.php
index adb93849..db40a2b3 100644
--- a/test/fixed/commenting.php
+++ b/test/fixed/commenting.php
@@ -32,9 +32,9 @@ class Commenting
     private $uriString;
 
     /**
-     * @param string|resource|StreamInterface $body Stream identifier and/or actual stream resource
-     * @param int $status Status code for the response, if any.
-     * @param array $headers Headers for the response, if any.
+     * @param string|resource|StreamInterface $body    Stream identifier and/or actual stream resource
+     * @param int                             $status  Status code for the response, if any.
+     * @param array                           $headers Headers for the response, if any.
      * @throws Exception\InvalidArgumentException on any invalid element.
      */
     public function __construct($body = 'php://memory', int $status = 200, array $headers = [])
@@ -52,11 +52,11 @@ public function __construct($body = 'php://memory', int $status = 200, array $he
      * order to marshal the request URI and headers.
      *
      * @see fromServer()
-     * @param array $server $_SERVER superglobal
-     * @param array $query $_GET superglobal
-     * @param array $body $_POST superglobal
+     * @param array $server  $_SERVER superglobal
+     * @param array $query   $_GET superglobal
+     * @param array $body    $_POST superglobal
      * @param array $cookies $_COOKIE superglobal
-     * @param array $files $_FILES superglobal
+     * @param array $files   $_FILES superglobal
      * @return ServerRequest
      */
     public static function fromGlobals(
diff --git a/test/fixed/concatenation-spacing.php b/test/fixed/concatenation-spacing.php
index 43850232..90b46036 100644
--- a/test/fixed/concatenation-spacing.php
+++ b/test/fixed/concatenation-spacing.php
@@ -11,7 +11,7 @@
 $foo = 'foo';
 $bar = 'bar';
 
-$string = $foo . $bar . 'baz' . 'quux' . $string;
+$string  = $foo . $bar . 'baz' . 'quux' . $string;
 $string .= $foo;
 $string .= $foo;
 $string .= $foo;
diff --git a/test/fixed/example-class.php b/test/fixed/example-class.php
index 6e35bbc2..a47c9907 100644
--- a/test/fixed/example-class.php
+++ b/test/fixed/example-class.php
@@ -38,9 +38,9 @@ class Example implements IteratorAggregate
 
     public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
     {
-        $this->foo = $foo;
-        $this->bar = $bar;
-        $this->baz = $baz;
+        $this->foo    = $foo;
+        $this->bar    = $bar;
+        $this->baz    = $baz;
         $this->baxBax = $baxBax;
     }
 
@@ -58,6 +58,7 @@ public function getFoo() : ?int
     public function getIterator() : array
     {
         assert($this->bar !== null);
+
         return new ArrayIterator($this->bar);
     }
 
diff --git a/test/fixed/new-with-parentheses.php b/test/fixed/new-with-parentheses.php
index 17ddde8f..6e81bbe6 100644
--- a/test/fixed/new-with-parentheses.php
+++ b/test/fixed/new-with-parentheses.php
@@ -5,14 +5,14 @@
 $foo = new DateTimeImmutable();
 
 $barClassName = 'Bar';
-$bar = new $barClassName();
+$bar          = new $barClassName();
 
 $classNamesInArray = ['Baz'];
-$foo = new $classNamesInArray[0]();
+$foo               = new $classNamesInArray[0]();
 
-$classNamesInObject = new stdClass();
+$classNamesInObject      = new stdClass();
 $classNamesInObject->foo = 'Foo';
-$foo = new $classNamesInObject->foo();
+$foo                     = new $classNamesInObject->foo();
 
 $whitespaceBetweenClassNameAndParentheses = new stdClass();
 
diff --git a/test/fixed/statement-alignment.php b/test/fixed/statement-alignment.php
index 52d7fa97..018efa9e 100644
--- a/test/fixed/statement-alignment.php
+++ b/test/fixed/statement-alignment.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-$shortVar = (1 + 2);
+$shortVar        = (1 + 2);
 $veryLongVarName = 'string';
 
-$value = (string) $value;
+$value  = (string) $value;
 $length = strlen($value);
 $string = '';
 
 $headerNames[$normalized] = $header;
-$headers[$header] = $value;
+$headers[$header]         = $value;
 
 $normalized = strtolower($header);
-$original = $headerNames[$normalized];
+$original   = $headerNames[$normalized];

From 850f481d17a49de9c94d96d7bfc7cbe305248d25 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 19 Sep 2018 16:16:57 +0200
Subject: [PATCH 49/60] Align array double arrows

---
 src/ZendCodingStandard/ruleset.xml | 2 --
 test/expected-report.txt           | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index a37119cd..815cb773 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -288,8 +288,6 @@
     <rule ref="Squiz.Arrays.ArrayDeclaration">
         <!-- Disable alignment of braces -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.CloseBraceNotAligned"/>
-        <!-- Disable arrow alignment -->
-        <exclude name="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned"/>
         <!-- Allow multiple values on a single line -->
         <exclude name="Squiz.Arrays.ArrayDeclaration.SingleLineNotAllowed"/>
         <!-- Disable alignment of values with opening brace -->
diff --git a/test/expected-report.txt b/test/expected-report.txt
index c69c19e3..99693d8f 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -4,7 +4,7 @@ PHP CODE SNIFFER REPORT SUMMARY
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 test/fixable/anonymous-classes.php                    9       0
-test/fixable/array-indentation.php                    27      0
+test/fixable/array-indentation.php                    34      0
 test/fixable/class-name-resolution.php                12      0
 test/fixable/closures.php                             19      0
 test/fixable/commenting.php                           17      0
@@ -30,9 +30,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 271 ERRORS AND 0 WARNINGS WERE FOUND IN 26 FILES
+A TOTAL OF 278 ERRORS AND 0 WARNINGS WERE FOUND IN 26 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 238 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 245 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

From 5eaa798f049dba4be43572b412865ca7141b83f9 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 19 Sep 2018 16:22:36 +0200
Subject: [PATCH 50/60] Validate fixes before running tests

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 95d5cb2c..bd9d5fec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,8 @@ script:
 
 stages:
   - Validate against schema
-  - Test
   - Validate fixes
+  - Test
 
 jobs:
   allow_failures:

From 41d35b98bdbab11405252ba46ab638087f9d04f1 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Wed, 19 Sep 2018 16:24:39 +0200
Subject: [PATCH 51/60] Fix single arrow indention test

---
 test/fixed/array-indentation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixed/array-indentation.php b/test/fixed/array-indentation.php
index 408ec45e..5597fb35 100644
--- a/test/fixed/array-indentation.php
+++ b/test/fixed/array-indentation.php
@@ -12,7 +12,7 @@
 ];
 
 $singleLine  = [1 => 2];
-$singleLine2 = ['foo' => 'bar'];
+$singleLine2 = [ 'foo' => 'bar' ];
 
 $serializedRequest = [
     'method'           => 'POST',

From 3974380803cba4b98425151ea7a5d539c74897da Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 20 Sep 2018 12:29:11 +0200
Subject: [PATCH 52/60] Reset array alignment and start from scratch

Using Squiz, Slevomat, General rules or a combination of those doesn't
work and it becomes a mess really fast. The WebimpressCodingStandard
has better rules for this, however they need some improvements.
---
 README.md                          |  1 -
 composer.json                      |  3 ++-
 src/ZendCodingStandard/ruleset.xml | 31 ++++++------------------------
 test/fixable/array-indentation.php | 23 ++++++++++++++--------
 test/fixed/array-indentation.php   | 11 +++++++++--
 test/fixed/example-class.php       |  1 -
 6 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 8ca9125d..5922b094 100644
--- a/README.md
+++ b/README.md
@@ -136,4 +136,3 @@ be found here:
 - [Selectively Applying Rules](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset#selectively-applying-rules)
 - [Customisable Sniff Properties](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Customisable-Sniff-Properties)
 - [Slevomat Coding Standard](https://github.com/slevomat/coding-standard)
-
diff --git a/composer.json b/composer.json
index da23c181..85963ccf 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
         "php": "^7.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
         "slevomat/coding-standard": "^4.7.3",
-        "squizlabs/php_codesniffer": "^3.3.1"
+        "squizlabs/php_codesniffer": "^3.3.1",
+        "webimpress/coding-standard": "dev-master"
     },
     "extra": {
         "branch-alias": {
diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 815cb773..00d2f0a3 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -13,12 +13,14 @@
     </rule>
 
     <!-- Force array element indentation with 4 spaces -->
-    <rule ref="Generic.Arrays.ArrayIndent">
-        <!-- multiline items causes evaluation as multiline array https://github.com/squizlabs/PHP_CodeSniffer/issues/1791 -->
-        <exclude name="Squiz.Arrays.ArrayDeclaration.SpaceBeforeDoubleArrow"/>
-    </rule>
+    <rule ref="Generic.Arrays.ArrayIndent"/>
     <!-- Forbid `array(...)` -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <!-- Format arrays -->
+    <rule ref="WebimpressCodingStandard.Arrays.Format"/>
+    <!-- Add trailing commas to all array elements -->
+    <rule ref="WebimpressCodingStandard.Arrays.TrailingArrayComma"/>
+
     <!-- Forbid duplicate classes -->
     <rule ref="Generic.Classes.DuplicateClassName"/>
     <!-- Forbid empty statements -->
@@ -110,8 +112,6 @@
     <rule ref="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed">
         <type>error</type>
     </rule>
-    <!-- Require comma after last element in multi-line array -->
-    <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
     <!-- Require presence of constant visibility -->
     <rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility">
         <properties>
@@ -279,25 +279,6 @@
     </rule>
     <!-- Forbid useless variables -->
     <rule ref="SlevomatCodingStandard.Variables.UselessVariable"/>
-    <!-- Forbid spaces around square brackets -->
-    <rule ref="Squiz.Arrays.ArrayBracketSpacing">
-        <!-- does not handle nested array access across multiple lines -->
-        <exclude name="Squiz.Arrays.ArrayBracketSpacing.SpaceBeforeBracket"/>
-    </rule>
-    <!-- Force array declaration structure -->
-    <rule ref="Squiz.Arrays.ArrayDeclaration">
-        <!-- Disable alignment of braces -->
-        <exclude name="Squiz.Arrays.ArrayDeclaration.CloseBraceNotAligned"/>
-        <!-- Allow multiple values on a single line -->
-        <exclude name="Squiz.Arrays.ArrayDeclaration.SingleLineNotAllowed"/>
-        <!-- Disable alignment of values with opening brace -->
-        <exclude name="Squiz.Arrays.ArrayDeclaration.ValueNotAligned"/>
-        <!-- Checked by SlevomatCodingStandard.Arrays.TrailingArrayComma.MissingTrailingComma -->
-        <exclude name="Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast"/>
-        <!-- Does not handle nested array access with complex keys on multiple lines and creates double commas !!! -->
-        <!-- Checked by SlevomatCodingStandard.Arrays.TrailingArrayComma -->
-        <exclude name="Squiz.Arrays.ArrayDeclaration.NoComma"/>
-    </rule>
     <!-- Forbid class being in a file with different name -->
     <rule ref="Squiz.Classes.ClassFileName"/>
     <!-- Force `self::` for self-reference, force lower-case self, forbid spaces around `::` -->
diff --git a/test/fixable/array-indentation.php b/test/fixable/array-indentation.php
index bb79d14d..3118f7f1 100644
--- a/test/fixable/array-indentation.php
+++ b/test/fixable/array-indentation.php
@@ -11,6 +11,12 @@
      5,
 ];
 
+$bar = [
+'foo' => 1,
+    'bar' => 2,
+        'baz' => 3,
+];
+
 $singleLine = [
     1 => 2,
 ];
@@ -22,21 +28,22 @@
     'uri' => 'http://example.com/foo/bar?baz=bat',
     'protocol_version' => '1.1',
     'headers' => [
-        'Host' => ['example.com'],
-        'Accept' => ['application/json'],
-        'X-Foo-Bar' => [
+        'Host'         => ['example.com'],
+        'Accept'       => ['application/json'],
+        'X-Foo-Bar'    => [
             'Baz',
             'Bat',
         ],
     ],
+
     'body' => '{"test":"value"}',
 ];
 
 // https://github.com/zendframework/zend-diactoros/blob/69dc20275fb8b9f7f8e05d556f6c0da5f36cac64/test/ServerRequestFactoryTest.php#L392-L398
 $files              = [ 'files' => [
-    'tmp_name' => 'php://temp',
-    'size'     => 0,
-    'error'    => 0,
-    'name'     => 'foo.bar',
-    'type'     => 'text/plain',
+    'tmp_name'   => 'php://temp',
+    'size'     =>     0,
+    'error'   =>   0,
+    'name'   =>  'foo.bar',
+    'type'  => 'text/plain',
 ]];
diff --git a/test/fixed/array-indentation.php b/test/fixed/array-indentation.php
index 5597fb35..9fa74554 100644
--- a/test/fixed/array-indentation.php
+++ b/test/fixed/array-indentation.php
@@ -11,8 +11,14 @@
     5,
 ];
 
+$bar = [
+    'foo' => 1,
+    'bar' => 2,
+    'baz' => 3,
+];
+
 $singleLine  = [1 => 2];
-$singleLine2 = [ 'foo' => 'bar' ];
+$singleLine2 = ['foo' => 'bar'];
 
 $serializedRequest = [
     'method'           => 'POST',
@@ -27,7 +33,8 @@
             'Bat',
         ],
     ],
-    'body'             => '{"test":"value"}',
+
+    'body' => '{"test":"value"}',
 ];
 
 // https://github.com/zendframework/zend-diactoros/blob/69dc20275fb8b9f7f8e05d556f6c0da5f36cac64/test/ServerRequestFactoryTest.php#L392-L398
diff --git a/test/fixed/example-class.php b/test/fixed/example-class.php
index a47c9907..99512a56 100644
--- a/test/fixed/example-class.php
+++ b/test/fixed/example-class.php
@@ -58,7 +58,6 @@ public function getFoo() : ?int
     public function getIterator() : array
     {
         assert($this->bar !== null);
-
         return new ArrayIterator($this->bar);
     }
 

From 137dc8a6bd80ebf8f08ce62433658f5d208f5788 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 20 Sep 2018 13:04:44 +0200
Subject: [PATCH 53/60] Update slevomat/coding-standard requirement and add
 regression test for fixed issues

---
 composer.json                         | 2 +-
 test/fixable/new-with-parentheses.php | 6 ++++++
 test/fixed/new-with-parentheses.php   | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 85963ccf..e87aa99f 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     "require": {
         "php": "^7.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
-        "slevomat/coding-standard": "^4.7.3",
+        "slevomat/coding-standard": "^4.8.0",
         "squizlabs/php_codesniffer": "^3.3.1",
         "webimpress/coding-standard": "dev-master"
     },
diff --git a/test/fixable/new-with-parentheses.php b/test/fixable/new-with-parentheses.php
index 56ee8ea9..5bdcbb0e 100644
--- a/test/fixable/new-with-parentheses.php
+++ b/test/fixable/new-with-parentheses.php
@@ -26,3 +26,9 @@
 
 $q = $q ?: new stdClass;
 $e = $e ?? new stdClass;
+
+// The parentheses around `(new Response())` should not be removed
+// https://github.com/slevomat/coding-standard/issues/478
+$response = (new Response())
+    ->withStatus(200)
+    ->withAddedHeader('Content-Type', 'text/plain');
diff --git a/test/fixed/new-with-parentheses.php b/test/fixed/new-with-parentheses.php
index 6e81bbe6..4684f85c 100644
--- a/test/fixed/new-with-parentheses.php
+++ b/test/fixed/new-with-parentheses.php
@@ -26,3 +26,9 @@
 
 $q = $q ?: new stdClass();
 $e = $e ?? new stdClass();
+
+// The parentheses around `(new Response())` should not be removed
+// https://github.com/slevomat/coding-standard/issues/478
+$response = (new Response())
+    ->withStatus(200)
+    ->withAddedHeader('Content-Type', 'text/plain');

From 61f6b4b2d795d9b6097247d71bfb65c145999f1d Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Thu, 20 Sep 2018 16:57:15 +0200
Subject: [PATCH 54/60] Add test for constant aligning

---
 test/fixable/example-class.php | 2 ++
 test/fixed/example-class.php   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/test/fixable/example-class.php b/test/fixable/example-class.php
index 69c0dd00..70f746e1 100644
--- a/test/fixable/example-class.php
+++ b/test/fixable/example-class.php
@@ -15,6 +15,8 @@
 class Example implements \IteratorAggregate
 {
     private const VERSION = \PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
+    public const ID     = 'id';
+    public const SKU = 'sku';
 
     /**
      * @var null|int
diff --git a/test/fixed/example-class.php b/test/fixed/example-class.php
index 99512a56..dcfe0644 100644
--- a/test/fixed/example-class.php
+++ b/test/fixed/example-class.php
@@ -23,6 +23,8 @@
 class Example implements IteratorAggregate
 {
     private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
+    public const ID       = 'id';
+    public const SKU      = 'sku';
 
     /** @var null|int */
     private $foo;

From 5f2280dda700606b41151500e87251339cf46f75 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Fri, 21 Sep 2018 09:05:40 +0200
Subject: [PATCH 55/60] Align double arrows in multiline arrays

---
 src/ZendCodingStandard/ruleset.xml |  6 ++++++
 test/fixable/array-indentation.php | 16 ++++++++++++++++
 test/fixed/array-indentation.php   | 21 ++++++++++++++++++++-
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 00d2f0a3..84270b03 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -16,6 +16,12 @@
     <rule ref="Generic.Arrays.ArrayIndent"/>
     <!-- Forbid `array(...)` -->
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <!-- Align double arrows -->
+    <rule ref="WebimpressCodingStandard.Arrays.DoubleArrow">
+        <properties>
+            <property name="maxPadding" value="50"/>
+        </properties>
+    </rule>
     <!-- Format arrays -->
     <rule ref="WebimpressCodingStandard.Arrays.Format"/>
     <!-- Add trailing commas to all array elements -->
diff --git a/test/fixable/array-indentation.php b/test/fixable/array-indentation.php
index 3118f7f1..fd7811ca 100644
--- a/test/fixable/array-indentation.php
+++ b/test/fixable/array-indentation.php
@@ -47,3 +47,19 @@
     'name'   =>  'foo.bar',
     'type'  => 'text/plain',
 ]];
+
+// Long lines test
+$config = [
+    'dependencies' => [
+        'factories' => [
+            App\Domain\User\UserRepository::class      =>      App\Domain\User\Persistence\DoctrineUserRepositoryFactory::class,
+            App\Http\Auth\LoginHandler::class          => App\Http\Auth\LoginHandlerFactory::class,
+            App\Http\Auth\LogoutHandler::class  => App\Http\Auth\LogoutHandlerFactory::class,
+
+            App\Infrastructure\View\TemplateDefaultsMiddleware::class
+            => App\Infrastructure\View\TemplateDefaultsMiddlewareFactory::class,
+            App\Http\HomePageHandler::class  =>  App\Http\HomePageHandlerFactory::class,
+            App\Http\StaticPageHandler::class => App\Http\StaticPageHandlerFactory::class,
+        ],
+    ],
+];
diff --git a/test/fixed/array-indentation.php b/test/fixed/array-indentation.php
index 9fa74554..2b5ec6a4 100644
--- a/test/fixed/array-indentation.php
+++ b/test/fixed/array-indentation.php
@@ -17,7 +17,9 @@
     'baz' => 3,
 ];
 
-$singleLine  = [1 => 2];
+$singleLine  = [
+    1 => 2,
+];
 $singleLine2 = ['foo' => 'bar'];
 
 $serializedRequest = [
@@ -47,3 +49,20 @@
         'type'     => 'text/plain',
     ],
 ];
+
+
+// Long lines test
+$config = [
+    'dependencies' => [
+        'factories' => [
+            App\Domain\User\UserRepository::class                     => App\Domain\User\Persistence\DoctrineUserRepositoryFactory::class,
+            App\Http\Auth\LoginHandler::class                         => App\Http\Auth\LoginHandlerFactory::class,
+            App\Http\Auth\LogoutHandler::class                        => App\Http\Auth\LogoutHandlerFactory::class,
+
+            App\Infrastructure\View\TemplateDefaultsMiddleware::class
+                => App\Infrastructure\View\TemplateDefaultsMiddlewareFactory::class,
+            App\Http\HomePageHandler::class                           => App\Http\HomePageHandlerFactory::class,
+            App\Http\StaticPageHandler::class                         => App\Http\StaticPageHandlerFactory::class,
+        ],
+    ],
+];

From a3d45d7319daa0d321988743a23ac5e92222bdc9 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Fri, 21 Sep 2018 09:08:10 +0200
Subject: [PATCH 56/60] Update expected errors report

---
 test/expected-report.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/expected-report.txt b/test/expected-report.txt
index 99693d8f..35517cc9 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -4,19 +4,19 @@ PHP CODE SNIFFER REPORT SUMMARY
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 test/fixable/anonymous-classes.php                    9       0
-test/fixable/array-indentation.php                    34      0
+test/fixable/array-indentation.php                    38      1
 test/fixable/class-name-resolution.php                12      0
 test/fixable/closures.php                             19      0
 test/fixable/commenting.php                           17      0
 test/fixable/concatenation-spacing.php                15      0
-test/fixable/example-class.php                        26      0
+test/fixable/example-class.php                        28      0
 test/fixable/extends-and-implements-multiline.php     10      0
 test/fixable/extends-and-implements.php               5       0
 test/fixable/forbidden-comments.php                   4       0
-test/fixable/forbidden-functions.php                  9       0
+test/fixable/forbidden-functions.php                  6       0
 test/fixable/LowCaseTypes.php                         2       0
 test/fixable/method-and-function-arguments.php        11      0
-test/fixable/method-and-function-calls.php            14      0
+test/fixable/method-and-function-calls.php            13      0
 test/fixable/namespaces-spacing.php                   3       0
 test/fixable/new-with-parentheses.php                 18      0
 test/fixable/not-spacing.php                          7       0
@@ -30,9 +30,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 278 ERRORS AND 0 WARNINGS WERE FOUND IN 26 FILES
+A TOTAL OF 280 ERRORS AND 1 WARNING WERE FOUND IN 26 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 245 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 248 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

From 27b735fca2ade4deac593b5031716a54a9a437b6 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 6 Oct 2018 18:59:58 +0200
Subject: [PATCH 57/60] Require php_codesniffer 3.3.2

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e87aa99f..024cd1b5 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "php": "^7.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
         "slevomat/coding-standard": "^4.8.0",
-        "squizlabs/php_codesniffer": "^3.3.1",
+        "squizlabs/php_codesniffer": "^3.3.2",
         "webimpress/coding-standard": "dev-master"
     },
     "extra": {

From 95213b5905ffc6f0b60a084c11b152f0c9f0f1a8 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 6 Oct 2018 19:18:41 +0200
Subject: [PATCH 58/60] Update array indentation tests

---
 test/fixable/array-indentation.php |  6 +++---
 test/fixed/array-indentation.php   | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/test/fixable/array-indentation.php b/test/fixable/array-indentation.php
index fd7811ca..765756f8 100644
--- a/test/fixable/array-indentation.php
+++ b/test/fixable/array-indentation.php
@@ -54,12 +54,12 @@
         'factories' => [
             App\Domain\User\UserRepository::class      =>      App\Domain\User\Persistence\DoctrineUserRepositoryFactory::class,
             App\Http\Auth\LoginHandler::class          => App\Http\Auth\LoginHandlerFactory::class,
-            App\Http\Auth\LogoutHandler::class  => App\Http\Auth\LogoutHandlerFactory::class,
+            App\Http\Auth\LogoutHandler::class  =>  App\Http\Auth\LogoutHandlerFactory::class,
 
             App\Infrastructure\View\TemplateDefaultsMiddleware::class
             => App\Infrastructure\View\TemplateDefaultsMiddlewareFactory::class,
-            App\Http\HomePageHandler::class  =>  App\Http\HomePageHandlerFactory::class,
-            App\Http\StaticPageHandler::class => App\Http\StaticPageHandlerFactory::class,
+            App\Http\HomePageHandler::class   =>  App\Http\HomePageHandlerFactory::class,
+            App\Http\StaticPageHandler::class =>  App\Http\StaticPageHandlerFactory::class,
         ],
     ],
 ];
diff --git a/test/fixed/array-indentation.php b/test/fixed/array-indentation.php
index 2b5ec6a4..4ccaa3d8 100644
--- a/test/fixed/array-indentation.php
+++ b/test/fixed/array-indentation.php
@@ -50,19 +50,18 @@
     ],
 ];
 
-
 // Long lines test
 $config = [
     'dependencies' => [
         'factories' => [
-            App\Domain\User\UserRepository::class                     => App\Domain\User\Persistence\DoctrineUserRepositoryFactory::class,
-            App\Http\Auth\LoginHandler::class                         => App\Http\Auth\LoginHandlerFactory::class,
-            App\Http\Auth\LogoutHandler::class                        => App\Http\Auth\LogoutHandlerFactory::class,
+            App\Domain\User\UserRepository::class => App\Domain\User\Persistence\DoctrineUserRepositoryFactory::class,
+            App\Http\Auth\LoginHandler::class     => App\Http\Auth\LoginHandlerFactory::class,
+            App\Http\Auth\LogoutHandler::class    => App\Http\Auth\LogoutHandlerFactory::class,
 
             App\Infrastructure\View\TemplateDefaultsMiddleware::class
-                => App\Infrastructure\View\TemplateDefaultsMiddlewareFactory::class,
-            App\Http\HomePageHandler::class                           => App\Http\HomePageHandlerFactory::class,
-            App\Http\StaticPageHandler::class                         => App\Http\StaticPageHandlerFactory::class,
+            => App\Infrastructure\View\TemplateDefaultsMiddlewareFactory::class,
+            App\Http\HomePageHandler::class   => App\Http\HomePageHandlerFactory::class,
+            App\Http\StaticPageHandler::class => App\Http\StaticPageHandlerFactory::class,
         ],
     ],
 ];

From 38a2deaf1ac04dbe6b9a4f1fc3b4f666096a6348 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 6 Oct 2018 19:29:23 +0200
Subject: [PATCH 59/60] Use new format to declare array properties

---
 src/ZendCodingStandard/ruleset.xml | 103 ++++++++++++-----------------
 1 file changed, 42 insertions(+), 61 deletions(-)

diff --git a/src/ZendCodingStandard/ruleset.xml b/src/ZendCodingStandard/ruleset.xml
index 84270b03..43dd2702 100644
--- a/src/ZendCodingStandard/ruleset.xml
+++ b/src/ZendCodingStandard/ruleset.xml
@@ -50,7 +50,7 @@
     <rule ref="Generic.Formatting.MultipleStatementAlignment">
         <properties>
             <property name="error" value="true"/>
-            <property name="maxPadding" value="50" />
+            <property name="maxPadding" value="50"/>
         </properties>
     </rule>
     <!-- Force whitespace after a type cast -->
@@ -73,32 +73,29 @@
     <!-- Forbid alias functions, i.e. `sizeof()`, `delete()` -->
     <rule ref="Generic.PHP.ForbiddenFunctions">
         <properties>
-            <property
-                name="forbiddenFunctions"
-                type="array"
-                value="
-                    chop => rtrim,
-                    close => closedir,
-                    compact => null,
-                    delete => unset,
-                    doubleval => floatval,
-                    extract => null,
-                    fputs => fwrite,
-                    ini_alter => ini_set,
-                    is_double => is_float,
-                    is_integer => is_int,
-                    is_long => is_int,
-                    is_null => null,
-                    is_real => is_float,
-                    is_writeable => is_writable,
-                    join => implode,
-                    key_exists => array_key_exists,
-                    pos => current,
-                    settype => null,
-                    show_source => highlight_file,
-                    sizeof => count,
-                    strchr => strstr
-                "/>
+            <property name="forbiddenFunctions" type="array">
+                <element key="chop" value="rtrim"/>
+                <element key="close" value="closedir"/>
+                <element key="compact" value="null"/>
+                <element key="delete" value="unset"/>
+                <element key="doubleval" value="floatval"/>
+                <element key="extract" value="null"/>
+                <element key="fputs" value="fwrite"/>
+                <element key="ini_alter" value="ini_set"/>
+                <element key="is_double" value="is_float"/>
+                <element key="is_integer" value="is_int"/>
+                <element key="is_long" value="is_int"/>
+                <element key="is_null" value="null"/>
+                <element key="is_real" value="is_float"/>
+                <element key="is_writeable" value="is_writable"/>
+                <element key="join" value="implode"/>
+                <element key="key_exists" value="array_key_exists"/>
+                <element key="pos" value="current"/>
+                <element key="settype" value="null"/>
+                <element key="show_source" value="highlight_file"/>
+                <element key="sizeof" value="count"/>
+                <element key="strchr" value="strstr"/>
+            </property>
         </properties>
     </rule>
     <!-- Force PHP 7 param and return types to be lowercased -->
@@ -142,19 +139,15 @@
     <!-- Forbid useless annotations - Git and LICENCE file provide more accurate information -->
     <rule ref="SlevomatCodingStandard.Commenting.ForbiddenAnnotations">
         <properties>
-            <property
-                name="forbiddenAnnotations"
-                type="array"
-                value="
-                    @api,
-                    @author,
-                    @category,
-                    @created,
-                    @package,
-                    @subpackage,
-                    @version
-                "
-            />
+            <property name="forbiddenAnnotations" type="array">
+                <element value="@api"/>
+                <element value="@author"/>
+                <element value="@category"/>
+                <element value="@created"/>
+                <element value="@package"/>
+                <element value="@subpackage"/>
+                <element value="@version"/>
+            </property>
         </properties>
     </rule>
     <!-- Forbid empty comments -->
@@ -162,14 +155,11 @@
     <!-- Forbid useless comments -->
     <rule ref="SlevomatCodingStandard.Commenting.ForbiddenComments">
         <properties>
-            <property
-                name="forbiddenCommentPatterns"
-                type="array"
-                value="
-                    ~^(?:(?!private|protected|static)\S+ )?(?:con|de)structor\.\z~i,
-                    ~^Created by \S+\.\z~i,
-                    ~^\S+ [gs]etter\.\z~i,
-                "/>
+            <property name="forbiddenCommentPatterns" type="array">
+                <element value="~^(?:(?!private|protected|static)\S+ )?(?:con|de)structor\.\z~i"/>
+                <element value="~^Created by \S+\.\z~i"/>
+                <element value="~^\S+ [gs]etter\.\z~i"/>
+            </property>
         </properties>
     </rule>
     <!-- report invalid format of inline phpDocs with @var -->
@@ -246,18 +236,9 @@
     <!-- Require presence of declare(strict_types=1) -->
     <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
         <properties>
-            <property
-                name="newlinesCountBetweenOpenTagAndDeclare"
-                value="2"
-            />
-            <property
-                name="spacesCountAroundEqualsSign"
-                value="0"
-            />
-            <property
-                name="newlinesCountAfterDeclare"
-                value="2"
-            />
+            <property name="newlinesCountBetweenOpenTagAndDeclare" value="2"/>
+            <property name="spacesCountAroundEqualsSign" value="0"/>
+            <property name="newlinesCountAfterDeclare" value="2"/>
         </properties>
     </rule>
     <!-- Forbid useless parentheses -->
@@ -371,7 +352,7 @@
     <!-- Forbid multiple spaces before and after operators -->
     <rule ref="Squiz.WhiteSpace.OperatorSpacing">
         <properties>
-            <property name="ignoreNewlines" value="true" />
+            <property name="ignoreNewlines" value="true"/>
         </properties>
     </rule>
     <!-- Forbid spaces before semicolon `;` -->

From 7dc2f7862f468b78127353e951f15a6e1edb1d69 Mon Sep 17 00:00:00 2001
From: Geert Eltink <xtreamwayz@gmail.com>
Date: Sat, 6 Oct 2018 19:41:18 +0200
Subject: [PATCH 60/60] Update phpcs report

---
 test/expected-report.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/expected-report.txt b/test/expected-report.txt
index 35517cc9..84d85f92 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -4,7 +4,7 @@ PHP CODE SNIFFER REPORT SUMMARY
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 test/fixable/anonymous-classes.php                    9       0
-test/fixable/array-indentation.php                    38      1
+test/fixable/array-indentation.php                    39      1
 test/fixable/class-name-resolution.php                12      0
 test/fixable/closures.php                             19      0
 test/fixable/commenting.php                           17      0
@@ -30,9 +30,9 @@ test/fixable/UnusedVariables.php                      1       0
 test/fixable/useless-semicolon.php                    2       0
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 280 ERRORS AND 1 WARNING WERE FOUND IN 26 FILES
+A TOTAL OF 281 ERRORS AND 1 WARNING WERE FOUND IN 26 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 248 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 249 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------