Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Updated phpDoc and removed duplicates #7489

Merged
merged 4 commits into from
May 7, 2015

Conversation

ASvi
Copy link

@ASvi ASvi commented May 5, 2015

Updated phpDoc,
ValidatorPluginManager - deleted duplicate for line 103.

ValidatorPluginManager - deleted duplicate for line 103.
@@ -492,6 +492,9 @@ public function getSystem()
* how to handle arguments. If set to true, all methods including constructor
* will receive the arguments. If set to false, only constructor will receive the
* arguments
*
* @param bool|null $flag
* @return Server
Copy link
Contributor

Choose a reason for hiding this comment

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

You can use @return self here, just like you did on the other places where return $this; is used.

@ASvi
Copy link
Author

ASvi commented May 5, 2015

Updated following the latest comments

@Martin-P
Copy link
Contributor

Martin-P commented May 5, 2015

@Maks3w
Regarding @return $this:
In ZF2 @return self is used. I mentioned it earlier in another PR and referenced the comment from @weierophinney there: #4436 (comment).

@ASvi
Copy link
Author

ASvi commented May 6, 2015

Updated to @return self

@Maks3w Maks3w added this to the 2.4.1 milestone May 6, 2015
@@ -105,7 +105,6 @@ class ValidatorPluginManager extends AbstractPluginManager
'isfloat' => 'Zend\I18n\Validator\IsFloat',
'isinstanceof' => 'Zend\Validator\IsInstanceOf',
'isint' => 'Zend\I18n\Validator\IsInt',
'ip' => 'Zend\Validator\Ip',
Copy link
Member

Choose a reason for hiding this comment

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

Why is this removed?

Copy link
Member

Choose a reason for hiding this comment

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

nm; it's because it's a duplicate.

weierophinney added a commit that referenced this pull request May 7, 2015
Updated phpDoc and removed duplicates
weierophinney added a commit that referenced this pull request May 7, 2015
@weierophinney weierophinney merged commit 74341c5 into zendframework:master May 7, 2015
weierophinney added a commit that referenced this pull request May 7, 2015
weierophinney added a commit to zendframework/zend-tag that referenced this pull request May 15, 2015
…fixes

Updated phpDoc and removed duplicates
weierophinney added a commit to zendframework/zend-tag that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015
…fixes

Updated phpDoc and removed duplicates
weierophinney added a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-xmlrpc that referenced this pull request May 15, 2015
…fixes

Updated phpDoc and removed duplicates
weierophinney added a commit to zendframework/zend-xmlrpc that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
…fixes

Updated phpDoc and removed duplicates
weierophinney added a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-session that referenced this pull request May 15, 2015
…fixes

Updated phpDoc and removed duplicates
weierophinney added a commit to zendframework/zend-session that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015
…fixes

Updated phpDoc and removed duplicates
weierophinney added a commit to zendframework/zend-soap that referenced this pull request May 15, 2015
weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015
…fixes

Updated phpDoc and removed duplicates
weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants