Skip to content

Commit 355ff78

Browse files
kocsismatekocsismate
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Declare ext/standard constants in stubs - part 4
2 parents 2a5dccd + 64b962b commit 355ff78

File tree

4 files changed

+262
-56
lines changed

4 files changed

+262
-56
lines changed

‎ext/standard/basic_functions.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "php_http.h"
2727
#include "php_incomplete_class.h"
2828
#include "php_getopt.h"
29+
#include "php_ext_syslog.h"
2930
#include "ext/standard/info.h"
3031
#include "ext/session/php_session.h"
3132
#include "zend_exceptions.h"

‎ext/standard/basic_functions.stub.php

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,205 @@
343343
*/
344344
const PHP_ROUND_HALF_ODD = UNKNOWN;
345345

346+
/* syslog.c */
347+
348+
/* error levels */
349+
350+
/**
351+
* system unusable
352+
* @var int
353+
* @cvalue LOG_EMERG
354+
*/
355+
const LOG_EMERG = UNKNOWN;
356+
/**
357+
* immediate action required
358+
* @var int
359+
* @cvalue LOG_ALERT
360+
*/
361+
const LOG_ALERT = UNKNOWN;
362+
/**
363+
* critical conditions
364+
* @var int
365+
* @cvalue LOG_CRIT
366+
*/
367+
const LOG_CRIT = UNKNOWN;
368+
/**
369+
* @var int
370+
* @cvalue LOG_ERR
371+
*/
372+
const LOG_ERR = UNKNOWN;
373+
/**
374+
* @var int
375+
* @cvalue LOG_WARNING
376+
*/
377+
const LOG_WARNING = UNKNOWN;
378+
/**
379+
* @var int
380+
* @cvalue LOG_NOTICE
381+
*/
382+
const LOG_NOTICE = UNKNOWN;
383+
/**
384+
* @var int
385+
* @cvalue LOG_INFO
386+
*/
387+
const LOG_INFO = UNKNOWN;
388+
/**
389+
* @var int
390+
* @cvalue LOG_DEBUG
391+
*/
392+
const LOG_DEBUG = UNKNOWN;
393+
/* facility: type of program logging the message */
394+
/**
395+
* @var int
396+
* @cvalue LOG_KERN
397+
*/
398+
const LOG_KERN = UNKNOWN;
399+
/**
400+
* generic user level
401+
* @var int
402+
* @cvalue LOG_USER
403+
*/
404+
const LOG_USER = UNKNOWN;
405+
/**
406+
* log to email
407+
* @var int
408+
* @cvalue LOG_MAIL
409+
*/
410+
const LOG_MAIL = UNKNOWN;
411+
/**
412+
* other system daemons
413+
* @var int
414+
* @cvalue LOG_DAEMON
415+
*/
416+
const LOG_DAEMON = UNKNOWN;
417+
/**
418+
* @var int
419+
* @cvalue LOG_AUTH
420+
*/
421+
const LOG_AUTH = UNKNOWN;
422+
/**
423+
* @var int
424+
* @cvalue LOG_SYSLOG
425+
*/
426+
const LOG_SYSLOG = UNKNOWN;
427+
/**
428+
* @var int
429+
* @cvalue LOG_LPR
430+
*/
431+
const LOG_LPR = UNKNOWN;
432+
#ifdef LOG_NEWS
433+
/* No LOG_NEWS on HP-UX */
434+
/**
435+
* usenet new
436+
* @var int
437+
* @cvalue LOG_NEWS
438+
*/
439+
const LOG_NEWS = UNKNOWN;
440+
#endif
441+
#ifdef LOG_UUCP
442+
/* No LOG_UUCP on HP-UX */
443+
/**
444+
* @var int
445+
* @cvalue LOG_UUCP
446+
*/
447+
const LOG_UUCP = UNKNOWN;
448+
#endif
449+
#ifdef LOG_CRON
450+
/* apparently some systems don't have this one */
451+
/**
452+
* @var int
453+
* @cvalue LOG_CRON
454+
*/
455+
const LOG_CRON = UNKNOWN;
456+
#endif
457+
#ifdef LOG_AUTHPRIV
458+
/* AIX doesn't have LOG_AUTHPRIV */
459+
/**
460+
* @var int
461+
* @cvalue LOG_AUTHPRIV
462+
*/
463+
const LOG_AUTHPRIV = UNKNOWN;
464+
#endif
465+
#ifndef PHP_WIN32
466+
/**
467+
* @var int
468+
* @cvalue LOG_LOCAL0
469+
*/
470+
const LOG_LOCAL0 = UNKNOWN;
471+
/**
472+
* @var int
473+
* @cvalue LOG_LOCAL1
474+
*/
475+
const LOG_LOCAL1 = UNKNOWN;
476+
/**
477+
* @var int
478+
* @cvalue LOG_LOCAL2
479+
*/
480+
const LOG_LOCAL2 = UNKNOWN;
481+
/**
482+
* @var int
483+
* @cvalue LOG_LOCAL3
484+
*/
485+
const LOG_LOCAL3 = UNKNOWN;
486+
/**
487+
* @var int
488+
* @cvalue LOG_LOCAL4
489+
*/
490+
const LOG_LOCAL4 = UNKNOWN;
491+
/**
492+
* @var int
493+
* @cvalue LOG_LOCAL5
494+
*/
495+
const LOG_LOCAL5 = UNKNOWN;
496+
/**
497+
* @var int
498+
* @cvalue LOG_LOCAL6
499+
*/
500+
const LOG_LOCAL6 = UNKNOWN;
501+
/**
502+
* @var int
503+
* @cvalue LOG_LOCAL7
504+
*/
505+
const LOG_LOCAL7 = UNKNOWN;
506+
#endif
507+
/* options */
508+
/**
509+
* @var int
510+
* @cvalue LOG_PID
511+
*/
512+
const LOG_PID = UNKNOWN;
513+
/**
514+
* @var int
515+
* @cvalue LOG_CONS
516+
*/
517+
const LOG_CONS = UNKNOWN;
518+
/**
519+
* @var int
520+
* @cvalue LOG_ODELAY
521+
*/
522+
const LOG_ODELAY = UNKNOWN;
523+
/**
524+
* @var int
525+
* @cvalue LOG_NDELAY
526+
*/
527+
const LOG_NDELAY = UNKNOWN;
528+
#ifdef LOG_NOWAIT
529+
/**
530+
* @var int
531+
* @cvalue LOG_NOWAIT
532+
*/
533+
const LOG_NOWAIT = UNKNOWN;
534+
#endif
535+
#ifdef LOG_PERROR
536+
/* AIX doesn't have LOG_PERROR */
537+
/**
538+
* log to stderr
539+
* @var int
540+
* @cvalue LOG_PERROR
541+
*/
542+
const LOG_PERROR = UNKNOWN;
543+
#endif
544+
346545
#[AllowDynamicProperties]
347546
final class __PHP_Incomplete_Class
348547
{

‎ext/standard/basic_functions_arginfo.h

Lines changed: 62 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/standard/syslog.c

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -35,61 +35,6 @@
3535
/* {{{ PHP_MINIT_FUNCTION */
3636
PHP_MINIT_FUNCTION(syslog)
3737
{
38-
/* error levels */
39-
REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */
40-
REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */
41-
REGISTER_LONG_CONSTANT("LOG_CRIT", LOG_CRIT, CONST_CS | CONST_PERSISTENT); /* critical conditions */
42-
REGISTER_LONG_CONSTANT("LOG_ERR", LOG_ERR, CONST_CS | CONST_PERSISTENT);
43-
REGISTER_LONG_CONSTANT("LOG_WARNING", LOG_WARNING, CONST_CS | CONST_PERSISTENT);
44-
REGISTER_LONG_CONSTANT("LOG_NOTICE", LOG_NOTICE, CONST_CS | CONST_PERSISTENT);
45-
REGISTER_LONG_CONSTANT("LOG_INFO", LOG_INFO, CONST_CS | CONST_PERSISTENT);
46-
REGISTER_LONG_CONSTANT("LOG_DEBUG", LOG_DEBUG, CONST_CS | CONST_PERSISTENT);
47-
/* facility: type of program logging the message */
48-
REGISTER_LONG_CONSTANT("LOG_KERN", LOG_KERN, CONST_CS | CONST_PERSISTENT);
49-
REGISTER_LONG_CONSTANT("LOG_USER", LOG_USER, CONST_CS | CONST_PERSISTENT); /* generic user level */
50-
REGISTER_LONG_CONSTANT("LOG_MAIL", LOG_MAIL, CONST_CS | CONST_PERSISTENT); /* log to email */
51-
REGISTER_LONG_CONSTANT("LOG_DAEMON", LOG_DAEMON, CONST_CS | CONST_PERSISTENT); /* other system daemons */
52-
REGISTER_LONG_CONSTANT("LOG_AUTH", LOG_AUTH, CONST_CS | CONST_PERSISTENT);
53-
REGISTER_LONG_CONSTANT("LOG_SYSLOG", LOG_SYSLOG, CONST_CS | CONST_PERSISTENT);
54-
REGISTER_LONG_CONSTANT("LOG_LPR", LOG_LPR, CONST_CS | CONST_PERSISTENT);
55-
#ifdef LOG_NEWS
56-
/* No LOG_NEWS on HP-UX */
57-
REGISTER_LONG_CONSTANT("LOG_NEWS", LOG_NEWS, CONST_CS | CONST_PERSISTENT); /* usenet new */
58-
#endif
59-
#ifdef LOG_UUCP
60-
/* No LOG_UUCP on HP-UX */
61-
REGISTER_LONG_CONSTANT("LOG_UUCP", LOG_UUCP, CONST_CS | CONST_PERSISTENT);
62-
#endif
63-
#ifdef LOG_CRON
64-
/* apparently some systems don't have this one */
65-
REGISTER_LONG_CONSTANT("LOG_CRON", LOG_CRON, CONST_CS | CONST_PERSISTENT);
66-
#endif
67-
#ifdef LOG_AUTHPRIV
68-
/* AIX doesn't have LOG_AUTHPRIV */
69-
REGISTER_LONG_CONSTANT("LOG_AUTHPRIV", LOG_AUTHPRIV, CONST_CS | CONST_PERSISTENT);
70-
#endif
71-
#ifndef PHP_WIN32
72-
REGISTER_LONG_CONSTANT("LOG_LOCAL0", LOG_LOCAL0, CONST_CS | CONST_PERSISTENT);
73-
REGISTER_LONG_CONSTANT("LOG_LOCAL1", LOG_LOCAL1, CONST_CS | CONST_PERSISTENT);
74-
REGISTER_LONG_CONSTANT("LOG_LOCAL2", LOG_LOCAL2, CONST_CS | CONST_PERSISTENT);
75-
REGISTER_LONG_CONSTANT("LOG_LOCAL3", LOG_LOCAL3, CONST_CS | CONST_PERSISTENT);
76-
REGISTER_LONG_CONSTANT("LOG_LOCAL4", LOG_LOCAL4, CONST_CS | CONST_PERSISTENT);
77-
REGISTER_LONG_CONSTANT("LOG_LOCAL5", LOG_LOCAL5, CONST_CS | CONST_PERSISTENT);
78-
REGISTER_LONG_CONSTANT("LOG_LOCAL6", LOG_LOCAL6, CONST_CS | CONST_PERSISTENT);
79-
REGISTER_LONG_CONSTANT("LOG_LOCAL7", LOG_LOCAL7, CONST_CS | CONST_PERSISTENT);
80-
#endif
81-
/* options */
82-
REGISTER_LONG_CONSTANT("LOG_PID", LOG_PID, CONST_CS | CONST_PERSISTENT);
83-
REGISTER_LONG_CONSTANT("LOG_CONS", LOG_CONS, CONST_CS | CONST_PERSISTENT);
84-
REGISTER_LONG_CONSTANT("LOG_ODELAY", LOG_ODELAY, CONST_CS | CONST_PERSISTENT);
85-
REGISTER_LONG_CONSTANT("LOG_NDELAY", LOG_NDELAY, CONST_CS | CONST_PERSISTENT);
86-
#ifdef LOG_NOWAIT
87-
REGISTER_LONG_CONSTANT("LOG_NOWAIT", LOG_NOWAIT, CONST_CS | CONST_PERSISTENT);
88-
#endif
89-
#ifdef LOG_PERROR
90-
/* AIX doesn't have LOG_PERROR */
91-
REGISTER_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/
92-
#endif
9338
BG(syslog_device)=NULL;
9439

9540
return SUCCESS;

0 commit comments

Comments
 (0)