Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: doctrine/coding-standard
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 12.0.0
Choose a base ref
...
head repository: doctrine/coding-standard
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 13.0.0
Choose a head ref
8 contributors

Commits on Apr 24, 2023

  1. Add PHP 8.2 to the build matrix

    @phansys
    phansys committed Apr 24, 2023
    Copy the full SHA
    f2efad6 View commit details

  2. Merge pull request #317 from phansys/php_matrix 

    Add PHP 8.2 to the build matrix
    @greg0ire
    greg0ire authored Apr 24, 2023
    Copy the full SHA
    3446dbe View commit details

  3. Lint shell scripts with ShellCheck

    @phansys
    phansys committed Apr 24, 2023
    Copy the full SHA
    a6bb07d View commit details

  4. Lint Dockerfile files with Hadolint

    @phansys
    phansys committed Apr 24, 2023
    Copy the full SHA
    75c0b44 View commit details

Commits on Apr 25, 2023

  1. Merge pull request #316 from phansys/hadolint 

    Lint Dockerfile files with Hadolint
    @greg0ire
    greg0ire authored Apr 25, 2023
    Copy the full SHA
    99b196d View commit details

  2. Merge pull request #315 from phansys/shellcheck 

    Lint shell scripts with ShellCheck
    @derrabus
    derrabus authored Apr 25, 2023
    Copy the full SHA
    c0fb0e6 View commit details

Commits on Apr 27, 2023

  1. Remove duplicate RequireOneLineDocComment rule

    @tomudding
    tomudding committed Apr 27, 2023
    Copy the full SHA
    8f57dc1 View commit details

Commits on Apr 28, 2023

  1. Merge pull request #319 from tomudding/fix/duplicate-onelinedoccomment 

    Remove duplicate `RequireOneLineDocComment` rule
    @greg0ire
    greg0ire authored Apr 28, 2023
    Copy the full SHA
    3e88327 View commit details

Commits on Oct 9, 2023

  1. feat: enable SlevomatCodingStandard.Classes.EnumCaseSpacing sniff

    @simPod
    simPod committed Oct 9, 2023
    Copy the full SHA
    89c3e07 View commit details

Commits on Oct 11, 2023

  1. Merge pull request #320 from simPod/enumspacing 

    feat: enable SlevomatCodingStandard.Classes.EnumCaseSpacing sniff
    @greg0ire
    greg0ire authored Oct 11, 2023
    Copy the full SHA
    0308bc4 View commit details

Commits on Jan 10, 2025

  1. Update fixed file and compatibility patches

    @greg0ire
    greg0ire committed Jan 10, 2025
    Copy the full SHA
    952e5f5 View commit details

Commits on Jan 12, 2025

  1. Merge pull request #324 from greg0ire/fix-build 

    Update compat patch
    @greg0ire
    greg0ire authored Jan 12, 2025
    Copy the full SHA
    2b558dd View commit details

  2. Create website schema validation workflow

    @SenseException
    SenseException committed Jan 12, 2025
    Copy the full SHA
    41d3d91 View commit details

Commits on Feb 24, 2025

  1. Require slevomat/coding-standard v8.16 

    Use DNFTypeHintFormat instead of deprecated UnionTypeHintFormat sniff.

Drop support for php 7.2 + 7.3 since it's super ancient and slevomat/coding-standard does not support in anymore as well.
    @simPod
    simPod committed Feb 24, 2025
    Copy the full SHA
    a18e94d View commit details

  2. Merge pull request #325 from simPod/bumpie 

    Require slevomat/coding-standard v8.16
    @greg0ire
    greg0ire authored Feb 24, 2025
    Copy the full SHA
    39e4a76 View commit details

  3. Merge pull request #323 from doctrine/website-schema 

    Create website schema validation workflow
    @greg0ire
    greg0ire authored Feb 24, 2025
    Copy the full SHA
    6b00877 View commit details

  4. test: run on php 8.3 and 8.4

    @simPod
    simPod committed Feb 24, 2025
    Copy the full SHA
    049a486 View commit details

Commits on Mar 18, 2025

  1. ci: use actions/cache@v4

    @simPod
    simPod committed Mar 18, 2025
    Copy the full SHA
    4ca4a1e View commit details

Commits on Mar 20, 2025

  1. Merge pull request #329 from simPod/action-cache 

    ci: use actions/cache@v4
    @greg0ire
    greg0ire authored Mar 20, 2025
    Copy the full SHA
    74f8512 View commit details

  2. Merge pull request #326 from simPod/8384 

    test: run on php 8.3 and 8.4
    @greg0ire
    greg0ire authored Mar 20, 2025
    Copy the full SHA
    3cc2cef View commit details

  3. test: increase errors in PropertyDeclaration 

    Probably caused by update in slevomat or squizlabs

I don't really want to dig what's new, all are legit finds:

```
vendor/bin/phpcs `find tests/input/PropertyDeclaration.php`
WARNING: The PHPCS Coding Standards for doctrine/coding-standards standard uses 1 deprecated sniff
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-  SlevomatCodingStandard.TypeHints.UnionTypeHintFormat
   This sniff has been deprecated since Slevomat Coding Standard 8.16.0 and will be removed in Slevomat Coding Standard 9.0.0. Use SlevomatCodingStandard.TypeHints.DNFTypeHintFormat instead.

Deprecated sniffs are still run, but will stop working at some point in the future.

E 1 / 1 (100%)

FILE: tests/input/PropertyDeclaration.php
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
FOUND 16 ERRORS AFFECTING 5 LINES
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  9 | ERROR | [x] Equals sign not aligned correctly; expected 1 space but found 2 spaces (Generic.Formatting.MultipleStatementAlignment.Incorrect)
 10 | ERROR | [x] There must be exactly one space between type hint and property $stringProperty. (SlevomatCodingStandard.Classes.PropertyDeclaration.MultipleSpacesBetweenTypeHintAndProperty)
 10 | ERROR | [x] There must be 1 space after the property type declaration; 2 found (PSR2.Classes.PropertyDeclaration.SpacingAfterType)
 11 | ERROR | [x] Scope keyword "public" must be followed by a single space; found 2 (Squiz.WhiteSpace.ScopeKeywordSpacing.Incorrect)
 11 | ERROR | [x] There must be exactly one space before type hint of property $intProperty. (SlevomatCodingStandard.Classes.PropertyDeclaration.MultipleSpacesBeforeTypeHint)
 12 | ERROR | [x] Usage of short nullable type hint in "?string" is disallowed. (SlevomatCodingStandard.TypeHints.UnionTypeHintFormat.DisallowedShortNullable)
 12 | ERROR | [x] There must be no whitespace between type hint nullability symbol and type hint of property $nullableString. (SlevomatCodingStandard.Classes.PropertyDeclaration.WhitespaceAfterNullabilitySymbol)
 15 | ERROR | [x] Expected 1 space after visibility modifier "public"; 2 found (Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterVisbility)
 15 | ERROR | [x] Scope keyword "public" must be followed by a single space; found 2 (Squiz.WhiteSpace.ScopeKeywordSpacing.Incorrect)
 15 | ERROR | [x] There must be exactly one space between modifiers of property $foo. (SlevomatCodingStandard.Classes.PropertyDeclaration.MultipleSpacesBetweenModifiers)
 15 | ERROR | [x] Expected 1 space after readonly modifier; 2 found (Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterReadonly)
 15 | ERROR | [x] Scope keyword "readonly" must be followed by a single space; found 2 (Squiz.WhiteSpace.ScopeKeywordSpacing.Incorrect)
 15 | ERROR | [x] There must be exactly one space before type hint of property $foo. (SlevomatCodingStandard.Classes.PropertyDeclaration.MultipleSpacesBeforeTypeHint)
 15 | ERROR | [x] Expected 1 space between type hint and argument "$foo"; 2 found (Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint)
 15 | ERROR | [x] There must be exactly one space between parameter type hint and parameter $foo. (SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing.MultipleSpacesBetweenTypeHintAndParameter)
 15 | ERROR | [x] There must be exactly one space between type hint and property $foo. (SlevomatCodingStandard.Classes.PropertyDeclaration.MultipleSpacesBetweenTypeHintAndProperty)
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
PHPCBF CAN FIX THE 16 MARKED SNIFF VIOLATIONS AUTOMATICALLY
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Time: 95ms; Memory: 12MB
```
    @simPod
    simPod committed Mar 20, 2025
    Copy the full SHA
    3710972 View commit details

  4. Merge remote-tracking branch 'origin/12.0.x' into 13.0.x

    @greg0ire
    greg0ire committed Mar 20, 2025
    Copy the full SHA
    5b3d705 View commit details

Commits on Mar 21, 2025

  1. Merge pull request #332 from simPod/fix-property-declaration 

    test: increase errors in PropertyDeclaration
    @greg0ire
    greg0ire authored Mar 21, 2025
    Copy the full SHA
    9ef5984 View commit details

  2. Merge pull request #333 from greg0ire/13.0.x 

    Merge 12.0.x up into 13.0.x
    @greg0ire
    greg0ire authored Mar 21, 2025
    Copy the full SHA
    67d8f07 View commit details

  3. feat: enable SlevomatCodingStandard.TypeHints.ClassConstantTypeHint s… 

    …niff
    @simPod
    simPod committed Mar 21, 2025
    Copy the full SHA
    7c1fef7 View commit details

  4. style: format phpcs.xml.dist

    @simPod
    simPod committed Mar 21, 2025
    Copy the full SHA
    5fcb4d3 View commit details

  5. Setup Dependabot for Github Actions

    @greg0ire
    greg0ire committed Mar 21, 2025
    Copy the full SHA
    9a8ccdc View commit details

  6. Merge pull request #328 from simPod/style-xml 

    style: format phpcs.xml.dist
    @derrabus
    derrabus authored Mar 21, 2025
    Copy the full SHA
    8421d3a View commit details

  7. Merge pull request #330 from greg0ire/dependabot-for-gh-actions 

    Setup Dependabot for Github Actions
    @derrabus
    derrabus authored Mar 21, 2025
    Copy the full SHA
    6ada74a View commit details

  8. chore(deps): bump actions/checkout from 2 to 4 

    Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Mar 21, 2025
    Copy the full SHA
    565c315 View commit details

  9. chore(deps): bump doctrine/.github from 2.0.0 to 7.2.2 

    Bumps [doctrine/.github](https://github.com/doctrine/.github) from 2.0.0 to 7.2.2.
- [Release notes](https://github.com/doctrine/.github/releases)
- [Commits](doctrine/.github@2.0.0...7.2.2)

---
updated-dependencies:
- dependency-name: doctrine/.github
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Mar 21, 2025
    Copy the full SHA
    e29d319 View commit details

  10. Merge pull request #327 from simPod/sniffie 

    feat: enable SlevomatCodingStandard.TypeHints.ClassConstantTypeHint
    @greg0ire
    greg0ire authored Mar 21, 2025
    Copy the full SHA
    ab80779 View commit details

Commits on Mar 23, 2025

  1. Merge pull request #335 from doctrine/dependabot/github_actions/doctr… 

    …ine/dot-github-7.2.2

chore(deps): bump doctrine/.github from 2.0.0 to 7.2.2
    @greg0ire
    greg0ire authored Mar 23, 2025
    Copy the full SHA
    2b7de8f View commit details

  2. Merge pull request #334 from doctrine/dependabot/github_actions/actio… 

    …ns/checkout-4

chore(deps): bump actions/checkout from 2 to 4
    @greg0ire
    greg0ire authored Mar 23, 2025
    Copy the full SHA
    9749fc1 View commit details

  3. Merge remote-tracking branch 'origin/12.0.x' into 13.0.x

    @greg0ire
    greg0ire committed Mar 23, 2025
    Copy the full SHA
    f9122e6 View commit details

  4. Merge pull request #337 from greg0ire/13.0.x 

    Merge 12.0.x up into 13.0.x
    @greg0ire
    greg0ire authored Mar 23, 2025
    Copy the full SHA
    8132673 View commit details
4 changes: 2 additions & 2 deletions .docker/validate-against-schema/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM alpine:3.11.3
FROM alpine:3.17.3

RUN apk add --no-cache libxml2-utils
RUN apk add --no-cache libxml2-utils=2.10.4-r0
6 changes: 6 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -19,3 +19,9 @@ updates:
- 7.0.2
- 7.0.4
- 7.0.5
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
labels:
- "CI"
30 changes: 30 additions & 0 deletions .github/workflows/ci-dockerfile.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions

name: "Continuous Integration for Dockerfile files"

on:
pull_request:
paths:
- ".docker/**/*"
- ".github/workflows/ci-dockerfile.yml"
push:
branches:
- "*.*.x"
paths:
- ".docker/**/*"
- ".github/workflows/ci-dockerfile.yml"
schedule:
- cron: "0 17 * * *"

jobs:
lint-dockerfile:
name: "Lint Dockerfile files with Hadolint"
runs-on: "ubuntu-22.04"

steps:
- uses: "actions/checkout@v4"

- name: "Lint Dockerfile"
uses: "hadolint/hadolint-action@v3.1.0"
with:
dockerfile: ".docker/validate-against-schema/Dockerfile"
33 changes: 33 additions & 0 deletions .github/workflows/ci-shell-scripts.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions

name: "Continuous Integration for shell scripts"

on:
pull_request:
paths:
- ".github/workflows/ci-shell-scripts.yml"
- "bin/**"
push:
branches:
- "*.*.x"
paths:
- ".github/workflows/ci-shell-scripts.yml"
- "bin/**"
schedule:
- cron: "0 17 * * *"

jobs:
lint-shell-scripts:
name: "Lint shell scripts"

runs-on: "ubuntu-22.04"

steps:
- name: "Checkout"
uses: "actions/checkout@v4"

- name: "Lint shell scripts with ShellCheck"
uses: "ludeeus/action-shellcheck@2.0.0"
with:
scandir: "./bin"
check_together: "yes"
30 changes: 16 additions & 14 deletions .github/workflows/continuous-integration.yml
View file
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@ jobs:
strategy:
matrix:
php-version:
- "7.2"
- "7.4"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
@@ -32,7 +32,7 @@ jobs:
php-version: "${{ matrix.php-version }}"

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v2"
uses: "actions/cache@v4"
with:
path: "~/.composer/cache"
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}"
@@ -52,11 +52,11 @@ jobs:
strategy:
matrix:
php-version:
- "7.2"
- "7.4"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
@@ -65,7 +65,7 @@ jobs:
php-version: "${{ matrix.php-version }}"

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v2"
uses: "actions/cache@v4"
with:
path: "~/.composer/cache"
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}"
@@ -91,15 +91,16 @@ jobs:
fail-fast: false
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
@@ -108,7 +109,7 @@ jobs:
php-version: "${{ matrix.php-version }}"

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v2"
uses: "actions/cache@v4"
with:
path: "~/.composer/cache"
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}"
@@ -129,15 +130,16 @@ jobs:
fail-fast: false
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
@@ -146,7 +148,7 @@ jobs:
php-version: "${{ matrix.php-version }}"

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v2"
uses: "actions/cache@v4"
with:
path: "~/.composer/cache"
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}"
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.0.0"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.2"
secrets:
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
21 changes: 21 additions & 0 deletions .github/workflows/website-schema.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

name: "Website config validation"

on:
pull_request:
branches:
- "*.x"
paths:
- ".doctrine-project.json"
- ".github/workflows/website-schema.yml"
push:
branches:
- "*.x"
paths:
- ".doctrine-project.json"
- ".github/workflows/website-schema.yml"

jobs:
json-validate:
name: "Validate JSON schema"
uses: "doctrine/.github/.github/workflows/website-schema.yml@7.2.2"
28 changes: 14 additions & 14 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -10,20 +10,6 @@ test-report: vendor
test-fix: vendor
./bin/test-fix

update-compatibility-patch-72:
@git apply tests/php72-compatibility.patch
@printf "Please open your editor and apply your changes\n"
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php72-compatibility.patch && git apply -R tests/php72-compatibility.patch
@git commit -m 'Update compatibility patch' tests/php72-compatibility.patch

update-compatibility-patch-73:
@git apply tests/php73-compatibility.patch
@printf "Please open your editor and apply your changes\n"
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php73-compatibility.patch && git apply -R tests/php73-compatibility.patch
@git commit -m 'Update compatibility patch' tests/php73-compatibility.patch

update-compatibility-patch-74:
@git apply tests/php74-compatibility.patch
@printf "Please open your editor and apply your changes\n"
@@ -38,6 +24,20 @@ update-compatibility-patch-80:
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php80-compatibility.patch && git apply -R tests/php80-compatibility.patch
@git commit -m 'Update compatibility patch' tests/php80-compatibility.patch

update-compatibility-patch-81:
@git apply tests/php81-compatibility.patch --allow-empty
@printf "Please open your editor and apply your changes\n"
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php81-compatibility.patch && git apply -R tests/php81-compatibility.patch --allow-empty
@git commit -m 'Update compatibility patch' tests/php81-compatibility.patch

update-compatibility-patch-82:
@git apply tests/php82-compatibility.patch --allow-empty
@printf "Please open your editor and apply your changes\n"
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php82-compatibility.patch && git apply -R tests/php82-compatibility.patch --allow-empty
@git commit -m 'Update compatibility patch' tests/php82-compatibility.patch

vendor: composer.json
composer update
touch -c vendor
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -22,9 +22,9 @@
{"name": "Steve Müller", "email": "st.mueller@dzh-online.de"}
],
"require": {
"php": "^7.2 || ^8.0",
"php": "^7.4 || ^8.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0.0",
"slevomat/coding-standard": "^8.11",
"slevomat/coding-standard": "^8.16",
"squizlabs/php_codesniffer": "^3.7"
},
"config": {
13 changes: 8 additions & 5 deletions lib/Doctrine/ruleset.xml
View file
Original file line number Diff line number Diff line change
@@ -145,6 +145,8 @@
<property name="linesCountBeforeClosingBrace" value="0"/>
</properties>
</rule>
<!-- Enforce consistent enum case spacing -->
<rule ref="SlevomatCodingStandard.Classes.EnumCaseSpacing" />
<!-- Add one line around parent call in order to improve readability -->
<rule ref="SlevomatCodingStandard.Classes.ParentCallSpacing"/>
<!-- Ensure that there are consistent blank lines between properties. -->
@@ -254,8 +256,6 @@
</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.RequireOneLineDocComment"/>
<!-- Forbid assignments in conditions -->
<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
<!-- Require consistent spacing for block structures -->
@@ -403,6 +403,8 @@
<rule ref="SlevomatCodingStandard.PHP.ShortList"/>
<!-- Forbid use of longhand cast operators -->
<rule ref="SlevomatCodingStandard.PHP.TypeCast"/>
<!-- Check for missing typehints in case they can be declared natively. Report useless @var annotation (or whole documentation comment) because the type of constant is always clear. -->
<rule ref="SlevomatCodingStandard.TypeHints.ClassConstantTypeHint"/>
<!-- Require presence of declare(strict_types=1) -->
<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
<properties>
@@ -482,10 +484,11 @@
</property>
</properties>
</rule>
<!-- Define unions style -->
<rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
<!-- Define DNF style -->
<rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
<properties>
<property name="withSpaces" value="no" />
<property name="withSpacesAroundOperators" value="no" />
<property name="withSpacesInsideParentheses" value="no" />
<property name="shortNullable" value="no" />
<property name="nullPosition" value="last" />
</properties>
10 changes: 5 additions & 5 deletions phpcs.xml.dist
View file
Original file line number Diff line number Diff line change
@@ -6,17 +6,17 @@
>
<description>Check the code of the sniffs in doctrine/coding-standards.</description>

<arg name="basepath" value="."/>
<arg name="extensions" value="php"/>
<arg name="basepath" value="." />
<arg name="extensions" value="php" />
<arg name="colors" />

<!-- Show progress of the run -->
<arg value="p"/>
<arg value="p" />

<!--Show sniff codes in all reports -->
<arg value="s"/>
<arg value="s" />

<rule ref="Doctrine"/>
<rule ref="Doctrine" />

<file>lib</file>
</ruleset>
14 changes: 7 additions & 7 deletions tests/expected_report.txt
View file
Original file line number Diff line number Diff line change
@@ -5,21 +5,21 @@ FILE ERRORS WARNINGS
----------------------------------------------------------------------
tests/input/annotation-name.php 8 0
tests/input/array_indentation.php 10 0
tests/input/arrow-functions-format.php 10 0
tests/input/arrow-functions-format.php 12 0
tests/input/assignment-operators.php 4 0
tests/input/attributes.php 15 0
tests/input/binary_operators.php 9 0
tests/input/class-references.php 10 2
tests/input/ClassPropertySpacing.php 2 0
tests/input/concatenation_spacing.php 49 0
tests/input/constants-no-lsb.php 2 0
tests/input/constants-var.php 6 0
tests/input/constants-var.php 13 0
tests/input/ControlStructures.php 28 0
tests/input/doc-comment-spacing.php 11 0
tests/input/duplicate-assignment-variable.php 1 0
tests/input/EarlyReturn.php 7 0
tests/input/example-class.php 47 0
tests/input/ExampleBackedEnum.php 3 0
tests/input/example-class.php 48 0
tests/input/ExampleBackedEnum.php 5 0
tests/input/Exceptions.php 1 0
tests/input/forbidden-comments.php 14 0
tests/input/forbidden-functions.php 6 0
@@ -34,7 +34,7 @@ tests/input/null_coalesce_equal_operator.php 5 0
tests/input/null_coalesce_operator.php 3 0
tests/input/null_safe_operator.php 1 0
tests/input/optimized-functions.php 1 0
tests/input/PropertyDeclaration.php 14 0
tests/input/PropertyDeclaration.php 16 0
tests/input/return_type_on_closures.php 26 0
tests/input/return_type_on_methods.php 22 0
tests/input/semicolon_spacing.php 3 0
@@ -54,9 +54,9 @@ tests/input/use-ordering.php 1 0
tests/input/useless-semicolon.php 2 0
tests/input/UselessConditions.php 21 0
----------------------------------------------------------------------
A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
A TOTAL OF 476 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
----------------------------------------------------------------------
PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
PHPCBF CAN FIX 391 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


2 changes: 1 addition & 1 deletion tests/fixed/ControlStructures.php
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

class ControlStructures
{
private const VERSION = PHP_VERSION;
private const int VERSION = PHP_VERSION;

/** @return iterable<int> */
public function varAndIfNoSpaceBetween(): iterable
7 changes: 7 additions & 0 deletions tests/fixed/ExampleBackedEnum.php
View file
Original file line number Diff line number Diff line change
@@ -6,4 +6,11 @@

enum ExampleBackedEnum: int
{
case FOO = 0;
case BAR = 1;

case BAZ = 2;

/** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
case BAM = 1234;
}
4 changes: 2 additions & 2 deletions tests/fixed/arrow-functions-format.php
View file
Original file line number Diff line number Diff line change
@@ -32,12 +32,12 @@
];

$singleLineArrayReturn = Collection::map(
static fn () => [1, 2]
static fn () => [1, 2],
);

$wrongMultiLineArrayReturn = Collection::map(
static fn () => [
1,
2,
]
],
);
2 changes: 2 additions & 0 deletions tests/fixed/constants-no-lsb.php
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@

namespace Test;

// phpcs:disable SlevomatCodingStandard.TypeHints.ClassConstantTypeHint

class ConstantLsb
{
public const A = 123;
14 changes: 7 additions & 7 deletions tests/fixed/constants-var.php
View file
Original file line number Diff line number Diff line change
@@ -13,19 +13,19 @@

class Bar
{
public const BAZ = 456;
public const int BAZ = 456;

protected const PROPERTY_1 = '1';
protected const PROPERTY_2 = '2';
protected const string PROPERTY_1 = '1';
protected const string PROPERTY_2 = '2';
}

class Spacing
{
public const FOO = 'bar';
public const BAR = 'bar';
public const string FOO = 'bar';
public const string BAR = 'bar';

public const BAZ = 'baz';
public const string BAZ = 'baz';

/** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
private const BAM = 1234;
private const int BAM = 1234;
}
2 changes: 1 addition & 1 deletion tests/input/ControlStructures.php
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

class ControlStructures
{
private const VERSION = PHP_VERSION;
private const int VERSION = PHP_VERSION;

/** @return iterable<int> */
public function varAndIfNoSpaceBetween(): iterable
9 changes: 9 additions & 0 deletions tests/input/ExampleBackedEnum.php
View file
Original file line number Diff line number Diff line change
@@ -6,4 +6,13 @@

enum ExampleBackedEnum : int
{
case FOO = 0;
case BAR = 1;


case BAZ = 2;


/** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
case BAM = 1234;
}
2 changes: 2 additions & 0 deletions tests/input/constants-no-lsb.php
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@

namespace Test;

// phpcs:disable SlevomatCodingStandard.TypeHints.ClassConstantTypeHint

class ConstantLsb
{
public const A = 123;
556 changes: 0 additions & 556 deletions tests/php72-compatibility.patch
View file

This file was deleted.

480 changes: 0 additions & 480 deletions tests/php73-compatibility.patch
View file

This file was deleted.

102 changes: 86 additions & 16 deletions tests/php74-compatibility.patch
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
index d1e1fad..ed67841 100644
index 8547171..f01ece0 100644
--- a/tests/expected_report.txt
+++ b/tests/expected_report.txt
@@ -17,26 +17,23 @@
@@ -13,30 +13,27 @@ tests/input/class-references.php 10 2
tests/input/ClassPropertySpacing.php 2 0
tests/input/concatenation_spacing.php 49 0
tests/input/constants-no-lsb.php 2 0
-tests/input/constants-var.php 13 0
+tests/input/constants-var.php 7 0
tests/input/ControlStructures.php 28 0
tests/input/doc-comment-spacing.php 11 0
tests/input/duplicate-assignment-variable.php 1 0
-tests/input/EarlyReturn.php 7 0
-tests/input/example-class.php 47 0
-tests/input/ExampleBackedEnum.php 3 0
-tests/input/example-class.php 48 0
-tests/input/ExampleBackedEnum.php 5 0
-tests/input/Exceptions.php 1 0
+tests/input/EarlyReturn.php 6 0
+tests/input/example-class.php 44 0
@@ -26,7 +31,7 @@ index d1e1fad..ed67841 100644
tests/input/null_coalesce_operator.php 3 0
-tests/input/null_safe_operator.php 1 0
tests/input/optimized-functions.php 1 0
-tests/input/PropertyDeclaration.php 14 0
-tests/input/PropertyDeclaration.php 16 0
-tests/input/return_type_on_closures.php 26 0
-tests/input/return_type_on_methods.php 22 0
+tests/input/PropertyDeclaration.php 6 0
@@ -35,7 +40,7 @@ index d1e1fad..ed67841 100644
tests/input/semicolon_spacing.php 3 0
tests/input/single-line-array-spacing.php 5 0
tests/input/spread-operator.php 6 0
@@ -46,17 +43,17 @@
@@ -46,17 +43,17 @@ tests/input/strings.php 3 0
tests/input/superfluous-naming.php 11 0
tests/input/test-case.php 8 0
tests/input/trailing_comma_on_array.php 1 0
@@ -50,18 +55,27 @@ index d1e1fad..ed67841 100644
-tests/input/UselessConditions.php 21 0
+tests/input/UselessConditions.php 20 0
----------------------------------------------------------------------
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 426 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
-A TOTAL OF 476 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 429 ERRORS AND 2 WARNINGS WERE FOUND IN 47 FILES
----------------------------------------------------------------------
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 342 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
-PHPCBF CAN FIX 391 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 345 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.php
index f8f7f65..a653086 100644
index 480e419..a653086 100644
--- a/tests/fixed/ControlStructures.php
+++ b/tests/fixed/ControlStructures.php
@@ -11,7 +11,7 @@ use const PHP_VERSION;

class ControlStructures
{
- private const int VERSION = PHP_VERSION;
+ private const VERSION = PHP_VERSION;

/** @return iterable<int> */
public function varAndIfNoSpaceBetween(): iterable
@@ -104,7 +104,7 @@ class ControlStructures

try {
@@ -85,16 +99,23 @@ index fc734db..caf1dbb 100644
foreach ($items as $item) {
if (! $item->isItem()) {
diff --git a/tests/fixed/ExampleBackedEnum.php b/tests/fixed/ExampleBackedEnum.php
index cc38c54..fe54eb9 100644
index fd701eb..fe54eb9 100644
--- a/tests/fixed/ExampleBackedEnum.php
+++ b/tests/fixed/ExampleBackedEnum.php
@@ -3,7 +3,3 @@
@@ -3,14 +3,3 @@
declare(strict_types=1);

namespace ExampleBackedEnum;
-
-enum ExampleBackedEnum: int
-{
- case FOO = 0;
- case BAR = 1;
-
- case BAZ = 2;
-
- /** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
- case BAM = 1234;
-}
diff --git a/tests/fixed/Exceptions.php b/tests/fixed/Exceptions.php
index db7408b..9b146c6 100644
@@ -185,6 +206,37 @@ index 71e0cfb..2151b17 100644
{
if (! $this->isAdmin) {
return null;
diff --git a/tests/fixed/constants-var.php b/tests/fixed/constants-var.php
index f10c235..d4268cb 100644
--- a/tests/fixed/constants-var.php
+++ b/tests/fixed/constants-var.php
@@ -13,19 +13,19 @@ const BAR_1 = 2;

class Bar
{
- public const int BAZ = 456;
+ public const BAZ = 456;

- protected const string PROPERTY_1 = '1';
- protected const string PROPERTY_2 = '2';
+ protected const PROPERTY_1 = '1';
+ protected const PROPERTY_2 = '2';
}

class Spacing
{
- public const string FOO = 'bar';
- public const string BAR = 'bar';
+ public const FOO = 'bar';
+ public const BAR = 'bar';

- public const string BAZ = 'baz';
+ public const BAZ = 'baz';

/** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
- private const int BAM = 1234;
+ private const BAM = 1234;
}
diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
index 4988dab..c31e53f 100644
--- a/tests/fixed/example-class.php
@@ -342,9 +394,18 @@ index 5e26ed8..bfa6d4f 100644
+ private $x = 1;
}
diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.php
index 73944e3..a0e0b2e 100644
index 7c20d0e..a0e0b2e 100644
--- a/tests/input/ControlStructures.php
+++ b/tests/input/ControlStructures.php
@@ -11,7 +11,7 @@ use const PHP_VERSION;

class ControlStructures
{
- private const int VERSION = PHP_VERSION;
+ private const VERSION = PHP_VERSION;

/** @return iterable<int> */
public function varAndIfNoSpaceBetween(): iterable
@@ -93,7 +93,7 @@ class ControlStructures
}
try {
@@ -355,16 +416,25 @@ index 73944e3..a0e0b2e 100644
echo 5;
}
diff --git a/tests/input/ExampleBackedEnum.php b/tests/input/ExampleBackedEnum.php
index 0c47286..fe54eb9 100644
index 3b09f47..fe54eb9 100644
--- a/tests/input/ExampleBackedEnum.php
+++ b/tests/input/ExampleBackedEnum.php
@@ -3,7 +3,3 @@
@@ -3,16 +3,3 @@
declare(strict_types=1);

namespace ExampleBackedEnum;
-
-enum ExampleBackedEnum : int
-{
- case FOO = 0;
- case BAR = 1;
-
-
- case BAZ = 2;
-
-
- /** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
- case BAM = 1234;
-}
diff --git a/tests/input/Exceptions.php b/tests/input/Exceptions.php
index 3aaa30f..9b146c6 100644
85 changes: 70 additions & 15 deletions tests/php80-compatibility.patch
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,62 @@
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
index d1e1fad..71022c4 100644
index 9b19b9e..760ee4a 100644
--- a/tests/expected_report.txt
+++ b/tests/expected_report.txt
@@ -19,7 +19,6 @@
@@ -13,13 +13,12 @@ tests/input/class-references.php 10 2
tests/input/ClassPropertySpacing.php 2 0
tests/input/concatenation_spacing.php 49 0
tests/input/constants-no-lsb.php 2 0
-tests/input/constants-var.php 13 0
+tests/input/constants-var.php 7 0
tests/input/ControlStructures.php 28 0
tests/input/doc-comment-spacing.php 11 0
tests/input/duplicate-assignment-variable.php 1 0
tests/input/EarlyReturn.php 7 0
tests/input/example-class.php 47 0
-tests/input/ExampleBackedEnum.php 3 0
-tests/input/example-class.php 48 0
-tests/input/ExampleBackedEnum.php 5 0
+tests/input/example-class.php 47 0
tests/input/Exceptions.php 1 0
tests/input/forbidden-comments.php 14 0
tests/input/forbidden-functions.php 6 0
@@ -34,7 +33,7 @@
@@ -34,7 +33,7 @@ tests/input/null_coalesce_equal_operator.php 5 0
tests/input/null_coalesce_operator.php 3 0
tests/input/null_safe_operator.php 1 0
tests/input/optimized-functions.php 1 0
-tests/input/PropertyDeclaration.php 14 0
-tests/input/PropertyDeclaration.php 16 0
+tests/input/PropertyDeclaration.php 11 0
tests/input/return_type_on_closures.php 26 0
tests/input/return_type_on_methods.php 22 0
tests/input/semicolon_spacing.php 3 0
@@ -54,9 +53,9 @@
@@ -54,9 +53,9 @@ tests/input/use-ordering.php 1 0
tests/input/useless-semicolon.php 2 0
tests/input/UselessConditions.php 21 0
----------------------------------------------------------------------
-A TOTAL OF 462 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 456 ERRORS AND 2 WARNINGS WERE FOUND IN 49 FILES
-A TOTAL OF 476 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 459 ERRORS AND 2 WARNINGS WERE FOUND IN 49 FILES
----------------------------------------------------------------------
-PHPCBF CAN FIX 378 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 372 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
-PHPCBF CAN FIX 391 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 375 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


diff --git a/tests/fixed/ExampleBackedEnum.php b/tests/fixed/ExampleBackedEnum.php
index cc38c54..fe54eb9 100644
index fd701eb..fe54eb9 100644
--- a/tests/fixed/ExampleBackedEnum.php
+++ b/tests/fixed/ExampleBackedEnum.php
@@ -3,7 +3,3 @@
@@ -3,14 +3,3 @@
declare(strict_types=1);

namespace ExampleBackedEnum;
-
-enum ExampleBackedEnum: int
-{
- case FOO = 0;
- case BAR = 1;
-
- case BAZ = 2;
-
- /** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
- case BAM = 1234;
-}
diff --git a/tests/fixed/PropertyDeclaration.php b/tests/fixed/PropertyDeclaration.php
index 9703897..7821d5c 100644
@@ -56,17 +71,57 @@ index 9703897..7821d5c 100644
) {
}
}
diff --git a/tests/fixed/constants-var.php b/tests/fixed/constants-var.php
index f10c235..d4268cb 100644
--- a/tests/fixed/constants-var.php
+++ b/tests/fixed/constants-var.php
@@ -13,19 +13,19 @@ const BAR_1 = 2;

class Bar
{
- public const int BAZ = 456;
+ public const BAZ = 456;

- protected const string PROPERTY_1 = '1';
- protected const string PROPERTY_2 = '2';
+ protected const PROPERTY_1 = '1';
+ protected const PROPERTY_2 = '2';
}

class Spacing
{
- public const string FOO = 'bar';
- public const string BAR = 'bar';
+ public const FOO = 'bar';
+ public const BAR = 'bar';

- public const string BAZ = 'baz';
+ public const BAZ = 'baz';

/** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
- private const int BAM = 1234;
+ private const BAM = 1234;
}
diff --git a/tests/input/ExampleBackedEnum.php b/tests/input/ExampleBackedEnum.php
index 0c47286..fe54eb9 100644
index 3b09f47..fe54eb9 100644
--- a/tests/input/ExampleBackedEnum.php
+++ b/tests/input/ExampleBackedEnum.php
@@ -3,7 +3,3 @@
@@ -3,16 +3,3 @@
declare(strict_types=1);

namespace ExampleBackedEnum;
-
-enum ExampleBackedEnum : int
-{
- case FOO = 0;
- case BAR = 1;
-
-
- case BAZ = 2;
-
-
- /** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
- case BAM = 1234;
-}
diff --git a/tests/input/PropertyDeclaration.php b/tests/input/PropertyDeclaration.php
index acdc445..4eb8164 100644
62 changes: 62 additions & 0 deletions tests/php81-compatibility.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
index 8547171..a7a42fa 100644
--- a/tests/expected_report.txt
+++ b/tests/expected_report.txt
@@ -13,12 +13,12 @@ tests/input/class-references.php 10 2
tests/input/ClassPropertySpacing.php 2 0
tests/input/concatenation_spacing.php 49 0
tests/input/constants-no-lsb.php 2 0
-tests/input/constants-var.php 13 0
+tests/input/constants-var.php 7 0
tests/input/ControlStructures.php 28 0
tests/input/doc-comment-spacing.php 11 0
tests/input/duplicate-assignment-variable.php 1 0
tests/input/EarlyReturn.php 7 0
-tests/input/example-class.php 48 0
+tests/input/example-class.php 47 0
tests/input/ExampleBackedEnum.php 5 0
tests/input/Exceptions.php 1 0
tests/input/forbidden-comments.php 14 0
@@ -54,9 +54,9 @@ tests/input/use-ordering.php 1 0
tests/input/useless-semicolon.php 2 0
tests/input/UselessConditions.php 21 0
----------------------------------------------------------------------
-A TOTAL OF 476 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 469 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
----------------------------------------------------------------------
-PHPCBF CAN FIX 391 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 385 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


diff --git a/tests/fixed/constants-var.php b/tests/fixed/constants-var.php
index f10c235..d4268cb 100644
--- a/tests/fixed/constants-var.php
+++ b/tests/fixed/constants-var.php
@@ -13,19 +13,19 @@ const BAR_1 = 2;

class Bar
{
- public const int BAZ = 456;
+ public const BAZ = 456;

- protected const string PROPERTY_1 = '1';
- protected const string PROPERTY_2 = '2';
+ protected const PROPERTY_1 = '1';
+ protected const PROPERTY_2 = '2';
}

class Spacing
{
- public const string FOO = 'bar';
- public const string BAR = 'bar';
+ public const FOO = 'bar';
+ public const BAR = 'bar';

- public const string BAZ = 'baz';
+ public const BAZ = 'baz';

/** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
- private const int BAM = 1234;
+ private const BAM = 1234;
}
62 changes: 62 additions & 0 deletions tests/php82-compatibility.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
index 8547171..a7a42fa 100644
--- a/tests/expected_report.txt
+++ b/tests/expected_report.txt
@@ -13,12 +13,12 @@ tests/input/class-references.php 10 2
tests/input/ClassPropertySpacing.php 2 0
tests/input/concatenation_spacing.php 49 0
tests/input/constants-no-lsb.php 2 0
-tests/input/constants-var.php 13 0
+tests/input/constants-var.php 7 0
tests/input/ControlStructures.php 28 0
tests/input/doc-comment-spacing.php 11 0
tests/input/duplicate-assignment-variable.php 1 0
tests/input/EarlyReturn.php 7 0
-tests/input/example-class.php 48 0
+tests/input/example-class.php 47 0
tests/input/ExampleBackedEnum.php 5 0
tests/input/Exceptions.php 1 0
tests/input/forbidden-comments.php 14 0
@@ -54,9 +54,9 @@ tests/input/use-ordering.php 1 0
tests/input/useless-semicolon.php 2 0
tests/input/UselessConditions.php 21 0
----------------------------------------------------------------------
-A TOTAL OF 476 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 469 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
----------------------------------------------------------------------
-PHPCBF CAN FIX 391 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 385 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------


diff --git a/tests/fixed/constants-var.php b/tests/fixed/constants-var.php
index f10c235..d4268cb 100644
--- a/tests/fixed/constants-var.php
+++ b/tests/fixed/constants-var.php
@@ -13,19 +13,19 @@ const BAR_1 = 2;

class Bar
{
- public const int BAZ = 456;
+ public const BAZ = 456;

- protected const string PROPERTY_1 = '1';
- protected const string PROPERTY_2 = '2';
+ protected const PROPERTY_1 = '1';
+ protected const PROPERTY_2 = '2';
}

class Spacing
{
- public const string FOO = 'bar';
- public const string BAR = 'bar';
+ public const FOO = 'bar';
+ public const BAR = 'bar';

- public const string BAZ = 'baz';
+ public const BAZ = 'baz';

/** Brevis, primus coordinataes foris promissio de varius, barbatus heuretes. */
- private const int BAM = 1234;
+ private const BAM = 1234;
}