Declare ext/stanard constants in stubs - part 11 (#9728)

Author: kocsismate

ext/standard/basic_functions.c

@@ -17,6 +17,7 @@
 
 #include "php.h"
 #include "php_assert.h"
+#include "php_crypt.h"
 #include "php_streams.h"
 #include "php_main.h"
 #include "php_globals.h"

ext/standard/basic_functions.stub.php

@@ -371,6 +371,26 @@
  */
 const PHP_ROUND_HALF_ODD = UNKNOWN;
 
+/* crypt.c */
+
+/**
+ * @var int
+ * @cvalue PHP_MAX_SALT_LEN
+ */
+const CRYPT_SALT_LENGTH = UNKNOWN;
+/** @var int */
+const CRYPT_STD_DES = 1;
+/** @var int */
+const CRYPT_EXT_DES = 1;
+/** @var int */
+const CRYPT_MD5 = 1;
+/** @var int */
+const CRYPT_BLOWFISH = 1;
+/** @var int */
+const CRYPT_SHA256 = 1;
+/** @var int */
+const CRYPT_SHA512 = 1;
+
 /* dns.c */
 
 #if (defined(PHP_WIN32) || (defined(HAVE_DNS_SEARCH_FUNC) && defined(HAVE_FULL_DNS_FUNCS)))

ext/standard/basic_functions_arginfo.h

@@ -45,22 +45,11 @@
 #include "php_crypt.h"
 #include "ext/random/php_random.h"
 
-/* sha512 crypt has the maximal salt length of 123 characters */
-#define PHP_MAX_SALT_LEN 123
-
 /* Used to check DES salts to ensure that they contain only valid characters */
 #define IS_VALID_SALT_CHARACTER(c) (((c) >= '.' && (c) <= '9') || ((c) >= 'A' && (c) <= 'Z') || ((c) >= 'a' && (c) <= 'z'))
 
 PHP_MINIT_FUNCTION(crypt) /* {{{ */
 {
-	REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", PHP_MAX_SALT_LEN, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("CRYPT_STD_DES", 1, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", 1, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("CRYPT_MD5", 1, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", 1, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("CRYPT_SHA256", 1, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("CRYPT_SHA512", 1, CONST_CS | CONST_PERSISTENT);
-
 #if PHP_USE_PHP_CRYPT_R
 	php_init_crypt_r();
 #endif

ext/standard/crypt.c

@@ -24,4 +24,7 @@ PHP_MINIT_FUNCTION(crypt);
 PHP_MSHUTDOWN_FUNCTION(crypt);
 PHP_RINIT_FUNCTION(crypt);
 
+/* sha512 crypt has the maximal salt length of 123 characters */
+#define PHP_MAX_SALT_LEN 123
+
 #endif