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

1.15.2 (#2782)

Browse Source 
* fix division by zero
* cleanup required directories, check configured data directory, do not check for freetype support
* bump version number
This commit is contained in:
Kevin Papst
2021-09-24 14:47:40 +02:00
committed by GitHub
parent d026460106
commit 204e0bc179
5 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Controller/DoctorController.php
View File

@@ -9,6 +9,7 @@
namespace App\Controller;
use App\Utils\FileHelper;
use Composer\InstalledVersions;
use PackageVersions\Versions;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
@@ -40,24 +41,18 @@ class DoctorController extends AbstractController
*/
public const DIRECTORIES_WRITABLE = [
'var/cache/',
'var/data/',
'var/log/',
'var/sessions/',
];
/**
* @var string
*/
private $projectDirectory;
/**
* @var string
*/
private $environment;
private $fileHelper;
public function __construct(string $projectDirectory, string $kernelEnvironment)
public function __construct(string $projectDirectory, string $kernelEnvironment, FileHelper $fileHelper)
{
$this->projectDirectory = $projectDirectory;
$this->environment = $kernelEnvironment;
$this->fileHelper = $fileHelper;
}
/**
@@ -119,6 +114,8 @@ class DoctorController extends AbstractController
$versions[$package] = InstalledVersions::getPrettyVersion($package);
}
} else {
@trigger_error('Please upgrade your Composer to 2.x', E_USER_DEPRECATED);
// @deprecated since 1.14, will be removed with 2.0
$rootPackage = Versions::rootPackageName();
foreach (Versions::VERSIONS as $name => $version) {
@@ -155,12 +152,6 @@ class DoctorController extends AbstractController
}
}
$results['Freetype Support'] = true;
// @see AvatarService::hasDependencies()
if (!\function_exists('imagettfbbox')) {
$results['Freetype Support'] = false;
}
return $results;
}
@@ -218,20 +209,31 @@ class DoctorController extends AbstractController
private function getFilePermissions()
{
$results = [];
$testPaths = [];
$baseDir = $this->projectDirectory . DIRECTORY_SEPARATOR;
foreach (self::DIRECTORIES_WRITABLE as $path) {
$results[$path] = false;
$fullPath = $this->projectDirectory . '/' . $path;
$fullPath = $baseDir . $path;
$fullUri = realpath($fullPath);
if ($fullUri === false && !file_exists($fullPath)) {
@mkdir($fullPath);
clearstatcache(true);
$fullUri = realpath($fullPath);
}
$testPaths[] = $fullUri;
}
$results = [];
$testPaths[] = $this->fileHelper->getDataDirectory();
foreach ($testPaths as $fullUri) {
$fullUri = rtrim($fullUri, DIRECTORY_SEPARATOR);
$tmp = str_replace($baseDir, '', $fullUri) . DIRECTORY_SEPARATOR;
if ($fullUri !== false && is_readable($fullUri) && is_writable($fullUri)) {
$results[$path] = true;
$results[$tmp] = true;
} else {
$results[$tmp] = false;
}
}