X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/8b450bb3ff801df8ac5522870325eb46543d2cd2..38aa0dc6133ff53d20fd9f714eb380809c8dba67:/src/phorkie/SetupCheck.php diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php index 5eae1f3..3762457 100644 --- a/src/phorkie/SetupCheck.php +++ b/src/phorkie/SetupCheck.php @@ -11,7 +11,7 @@ class SetupCheck 'pear.php.net/OpenID' => 'OpenID', 'pear.php.net/Pager' => 'Pager', 'pear.php.net/Services_Libravatar' => 'Services_Libravatar', - 'pear2.php.net/Services_Linkback' => '\\PEAR2\\Services\\Linkback\\Client', + 'pear2.php.net/PEAR2_Services_Linkback' => '\\PEAR2\\Services\\Linkback\\Client', 'zustellzentrum.cweiske.de/MIME_Type_PlainDetect' => 'MIME_Type_PlainDetect', ); @@ -77,7 +77,7 @@ class SetupCheck if ($retval !== 0) { $this->fail('Running git executable failed.'); } - if (!preg_match('#^git version ([0-9.]+)$#', $line, $matches)) { + if (!preg_match('#^git version ([0-9.]+(rc[0-9]+)?)$#', $line, $matches)) { $this->fail('git version output format unexpected: ' . $line); } if (version_compare($matches[1], '1.7.5') < 0) {