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

Remove unused code #6969

Closed
wants to merge 8 commits into from
Closed

Remove unused code #6969

wants to merge 8 commits into from

Conversation

jaapio
Copy link
Contributor

@jaapio jaapio commented Dec 7, 2014

An other set of fixes for #5860. In this pr I reviewed all unused code Scrutinizer issues. The most obvious issues are fixed in this pr.

@jaapio
Copy link
Contributor Author

jaapio commented Dec 7, 2014

it looks like the failed test is an unstable one :-(. An other build in an other branch with the same changes did pass!

@Ocramius Ocramius self-assigned this Dec 7, 2014
@Ocramius Ocramius added this to the 2.3.4 milestone Dec 7, 2014
@Ocramius
Copy link
Member

Ocramius commented Dec 7, 2014

@jaapio yes, the filesystem integration tests got much more unreliable lately, mainly because travis got much slower there :-(

@@ -1049,8 +1049,6 @@ protected function drawBarcode()
{
$barcodeTable = $this->prepareBarcode();

$this->preDrawBarcode();
Copy link
Member

Choose a reason for hiding this comment

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

This should probably be re-included, as the preDrawBarcode() may be used in subclasses (that may be outside the framework)

@Ocramius Ocramius modified the milestones: 2.4.0, 2.3.4 Dec 7, 2014
@Ocramius
Copy link
Member

Ocramius commented Dec 7, 2014

Marking for 2.4: won't merge in `master due to the risk of regressions

@jaapio
Copy link
Contributor Author

jaapio commented Dec 8, 2014

In that case, should this one go to the development branch?

@Ocramius
Copy link
Member

Ocramius commented Dec 8, 2014

You can keep it as-is: it's just a question of merging, up to me :-)

Ocramius added a commit that referenced this pull request Dec 8, 2014
@Ocramius
Copy link
Member

Ocramius commented Dec 8, 2014

Pulled locally, rebased onto develop, tested, merged into develop at 237473c, thanks!

@Ocramius Ocramius closed this Dec 8, 2014
weierophinney pushed a commit to zendframework/zend-authentication that referenced this pull request May 14, 2015
weierophinney pushed a commit to zendframework/zend-mail that referenced this pull request May 14, 2015
gianarb pushed a commit to zendframework/zend-config that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-crypt that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-i18n that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-di that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-http that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-console that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-ldap that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-json that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-session that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-log that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-cache that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-soap that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-view that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-feed 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.

2 participants