Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docs: use canonical order for phpdoc tags, add missed semicolon #9190

Merged
merged 2 commits into from
Dec 20, 2021
Merged

Docs: use canonical order for phpdoc tags, add missed semicolon #9190

merged 2 commits into from
Dec 20, 2021

Conversation

andrew-demb
Copy link
Contributor

@greg0ire
Copy link
Member

Looks like there are a bit more occurrences in the project:

rg -F '@var $'
tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php
243:         * @var $entity Token

docs/en/reference/second-level-cache.rst
242:    /* @var $config \Doctrine\ORM\Configuration */
546:    /* @var $em \Doctrine\ORM\EntityManager */
573:    /* @var $em \Doctrine\ORM\EntityManager */
662:    /* @var $cache \Doctrine\ORM\Cache */
707:    /* @var $article Article */
711:    /* @var $article Article */

docs/en/cookbook/dql-user-defined-functions.rst
198:            /* @var $lexer Lexer */

docs/en/cookbook/dql-custom-walkers.rst
104:            /* @var $countQuery Query */

@andrew-demb andrew-demb force-pushed the patch-1 branch 2 times, most recently from 894de06 to 17c6773 Compare November 18, 2021 17:08
@andrew-demb
Copy link
Contributor Author

@greg0ire
Done

@greg0ire
Copy link
Member

@andrew-demb you should target 2.10.x, 2.8 is no longer supported.

@greg0ire greg0ire changed the base branch from 2.8.x to 2.10.x November 19, 2021 08:04
@andrew-demb
Copy link
Contributor Author

Sorry, it was't clear to me from readme (lower branch 2.8 is mentioned)

@greg0ire
Copy link
Member

Sorry, it was't clear to me from readme (lower branch 2.8 is mentioned)

Is it? I don't see it mentioned on https://github.com/doctrine/orm

@andrew-demb
Copy link
Contributor Author

Then I can't find a reason why I chose this branch :(

@derrabus
Copy link
Member

derrabus commented Dec 6, 2021

Can you resolve the conflicts, please?

@andrew-demb
Copy link
Contributor Author

@derrabus done

@andrew-demb andrew-demb mentioned this pull request Dec 10, 2021
Merged
@andrew-demb
Copy link
Contributor Author

And rebased one more time

@andrew-demb
Copy link
Contributor Author

Fixed build - CS requires avoiding use phpdoc for specifying variable type

Run phpcs log 
FILE: tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php
----------------------------------------------------------------------------------------------------------------------------------------------------------
FOUND 1 ERROR AFFECTING 1 LINE
----------------------------------------------------------------------------------------------------------------------------------------------------------
 243 | ERROR | [x] Use assertion instead of inline documentation comment.
     |       |     (SlevomatCodingStandard.PHP.RequireExplicitAssertion.RequiredExplicitAssertion)
----------------------------------------------------------------------------------------------------------------------------------------------------------
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------------------------------------------------------------------------------------------

Time: 17.46 secs; Memory: 82MB

@derrabus derrabus added this to the 2.10.4 milestone Dec 20, 2021
@derrabus derrabus merged commit cccb2e2 into doctrine:2.10.x Dec 20, 2021
@derrabus
Copy link
Member

Thank you!

@andrew-demb andrew-demb deleted the patch-1 branch December 20, 2021 21:26
derrabus added a commit to derrabus/orm that referenced this pull request Dec 26, 2021
@derrabus
Merge branch '2.11.x' into 3.0.x
47f931c 
* 2.11.x:
  Enable UnusedUse sniff again (doctrine#9267)
  Whitelist composer plugins used by this repository (doctrine#9286)
  Fix XML export for `change-tracking-policy` (doctrine#9285)
  Allow symfony/cache 6 (doctrine#9283)
  Put actual value instead of index inside $originalEntityData. (doctrine#9244)
  Fix return types of cache interfaces (doctrine#9271)
  Better explain limitations of DQL "DELETE" (doctrine#9281)
  Fix docblocks on nullable EM properties (doctrine#9273)
  Docs: use canonical order for phpdoc tags, add missed semicolon (doctrine#9190)
  Make PrimaryReadReplicaConnection enforcement explicit (doctrine#9239)
  Regenerate Psalm baseline (doctrine#9272)
  Improve compatibility with Doctrine DBAL 4 (doctrine#9266)
  [docs] Fix wording for attributes=>parameters. (doctrine#9265)
  Support for nesting attributes with PHP 8.1 (doctrine#9241)
  Revert "Fix SchemaValidator with abstract child class in discriminator map (doctrine#9096)" (doctrine#9262)
  Docs: consistency for FQCN, spacing, etc (doctrine#9232)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derrabus derrabus derrabus approved these changes

Assignees
No one assigned
Labels
Documentation
Projects
None yet
Milestone
2.10.4
Development

Successfully merging this pull request may close these issues.
3 participants
@andrew-demb @greg0ire @derrabus