-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Fix undefined classes, constants and methods #6094
Conversation
@@ -179,7 +179,7 @@ public static function removeFromAttribute(array &$data, $attribName, $value) | |||
* @param mixed $value | |||
* @return string|null | |||
*/ | |||
private static function valueToLdap($value) | |||
protected static function valueToLdap($value) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these methods called statically only from within the class? Because I'd simply change the static::
calls to self::
calls instead of increasing visibility
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. But in my opinion these methods would be useful in possible subclasses anyway (e.g. if you want to change the conversion). Therefore I preferred the increased visibility.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd personally disallow inheritance usage here unless there's a very strong use-case for it - if you don't have it, then changing static::
to self::
is preferable.
Pull request updated to use |
@@ -551,7 +551,7 @@ protected function resolveAndCallInjectionMethodForInstance($instance, $method, | |||
* @param string $method | |||
* @param array $callTimeUserParams | |||
* @param string $alias | |||
* @param int|bolean $methodRequirementType | |||
* @param int|boolean $methodRequirementType |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use bool
instead. see #3342
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@samsonasik handled @786757c5ab564de8d23495566ab3fbca459e45cb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Ocramius thank you ;)
@micheh thanks for changing the visibility as requested. I will merge as-is: if you feel like changing visibility of the discussed methods is required, then I'd still want to see a good use-case before accepting such a change ;-) |
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
…ls-fixes' into develop Close zendframework/zendframework#6094 Forward Port zendframework/zendframework#6094
This pull request fixes undefined classes in phpDoc and one undefined class constant. In addition, the visibility for some methods was increased to
protected
as those methods were called withstatic
.