Skip to content
This repository was archived by the owner on Mar 6, 2022. It is now read-only.

Override templates by php version - #16

Merged
dantleech merged 5 commits into
phpactor:masterfrom
camilledejoye:override-templates-by-php-version
Dec 15, 2019
Merged

dantleech merged 5 commits into
phpactor:masterfrom
camilledejoye:override-templates-by-php-version

Conversation

@camilledejoye

@camilledejoye camilledejoye commented Dec 14, 2019 •

Copy link
Copy Markdown
Contributor

Fixes phpactor/phpactor#856

phpactor/phpactor#857 need this PR to be merged in order for the CI to pass.

@dantleech

Copy link
Copy Markdown
Contributor

It needs phpactor/phpactor#857 to be merged in order to have access to the PHP version override

I guess this isn't true? i.e. Phpactor depends on this package, this package doesn't depend on Phpactor.

class TemplatePathsResolver
{
/**
* @var string In the form of "major.minor.release[extra]"

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.

Is this a valid docblock? Otherwise I'd be happy to ommit the @var

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

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.

The @var tag MUST contain the name of the element it documents. An exception to this is when property declarations only refer to a single property. In this case the name of the property MAY be omitted.

Only can be omitted for properties at the moment.

@camilledejoye

Copy link
Copy Markdown
Contributor Author

It needs phpactor/phpactor#857 to be merged in order to have access to the PHP version override

I guess this isn't true? i.e. Phpactor depends on this package, this package doesn't depend on Phpactor.

Yes, it's the other way around, I updated it and the message in the PR on phpactor.

@dantleech

Copy link
Copy Markdown
Contributor

I made a PR on this PR which renames the resolver and adds an integration test: camilledejoye#1

@camilledejoye

Copy link
Copy Markdown
Contributor Author

Nice !

@dantleech

Copy link
Copy Markdown
Contributor

Looks like my change caused the CS to fail..

@camilledejoye

Copy link
Copy Markdown
Contributor Author

Yeah I really need to had some git hook before pushing...

@dantleech
dantleech merged commit d5563f5 into phpactor:master Dec 15, 2019
@dantleech

Copy link
Copy Markdown
Contributor

🎉

@camilledejoye
camilledejoye deleted the override-templates-by-php-version branch December 15, 2019 14:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[improvement] PHP 7.4 property generation

2 participants