diff vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10
author Chris Cannam
date Thu, 28 Feb 2019 13:21:36 +0000
parents 1fec387a4317
children af1871eacc83
line wrap: on
line diff
--- a/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php	Thu Feb 28 13:21:36 2019 +0000
@@ -55,7 +55,7 @@
         if ($this->logger && method_exists($this->logger, 'clear')) {
             $this->logger->clear();
         }
-        $this->data = array();
+        $this->data = [];
     }
 
     /**
@@ -79,12 +79,12 @@
      */
     public function getLogs()
     {
-        return isset($this->data['logs']) ? $this->data['logs'] : array();
+        return isset($this->data['logs']) ? $this->data['logs'] : [];
     }
 
     public function getPriorities()
     {
-        return isset($this->data['priorities']) ? $this->data['priorities'] : array();
+        return isset($this->data['priorities']) ? $this->data['priorities'] : [];
     }
 
     public function countErrors()
@@ -109,7 +109,7 @@
 
     public function getCompilerLogs()
     {
-        return isset($this->data['compiler_logs']) ? $this->data['compiler_logs'] : array();
+        return isset($this->data['compiler_logs']) ? $this->data['compiler_logs'] : [];
     }
 
     /**
@@ -123,13 +123,13 @@
     private function getContainerDeprecationLogs()
     {
         if (null === $this->containerPathPrefix || !file_exists($file = $this->containerPathPrefix.'Deprecations.log')) {
-            return array();
+            return [];
         }
 
         $bootTime = filemtime($file);
-        $logs = array();
+        $logs = [];
         foreach (unserialize(file_get_contents($file)) as $log) {
-            $log['context'] = array('exception' => new SilencedErrorContext($log['type'], $log['file'], $log['line'], $log['trace'], $log['count']));
+            $log['context'] = ['exception' => new SilencedErrorContext($log['type'], $log['file'], $log['line'], $log['trace'], $log['count'])];
             $log['timestamp'] = $bootTime;
             $log['priority'] = 100;
             $log['priorityName'] = 'DEBUG';
@@ -145,17 +145,17 @@
     private function getContainerCompilerLogs()
     {
         if (null === $this->containerPathPrefix || !file_exists($file = $this->containerPathPrefix.'Compiler.log')) {
-            return array();
+            return [];
         }
 
-        $logs = array();
+        $logs = [];
         foreach (file($file, FILE_IGNORE_NEW_LINES) as $log) {
             $log = explode(': ', $log, 2);
             if (!isset($log[1]) || !preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $log[0])) {
-                $log = array('Unknown Compiler Pass', implode(': ', $log));
+                $log = ['Unknown Compiler Pass', implode(': ', $log)];
             }
 
-            $logs[$log[0]][] = array('message' => $log[1]);
+            $logs[$log[0]][] = ['message' => $log[1]];
         }
 
         return $logs;
@@ -163,8 +163,8 @@
 
     private function sanitizeLogs($logs)
     {
-        $sanitizedLogs = array();
-        $silencedLogs = array();
+        $sanitizedLogs = [];
+        $silencedLogs = [];
 
         foreach ($logs as $log) {
             if (!$this->isSilencedOrDeprecationErrorLog($log)) {
@@ -183,10 +183,10 @@
                 $silencedLogs[$h] = true;
 
                 if (!isset($sanitizedLogs[$message])) {
-                    $sanitizedLogs[$message] = $log + array(
+                    $sanitizedLogs[$message] = $log + [
                         'errorCount' => 0,
                         'scream' => true,
-                    );
+                    ];
                 }
                 $sanitizedLogs[$message]['errorCount'] += $exception->count;
 
@@ -198,10 +198,10 @@
             if (isset($sanitizedLogs[$errorId])) {
                 ++$sanitizedLogs[$errorId]['errorCount'];
             } else {
-                $log += array(
+                $log += [
                     'errorCount' => 1,
                     'scream' => false,
-                );
+                ];
 
                 $sanitizedLogs[$errorId] = $log;
             }
@@ -222,7 +222,7 @@
             return true;
         }
 
-        if ($exception instanceof \ErrorException && in_array($exception->getSeverity(), array(E_DEPRECATED, E_USER_DEPRECATED), true)) {
+        if ($exception instanceof \ErrorException && \in_array($exception->getSeverity(), [E_DEPRECATED, E_USER_DEPRECATED], true)) {
             return true;
         }
 
@@ -231,23 +231,23 @@
 
     private function computeErrorsCount(array $containerDeprecationLogs)
     {
-        $silencedLogs = array();
-        $count = array(
+        $silencedLogs = [];
+        $count = [
             'error_count' => $this->logger->countErrors(),
             'deprecation_count' => 0,
             'warning_count' => 0,
             'scream_count' => 0,
-            'priorities' => array(),
-        );
+            'priorities' => [],
+        ];
 
         foreach ($this->logger->getLogs() as $log) {
             if (isset($count['priorities'][$log['priority']])) {
                 ++$count['priorities'][$log['priority']]['count'];
             } else {
-                $count['priorities'][$log['priority']] = array(
+                $count['priorities'][$log['priority']] = [
                     'count' => 1,
                     'name' => $log['priorityName'],
-                );
+                ];
             }
             if ('WARNING' === $log['priorityName']) {
                 ++$count['warning_count'];