Merge branch '2.7' into 2.8

fabpot · fabpot · commit 442af181bddb · 2015-10-01T10:42:31.000+02:00
* 2.7:
  fixed typo
diff --git a/phpunit b/phpunit
@@ -8,7 +8,7 @@ $PHPUNIT_DIR = __DIR__.'/.phpunit';
 
 // PHPUnit 4.8 does not support PHP 7, while 5.0 requires PHP 5.6+
 if (PHP_VERSION_ID >= 70000) {
-    $PHPUNIT_DIR = '5.0';
+    $PHPUNIT_VERSION = '5.0';
 }
 
 if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit")) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ $PHPUNIT_DIR = __DIR__.'/.phpunit';`
`8`	`8`
`9`	`9`	`// PHPUnit 4.8 does not support PHP 7, while 5.0 requires PHP 5.6+`
`10`	`10`	`if (PHP_VERSION_ID >= 70000) {`
`11`		`- $PHPUNIT_DIR = '5.0';`
	`11`	`+ $PHPUNIT_VERSION = '5.0';`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit")) {`