Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: webdevel/zf2
base: e94777bbbf
...
head fork: webdevel/zf2
compare: 006518f2b9
Checking mergeability… Don't worry, you can still create the pull request.
Commits on May 09, 2012
@prolic prolic fixed exceptions in Zend\Search 02cdfa0
@Maks3w Maks3w [Composer] Keywords suggestion d5140f3
@prolic prolic Merge branch 'master' of git://github.com/zendframework/zf2 into search 535a6d5
@mwillbanks mwillbanks added dbtablegateway and updated cache for some psr-0 items and fixed…
… a unit test botch
7712781
Commits on May 10, 2012
@Bilge Bilge Fix doc block typo. d642d77
@mishak87 mishak87 Typo in comment 8be9fc2
@Maks3w Maks3w [Cloud] Mark some incomplete tests. 68a1d6c
@Maks3w Maks3w [Json] Change unit test.
The casting from string to float using (float) is not locale aware.

Probably this function could be refactored implementing something like this
http://www.php.net/manual/en/function.floatval.php#92563
465e6d8
@matuszeman matuszeman SharedEventManager type preference e0589f6
@matuszeman matuszeman Merge branch 'master' of https://github.com/zendframework/zf2 into qu…
…ickfix/sharedem-type-preference
0aa2f0d
@sasezaki sasezaki renamed Exception -> ExceptionInterface in ServiceManager e2637f3
@Maks3w Maks3w [Loader] Cross platform adaptions 58ece26
@weierophinney weierophinney [#1185] Remove "zend" keyword
- Already in description
c1eed8f
@weierophinney weierophinney Merge branch 'search-renamed-interfaces' of https://github.com/prolic…
…/zf2 into hotfix/search-exceptions
7c346dd
@weierophinney weierophinney Merge branch 'bugfix/zend-session-db-adapter-and-fixes' of https://gi…
…thub.com/mwillbanks/zf2 into feature/session-save-dbtablegateway
c59fce3
@weierophinney weierophinney Merge branch 'master' of https://github.com/BilgeXA/zf2 ecbe283
@weierophinney weierophinney Merge branch 'patch-1' of https://github.com/mishak87/zf2 d642af4
@weierophinney weierophinney Merge branch 'quickfix/sharedem-type-preference' of https://github.co… bbbb2e8
@weierophinney weierophinney Merge branch 'servicemanger-exception-interface-rename' of https://gi…
…thub.com/sasezaki/zf2 into hotfix/servicemanager-exceptions
70ea14e
@Maks3w Maks3w [Validator] Various test changes
* Remove obsolete tests.
* Mark incomplete tests.
4094bae
@adamlundrigan adamlundrigan [ZF-4520] Reorder Zend\Http\Header\SetCookie constructor arguments to…
… match PHP setcookie()
d239eb1
@Maks3w Maks3w [Validator] Improve Magic Mime Exceptions and Tests
As of PHP >= 5.3.11 and >= 5.4.1 the magic database format has changed.
http://doc.php.net/downloads/pdf/split/de/File-Information.pdf
d6babb2
Duccio Gasparri [ZF2-268] AmazonS3 service broken and other problems between
Service\Amazon\S3\S3 and Http\Client

http://framework.zend.com/issues/browse/ZF2-268


* substituted the $client->send()
* added appropriate ['Content-Type'] header
* fixed the call to the addSignature method
* substituted in the whole file the removed Request::getStatus() with
the new Request::getStatusCode()
* replaced in the whole file the removed Request::getHeader() method
with the Request->headers()->get()
* changed the static call to addSignature() into $this->addSignature(),
and changed its return value

This commit completely replaces pull #1173
zendframework#1173

Change-Id: Ib576245d3ee0295dc24fca6bcd77f3737dd9354b
3e2bf5b
@Maks3w Maks3w [Validator] Change phpversion() to PHP_VERSION bb45872
@weierophinney weierophinney Merge branch 'master' of https://github.com/dgasparri/zf2-testserver
…into hotfix/zf2-268
abf7335
@Maks3w Maks3w Erase @uses statements
Since PHP 5.3 the 'use' statement is used for declare dependencies.
331805d
@weierophinney weierophinney [#1194] CS cleanup
- Added imports for types tested in the code
- Fixed a number of control structures to add braces
f37a98e
@weierophinney weierophinney Merge branch 'hotfix/unit-tests' of https://github.com/Maks3w/zf2 int…
…o hotfix/tests-skipped
739d798
@weierophinney weierophinney [#1193] Removed unnecessary ZF1 PHPUnit artifacts 05b9e6f
@weierophinney weierophinney Merge branch 'hotfix/code-cleanup' of https://github.com/Maks3w/zf2 i…
…nto hotfix/uses-annotations
94bd4d8
@weierophinney weierophinney Cleanup assertion
- Trim contents to ensure no trailing EOL characters in expected string
  or returned string
e61b311
@prolic prolic [zen-27] Renamed interfaces in Zend\InfoCard dde7e64
@weierophinney weierophinney [zen-27][#1197] Fix assertion
- test against Adapter\AdapterInterface, not Adapter
e92282d
Commits on May 11, 2012
@webdevel Merge remote-tracking branch 'upstream/master' 006518f