Skip to content

Loading…

Optional ProxyManager in builds #5877

Merged
merged 1 commit into from

2 participants

@Ocramius
Zend Framework member

Composer+Proxy-manager causing cyclic dependency resolutions has been a nightmare so far

Fortunately, the tests were already designed to skip tests when the ProxyManager is not installed, so this PR is trivial.

@weierophinney
Zend Framework member

@Ocramius going to go ahead and merge... however, it'd be nice to be able to test this functionality via Travis-CI. Will you be keeping track in a branch to see when the issue resolves itself?

@weierophinney weierophinney merged commit c02332a into zendframework:develop

1 check passed

Details default The Travis CI build passed
@weierophinney weierophinney added this to the 2.3.0 milestone
@weierophinney weierophinney self-assigned this
@Ocramius
Zend Framework member

@weierophinney it works locally, but I couldn't get it to run on travis for whatever reason :-(

If there are changes in related functionality, I'll have to run the tests manually myself.

@Ocramius Ocramius deleted the Ocramius:hotfix/optional-proxy-manager-in-builds branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 26, 2014
  1. @Ocramius
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 2 deletions.
  1. +1 −2 composer.json
View
3 composer.json
@@ -37,7 +37,6 @@
"ircmaxell/random-lib": "dev-master",
"ircmaxell/security-lib": "dev-master",
"mikey179/vfsStream": "1.2.*",
- "ocramius/proxy-manager": "0.5.*",
"fabpot/php-cs-fixer": "*@dev",
"phpunit/PHPUnit": "3.7.*",
"satooshi/php-coveralls": "dev-master",
@@ -47,7 +46,7 @@
"ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
"doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
"ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
- "ocramius/proxy-manager": "ProxyManager to handle lazy initialization of services",
+ "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
"zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
"zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
},
Something went wrong with that request. Please try again.