Skip to content

Update for Doctrine Coding Standards 4.0 - #2

Merged
jwage merged 1 commit into
masterfrom
doctrine-coding-standards
Jun 8, 2018
Merged

jwage merged 1 commit into
masterfrom
doctrine-coding-standards

Conversation

@jwage

@jwage jwage commented Jun 8, 2018

Copy link
Copy Markdown
Member

No description provided.

@jwage jwage added this to the 1.0 milestone Jun 8, 2018
@jwage jwage self-assigned this Jun 8, 2018
@jwage
jwage force-pushed the doctrine-coding-standards branch from 1efa319 to a9985d2 Compare June 8, 2018 20:10

@Majkl578 Majkl578 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall, just some leftovers that are not handled by our CS currently.

Comment thread composer.lock Outdated
{
"name": "squizlabs/php_codesniffer",
"version": "3.2.3",
"version": "3.3.0",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you keep the 3.2.3 version here the same way as we did last time?

/**
* Abstract implementation of the ManagerRegistry contract.
*
* @link www.doctrine-project.org

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can safely remove all @link www.doctrine-project.org.
(This annotation isn't forbidden by our CS as it may contain useful information so it needs to be done manually - one nice regexp :) .)

* Constructor.
*
*
* @param ObjectManager $objectManager The object manager.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately we currently have no sniff for phpDoc spacing so some fixers leave superfluous empty lines:

  • empty line(s) after /**
  • empty line(s) before `*/
  • multiple empty lines instead of single empty line

Can you grep through these manually? It's slightly annoying, but doable with three regexes.

@jwage
jwage force-pushed the doctrine-coding-standards branch 2 times, most recently from c55ba99 to 2adcf99 Compare June 8, 2018 20:48
@jwage
jwage force-pushed the doctrine-coding-standards branch from 2adcf99 to 6f467e7 Compare June 8, 2018 21:04
@jwage
jwage merged commit 5afe971 into master Jun 8, 2018
@jwage
jwage deleted the doctrine-coding-standards branch June 8, 2018 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants