jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Release 1.6.1 (#1282)

Browse Source
This commit is contained in:
Kevin Papst
2019-11-26 17:22:31 +01:00
committed by GitHub
parent 724eb9c658
commit 5ee0396a02
27 changed files with 240 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Command/ImportTimesheetCommand.php
View File

@@ -42,7 +42,8 @@ class ImportTimesheetCommand extends Command
{
protected static $defaultName = 'kimai:import:timesheet';
public const DEFAULT_BEGIN = '00:00';
// if we use 00:00 we might run into summer/winter time problems which happen between 02:00 and 03:00
public const DEFAULT_BEGIN = '04:00';
public const DEFAULT_CUSTOMER = 'Imported customer - %s';
private static $supportedHeader = [

12
src/Command/InstallCommand.php
View File

@@ -136,12 +136,6 @@ final class InstallCommand extends Command
protected function createDatabase(SymfonyStyle $io, InputInterface $input, OutputInterface $output)
{
if (!$this->connection->isConnected() && !$this->connection->connect()) {
throw new \Exception(
sprintf('Database connection could not be established: %s', $this->connection->getDatabase())
);
}
if ($this->connection->isConnected()) {
$io->note(sprintf('Database is existing and connection could be established'));
@@ -153,7 +147,11 @@ final class InstallCommand extends Command
}
$command = $this->getApplication()->find('doctrine:database:create');
$command->run(new ArrayInput([]), $output);
$result = $command->run(new ArrayInput(['--if-not-exists' => true]), $output);
if (0 !== $result) {
throw new \Exception('Failed creating database. Check your credentials in DATABASE_URL');
}
}
/**