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.

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

Convert proxy factory auto generate mode to integer #815

Closed
wants to merge 3 commits into from

Conversation

dragosprotung
Copy link
Contributor

No description provided.

Copy link
Member

@lcobucci lcobucci left a comment

Choose a reason for hiding this comment

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

@dragosprotung some small nitpickings and CS fixes to be done (I'm sending a PR that will add PHPCS to help to detect and use phpcbf to fix them).

And please use master as the destination branch, we'll handle the necessary backporting 😄

Thanks for you contribution 👍

*
* @return self
*/
public static function invalidAutoGenerateMode($value)
Copy link
Member

Choose a reason for hiding this comment

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

Please add the return type declation

[$proxyGenerator, $metadataFactory, $autoGenerate]
);

$this->assertAttributeSame($expected, 'autoGenerate', $proxyFactory);
Copy link
Member

Choose a reason for hiding this comment

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

Please use self::assert*()

* @param mixed $autoGenerate
* @param int $expected
*/
public function testNoExceptionIsThrownForValidIntegerAutoGenerateValues($autoGenerate, $expected)
Copy link
Member

Choose a reason for hiding this comment

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

Please add the type declaration on $expected and : void as return type

@dragosprotung
Copy link
Contributor Author

I changed the commit base to master and resolved in GitHub UI the conflict and this made a bit of a mess. Don't know how to have a cleaner PR. Shall I close this one and submit a new one ?

@lcobucci
Copy link
Member

@dragosprotung we usually use git rebase to sync branches and solve conflicts. It's up to you to decide which path you want to go. Personally I'd advise to give it a try, you might learn about some nice git features 😉

@dragosprotung
Copy link
Contributor Author

Usually I use rebase, but not this time.
Submitted #816

@Ocramius Ocramius added the Bug label Aug 31, 2017
@Ocramius Ocramius added this to the 2.8.1 milestone Aug 31, 2017
Ocramius added a commit that referenced this pull request Aug 31, 2017
…oxy-generator-modes-2.8' into 2.8

Backport #815
Backport #816
Ocramius added a commit that referenced this pull request Aug 31, 2017
@dragosprotung dragosprotung deleted the 2.8 branch August 31, 2017 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants