Skip to content

Conversation

greg0ire
Copy link
Contributor

@greg0ire greg0ire commented Jul 4, 2023

This should make it easier to install the project on projects with recent dependencies.

@greg0ire
Copy link
Contributor Author

greg0ire commented Jul 4, 2023

I would like to have a CI job on all Doctrine projects with the guides-cli running in it, so it's possible to forbid contributors to contribute invalid docs (based on the warnings output to stderr). This is one step towards doing that, another step will be to upgrade to Symfony 6

composer.lock Outdated
@@ -1120,7 +1072,7 @@
},
{
"name": "phpdocumentor/guides-cli",
"version": "dev-main",
"version": "dev-lexer-3",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know how to avoid this 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed by:

  • switching to main
  • merging my branch
  • running the composer command I wanted
  • switching back
  • committing
  • switching back to main
  • resetting to HEAD^

@greg0ire greg0ire marked this pull request as draft July 4, 2023 12:07
@wouterj
Copy link
Contributor

wouterj commented Jul 4, 2023

This is one step towards doing that, another step will be to upgrade to Symfony 6

We must keep support for Symfony 5.4, as this library is part of the core phpDocumentor application (which does not yet support Symfony 6).

@greg0ire

This comment was marked as outdated.

@greg0ire greg0ire marked this pull request as ready for review July 4, 2023 13:09
@@ -22,7 +22,7 @@
"minimum-stability": "stable",
"require": {
"php": "^8.1",
"doctrine/lexer": "^2.1",
"doctrine/lexer": "^3.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"doctrine/lexer": "^3.0",
"doctrine/lexer": "^2.1 || ^3.0",

Btw, I think only supporting doctrine/lexer 3 is fine (as far as I can see in https://github.com/phpDocumentor/phpDocumentor , only the guides package is using Doctrine lexer).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right, I will change that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wouterj I dropped doctrine/lexer 2 support again.

@jaapio
Copy link
Member

jaapio commented Jul 5, 2023

Thanks for the upgrade!

This should make it easier to install the project on projects with
recent dependencies.
@jaapio jaapio enabled auto-merge July 5, 2023 07:14
@jaapio jaapio merged commit b453b9f into phpDocumentor:main Jul 5, 2023
@greg0ire greg0ire deleted the lexer-3 branch July 5, 2023 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants