Skip to content

Conversation

@dunglas
Copy link
Contributor

@dunglas dunglas commented May 30, 2016

Follow up of #264. Allow to use Prophecy (and PHPUnit) with Symfony 3.1.

Test that it works with @fabiang's patch on ReflectionDocBlock merged: phpDocumentor/ReflectionDocBlock#72

The last commit (update of composer.json to use the branch of Fabian) must be removed before the merge in Prophecy.

ping @mvriel

@dunglas dunglas changed the title Dockbloc 3 Compatibility with phpDocumentor Reflection Dockbloc 3 May 30, 2016
composer.json Outdated
"repositories": [
{
"type": "vcs",
"url": "https://github.com/fabiang/ReflectionDocBlock"
Copy link
Contributor

Choose a reason for hiding this comment

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

This can't be merged as is, because composer doesn't inherit this from packages that want to install prophecy.

Copy link
Contributor Author

@dunglas dunglas May 30, 2016

Choose a reason for hiding this comment

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

Right. It was just to run a Travis build, it will be removed before merge (see the PR description).

@dunglas
Copy link
Contributor Author

dunglas commented May 30, 2016

Travis failure is intended. We only need to get phpDocumentor/ReflectionDocBlock#72 merged and Prophecy will be compatible with Symfony 3.1.

use phpDocumentor\Reflection\DocBlock\Tags\Method;

/**
* @author Théo FIDRY <[email protected]>
Copy link
Member

Choose a reason for hiding this comment

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

please mark this interface and all its implementations as @internal

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

.travis.yml Outdated
fast_finish: true
include:
- php: '7.0'
env: PHPDOCUMENTOR_REFLECTION_DOCBLOCK="~2.0"

Choose a reason for hiding this comment

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

Maybe take profit to use the new constraint format: ^2.0?

@dunglas
Copy link
Contributor Author

dunglas commented Jun 6, 2016

A fixed version of Reflection Docblock has been released: phpDocumentor/ReflectionDocBlock#72 (comment)

I've updated this PR to use it and I fixed the last remaining comments. It should be ready to be merged now.

@stof stof merged commit eec64c9 into phpspec:master Jun 6, 2016
@stof
Copy link
Member

stof commented Jun 6, 2016

I will do a release this evening

@dunglas
Copy link
Contributor Author

dunglas commented Jun 6, 2016

Thanks @stof

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.

5 participants