summaryrefslogtreecommitdiff
path: root/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2018-05-31 09:45:16 +0100
committerGreg Roach <fisharebest@gmail.com>2018-05-31 09:57:27 +0100
commitffe6005c11fdad01969e67c039b0d73beb0232e9 (patch)
tree6d8df2e00473a813fef26155db549f9a969092f7 /vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
parentbba27599b02e0b6f90f62348bb4fa32bd74056d0 (diff)
downloadwebtrees-ffe6005c11fdad01969e67c039b0d73beb0232e9.tar.gz
webtrees-ffe6005c11fdad01969e67c039b0d73beb0232e9.tar.bz2
webtrees-ffe6005c11fdad01969e67c039b0d73beb0232e9.zip
Update minimum PHP version to 7.0.8 so that we can use the 3.4 LTS version of symfony
Diffstat (limited to 'vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php')
-rw-r--r--vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php19
1 files changed, 15 insertions, 4 deletions
diff --git a/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php b/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
index 9385010844..8d8cc1a04d 100644
--- a/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
@@ -23,10 +23,7 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
{
public function __construct()
{
- $this->data = array(
- 'memory' => 0,
- 'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
- );
+ $this->reset();
}
/**
@@ -40,6 +37,17 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
/**
* {@inheritdoc}
*/
+ public function reset()
+ {
+ $this->data = array(
+ 'memory' => 0,
+ 'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
public function lateCollect()
{
$this->updateMemoryUsage();
@@ -99,8 +107,11 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
switch (substr($memoryLimit, -1)) {
case 't': $max *= 1024;
+ // no break
case 'g': $max *= 1024;
+ // no break
case 'm': $max *= 1024;
+ // no break
case 'k': $max *= 1024;
}