Some fixes for phpDoc in Zend\Mvc #4079

Closed
wants to merge 4 commits into from

2 participants

@iquabius

No description provided.

@weierophinney weierophinney commented on an outdated diff Mar 19, 2013
library/Zend/Mvc/Service/ConsoleAdapterFactory.php
@@ -48,7 +48,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)
// Read app config and determine Console adapter to use
$config = $serviceLocator->get('Config');
- if (!empty($config['console']) && !empty($config['console']['adapter'])) {
@weierophinney
Zend Framework member

The original code is a good defensive practice; removing it can lead to notices if any key in the hierarchy is missing. (This is true in your other changes, too.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@weierophinney weierophinney commented on the diff Mar 19, 2013
.../Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
*
* @param ServiceLocatorInterface $serviceLocator
- * @return DiStrictAbstractServiceFactory
+ * @return DiAbstractServiceFactory
@weierophinney
Zend Framework member

The changes in this file are the only ones that should be made; revert the others and update the PR description to reflect this particular change, and it can be merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@samsonasik samsonasik commented on an outdated diff Mar 22, 2013
library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
@@ -552,7 +552,7 @@ public function clearCurrentMessages()
* Clear messages from the current namespace
*
* @param string $namespaceToClear
- * @return boolean
+ * @return boolean True if current messages were cleared from the given namespace, false if none existed.

boolean should be bool

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@samsonasik samsonasik commented on an outdated diff Mar 22, 2013
library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
@@ -567,7 +567,7 @@ public function clearCurrentMessagesFromNamespace($namespaceToClear)
/**
* Clear messages from the container
*
- * @return boolean
+ * @return boolean True if current messages were cleared from the container, false if none existed.

boolean should be bool

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@weierophinney weierophinney added a commit that referenced this pull request Mar 28, 2013
@weierophinney weierophinney Merge branch 'hotfix/4079' into develop
Forward port #4079
1a8bb06
@weierophinney weierophinney added a commit that closed this pull request Mar 28, 2013
@weierophinney weierophinney Merge branch 'hotfix/4079'
Close #4079
d0098f9
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney Merge branch 'hotfix/4079'
Close #4079
a0117af
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney Merge branch 'hotfix/4079' into develop
Forward port #4079
166d3a8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment