From 732d7388593f179804d799cf169e61f0f1d9050d Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 19:55:25 +0100 Subject: [PATCH 01/17] Add a description. --- phpcs.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpcs.xml b/phpcs.xml index bda9a9f9174..dcc5c221890 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -4,6 +4,8 @@ xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd" name="Psalm coding standard" > + The coding standard for Psalm. + From 1ab0f487c9c4b92b5f024bdcef862962fd40c1cf Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 20:13:38 +0100 Subject: [PATCH 02/17] Move include section --- phpcs.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index dcc5c221890..3fce45f979d 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -6,6 +6,13 @@ > The coding standard for Psalm. + + bin/ + src/ + tests/ + @@ -44,9 +51,6 @@ - bin/ - src/ - tests/ src/Psalm/Internal/Visitor/SimpleNameResolver.php From cca1b0bb499251f802b0788676b4464dd8077161 Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 20:19:34 +0100 Subject: [PATCH 03/17] Move exclude section --- phpcs.xml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index 3fce45f979d..14195cfc38c 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -13,6 +13,15 @@ src/ tests/ + + src/Psalm/Internal/Visitor/SimpleNameResolver.php + + src/Psalm/Internal/Stubs/ + tests/fixtures/ + + @@ -52,9 +61,4 @@ - src/Psalm/Internal/Visitor/SimpleNameResolver.php - - - src/Psalm/Internal/Stubs/ - tests/fixtures/ From 164f06154611f9206362c4dbaeca3ff53fa6531a Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 20:26:22 +0100 Subject: [PATCH 04/17] Move generic ruleset --- phpcs.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index 14195cfc38c..de8b4c9e4c4 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -22,6 +22,15 @@ tests/fixtures/ + + + + tests + src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php + + @@ -36,10 +45,6 @@ - - tests - src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php - * From be2cb57e759a0b3967e4686508ddd41049f16937 Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 20:27:40 +0100 Subject: [PATCH 05/17] Move PSR2 ruleset --- phpcs.xml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index de8b4c9e4c4..1a31bc628e2 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -31,8 +31,18 @@ src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php - + + + + + + * + + + @@ -45,10 +55,6 @@ - - * - - From 58291cf246e60bf295e80d190bbc9ed8e4d7ef42 Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 20:29:33 +0100 Subject: [PATCH 06/17] Move Squiz ruleset --- phpcs.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/phpcs.xml b/phpcs.xml index 1a31bc628e2..f1851faa0c8 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -42,6 +42,13 @@ * + + + + + @@ -70,6 +77,5 @@ - From 21796e2e87dcb38675e3df9be5c5bec096659217 Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 20:31:07 +0100 Subject: [PATCH 07/17] Move SlevomatCodingStandard ruleset --- phpcs.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/phpcs.xml b/phpcs.xml index f1851faa0c8..002afecef3b 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -49,7 +49,13 @@ + + + + @@ -59,6 +65,7 @@ + @@ -67,11 +74,13 @@ + + From 5fc24f9ffd0d11846e2a6c0ba6155b458f5eb312 Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 20:31:54 +0100 Subject: [PATCH 08/17] Combine file include/exclude section --- phpcs.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index 002afecef3b..239baf34ee2 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -7,15 +7,13 @@ The coding standard for Psalm. + bin/ src/ tests/ - src/Psalm/Internal/Visitor/SimpleNameResolver.php src/Psalm/Internal/Stubs/ From 3c00485557d5c0d20123bfc857b46e81e4af434d Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 20:55:47 +0100 Subject: [PATCH 09/17] Add a URL --- phpcs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpcs.xml b/phpcs.xml index 239baf34ee2..c33d9c3af37 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -49,7 +49,7 @@ From dee820378020fd112d16ce5aba6f3901de047715 Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 21:08:40 +0100 Subject: [PATCH 10/17] Add some documentation --- phpcs.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index c33d9c3af37..32e731556e7 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -49,12 +49,15 @@ - + @@ -67,18 +70,31 @@ + + + + From 5210a1d509d3e3f7a722c3060938fc9048cb46d7 Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 21:09:06 +0100 Subject: [PATCH 11/17] Unify endtag --- phpcs.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index 32e731556e7..5b101e31647 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -34,7 +34,7 @@ * RULESET: PSR2 * ************************************************************************************************************** --> - + * @@ -45,7 +45,7 @@ * RULESET: Squiz * ************************************************************************************************************** --> - + - + @@ -97,7 +97,7 @@ --> - + From d84617c3edb8f7d8142c439a7a494a207b47944d Mon Sep 17 00:00:00 2001 From: ralila <> Date: Wed, 1 Dec 2021 21:10:14 +0100 Subject: [PATCH 12/17] Add configuration section --- phpcs.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index 5b101e31647..ef4b60ce041 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -6,6 +6,12 @@ > The coding standard for Psalm. + + + + @@ -52,8 +58,6 @@ * RULESET: SlevomatCodingStandard: * ************************************************************************************************************** --> - - @@ -37,7 +37,7 @@ @@ -48,14 +48,14 @@ + tests src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php @@ -42,6 +46,10 @@ + * @@ -51,6 +59,10 @@ * STANDARD: Squiz * ************************************************************************************************************** --> + @@ -94,7 +106,6 @@ - @@ -83,7 +85,7 @@ - + +