Fix error logging to syslog

Fix notice in examples
pear · Feb 20, 2024 · 6c7838a · 6c7838a
1 parent 8d27054
commit 6c7838a
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 19 deletions.
diff --git a/Log/syslog.php b/Log/syslog.php
@@ -108,7 +108,7 @@ public function __construct(
         }
 
         $this->id = md5(microtime().random_int(0, mt_getrandmax()));
-        $this->name = $name;
+        $this->name = (int)$name;
         $this->ident = $ident;
         $this->mask = Log::MAX($level);
     }

diff --git a/examples/composite.php b/examples/composite.php
@@ -2,10 +2,10 @@
 
 require_once 'Log.php';
 
-$console = &Log::singleton('console', '', 'TEST');
-$file = &Log::singleton('file', 'out.log', 'TEST');
+$console = Log::singleton('console', '', 'TEST');
+$file = Log::singleton('file', 'out.log', 'TEST');
 
-$composite = &Log::singleton('composite');
+$composite = Log::singleton('composite');
 $composite->addChild($console);
 $composite->addChild($file);
 

diff --git a/examples/console.php b/examples/console.php
@@ -2,7 +2,7 @@
 
 require_once 'Log.php';
 
-$logger = &Log::singleton('console', '', 'ident');
+$logger = Log::singleton('console', '', 'ident');
 for ($i = 0; $i < 10; $i++) {
     $logger->log("Log entry $i");
 }
diff --git a/examples/display.php b/examples/display.php
@@ -6,7 +6,7 @@
     'error_prepend' => '<font color="#ff0000"><tt>',
     'error_append'  => '</tt></font>'
 ];
-$logger = &Log::singleton('display', '', '', $conf, PEAR_LOG_DEBUG);
+$logger = Log::singleton('display', '', '', $conf, PEAR_LOG_DEBUG);
 for ($i = 0; $i < 10; $i++) {
     $logger->log("Log entry $i");
 }
diff --git a/examples/error_log.php b/examples/error_log.php
@@ -2,7 +2,7 @@
 
 require_once 'Log.php';
 
-$logger = &Log::singleton('error_log', PEAR_LOG_TYPE_SYSTEM, 'ident');
+$logger = Log::singleton('error_log', PEAR_LOG_TYPE_SYSTEM, 'ident');
 for ($i = 0; $i < 10; $i++) {
     $logger->log("Log entry $i");
 }
diff --git a/examples/file.php b/examples/file.php
@@ -3,7 +3,7 @@
 require_once 'Log.php';
 
 $conf = ['mode' => 0600, 'timeFormat' => '%X %x'];
-$logger = &Log::singleton('file', 'out.log', 'ident', $conf);
+$logger = Log::singleton('file', 'out.log', 'ident', $conf);
 for ($i = 0; $i < 10; $i++) {
     $logger->log("Log entry $i");
 }
diff --git a/examples/firebug.php b/examples/firebug.php
@@ -2,7 +2,7 @@
 
 require_once 'Log.php';
 
-$logger = &Log::singleton(
+$logger = Log::singleton(
     'firebug',
     '',
     'PHP',

diff --git a/examples/mail.php b/examples/mail.php
@@ -3,7 +3,7 @@
 require_once 'Log.php';
 
 $conf = ['subject' => 'Important Log Events'];
-$logger = &Log::singleton('mail', '[email protected]', 'ident', $conf);
+$logger = Log::singleton('mail', '[email protected]', 'ident', $conf);
 for ($i = 0; $i < 10; $i++) {
     $logger->log("Log entry $i");
 }
diff --git a/examples/null.php b/examples/null.php
@@ -2,7 +2,7 @@
 
 require_once 'Log.php';
 
-$logger = &Log::singleton('null');
+$logger = Log::singleton('null');
 for ($i = 0; $i < 10; $i++) {
     $logger->log("Log entry $i");
 }
diff --git a/examples/observer_mail.php b/examples/observer_mail.php
@@ -19,7 +19,7 @@ public function __construct($priority, $conf)
         $this->pattern = $conf['pattern'];
     }
 
-    public function notify($event)
+    public function notify($event): void
     {
         if (preg_match($this->pattern, $event['message']) != 0) {
             mail($this->to, $this->subject, $event['message']);

diff --git a/examples/pear_error_handler.php b/examples/pear_error_handler.php
@@ -19,7 +19,7 @@ function errorHandler($error)
     $logger->log($message, $error->code);
 }
 
-$logger = &Log::singleton('console', '', 'ident');
+$logger = Log::singleton('console', '', 'ident');
 
 PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'errorHandler');
 PEAR::raiseError('This is an information log message.', PEAR_LOG_INFO);
diff --git a/examples/php_error_handler.php b/examples/php_error_handler.php
@@ -28,7 +28,7 @@ function errorHandler($code, $message, $file, $line)
                  $priority);
 }
 
-$logger = &Log::singleton('console', '', 'ident');
+$logger = Log::singleton('console', '', 'ident');
 
 set_error_handler('errorHandler');
 trigger_error('This is an information log message.', E_USER_NOTICE);
diff --git a/examples/sql.php b/examples/sql.php
@@ -3,7 +3,7 @@
 require_once 'Log.php';
 
 $conf = ['dsn' => 'pgsql://jon@localhost+unix/logs'];
-$logger = &Log::singleton('sql', 'log_table', 'ident', $conf);
+$logger = Log::singleton('sql', 'log_table', 'ident', $conf);
 for ($i = 0; $i < 10; $i++) {
     $logger->log("Log entry $i");
 }
diff --git a/examples/sqlite.php b/examples/sqlite.php
@@ -4,11 +4,11 @@
 
 /* Creating a new database connection. */
 $conf = ['filename' => 'log.db', 'mode' => 0666, 'persistent' => true];
-$logger =& Log::factory('sqlite', 'log_table', 'ident', $conf);
+$logger = Log::factory('sqlite', 'log_table', 'ident', $conf);
 $logger->log('logging an event', PEAR_LOG_WARNING);
 
 /* Using an existing database connection. */
 $db = sqlite_open('log.db', 0666, $error);
-$logger =& Log::factory('sqlite', 'log_table', 'ident', $db);
+$logger = Log::factory('sqlite', 'log_table', 'ident', $db);
 $logger->log('logging an event', PEAR_LOG_WARNING);
 sqlite_close($db);
diff --git a/examples/syslog.php b/examples/syslog.php
@@ -2,7 +2,7 @@
 
 require_once 'Log.php';
 
-$logger = &Log::singleton('syslog', LOG_LOCAL0, 'ident');
+$logger = Log::singleton('syslog', LOG_LOCAL0, 'ident');
 for ($i = 0; $i < 10; $i++) {
     $logger->log("Log entry $i");
 }
diff --git a/examples/win.php b/examples/win.php
@@ -3,7 +3,7 @@
 require_once 'Log.php';
 
 $conf = ['title' => 'Sample Log Output'];
-$logger = &Log::singleton('win', 'LogWindow', 'ident', $conf);
+$logger = Log::singleton('win', 'LogWindow', 'ident', $conf);
 for ($i = 0; $i < 10; $i++) {
     $logger->log("Log entry $i");
 }