Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 19845d0

Browse files
committed
feature #1042 Register WebServerBundle (chalasr)
This PR was squashed before being merged into the 3.3-dev branch (closes #1042). Discussion ---------- Register WebServerBundle Updates vendors which was locked to 3.2.1 and registers the WebServerBundle. Closes #1041 Commits ------- 1f2612c Register WebServerBundle
2 parents 27da053 + 1f2612c commit 19845d0

File tree

3 files changed

+68
-50
lines changed

3 files changed

+68
-50
lines changed

app/AppKernel.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ public function registerBundles()
2323
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
2424
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
2525
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
26+
27+
if ('dev' === $this->getEnvironment()) {
28+
$bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
29+
}
2630
}
2731

2832
return $bundles;

composer.lock

Lines changed: 59 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

var/SymfonyRequirements.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,11 @@ protected function getRealpathCacheSize()
780780
{
781781
$size = ini_get('realpath_cache_size');
782782
$size = trim($size);
783-
$unit = strtolower(substr($size, -1, 1));
783+
$unit = '';
784+
if (!ctype_digit($size)) {
785+
$unit = strtolower(substr($size, -1, 1));
786+
$size = (int) substr($size, 0, -1);
787+
}
784788
switch ($unit) {
785789
case 'g':
786790
return $size * 1024 * 1024 * 1024;

0 commit comments

Comments
 (0)