pajoye Sat, 25 Jun 2011 10:47:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312454
Log:
- reflection is always enabled
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c
U php/php-src/trunk/sapi/cli/php_cli.c
Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-06-25 10:16:46 UTC
(rev 312453)
+++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-06-25 10:47:54 UTC
(rev 312454)
@@ -29,9 +29,7 @@
#include "zend_modules.h"
#include "zend_interfaces.h"
-#ifdef HAVE_REFLECTION
#include "ext/reflection/php_reflection.h"
-#endif
#include "SAPI.h"
@@ -159,14 +157,12 @@
{'?', 0, "usage"},/* help alias (both '?' and 'usage') */
{'v', 0, "version"},
{'z', 1, "zend-extension"},
-#ifdef HAVE_REFLECTION
{10, 1, "rf"},
{10, 1, "rfunction"},
{11, 1, "rc"},
{11, 1, "rclass"},
{12, 1, "re"},
{12, 1, "rextension"},
-#endif
{13, 1, "ri"},
{13, 1, "rextinfo"},
{14, 0, "ini"},
@@ -519,11 +515,9 @@
"\n"
" --ini Show configuration file
names\n"
"\n"
-#if (HAVE_REFLECTION)
" --rf <name> Show information about
function <name>.\n"
" --rc <name> Show information about
class <name>.\n"
" --re <name> Show information about
extension <name>.\n"
-#endif
" --ri <name> Show configuration for
extension <name>.\n"
"\n"
, prog, prog, prog, prog, prog, prog);
@@ -1005,8 +999,6 @@
case 'H':
hide_argv = 1;
break;
-
-#ifdef HAVE_REFLECTION
case 10:
behavior=PHP_MODE_REFLECTION_FUNCTION;
reflection_what = php_optarg;
@@ -1019,7 +1011,6 @@
behavior=PHP_MODE_REFLECTION_EXTENSION;
reflection_what = php_optarg;
break;
-#endif
case 13:
behavior=PHP_MODE_REFLECTION_EXT_INFO;
reflection_what = php_optarg;
@@ -1285,7 +1276,6 @@
break;
}
-#ifdef HAVE_REFLECTION
case PHP_MODE_REFLECTION_FUNCTION:
case PHP_MODE_REFLECTION_CLASS:
case PHP_MODE_REFLECTION_EXTENSION:
@@ -1336,7 +1326,6 @@
break;
}
-#endif /* reflection */
case PHP_MODE_REFLECTION_EXT_INFO:
{
int len = strlen(reflection_what);
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-06-25 10:16:46 UTC
(rev 312453)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-06-25 10:47:54 UTC
(rev 312454)
@@ -29,9 +29,7 @@
#include "zend_modules.h"
#include "zend_interfaces.h"
-#ifdef HAVE_REFLECTION
#include "ext/reflection/php_reflection.h"
-#endif
#include "SAPI.h"
@@ -158,7 +156,6 @@
{'?', 0, "usage"},/* help alias (both '?' and 'usage') */
{'v', 0, "version"},
{'z', 1, "zend-extension"},
-#ifdef HAVE_REFLECTION
{10, 1, "rf"},
{10, 1, "rfunction"},
{11, 1, "rc"},
@@ -167,7 +164,6 @@
{12, 1, "rextension"},
{13, 1, "rz"},
{13, 1, "rzendextension"},
-#endif
{14, 1, "ri"},
{14, 1, "rextinfo"},
{15, 0, "ini"},
@@ -537,12 +533,10 @@
"\n"
" --ini Show configuration file
names\n"
"\n"
-#if (HAVE_REFLECTION)
" --rf <name> Show information about
function <name>.\n"
" --rc <name> Show information about
class <name>.\n"
" --re <name> Show information about
extension <name>.\n"
" --rz <name> Show information about Zend
extension <name>.\n"
-#endif
" --ri <name> Show configuration for
extension <name>.\n"
"\n"
, prog, prog, prog, prog, prog, prog);
@@ -873,8 +867,6 @@
case 'H':
hide_argv = 1;
break;
-
-#ifdef HAVE_REFLECTION
case 10:
behavior=PHP_MODE_REFLECTION_FUNCTION;
reflection_what = php_optarg;
@@ -891,7 +883,6 @@
behavior=PHP_MODE_REFLECTION_ZEND_EXTENSION;
reflection_what = php_optarg;
break;
-#endif
case 14:
behavior=PHP_MODE_REFLECTION_EXT_INFO;
reflection_what = php_optarg;
@@ -1083,7 +1074,6 @@
break;
}
-#ifdef HAVE_REFLECTION
case PHP_MODE_REFLECTION_FUNCTION:
case PHP_MODE_REFLECTION_CLASS:
case PHP_MODE_REFLECTION_EXTENSION:
@@ -1138,7 +1128,6 @@
break;
}
-#endif /* reflection */
case PHP_MODE_REFLECTION_EXT_INFO:
{
int len = strlen(reflection_what);
Modified: php/php-src/trunk/sapi/cli/php_cli.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli.c 2011-06-25 10:16:46 UTC (rev
312453)
+++ php/php-src/trunk/sapi/cli/php_cli.c 2011-06-25 10:47:54 UTC (rev
312454)
@@ -29,9 +29,7 @@
#include "zend_modules.h"
#include "zend_interfaces.h"
-#ifdef HAVE_REFLECTION
#include "ext/reflection/php_reflection.h"
-#endif
#include "SAPI.h"
@@ -158,7 +156,6 @@
{'?', 0, "usage"},/* help alias (both '?' and 'usage') */
{'v', 0, "version"},
{'z', 1, "zend-extension"},
-#ifdef HAVE_REFLECTION
{10, 1, "rf"},
{10, 1, "rfunction"},
{11, 1, "rc"},
@@ -167,7 +164,6 @@
{12, 1, "rextension"},
{13, 1, "rz"},
{13, 1, "rzendextension"},
-#endif
{14, 1, "ri"},
{14, 1, "rextinfo"},
{15, 0, "ini"},
@@ -537,12 +533,10 @@
"\n"
" --ini Show configuration file
names\n"
"\n"
-#if (HAVE_REFLECTION)
" --rf <name> Show information about
function <name>.\n"
" --rc <name> Show information about
class <name>.\n"
" --re <name> Show information about
extension <name>.\n"
" --rz <name> Show information about Zend
extension <name>.\n"
-#endif
" --ri <name> Show configuration for
extension <name>.\n"
"\n"
, prog, prog, prog, prog, prog, prog);
@@ -873,8 +867,6 @@
case 'H':
hide_argv = 1;
break;
-
-#ifdef HAVE_REFLECTION
case 10:
behavior=PHP_MODE_REFLECTION_FUNCTION;
reflection_what = php_optarg;
@@ -891,7 +883,6 @@
behavior=PHP_MODE_REFLECTION_ZEND_EXTENSION;
reflection_what = php_optarg;
break;
-#endif
case 14:
behavior=PHP_MODE_REFLECTION_EXT_INFO;
reflection_what = php_optarg;
@@ -1083,7 +1074,6 @@
break;
}
-#ifdef HAVE_REFLECTION
case PHP_MODE_REFLECTION_FUNCTION:
case PHP_MODE_REFLECTION_CLASS:
case PHP_MODE_REFLECTION_EXTENSION:
@@ -1138,7 +1128,6 @@
break;
}
-#endif /* reflection */
case PHP_MODE_REFLECTION_EXT_INFO:
{
int len = strlen(reflection_what);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
