Merge branch 'master' into 4.x

Author: jrfnl

.gitattributes

@@ -5,22 +5,26 @@
 # https://www.reddit.com/r/PHP/comments/2jzp6k/i_dont_need_your_tests_in_my_production/
 # https://blog.madewithlove.be/post/gitattributes/
 #
-.github/                            export-ignore
-scripts/                            export-ignore
-src/Standards/**/Tests/             export-ignore
-tests/Core/**/                      export-ignore
-.cspell.json                        export-ignore
-.gitattributes                      export-ignore
-.gitignore                          export-ignore
-.markdownlint-cli2.yaml             export-ignore
-.remarkignore                       export-ignore
-.remarkrc                           export-ignore
-.yamllint.yml                       export-ignore
-phpcs.xml.dist                      export-ignore
-phpstan.neon.dist                   export-ignore
-phpunit.xml.dist                    export-ignore
-phpunit-lte9.xml.dist               export-ignore
-tests/Core/ErrorSuppressionTest.php export-ignore
+.github/                              export-ignore
+scripts/                              export-ignore
+src/Standards/**/Tests/               export-ignore
+tests/Core/**/                        export-ignore
+tests/EndToEnd/**/                    export-ignore
+.cspell.json                          export-ignore
+.gitattributes                        export-ignore
+.gitignore                            export-ignore
+.markdownlint-cli2.yaml               export-ignore
+.remarkignore                         export-ignore
+.remarkrc                             export-ignore
+.shellcheckrc                         export-ignore
+.yamllint.yml                         export-ignore
+phpcs.xml.dist                        export-ignore
+phpstan.neon.dist                     export-ignore
+phpunit.xml.dist                      export-ignore
+phpunit-lte9.xml.dist                 export-ignore
+tests/Core/AbstractWriterTestCase.php export-ignore
+tests/Core/ErrorSuppressionTest.php   export-ignore
+tests/Core/StatusWriterTestHelper.php export-ignore
 
 #
 # Declare files that should always have CRLF line endings on checkout.

.gitignore

@@ -1,17 +1,17 @@
+.idea/*
+build/
+lib/
+node_modules/
+vendor/
+/.phpunit.result.cache
 /CodeSniffer.conf
+/composer.lock
 /phpcs.xml
+/phpstan.neon
 /phpunit.xml
 /phpunitlte9.xml
 /phpunit-lte9.xml
-.phpunit.result.cache
-/build/
-.idea/*
-/vendor/
-composer.lock
-phpstan.neon
-/node_modules/
 /tests/Standards/sniffStnd.xml
 /tests/Core/Util/ExitCode/Fixtures/ExitCodeTest/*.fixed
 /tests/Core/Util/ExitCode/Fixtures/ExitCodeTest/phpcs.cache
 /tests/EndToEnd/Fixtures/*.fixed
-/lib/