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

updated packages

Browse Source
This commit is contained in:
Kevin Papst
2018-01-01 17:49:59 +01:00
parent e95f3999e4
commit 5565842c28
5 changed files with 809 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/AppKernel.php
View File

@@ -43,6 +43,7 @@ class AppKernel extends Kernel
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
$bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
} }
return $bundles; return $bundles;

10
composer.json
View File

@@ -19,7 +19,7 @@
} }
], ],
"require": { "require": {
"php": ">=5.5.9", "php": ">=7.0.8",
"ext-pdo_sqlite": "*", "ext-pdo_sqlite": "*",
"doctrine/doctrine-bundle": "^1.6", "doctrine/doctrine-bundle": "^1.6",
"doctrine/doctrine-fixtures-bundle": "^2.2", "doctrine/doctrine-fixtures-bundle": "^2.2",
@@ -34,11 +34,13 @@
"symfony/assetic-bundle": "^2.8", "symfony/assetic-bundle": "^2.8",
"symfony/monolog-bundle": "^2.8", "symfony/monolog-bundle": "^2.8",
"symfony/swiftmailer-bundle": "^2.3", "symfony/swiftmailer-bundle": "^2.3",
"symfony/symfony": "^3.1", "symfony/symfony": "~3.4",
"twig/extensions": "^1.3", "twig/extensions": "^1.3",
"white-october/pagerfanta-bundle": "^1.0", "white-october/pagerfanta-bundle": "^1.0",
"avanzu/admin-theme-bundle": "dev-feature/2.0-advanced", "beberlei/DoctrineExtensions": "^1.0",
"beberlei/DoctrineExtensions": "^1.0" "symfony/web-server-bundle": "3.4",
"avanzu/admin-theme-bundle": "dev-feature/2.0",
"almasaeed2010/adminlte": "~2.3.0"
}, },
"require-dev": { "require-dev": {
"sensio/generator-bundle": "~3.0", "sensio/generator-bundle": "~3.0",

1153
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

12
var/SymfonyRequirements.php
View File

@@ -633,12 +633,6 @@ class SymfonyRequirements extends RequirementCollection
'Install and enable the <strong>mbstring</strong> extension.' 'Install and enable the <strong>mbstring</strong> extension.'
); );
$this->addRecommendation(
function_exists('iconv'),
'iconv() should be available',
'Install and enable the <strong>iconv</strong> extension.'
);
$this->addRecommendation( $this->addRecommendation(
function_exists('utf8_decode'), function_exists('utf8_decode'),
'utf8_decode() should be available', 'utf8_decode() should be available',
@@ -780,7 +774,11 @@ class SymfonyRequirements extends RequirementCollection
{ {
$size = ini_get('realpath_cache_size'); $size = ini_get('realpath_cache_size');
$size = trim($size); $size = trim($size);
$unit = strtolower(substr($size, -1, 1)); $unit = '';
if (!ctype_digit($size)) {
$unit = strtolower(substr($size, -1, 1));
$size = (int) substr($size, 0, -1);
}
switch ($unit) { switch ($unit) {
case 'g': case 'g':
return $size * 1024 * 1024 * 1024; return $size * 1024 * 1024 * 1024;

4
web/config.php
View File

@@ -11,7 +11,7 @@
*/ */
if (!isset($_SERVER['HTTP_HOST'])) { if (!isset($_SERVER['HTTP_HOST'])) {
exit('This script cannot be run from the CLI. Run it from a browser.'); exit("This script cannot be run from the CLI. Run it from a browser.\n");
} }
if (!in_array(@$_SERVER['REMOTE_ADDR'], array( if (!in_array(@$_SERVER['REMOTE_ADDR'], array(
@@ -270,7 +270,7 @@ $hasMinorProblems = (bool) count($minorProblems);
} }
.sf-reset ul a, .sf-reset ul a,
.sf-reset ul a:hover { .sf-reset ul a:hover {
background: url(../images/blue-arrow.png) no-repeat right 6px; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAICAYAAAAx8TU7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFdJREFUeNpiYACBjjOhDEiACSggCKTLgXQ5TJARqhIkcReIKxgqTGYxwvV0nDEGkmeAOIwJySiQ4HsgvseIpGo3ELsCtZ9lRDIvDCiwhwHJPEFkJwEEGACq6hdnax8y1AAAAABJRU5ErkJggg==) no-repeat right 7px;
padding-right: 10px; padding-right: 10px;
} }
.sf-reset ul, ol { .sf-reset ul, ol {