AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove exit expression in database provider

This commit is contained in:
Frederic Guillot 2015-10-17 22:31:04 -04:00
parent 09da289c2f
commit ad55e6ede5
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Core/Base.php
View File

@ -56,6 +56,8 @@ use Pimple\Container;
* @property \Kanboard\Model\ProjectDailyStats $projectDailyStats * @property \Kanboard\Model\ProjectDailyStats $projectDailyStats
* @property \Kanboard\Model\ProjectMetadata $projectMetadata * @property \Kanboard\Model\ProjectMetadata $projectMetadata
* @property \Kanboard\Model\ProjectPermission $projectPermission * @property \Kanboard\Model\ProjectPermission $projectPermission
* @property \Kanboard\Model\ProjectNotification $projectNotification
* @property \Kanboard\Model\ProjectNotificationType $projectNotificationType
* @property \Kanboard\Model\Subtask $subtask * @property \Kanboard\Model\Subtask $subtask
* @property \Kanboard\Model\SubtaskExport $subtaskExport * @property \Kanboard\Model\SubtaskExport $subtaskExport
* @property \Kanboard\Model\SubtaskTimeTracking $subtaskTimeTracking * @property \Kanboard\Model\SubtaskTimeTracking $subtaskTimeTracking

2
app/Model/NotificationType.php
View File

@ -120,7 +120,7 @@ abstract class NotificationType extends Base
{ {
$classes = $this->classes; $classes = $this->classes;
return array_filter($types, function($type) use ($classes) { return array_filter($types, function ($type) use ($classes) {
return isset($classes[$type]); return isset($classes[$type]);
}); });
} }

2
app/Model/UserMetadata.php
View File

@ -27,4 +27,4 @@ class UserMetadata extends Metadata
{ {
return 'user_id'; return 'user_id';
} }
} }

9
app/ServiceProvider/DatabaseProvider.php
View File

@ -2,6 +2,8 @@
namespace Kanboard\ServiceProvider; namespace Kanboard\ServiceProvider;
use LogicException;
use RuntimeException;
use Pimple\Container; use Pimple\Container;
use Pimple\ServiceProviderInterface; use Pimple\ServiceProviderInterface;
use PicoDb\Database; use PicoDb\Database;
@ -27,24 +29,21 @@ class DatabaseProvider implements ServiceProviderInterface
case 'sqlite': case 'sqlite':
$db = $this->getSqliteInstance(); $db = $this->getSqliteInstance();
break; break;
case 'mysql': case 'mysql':
$db = $this->getMysqlInstance(); $db = $this->getMysqlInstance();
break; break;
case 'postgres': case 'postgres':
$db = $this->getPostgresInstance(); $db = $this->getPostgresInstance();
break; break;
default: default:
die('Database driver not supported'); throw new LogicException('Database driver not supported');
} }
if ($db->schema()->check(\Schema\VERSION)) { if ($db->schema()->check(\Schema\VERSION)) {
return $db; return $db;
} else { } else {
$errors = $db->getLogMessages(); $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'));
} }
} }

3
index.php
View File

@ -1,8 +1,7 @@
<?php <?php
require __DIR__.'/app/common.php';
try { try {
require __DIR__.'/app/common.php';
$container['router']->dispatch($_SERVER['REQUEST_URI'], isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : ''); $container['router']->dispatch($_SERVER['REQUEST_URI'], isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '');
} catch (Exception $e) { } catch (Exception $e) {
echo 'Internal Error: '.$e->getMessage(); echo 'Internal Error: '.$e->getMessage();