This repository was archived by the owner on Jan 8, 2020. It is now read-only.
Cleanup of previous bad merge#2
Closed
mfacenet wants to merge 13 commits into
Closed
Conversation
- Overrode run() in test cases to disable preservation of global state, per http://matthewturland.com/2010/08/19/process-isolation-in-phpunit/ - Fixed issue in StandardConfiguration (incorrectly referenced classname) - TODO: because global state is destroyed, autoloader disappears
- Moved test autoload setup to tests/_autoload.php - Modified Session\ContainerTest and Session\SessionManagerTest to include _autoload.php if no autoloader is detected (happens when global state is destroyed).
…' into merges/akrabat-crypt
Member
|
Merged and pushed to master -- thanks! |
EvanDotPro
pushed a commit
that referenced
this pull request
Jul 2, 2012
s/ServiceNotFoundException/ServiceNotCreatedException
weierophinney
pushed a commit
that referenced
this pull request
Jul 24, 2012
Proposed a new float random number generator
Maks3w
pushed a commit
that referenced
this pull request
Jan 23, 2013
ezimuel
added a commit
to zendframework/zend-loader
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
gianarb
pushed a commit
to zendframework/zend-loader
that referenced
this pull request
May 15, 2015
gianarb
pushed a commit
to zendframework/zend-loader
that referenced
this pull request
May 15, 2015
…aster Back port from zf2/master
ezimuel
added a commit
to zendframework/zend-memory
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
ezimuel
added a commit
to zendframework/zend-modulemanager
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
gianarb
pushed a commit
to zendframework/zend-modulemanager
that referenced
this pull request
May 15, 2015
…aster Back port from zf2/master
ezimuel
added a commit
to zendframework/zend-config
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
gianarb
pushed a commit
to zendframework/zend-config
that referenced
this pull request
May 15, 2015
ezimuel
added a commit
to zendframework/zend-test
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
gianarb
pushed a commit
to zendframework/zend-test
that referenced
this pull request
May 15, 2015
…aster Back port from zf2/master
ezimuel
added a commit
to zendframework/zend-stdlib
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
gianarb
pushed a commit
to zendframework/zend-stdlib
that referenced
this pull request
May 15, 2015
gianarb
pushed a commit
to zendframework/zend-stdlib
that referenced
this pull request
May 15, 2015
…aster Back port from zf2/master
ezimuel
added a commit
to zendframework/zend-crypt
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
gianarb
pushed a commit
to zendframework/zend-crypt
that referenced
this pull request
May 15, 2015
ezimuel
added a commit
to zendframework/zend-paginator
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
ezimuel
added a commit
to zendframework/zend-serializer
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
ezimuel
added a commit
to zendframework/zend-i18n
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
gianarb
pushed a commit
to zendframework/zend-i18n
that referenced
this pull request
May 15, 2015
ezimuel
added a commit
to zendframework/zend-text
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
ezimuel
added a commit
to zendframework/zend-xmlrpc
that referenced
this pull request
May 15, 2015
…feature/crypt Ezimuel/feature/crypt
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
My commit cleans up some left over conflicts from a merge of a branch called farazdagi. I managed to accidentally add some foreign commits which are already in the Zend Repo to my pull request.