X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/9928e3aa7a4cb0c8cf7054328e1373cd000e93de..38aa0dc6133ff53d20fd9f714eb380809c8dba67:/src/phorkie/SetupCheck.php

diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php
index e4db48d..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',
     );
 
@@ -35,6 +35,7 @@ class SetupCheck
         $sc->checkDirs();
         $sc->checkGit();
         $sc->checkDatabase();
+        $sc->checkMimeTypeDetection();
     }
 
     public function checkDeps()
@@ -76,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) {
@@ -104,6 +105,14 @@ class SetupCheck
         $dbs->getSetup()->setup();
     }
 
+    public function checkMimeTypeDetection()
+    {
+        $rp = new Repository_Post();
+        if ($rp->getType('<?php echo "foo"; ?>') != 'php') {
+            $this->fail('MIME type detection fails');
+        }
+    }
+
     public function fail($msg)
     {
         throw new Exception($msg);