Skip to content

Commit d4d5216

Browse files
Girgiashaszi
Girgias
and
haszi
committed
[skip-revcheck] Replace PHP_INI_* with INI_* constants
Performed via a bash script which can be found on PR GH-3140 Closes GH-3140 Co-authored-by: haszi <haszika80@gmail.com>
1 parent ed851c6 commit d4d5216

File tree

84 files changed

+701
-701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+701
-701
lines changed

‎appendices/ini.core.xml‎

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

‎appendices/ini.list.xml‎

Lines changed: 116 additions & 116 deletions
Large diffs are not rendered by default.

‎appendices/ini.sections.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
<tbody>
3232
<row>
3333
<entry><link linkend="ini.per-host">[HOST=]</link></entry>
34-
<entry>PHP_INI_SYSTEM</entry>
34+
<entry><constant>INI_SYSTEM</constant></entry>
3535
<entry></entry>
3636
</row>
3737
<row>
3838
<entry><link linkend="ini.per-path">[PATH=]</link></entry>
39-
<entry>PHP_INI_SYSTEM</entry>
39+
<entry><constant>INI_SYSTEM</constant></entry>
4040
<entry></entry>
4141
</row>
4242
</tbody>

‎appendices/migration82/other-changes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198

199199
<para>
200200
<link linkend="ini.sqlite3.defensive">sqlite3.defensive</link>
201-
is now <constant>PHP_INI_USER</constant>.
201+
is now <constant>INI_USER</constant>.
202202
</para>
203203
</sect3>
204204

‎features/commandline.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1907,7 +1907,7 @@ $ php -S 0.0.0.0:8000
19071907
<row>
19081908
<entry><link linkend="ini.cli-server.color">cli_server.color</link></entry>
19091909
<entry>"0"</entry>
1910-
<entry>PHP_INI_ALL</entry>
1910+
<entry><constant>INI_ALL</constant></entry>
19111911
<entry></entry>
19121912
</row>
19131913
</tbody>

‎install/ini.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
215215
</simpara>
216216
<simpara>
217217
Only INI settings with the
218-
modes <constant>PHP_INI_PERDIR</constant> and
219-
<constant>PHP_INI_USER</constant> will be recognized in .user.ini-style INI
218+
modes <constant>INI_PERDIR</constant> and
219+
<constant>INI_USER</constant> will be recognized in .user.ini-style INI
220220
files.
221221
</simpara>
222222

@@ -253,16 +253,16 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
253253
<para>
254254
For example, the
255255
<link linkend="ini.output-buffering">output_buffering</link> setting
256-
is <literal>PHP_INI_PERDIR</literal> therefore it may not be set using
256+
is <constant>INI_PERDIR</constant> therefore it may not be set using
257257
<function>ini_set</function>. However, the
258258
<link linkend="ini.display-errors">display_errors</link> directive is
259-
<literal>PHP_INI_ALL</literal> therefore it may be set anywhere,
259+
<constant>INI_ALL</constant> therefore it may be set anywhere,
260260
including with <function>ini_set</function>.
261261
</para>
262262

263263
<para>
264264
<table>
265-
<title>Definition of PHP_INI_* modes</title>
265+
<title>Definition of INI_* modes</title>
266266
<tgroup cols="2">
267267
<thead>
268268
<row>
@@ -272,25 +272,25 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
272272
</thead>
273273
<tbody>
274274
<row>
275-
<entry><literal>PHP_INI_USER</literal></entry>
275+
<entry><constant>INI_USER</constant></entry>
276276
<entry>
277277
Entry can be set in user scripts (like with <function>ini_set</function>)
278278
or in the <link linkend="configuration.changes.windows">Windows registry</link>.
279279
Entry can be set in &user-ini;
280280
</entry>
281281
</row>
282282
<row>
283-
<entry><literal>PHP_INI_PERDIR</literal></entry>
283+
<entry><constant>INI_PERDIR</constant></entry>
284284
<entry>
285285
Entry can be set in &php.ini;, &htaccess;, &httpd.conf; or &user-ini;
286286
</entry>
287287
</row>
288288
<row>
289-
<entry><literal>PHP_INI_SYSTEM</literal></entry>
289+
<entry><constant>INI_SYSTEM</constant></entry>
290290
<entry>Entry can be set in &php.ini; or &httpd.conf;</entry>
291291
</row>
292292
<row>
293-
<entry><literal>PHP_INI_ALL</literal></entry>
293+
<entry><constant>INI_ALL</constant></entry>
294294
<entry>Entry can be set anywhere</entry>
295295
</row>
296296
</tbody>
@@ -315,8 +315,8 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
315315
There are several Apache directives that allow you
316316
to change the PHP configuration from within the Apache configuration
317317
files. For a listing of which directives are
318-
<constant>PHP_INI_ALL</constant>, <constant>PHP_INI_PERDIR</constant>,
319-
or <constant>PHP_INI_SYSTEM</constant>, have a look at the
318+
<constant>INI_ALL</constant>, <constant>INI_PERDIR</constant>,
319+
or <constant>INI_SYSTEM</constant>, have a look at the
320320
<link linkend="ini.list">List of php.ini directives</link> appendix.
321321
</para>
322322

@@ -331,7 +331,7 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
331331
<listitem>
332332
<para>
333333
Sets the value of the specified directive.
334-
Can be used only with <constant>PHP_INI_ALL</constant> and <constant>PHP_INI_PERDIR</constant> type directives.
334+
Can be used only with <constant>INI_ALL</constant> and <constant>INI_PERDIR</constant> type directives.
335335
To clear a previously set value use <literal>none</literal> as the value.
336336
</para>
337337
<note>
@@ -351,8 +351,8 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
351351
<listitem>
352352
<para>
353353
Used to set a boolean configuration directive.
354-
Can be used only with <constant>PHP_INI_ALL</constant> and
355-
<constant>PHP_INI_PERDIR</constant> type directives.
354+
Can be used only with <constant>INI_ALL</constant> and
355+
<constant>INI_PERDIR</constant> type directives.
356356
</para>
357357
</listitem>
358358
</varlistentry>
@@ -435,8 +435,8 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
435435
should have the name of the PHP configuration directive and the
436436
string value. PHP constants in the values are not parsed.
437437
However, only configuration values changeable in
438-
<constant>PHP_INI_USER</constant> can be set
439-
this way, <constant>PHP_INI_PERDIR</constant> values can not,
438+
<constant>INI_USER</constant> can be set
439+
this way, <constant>INI_PERDIR</constant> values can not,
440440
because these configuration values are re-read for each request.
441441
</simpara>
442442
</sect2>

‎language-snippets.ent‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@ The behaviour of these functions is affected by settings in &php.ini;.
18861886
</simpara>'>
18871887

18881888
<!ENTITY ini.php.constants 'For further details and definitions of the
1889-
PHP_INI_* modes, see the <xref xmlns="http://docbook.org/ns/docbook" linkend="configuration.changes.modes"/>.'>
1889+
INI_* modes, see the <xref xmlns="http://docbook.org/ns/docbook" linkend="configuration.changes.modes"/>.'>
18901890

18911891
<!-- Used in reference/$extname/constants.xml -->
18921892
<!ENTITY extension.constants '<simpara xmlns="http://docbook.org/ns/docbook">

‎language/namespaces.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ echo \Foo\Bar\FOO; // resolves to constant Foo\Bar\FOO
409409
Note that to access any global
410410
class, function or constant, a fully qualified name can be used, such as
411411
<function>\strlen</function> or <classname>\Exception</classname> or
412-
<literal>\INI_ALL</literal>.
412+
\<constant>INI_ALL</constant>.
413413
<example>
414414
<title>Accessing global classes, functions and constants from within a namespace</title>
415415
<programlisting role="php">

‎reference/apache/ini.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@
2828
<row>
2929
<entry><link linkend="ini.engine">engine</link></entry>
3030
<entry>"1"</entry>
31-
<entry>PHP_INI_ALL</entry>
31+
<entry><constant>INI_ALL</constant></entry>
3232
<entry></entry>
3333
</row>
3434
<row>
3535
<entry><link linkend="ini.child-terminate">child_terminate</link></entry>
3636
<entry>"0"</entry>
37-
<entry>PHP_INI_ALL</entry>
37+
<entry><constant>INI_ALL</constant></entry>
3838
<entry></entry>
3939
</row>
4040
<row>
4141
<entry><link linkend="ini.last-modified">last_modified</link></entry>
4242
<entry>"0"</entry>
43-
<entry>PHP_INI_ALL</entry>
43+
<entry><constant>INI_ALL</constant></entry>
4444
<entry></entry>
4545
</row>
4646
<row>
4747
<entry><link linkend="ini.xbithack">xbithack</link></entry>
4848
<entry>"0"</entry>
49-
<entry>PHP_INI_ALL</entry>
49+
<entry><constant>INI_ALL</constant></entry>
5050
<entry></entry>
5151
</row>
5252
</tbody>

‎reference/apcu/ini.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,79 +60,79 @@
6060
<row>
6161
<entry><link linkend="ini.apcu.enabled">apc.enabled</link></entry>
6262
<entry>"1"</entry>
63-
<entry>PHP_INI_SYSTEM</entry>
63+
<entry><constant>INI_SYSTEM</constant></entry>
6464
<entry></entry>
6565
</row>
6666
<row>
6767
<entry><link linkend="ini.apcu.shm-segments">apc.shm_segments</link></entry>
6868
<entry>"1"</entry>
69-
<entry>PHP_INI_SYSTEM</entry>
69+
<entry><constant>INI_SYSTEM</constant></entry>
7070
<entry></entry>
7171
</row>
7272
<row>
7373
<entry><link linkend="ini.apcu.shm-size">apc.shm_size</link></entry>
7474
<entry>"32M"</entry>
75-
<entry>PHP_INI_SYSTEM</entry>
75+
<entry><constant>INI_SYSTEM</constant></entry>
7676
<entry></entry>
7777
</row>
7878
<row>
7979
<entry><link linkend="ini.apcu.entries-hint">apc.entries_hint</link></entry>
8080
<entry>"4096"</entry>
81-
<entry>PHP_INI_SYSTEM</entry>
81+
<entry><constant>INI_SYSTEM</constant></entry>
8282
<entry></entry>
8383
</row>
8484
<row>
8585
<entry><link linkend="ini.apcu.ttl">apc.ttl</link></entry>
8686
<entry>"0"</entry>
87-
<entry>PHP_INI_SYSTEM</entry>
87+
<entry><constant>INI_SYSTEM</constant></entry>
8888
<entry></entry>
8989
</row>
9090
<row>
9191
<entry><link linkend="ini.apcu.gc-ttl">apc.gc_ttl</link></entry>
9292
<entry>"3600"</entry>
93-
<entry>PHP_INI_SYSTEM</entry>
93+
<entry><constant>INI_SYSTEM</constant></entry>
9494
<entry></entry>
9595
</row>
9696
<row>
9797
<entry><link linkend="ini.apcu.mmap-file-mask">apc.mmap_file_mask</link></entry>
9898
<entry>NULL</entry>
99-
<entry>PHP_INI_SYSTEM</entry>
99+
<entry><constant>INI_SYSTEM</constant></entry>
100100
<entry></entry>
101101
</row>
102102
<row>
103103
<entry><link linkend="ini.apcu.slam-defense">apc.slam_defense</link></entry>
104104
<entry>"1"</entry>
105-
<entry>PHP_INI_SYSTEM</entry>
105+
<entry><constant>INI_SYSTEM</constant></entry>
106106
<entry></entry>
107107
</row>
108108
<row>
109109
<entry><link linkend="ini.apcu.enable-cli">apc.enable_cli</link></entry>
110110
<entry>"0"</entry>
111-
<entry>PHP_INI_SYSTEM</entry>
111+
<entry><constant>INI_SYSTEM</constant></entry>
112112
<entry></entry>
113113
</row>
114114
<row>
115115
<entry><link linkend="ini.apcu.use-request-time">apc.use_request_time</link></entry>
116116
<entry>"0"</entry>
117-
<entry>PHP_INI_ALL</entry>
117+
<entry><constant>INI_ALL</constant></entry>
118118
<entry>Prior to APCu 5.1.19, the default was "1".</entry>
119119
</row>
120120
<row>
121121
<entry><link linkend="ini.apcu.serializer">apc.serializer</link></entry>
122122
<entry>"php"</entry>
123-
<entry>PHP_INI_SYSTEM</entry>
123+
<entry><constant>INI_SYSTEM</constant></entry>
124124
<entry>Prior to APCu 5.1.15, the default was "default".</entry>
125125
</row>
126126
<row>
127127
<entry><link linkend="ini.apcu.coredump-unmap">apc.coredump_unmap</link></entry>
128128
<entry>"0"</entry>
129-
<entry>PHP_INI_SYSTEM</entry>
129+
<entry><constant>INI_SYSTEM</constant></entry>
130130
<entry></entry>
131131
</row>
132132
<row>
133133
<entry><link linkend="ini.apcu.preload-path">apc.preload_path</link></entry>
134134
<entry>NULL</entry>
135-
<entry>PHP_INI_SYSTEM</entry>
135+
<entry><constant>INI_SYSTEM</constant></entry>
136136
<entry></entry>
137137
</row>
138138
</tbody>

0 commit comments

Comments
 (0)