- reflection is always enabled

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index de862f7a1fa4ca641ae1c2a47751bfa79cdea235..6828011a24156a091104e996651d295c07bcef83 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -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 @@ static const opt_struct OPTIONS[] = {
        {'?', 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 @@ static void php_cli_usage(char *argv0)
                                "\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 @@ int main(int argc, char *argv[])
                        case 'H':
                                hide_argv = 1;
                                break;
-
-#ifdef HAVE_REFLECTION
                        case 10:
                                behavior=PHP_MODE_REFLECTION_FUNCTION;
                                reflection_what = php_optarg;
@@ -1019,7 +1011,6 @@ int main(int argc, char *argv[])
                                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 @@ int main(int argc, char *argv[])
 
                                break;
                        }
-#ifdef HAVE_REFLECTION
                        case PHP_MODE_REFLECTION_FUNCTION:
                        case PHP_MODE_REFLECTION_CLASS:
                        case PHP_MODE_REFLECTION_EXTENSION:
@@ -1336,7 +1326,6 @@ int main(int argc, char *argv[])
 
                                        break;
                                }
-#endif /* reflection */
                        case PHP_MODE_REFLECTION_EXT_INFO:
                                {
                                        int len = strlen(reflection_what);