Remove exit expression in database provider
This commit is contained in:
parent
09da289c2f
commit
ad55e6ede5
|
|
@ -56,6 +56,8 @@ use Pimple\Container;
|
|||
* @property \Kanboard\Model\ProjectDailyStats $projectDailyStats
|
||||
* @property \Kanboard\Model\ProjectMetadata $projectMetadata
|
||||
* @property \Kanboard\Model\ProjectPermission $projectPermission
|
||||
* @property \Kanboard\Model\ProjectNotification $projectNotification
|
||||
* @property \Kanboard\Model\ProjectNotificationType $projectNotificationType
|
||||
* @property \Kanboard\Model\Subtask $subtask
|
||||
* @property \Kanboard\Model\SubtaskExport $subtaskExport
|
||||
* @property \Kanboard\Model\SubtaskTimeTracking $subtaskTimeTracking
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ abstract class NotificationType extends Base
|
|||
{
|
||||
$classes = $this->classes;
|
||||
|
||||
return array_filter($types, function($type) use ($classes) {
|
||||
return array_filter($types, function ($type) use ($classes) {
|
||||
return isset($classes[$type]);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,4 +27,4 @@ class UserMetadata extends Metadata
|
|||
{
|
||||
return 'user_id';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
namespace Kanboard\ServiceProvider;
|
||||
|
||||
use LogicException;
|
||||
use RuntimeException;
|
||||
use Pimple\Container;
|
||||
use Pimple\ServiceProviderInterface;
|
||||
use PicoDb\Database;
|
||||
|
|
@ -27,24 +29,21 @@ class DatabaseProvider implements ServiceProviderInterface
|
|||
case 'sqlite':
|
||||
$db = $this->getSqliteInstance();
|
||||
break;
|
||||
|
||||
case 'mysql':
|
||||
$db = $this->getMysqlInstance();
|
||||
break;
|
||||
|
||||
case 'postgres':
|
||||
$db = $this->getPostgresInstance();
|
||||
break;
|
||||
|
||||
default:
|
||||
die('Database driver not supported');
|
||||
throw new LogicException('Database driver not supported');
|
||||
}
|
||||
|
||||
if ($db->schema()->check(\Schema\VERSION)) {
|
||||
return $db;
|
||||
} else {
|
||||
$errors = $db->getLogMessages();
|
||||
die('Unable to migrate database schema: <br/><br/><strong>'.(isset($errors[0]) ? $errors[0] : 'Unknown error').'</strong>');
|
||||
throw new RuntimeException('Unable to migrate database schema: '.(isset($errors[0]) ? $errors[0] : 'Unknown error'));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
<?php
|
||||
|
||||
require __DIR__.'/app/common.php';
|
||||
|
||||
try {
|
||||
require __DIR__.'/app/common.php';
|
||||
$container['router']->dispatch($_SERVER['REQUEST_URI'], isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '');
|
||||
} catch (Exception $e) {
|
||||
echo 'Internal Error: '.$e->getMessage();
|
||||
|
|
|
|||
Loading…
Reference in New Issue