Appeasing the style gods

ryanrath · ryanrath · commit 2ce0e7b9536c · 2025-09-17T10:26:25.000-04:00
diff --git a/background_scripts/batch_export_manager.php b/background_scripts/batch_export_manager.php
@@ -83,7 +83,7 @@
     $logger = Log::factory('batch-export', $logConf);
     $logger->info('Command: ' . implode(' ', array_map('escapeshellarg', $argv)));
     // NOTE: "process_start_time" is needed for the log summary.
-    $logger->notice('batch_export_manager start',  ['process_start_time' => date('Y-m-d H:i:s')]);
+    $logger->notice('batch_export_manager start', ['process_start_time' => date('Y-m-d H:i:s')]);
     $batchProcessor = new BatchProcessor($logger);
     $batchProcessor->setDryRun($dryRun);
     $batchProcessor->processRequests();
diff --git a/background_scripts/report_schedule_manager.php b/background_scripts/report_schedule_manager.php
@@ -66,7 +66,7 @@
 // =====================================================================
 
 // NOTE: "process_start_time" is needed for log summary.
-$logger->notice('Report scheduler start',['process_start_time' => date('Y-m-d H:i:s')]);
+$logger->notice('Report scheduler start', ['process_start_time' => date('Y-m-d H:i:s')]);
 
 $active_frequencies = getActiveFrequencies(true);
 
@@ -115,7 +115,7 @@
             } catch(Exception $e) {
                 $msg = "Error Preparing report on " . gethostname() . " {$details['report_id']}: "
                     . $e->getMessage();
-                $logger->error($msg,['stacktrace' => $e->getTraceAsString()]);
+                $logger->error($msg, ['stacktrace' => $e->getTraceAsString()]);
             }
 
             if (isset($working_dir) && $working_dir != '/' && $working_dir != getcwd()) {
diff --git a/classes/CCR/CCRLineFormatter.php b/classes/CCR/CCRLineFormatter.php
@@ -2,7 +2,6 @@
 
 namespace CCR;
 
-
 use Monolog\Formatter\LineFormatter;
 use Monolog\Formatter\NormalizerFormatter;
 
diff --git a/classes/CCR/DB/MySQLHelper.php b/classes/CCR/DB/MySQLHelper.php
@@ -219,9 +219,10 @@ public function tableExists($tableName)
      */
     public function executeStatement($stmt)
     {
-        $this->logger->info('Executing SQL statement',
+        $this->logger->info(
+            'Executing SQL statement',
             [
-                'host'      => $this->db->_db_host,
+                'host' => $this->db->_db_host,
                 'port' => $this->db->_db_port,
                 'username' => $this->db->_db_username,
                 'database' => $this->db->_db_name,
@@ -259,7 +260,8 @@ public function executeStatement($stmt)
      */
     public function executeFile($file)
     {
-        $this->logger->info('Executing SQL file',
+        $this->logger->info(
+            'Executing SQL file',
             [
                 'host'     => $this->db->_db_host,
                 'port' => $this->db->_db_port,
diff --git a/classes/CCR/Log.php b/classes/CCR/Log.php
@@ -112,7 +112,8 @@ public static function factory(
                 | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED;
 
             if ($e !== null && ($e['type'] & $mask) == 0) {
-                $logger->critical($e['message'],
+                $logger->critical(
+                    $e['message'],
                     [
                         'file'    => $e['file'],
                         'line'    => $e['line'],
diff --git a/classes/DB/ArrayIngestor.php b/classes/DB/ArrayIngestor.php
@@ -75,7 +75,8 @@ public function ingest()
             try {
                 $destStatementPrepared->execute($srcRow);
             } catch (PDOException $e) {
-                $this->_logger->error($e->getMessage(),
+                $this->_logger->error(
+                    $e->getMessage(),
                     [
                         'stacktrace' => $e->getTraceAsString(),
                         'source_row' => json_encode($srcRow)
@@ -101,7 +102,8 @@ public function ingest()
         $time_end = microtime(true);
         $time = $time_end - $time_start;
 
-        $this->_logger->notice('Finished ingestion',
+        $this->_logger->notice(
+            'Finished ingestion',
             [
                 'class'            => get_class($this),
                 'records_examined' => $sourceRows,
diff --git a/classes/DB/FilterListBuilder.php b/classes/DB/FilterListBuilder.php
@@ -76,13 +76,14 @@ public function buildRealmLists($realmName)
         foreach ($currentRealm->getGroupByObjects() as $groupByObj) {
             $this->buildDimensionLists($realmQuery, $groupByObj, $currentRealm);
         }
-        $this->logger->notice('end',
-                [
-                    'action' => $realmName . '.build-filter-list',
-                    'start_time' => $startTime,
-                    'end_time' => microtime(true)
-                ]
-            );
+        $this->logger->notice(
+            'end',
+            [
+                'action' => $realmName . '.build-filter-list',
+                'start_time' => $startTime,
+                'end_time' => microtime(true)
+            ]
+        );
     }
 
     /**
@@ -107,7 +108,8 @@ private function buildDimensionLists(iQuery $realmQuery, iGroupBy $groupBy, iRea
         // exist, create it.
         $dimensionId = $groupBy->getId();
         $startTime = microtime(true);
-        $this->logger->notice('start',
+        $this->logger->notice(
+            'start',
             [
                 'action' => $currentRealm->getName() . '.build-filter-list.' . $dimensionId
             ]
@@ -243,7 +245,8 @@ private function buildDimensionLists(iQuery $realmQuery, iGroupBy $groupBy, iRea
 
             $this->builtListTables[$pairTableName] = true;
         }
-        $this->logger->notice('end',
+        $this->logger->notice(
+            'end',
             [
                 'action' => $currentRealm->getName() . '.build-filter-list.' . $dimensionId,
                 'start_time' => $startTime,
diff --git a/classes/DB/PDODBMultiIngestor.php b/classes/DB/PDODBMultiIngestor.php
@@ -89,7 +89,8 @@ public function ingest()
                 )->execute();
             }
             catch (PDOException $e) {
-                $this->_logger->info($e->getMessage(),
+                $this->_logger->info(
+                    $e->getMessage(),
                     [
                         'sql'        => $updateStatement,
                         'stacktrace' => $e->getTraceAsString()
@@ -284,7 +285,8 @@ public function ingest()
                     $f = fopen($infile_name, 'w');
                 }
                 catch (Exception $e) {
-                    $this->_logger->error($e->getMessage(),
+                    $this->_logger->error(
+                        $e->getMessage(),
                         [
                             'stacktrace' => $e->getTraceAsString(),
                             'statement'  => $load_statement
@@ -308,7 +310,8 @@ public function ingest()
                 )->execute();
             }
             catch (PDOException $e) {
-                $this->_logger->error($e->getMessage(),
+                $this->_logger->error(
+                    $e->getMessage(),
                     [
                         'sql'        => $updateStatement,
                         'stacktrace' => $e->getTraceAsString()
@@ -342,7 +345,8 @@ public function ingest()
         $this->_logger->info($message);
 
         // NOTE: This is needed for the log summary.
-        $this->_logger->notice('Finished ingestion',
+        $this->_logger->notice(
+            'Finished ingestion',
             [
                 'class'            => get_class($this),
                 'start_time'       => $time_start,
@@ -404,10 +408,11 @@ public function checkForChanges()
         $sadness = false;
         while($row = $stmt->fetch(PDO::FETCH_ASSOC) )
         {
-            $this->_logger->critical('Missing row',
+            $this->_logger->critical(
+                'Missing row',
                 [
-                    'rowdata'          => print_r($row, true),
-                    'class'            => get_class($this)
+                    'rowdata' => print_r($row, true),
+                    'class' => get_class($this)
                 ]
             );
             $sadness = true;
diff --git a/classes/DB/PDODBSynchronizingIngestor.php b/classes/DB/PDODBSynchronizingIngestor.php
@@ -159,7 +159,8 @@ function ($column) use ($row) { return $row[$column]; },
         $time = $timeEnd - $timeStart;
 
         // NOTE: This is needed for the log summary.
-        $this->logger->notice('Finished ingestion',
+        $this->logger->notice(
+            'Finished ingestion',
             [
                 'class'             => get_class($this),
                 'start_time'        => $timeStart,
diff --git a/classes/ETL/Aggregator/pdoAggregator.php b/classes/ETL/Aggregator/pdoAggregator.php
@@ -243,10 +243,12 @@ protected function createDestinationTableObjects()
 
         if ( is_array($this->parsedDefinitionFile->table_definition) ) {
             if ( count($this->parsedDefinitionFile->table_definition) > 1 ) {
-                $this->logger->warning(sprintf(
+                $this->logger->warning(
+                    sprintf(
                     "%s does not support multiple ETL destination tables, using first table",
                     $this
-                ));
+                    )
+                );
             }
             $tableDefinition = $this->parsedDefinitionFile->table_definition;
             $this->parsedDefinitionFile->table_definition = array_shift($tableDefinition);
@@ -715,7 +717,8 @@ protected function _execute($aggregationUnit)
     {
         $time_start = microtime(true);
 
-        $this->logger->notice("aggregate start",
+        $this->logger->notice(
+            "aggregate start",
             [
                 "action" => (string) $this,
                 "unit" => $aggregationUnit,
@@ -1057,7 +1060,8 @@ function ($k, $first, $last) {
         $time_end = microtime(true);
         $time = $time_end - $time_start;
 
-        $this->logger->notice("aggregate end",
+        $this->logger->notice(
+            "aggregate end",
             [
                 "action" => (string)$this,
                 "unit" => $aggregationUnit,
diff --git a/classes/ETL/Ingestor/UpdateIngestor.php b/classes/ETL/Ingestor/UpdateIngestor.php
@@ -245,7 +245,8 @@ function ($field) use ($record) {
         $time_end = microtime(true);
         $time = $time_end - $time_start;
 
-        $this->logger->notice('',
+        $this->logger->notice(
+            '',
             [
                 'action' => (string)$this,
                 'start_time' => $time_start,
diff --git a/classes/ETL/Ingestor/aIngestor.php b/classes/ETL/Ingestor/aIngestor.php
@@ -145,7 +145,8 @@ public function execute(EtlOverseerOptions $etlOverseerOptions)
         $this->logger->info($message);
 
         // NOTE: This is needed for the log summary.
-        $this->logger->notice('',
+        $this->logger->notice(
+            '',
             [
                 'action' => (string)$this,
                 'start_time' => $time_start,
diff --git a/classes/ETL/Maintenance/ExecuteSql.php b/classes/ETL/Maintenance/ExecuteSql.php
@@ -240,7 +240,8 @@ public function execute(EtlOverseerOptions $etlOverseerOptions)
                 $statementPosition = ($numStatementsProcessed + 1);
                 $statementPositionDisplay = "( $statementPosition / $numSqlStatements)";
                 try {
-                    $this->logger->info("Executing statement " . $statementPositionDisplay,
+                    $this->logger->info(
+                        "Executing statement " . $statementPositionDisplay,
                         [
                             "action" => (string) $this . '-sql-' . $statementPosition,
                             "endpoint" => $this->destinationEndpoint,
@@ -279,11 +280,14 @@ public function execute(EtlOverseerOptions $etlOverseerOptions)
 
         $time_end = microtime(true);
         $time = $time_end - $time_start;
-        $this->logger->notice('', array(
-            'action'       => (string) $this,
-            'start_time' => $time_start,
-            'end_time' => $time_end,
-            'elapsed_time' => round($time, 5)
-        ));
+        $this->logger->notice(
+            '',
+            array(
+                'action' => (string)$this,
+                'start_time' => $time_start,
+                'end_time' => $time_end,
+                'elapsed_time' => round($time, 5)
+            )
+        );
     }  // execute()
 }  // class ExecuteSql
diff --git a/classes/ETL/Maintenance/ManageTables.php b/classes/ETL/Maintenance/ManageTables.php
@@ -156,7 +156,8 @@ public function execute(EtlOverseerOptions $etlOverseerOptions)
         $time_end = microtime(true);
         $time = $time_end - $time_start;
 
-        $this->logger->notice('',
+        $this->logger->notice(
+            '',
             array(
                 'action' => (string)$this,
                 'start_time' => $time_start,
diff --git a/classes/ETL/Maintenance/VerifyDatabase.php b/classes/ETL/Maintenance/VerifyDatabase.php
@@ -289,7 +289,8 @@ public function execute(EtlOverseerOptions $etlOverseerOptions)
 
         $time_end = microtime(true);
         $time = $time_end - $time_start;
-        $this->logger->notice('',
+        $this->logger->notice(
+            '',
             array(
                 'action' => (string)$this,
                 'start_time' => $time_start,
diff --git a/classes/OpenXdmod/DataWarehouseInitializer.php b/classes/OpenXdmod/DataWarehouseInitializer.php
@@ -489,7 +489,8 @@ public function aggregate(
         $endDate,
         $append = true
     ) {
-        $this->logger->info('start',
+        $this->logger->info(
+            'start',
             [
                 'class'      => get_class($this),
                 'function'   => __FUNCTION__,
diff --git a/classes/OpenXdmod/Shredder.php b/classes/OpenXdmod/Shredder.php
@@ -417,7 +417,8 @@ public function shredFile($file)
                     // Ignore duplicate key errors.
                     if ($e->getCode() == 23000) {
                         $msg = 'Skipping duplicate data: ' . $e->getMessage();
-                        $this->logger->debug($msg,
+                        $this->logger->debug(
+                            $msg,
                             [
                                 'file'        => $file,
                                 'line_number' => $lineNumber,
@@ -850,7 +851,8 @@ protected function fixJobTimes($startTime, $endTime, $walltime)
         if ($walltime === null) { $invalidCount++; }
 
         if ($invalidCount > 1) {
-            $this->logger->error('Failed to correct job times',
+            $this->logger->error(
+                'Failed to correct job times',
                 [
                     'start_time' => $startTime,
                     'end_time'   => $endTime,
diff --git a/classes/OpenXdmod/Shredder/Lsf.php b/classes/OpenXdmod/Shredder/Lsf.php
@@ -294,7 +294,8 @@ public function shredLine($line)
             = ($job['ru_utime'] > 0 ? $job['ru_utime'] : 0)
             + ($job['ru_stime'] > 0 ? $job['ru_stime'] : 0);
 
-        $this->logger->debug('Estimating walltime with data from rusage',
+        $this->logger->debug(
+            'Estimating walltime with data from rusage',
             [
                 'ru_utime' => $job['ru_utime'],
                 'ru_stime' => $job['ru_stime'],
diff --git a/classes/Rest/Controllers/WarehouseExportControllerProvider.php b/classes/Rest/Controllers/WarehouseExportControllerProvider.php
@@ -379,13 +379,16 @@ public function deleteRequests(Request $request, Application $app)
                 if ($count === 0) {
                     throw new NotFoundHttpException('Export request not found');
                 }
-                $this->logger->info('', [
-                    'module' => self::LOG_MODULE,
-                    'message' => 'Deleted data warehouse export request',
-                    'event' => 'DELETE_BY_USER',
-                    'id' => $id,
-                    'Users.id' => $user->getUserId()
-                ]);
+                $this->logger->info(
+                    '',
+                    [
+                        'module' => self::LOG_MODULE,
+                        'message' => 'Deleted data warehouse export request',
+                        'event' => 'DELETE_BY_USER',
+                        'id' => $id,
+                        'Users.id' => $user->getUserId()
+                    ]
+                );
             }
 
             $dbh->commit();

Original file line number	Diff line number	Diff line change
`@@ -219,9 +219,10 @@ public function tableExists($tableName)`
`219`	`219`	`*/`
`220`	`220`	`public function executeStatement($stmt)`
`221`	`221`	`{`
`222`		`- $this->logger->info('Executing SQL statement',`
	`222`	`+ $this->logger->info(`
	`223`	`+ 'Executing SQL statement',`
`223`	`224`	`[`
`224`		`- 'host' => $this->db->_db_host,`
	`225`	`+ 'host' => $this->db->_db_host,`
`225`	`226`	`'port' => $this->db->_db_port,`
`226`	`227`	`'username' => $this->db->_db_username,`
`227`	`228`	`'database' => $this->db->_db_name,`
`@@ -259,7 +260,8 @@ public function executeStatement($stmt)`
`259`	`260`	`*/`
`260`	`261`	`public function executeFile($file)`
`261`	`262`	`{`
`262`		`- $this->logger->info('Executing SQL file',`
	`263`	`+ $this->logger->info(`
	`264`	`+ 'Executing SQL file',`
`263`	`265`	`[`
`264`	`266`	`'host' => $this->db->_db_host,`
`265`	`267`	`'port' => $this->db->_db_port,`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ public static function factory(`
`112`	`112`	`\| E_STRICT \| E_DEPRECATED \| E_USER_DEPRECATED;`
`113`	`113`
`114`	`114`	`if ($e !== null && ($e['type'] & $mask) == 0) {`
`115`		`- $logger->critical($e['message'],`
	`115`	`+ $logger->critical(`
	`116`	`+ $e['message'],`
`116`	`117`	`[`
`117`	`118`	`'file' => $e['file'],`
`118`	`119`	`'line' => $e['line'],`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ public function ingest()`
`89`	`89`	`)->execute();`
`90`	`90`	`}`
`91`	`91`	`catch (PDOException $e) {`
`92`		`- $this->_logger->info($e->getMessage(),`
	`92`	`+ $this->_logger->info(`
	`93`	`+ $e->getMessage(),`
`93`	`94`	`[`
`94`	`95`	`'sql' => $updateStatement,`
`95`	`96`	`'stacktrace' => $e->getTraceAsString()`
`@@ -284,7 +285,8 @@ public function ingest()`
`284`	`285`	`$f = fopen($infile_name, 'w');`
`285`	`286`	`}`
`286`	`287`	`catch (Exception $e) {`
`287`		`- $this->_logger->error($e->getMessage(),`
	`288`	`+ $this->_logger->error(`
	`289`	`+ $e->getMessage(),`
`288`	`290`	`[`
`289`	`291`	`'stacktrace' => $e->getTraceAsString(),`
`290`	`292`	`'statement' => $load_statement`
`@@ -308,7 +310,8 @@ public function ingest()`
`308`	`310`	`)->execute();`
`309`	`311`	`}`
`310`	`312`	`catch (PDOException $e) {`
`311`		`- $this->_logger->error($e->getMessage(),`
	`313`	`+ $this->_logger->error(`
	`314`	`+ $e->getMessage(),`
`312`	`315`	`[`
`313`	`316`	`'sql' => $updateStatement,`
`314`	`317`	`'stacktrace' => $e->getTraceAsString()`
`@@ -342,7 +345,8 @@ public function ingest()`
`342`	`345`	`$this->_logger->info($message);`
`343`	`346`
`344`	`347`	`// NOTE: This is needed for the log summary.`
`345`		`- $this->_logger->notice('Finished ingestion',`
	`348`	`+ $this->_logger->notice(`
	`349`	`+ 'Finished ingestion',`
`346`	`350`	`[`
`347`	`351`	`'class' => get_class($this),`
`348`	`352`	`'start_time' => $time_start,`
`@@ -404,10 +408,11 @@ public function checkForChanges()`
`404`	`408`	`$sadness = false;`
`405`	`409`	`while($row = $stmt->fetch(PDO::FETCH_ASSOC) )`
`406`	`410`	`{`
`407`		`- $this->_logger->critical('Missing row',`
	`411`	`+ $this->_logger->critical(`
	`412`	`+ 'Missing row',`
`408`	`413`	`[`
`409`		`- 'rowdata' => print_r($row, true),`
`410`		`- 'class' => get_class($this)`
	`414`	`+ 'rowdata' => print_r($row, true),`
	`415`	`+ 'class' => get_class($this)`
`411`	`416`	`]`
`412`	`417`	`);`
`413`	`418`	`$sadness = true;`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ function ($column) use ($row) { return $row[$column]; },`
`159`	`159`	`$time = $timeEnd - $timeStart;`
`160`	`160`
`161`	`161`	`// NOTE: This is needed for the log summary.`
`162`		`- $this->logger->notice('Finished ingestion',`
	`162`	`+ $this->logger->notice(`
	`163`	`+ 'Finished ingestion',`
`163`	`164`	`[`
`164`	`165`	`'class' => get_class($this),`
`165`	`166`	`'start_time' => $timeStart,`