Commit Graph

6 Commits

Author SHA1 Message Date
Andreas Fischer
61b0fe2ddf Merge branch 'master' into php5
* master:
  Run Code Sniffer via phing.
  Depend on phing/phing build script.

Conflicts:
	composer.lock
2014-04-12 19:33:05 +02:00
Andreas Fischer
8c9b7083d8 Depend on phing/phing build script. 2014-04-12 07:47:26 +02:00
Andreas Fischer
7b7cc829d9 Merge branch 'master' into php5
* master:
  Update composer before using it. Fixes openssl for https error.
  Install PHPUnit via Composer and update to version 4.0.
2014-04-12 06:54:55 +02:00
Andreas Fischer
86d7c6830c Install PHPUnit via Composer and update to version 4.0. 2014-04-12 04:28:11 +02:00
Andreas Fischer
9cb25c3032 Update PHP_CodeSniffer from 1.4.7 to 1.5.2. This fixes a rule inheritance bug. 2014-02-15 19:40:19 +01:00
Andreas Fischer
6ed4e3c92e Add composer.lock file. 2013-11-23 20:31:06 +01:00