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

Fix annotations on zend db #6798

Closed
wants to merge 4 commits into from
Closed

Fix annotations on zend db #6798

wants to merge 4 commits into from

Conversation

dennisdegreef
Copy link
Contributor

@dennisdegreef dennisdegreef mentioned this pull request Oct 24, 2014
Merged
@samsonasik
Copy link
Contributor

please do rebase againts master and fix the conflicts.

@dennisdegreef
Copy link
Contributor Author

Done! :)

@Ocramius
Copy link
Member

Ocramius commented Dec 2, 2014

@dennisdegreef commit dennisdegreef/zf2@433a40e should be removed. Rebase instead, merging master into dev branches causes merge/bisect hell.

@dennisdegreef dennisdegreef force-pushed the fixAnnotationsOnZendDb branch from 433a40e to b085ded Compare December 2, 2014 23:50
@dennisdegreef
Copy link
Contributor Author

Sorry, I may have messed this up... I'll try and repatch it on a fresh branch

@Ocramius
Copy link
Member

Ocramius commented Dec 2, 2014

@dennisdegreef looking much better now

@Ocramius Ocramius added this to the 2.3.4 milestone Dec 2, 2014
@Ocramius Ocramius self-assigned this Dec 2, 2014
Ocramius
Ocramius reviewed Dec 5, 2014
View reviewed changes
library/Zend/Db/Adapter/AdapterInterface.php
* @throws Exception\InvalidArgumentException
* @return Driver\StatementInterface|ResultSet\ResultSet
*/
public function query($sql, $parametersOrQueryMode, ResultSet\ResultSetInterface $resultPrototype = null);
Copy link
Member

Choose a reason for hiding this comment

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

This is a major BC break and I will have to remove it on merge.

Ocramius added a commit that referenced this pull request Dec 5, 2014
@Ocramius
#6798 - reverting BC break in AdapterInterface (added method cannot…
10c31a3 
… be added in 2.x)
Ocramius added a commit that referenced this pull request Dec 5, 2014
@Ocramius
#6798 - removing unused imports
31b6581
@Ocramius Ocramius closed this in f373802 Dec 5, 2014
Ocramius added a commit that referenced this pull request Dec 5, 2014
@Ocramius
Merge branch 'hotfix/#6798-fix-zend-db-docblock-annotations-as-per-sc…
cbbf68d 
…rutinizer' into develop

Close #6798
Forward port #6798
@Ocramius
Copy link
Member

Ocramius commented Dec 5, 2014

@dennisdegreef manually merged, thanks!

master: f373802
develop: cbbf68d

@dennisdegreef
Copy link
Contributor Author

Hi @Ocramius , If the query() method in the interface is a BC break (I can't see why currently, but that may be the time of day), shouldn't the getMock() methods in the tests also remove the 'query' method from the second parameter?

$mockMasterAdapter = $this->getMock(
            'Zend\Db\Adapter\AdapterInterface',
-            array('getDriver', 'getPlatform', 'query')
+           array('getDriver', 'getPlatform')
        );

@Ocramius
Copy link
Member

Ocramius commented Dec 5, 2014

It's a bc break because implementing classes not implementing query() will then cause a fatal (non-framework classes).

I didn't see any other failures otherwise: getMock could indeed need some fixing there, if you want to open a different PR :-)

@dennisdegreef dennisdegreef mentioned this pull request Dec 6, 2014
Closed
Ocramius added a commit that referenced this pull request Dec 7, 2014
@Ocramius
#6968 #6798 - minor CS fixes (default values)
1f3943f
Ocramius added a commit that referenced this pull request Dec 7, 2014
@Ocramius
#6968 #6798 - removing explicit method mocking (not required with int…
d208821 
…erfaces)
Ocramius added a commit that referenced this pull request Dec 7, 2014
@Ocramius
#6968 #6798 - removing explicit method mocking (not required with int…
2751a43 
…erfaces)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@Ocramius Ocramius

Labels
Db enhancement
Projects
None yet
Milestone
2.3.4
Development

Successfully merging this pull request may close these issues.
3 participants
@dennisdegreef @samsonasik @Ocramius