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

Fix delegators config with Mvc\Application #6266

Merged
merged 1 commit into from
May 20, 2014
Merged

Fix delegators config with Mvc\Application #6266

merged 1 commit into from
May 20, 2014

Conversation

blanchonvincent
Copy link
Contributor

Delegators are missing in mvc service config.

@nbochenko @Ocramius Can you have a look? :)

@nbochenko
Copy link

Yes it works for me.

@Ocramius
Copy link
Member

@blanchonvincent shouldn't the Zend\Mvc\Service\ServiceManagerConfig maybe extend Zend\ServiceManager\Config?

@blanchonvincent
Copy link
Contributor Author

@Ocramius I was thinking about this, I think it can be a good way to reduce side effect

@blanchonvincent
Copy link
Contributor Author

@Ocramius done :)

Ocramius
Ocramius reviewed May 13, 2014
View reviewed changes
library/Zend/Mvc/Service/ServiceManagerConfig.php
$this->shared = array_merge($this->shared, $configuration['shared']);
}

$configuration = array_replace_recursive(array(
Copy link
Member

Choose a reason for hiding this comment

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

PSR-2 expects one parameter per line

Copy link
Member

Choose a reason for hiding this comment

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

Why not ArrayUtils::merge()?

Copy link

Choose a reason for hiding this comment

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

I think ArrayUtils::merge() is needed, otherwise I think that some numeric keys would be overwritten.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the union operator + should do the trick

Copy link
Member

Choose a reason for hiding this comment

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

Nope: http://3v4l.org/1rl41

Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - removing unused imports
66df16a
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - CS - alignment of braces/array syntax in closure…
78134fb 
… definitions
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - CS - docblock empty lines
feb2b9a
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Initializers should also be registered locally
f1e45fb
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Service manager aliases should be stored locally
8334555
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Optimized and named the `EventManagerAwareInitia…
d9544fb 
…lizer`
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Optimized and named the `ServiceManagerAwareInit…
9f701ca 
…ializer`
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Optimized and named the `ServiceLocatorAwareInit…
843ad2a 
…ializer`
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Moved the alias for the ServiceManager to its …
8652a92 
…own factory (allows for overrides)
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Using ArrayUtils::merge() for merging construc…
f91cf8f 
…tor parameters
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Adding missing coverage annotations
cb028de
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Explicitly defining test case variables
932f47c
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Adding missing group annotations
2db90e4
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Verifying that the service manager is registered…
b096b36 
… as a service in itself
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Verifying that the service manager initializer i…
fa1dc47 
…s registered and initializes `ServiceManagerAwareInterface` objects
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Verifying that the service locator initializer i…
3db38f6 
…s registered and initializes `ServiceLocatorAwareInterface` objects
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Verifying that the ServiceManager service can …
ac904d3 
…be replaced
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Verifying that the `ServiceManagerAwareInitializ…
893242c 
…er` can be replaced
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Verifying that the `ServiceLocatorAwareInitializ…
4a456f9 
…er` can be replaced
Ocramius added a commit to Ocramius/zf2 that referenced this pull request May 20, 2014
@Ocramius
zendframework#6266 - Verifying that the `EventManagerAwareInitializer…
af02bd4 
…` can be replaced
@Ocramius
Copy link
Member

@blanchonvincent I provided additional tests and functionality in blanchonvincent/zf2#1

@Ocramius Ocramius self-assigned this May 20, 2014
@Ocramius Ocramius added this to the 2.3.2 milestone May 20, 2014
@blanchonvincent
Merge pull request #1 from Ocramius/hotfix/#6266-mvc-service-config-d…
9c73a80 
…elegators

Hotfix/#6266 mvc service config delegators
Ocramius added a commit that referenced this pull request May 20, 2014
@Ocramius
Merge branch 'hotfix/#6266-delegator-support-in-mvc-service-config' i…
d270f73 
…nto develop

Close #6266
Forward Port #6266
@Ocramius Ocramius merged commit 9c73a80 into zendframework:master May 20, 2014
Ocramius added a commit that referenced this pull request May 20, 2014
@Ocramius
Merge branch 'hotfix/#6266-delegator-support-in-mvc-service-config'
a0200fb 
Close #6266
@Ocramius
Copy link
Member

No clue why github keeps swallowing the diffs. The actual diff can be seen on the merge commit, and the merge graph is actually clean

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@Ocramius Ocramius

Labels
bug Mvc
Projects
None yet
Milestone
2.3.2
Development

Successfully merging this pull request may close these issues.
4 participants
@blanchonvincent @nbochenko @Ocramius @danizord