From c62465ceef489119ab2aeca120d5c676f0c5fa58 Mon Sep 17 00:00:00 2001 From: Corey Taylor Date: Mon, 20 Feb 2023 22:30:21 -0600 Subject: [PATCH] Fix several spl callmap methods --- dictionaries/CallMap.php | 146 +++++++++--------- dictionaries/CallMap_71_delta.php | 2 +- dictionaries/CallMap_73_delta.php | 2 + dictionaries/CallMap_74_delta.php | 16 +- dictionaries/CallMap_80_delta.php | 80 +++++++--- dictionaries/CallMap_81_delta.php | 8 + dictionaries/CallMap_historical.php | 144 +++++++++-------- .../Codebase/InternalCallMapHandlerTest.php | 62 -------- 8 files changed, 229 insertions(+), 231 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index 23a89269691..4cc19235b26 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -294,7 +294,7 @@ 'apcu_delete' => ['bool', 'key'=>'string|APCuIterator'], 'apcu_delete\'1' => ['list', 'key'=>'string[]'], 'apcu_enabled' => ['bool'], -'apcu_entry' => ['mixed', 'key'=>'string', 'generator'=>'callable', 'ttl='=>'int'], +'apcu_entry' => ['mixed', 'key'=>'string', 'generator'=>'callable(string):mixed', 'ttl='=>'int'], 'apcu_exists' => ['bool', 'keys'=>'string'], 'apcu_exists\'1' => ['array', 'keys'=>'string[]'], 'apcu_fetch' => ['mixed|false', 'key'=>'string', '&w_success='=>'bool'], @@ -675,10 +675,10 @@ 'closelog' => ['true'], 'Closure::__construct' => ['void'], 'Closure::__invoke' => ['', '...args='=>''], -'Closure::bind' => ['Closure|false', 'old'=>'Closure', 'to'=>'?object', 'scope='=>'object|string'], -'Closure::bindTo' => ['Closure|false', 'new'=>'?object', 'newscope='=>'object|string'], -'Closure::call' => ['', 'to'=>'object', '...parameters='=>''], -'Closure::fromCallable' => ['Closure', 'callable'=>'callable'], +'Closure::bind' => ['?Closure', 'closure'=>'Closure', 'newThis'=>'?object', 'newScope='=>'object|string|null'], +'Closure::bindTo' => ['?Closure', 'newThis'=>'?object', 'newScope='=>'object|string|null'], +'Closure::call' => ['mixed', 'newThis'=>'object', '...args='=>'mixed'], +'Closure::fromCallable' => ['Closure', 'callback'=>'callable'], 'clusterObj::convertToString' => ['string'], 'clusterObj::getFilterString' => ['string'], 'clusterObj::getGroupString' => ['string'], @@ -2871,10 +2871,10 @@ 'FilterIterator::next' => ['void'], 'FilterIterator::rewind' => ['void'], 'FilterIterator::valid' => ['bool'], -'finfo::__construct' => ['void', 'options='=>'int', 'magic_file='=>'string'], -'finfo::buffer' => ['string|false', 'string'=>'string', 'options='=>'int', 'context='=>'resource'], -'finfo::file' => ['string|false', 'file_name'=>'string', 'options='=>'int', 'context='=>'resource'], -'finfo::set_flags' => ['bool', 'options'=>'int'], +'finfo::__construct' => ['void', 'flags='=>'int', 'magic_database='=>'?string'], +'finfo::buffer' => ['string|false', 'string'=>'string', 'flags='=>'int', 'context='=>'?resource'], +'finfo::file' => ['string|false', 'filename'=>'string', 'flags='=>'int', 'context='=>'?resource'], +'finfo::set_flags' => ['bool', 'flags'=>'int'], 'finfo_buffer' => ['string|false', 'finfo'=>'finfo', 'string'=>'string', 'flags='=>'int', 'context='=>'resource'], 'finfo_close' => ['bool', 'finfo'=>'finfo'], 'finfo_file' => ['string|false', 'finfo'=>'finfo', 'filename'=>'string', 'flags='=>'int', 'context='=>'resource'], @@ -3166,7 +3166,7 @@ 'Generator::next' => ['void'], 'Generator::rewind' => ['void'], 'Generator::send' => ['mixed', 'value'=>'mixed'], -'Generator::throw' => ['mixed', 'exception'=>'Exception|Throwable'], +'Generator::throw' => ['mixed', 'exception'=>'Throwable'], 'Generator::valid' => ['bool'], 'geoip_asnum_by_name' => ['string|false', 'hostname'=>'string'], 'geoip_continent_code_by_name' => ['string|false', 'hostname'=>'string'], @@ -6464,14 +6464,14 @@ 'Locale::acceptFromHttp' => ['string|false', 'header'=>'string'], 'Locale::canonicalize' => ['string', 'locale'=>'string'], 'Locale::composeLocale' => ['string', 'subtags'=>'array'], -'Locale::filterMatches' => ['bool', 'langtag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'], +'Locale::filterMatches' => ['?bool', 'languageTag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'], 'Locale::getAllVariants' => ['array', 'locale'=>'string'], 'Locale::getDefault' => ['string'], -'Locale::getDisplayLanguage' => ['string', 'locale'=>'string', 'in_locale='=>'string'], -'Locale::getDisplayName' => ['string', 'locale'=>'string', 'in_locale='=>'string'], -'Locale::getDisplayRegion' => ['string', 'locale'=>'string', 'in_locale='=>'string'], -'Locale::getDisplayScript' => ['string', 'locale'=>'string', 'in_locale='=>'string'], -'Locale::getDisplayVariant' => ['string', 'locale'=>'string', 'in_locale='=>'string'], +'Locale::getDisplayLanguage' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], +'Locale::getDisplayName' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], +'Locale::getDisplayRegion' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], +'Locale::getDisplayScript' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], +'Locale::getDisplayVariant' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], 'Locale::getKeywords' => ['array|false', 'locale'=>'string'], 'Locale::getPrimaryLanguage' => ['string', 'locale'=>'string'], 'Locale::getRegion' => ['string', 'locale'=>'string'], @@ -8138,12 +8138,12 @@ 'NoRewindIterator::next' => ['void'], 'NoRewindIterator::rewind' => ['void'], 'NoRewindIterator::valid' => ['bool'], -'Normalizer::getRawDecomposition' => ['string|null', 'input'=>'string'], -'Normalizer::isNormalized' => ['bool', 'input'=>'string', 'form='=>'int'], -'Normalizer::normalize' => ['string', 'input'=>'string', 'form='=>'int'], -'normalizer_get_raw_decomposition' => ['string|null', 'string'=>'string'], +'Normalizer::getRawDecomposition' => ['?string', 'string'=>'string', 'form='=>'int'], +'Normalizer::isNormalized' => ['bool', 'string'=>'string', 'form='=>'int'], +'Normalizer::normalize' => ['string|false', 'string'=>'string', 'form='=>'int'], +'normalizer_get_raw_decomposition' => ['string|null', 'string'=>'string', 'form='=>'int'], 'normalizer_is_normalized' => ['bool', 'string'=>'string', 'form='=>'int'], -'normalizer_normalize' => ['string', 'string'=>'string', 'form='=>'int'], +'normalizer_normalize' => ['string|false', 'string'=>'string', 'form='=>'int'], 'notes_body' => ['array', 'server'=>'string', 'mailbox'=>'string', 'msg_number'=>'int'], 'notes_copy_db' => ['bool', 'from_database_name'=>'string', 'to_database_name'=>'string'], 'notes_create_db' => ['bool', 'database_name'=>'string'], @@ -8996,7 +8996,7 @@ 'PDFlib::utf16_to_utf8' => ['string', 'utf16string'=>'string'], 'PDFlib::utf32_to_utf16' => ['string', 'utf32string'=>'string', 'ordering'=>'string'], 'PDFlib::utf8_to_utf16' => ['string', 'utf8string'=>'string', 'ordering'=>'string'], -'PDO::__construct' => ['void', 'dsn'=>'string', 'username='=>'?string', 'passwd='=>'?string', 'options='=>'?array'], +'PDO::__construct' => ['void', 'dsn'=>'string', 'username='=>'?string', 'password='=>'?string', 'options='=>'?array'], 'PDO::__sleep' => ['list'], 'PDO::__wakeup' => ['void'], 'PDO::beginTransaction' => ['bool'], @@ -9004,7 +9004,7 @@ 'PDO::cubrid_schema' => ['array', 'schema_type'=>'int', 'table_name='=>'string', 'col_name='=>'string'], 'PDO::errorCode' => ['?string'], 'PDO::errorInfo' => ['array{0: ?string, 1: ?int, 2: ?string, 3?: mixed, 4?: mixed}'], -'PDO::exec' => ['int|false', 'query'=>'string'], +'PDO::exec' => ['int|false', 'statement'=>'string'], 'PDO::getAttribute' => ['mixed', 'attribute'=>'int'], 'PDO::getAvailableDrivers' => ['array'], 'PDO::inTransaction' => ['bool'], @@ -9018,12 +9018,12 @@ 'PDO::pgsqlLOBCreate' => ['string'], 'PDO::pgsqlLOBOpen' => ['resource', 'oid'=>'string', 'mode='=>'string'], 'PDO::pgsqlLOBUnlink' => ['bool', 'oid'=>'string'], -'PDO::prepare' => ['PDOStatement|false', 'statement'=>'string', 'options='=>'array'], -'PDO::query' => ['PDOStatement|false', 'sql'=>'string'], -'PDO::query\'1' => ['PDOStatement|false', 'sql'=>'string', 'fetch_column'=>'int', 'colno='=>'int'], -'PDO::query\'2' => ['PDOStatement|false', 'sql'=>'string', 'fetch_class'=>'int', 'classname'=>'string', 'ctorargs'=>'array'], -'PDO::query\'3' => ['PDOStatement|false', 'sql'=>'string', 'fetch_into'=>'int', 'object'=>'object'], -'PDO::quote' => ['string|false', 'string'=>'string', 'paramtype='=>'int'], +'PDO::prepare' => ['PDOStatement|false', 'query'=>'string', 'options='=>'array'], +'PDO::query' => ['PDOStatement|false', 'query'=>'string'], +'PDO::query\'1' => ['PDOStatement|false', 'query'=>'string', 'fetch_column'=>'int', 'colno='=>'int'], +'PDO::query\'2' => ['PDOStatement|false', 'query'=>'string', 'fetch_class'=>'int', 'classname'=>'string', 'constructorArgs'=>'array'], +'PDO::query\'3' => ['PDOStatement|false', 'query'=>'string', 'fetch_into'=>'int', 'object'=>'object'], +'PDO::quote' => ['string|false', 'string'=>'string', 'type='=>'int'], 'PDO::rollBack' => ['bool'], 'PDO::setAttribute' => ['bool', 'attribute'=>'int', 'value'=>''], 'PDO::sqliteCreateAggregate' => ['bool', 'function_name'=>'string', 'step_func'=>'callable', 'finalize_func'=>'callable', 'num_args='=>'int'], @@ -9039,8 +9039,8 @@ 'PDOException::getTraceAsString' => ['string'], 'PDOStatement::__sleep' => ['list'], 'PDOStatement::__wakeup' => ['void'], -'PDOStatement::bindColumn' => ['bool', 'column'=>'mixed', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'], -'PDOStatement::bindParam' => ['bool', 'param,'=>'string|int', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'], +'PDOStatement::bindColumn' => ['bool', 'column'=>'string|int', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'], +'PDOStatement::bindParam' => ['bool', 'param'=>'string|int', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'], 'PDOStatement::bindValue' => ['bool', 'param'=>'string|int', 'value'=>'mixed', 'type='=>'int'], 'PDOStatement::closeCursor' => ['bool'], 'PDOStatement::columnCount' => ['int'], @@ -9051,8 +9051,8 @@ 'PDOStatement::fetch' => ['mixed', 'mode='=>'int', 'cursorOrientation='=>'int', 'cursorOffset='=>'int'], 'PDOStatement::fetchAll' => ['array', 'mode='=>'int', '...args='=>'mixed'], 'PDOStatement::fetchColumn' => ['mixed', 'column='=>'int'], -'PDOStatement::fetchObject' => ['object|false', 'class='=>'?string', 'ctorArgs='=>'?array'], -'PDOStatement::getAttribute' => ['mixed', 'attribute'=>'int'], +'PDOStatement::fetchObject' => ['object|false', 'class='=>'?string', 'constructorArgs='=>'array'], +'PDOStatement::getAttribute' => ['mixed', 'name'=>'int'], 'PDOStatement::getColumnMeta' => ['array|false', 'column'=>'int'], 'PDOStatement::nextRowset' => ['bool'], 'PDOStatement::rowCount' => ['int'], @@ -12305,14 +12305,14 @@ 'SplDoublyLinkedList::valid' => ['bool'], 'SplEnum::__construct' => ['void', 'initial_value='=>'mixed', 'strict='=>'bool'], 'SplEnum::getConstList' => ['array', 'include_default='=>'bool'], -'SplFileInfo::__construct' => ['void', 'file_name'=>'string'], +'SplFileInfo::__construct' => ['void', 'filename'=>'string'], 'SplFileInfo::__toString' => ['string'], 'SplFileInfo::__wakeup' => ['void'], 'SplFileInfo::getATime' => ['int|false'], 'SplFileInfo::getBasename' => ['string', 'suffix='=>'string'], 'SplFileInfo::getCTime' => ['int|false'], 'SplFileInfo::getExtension' => ['string'], -'SplFileInfo::getFileInfo' => ['SplFileInfo', 'class_name='=>'string'], +'SplFileInfo::getFileInfo' => ['SplFileInfo', 'class='=>'?string'], 'SplFileInfo::getFilename' => ['string'], 'SplFileInfo::getGroup' => ['int|false'], 'SplFileInfo::getInode' => ['int|false'], @@ -12320,7 +12320,7 @@ 'SplFileInfo::getMTime' => ['int|false'], 'SplFileInfo::getOwner' => ['int|false'], 'SplFileInfo::getPath' => ['string'], -'SplFileInfo::getPathInfo' => ['SplFileInfo|null', 'class_name='=>'string'], +'SplFileInfo::getPathInfo' => ['SplFileInfo|null', 'class='=>'?string'], 'SplFileInfo::getPathname' => ['string'], 'SplFileInfo::getPerms' => ['int|false'], 'SplFileInfo::getRealPath' => ['string|false'], @@ -12332,27 +12332,27 @@ 'SplFileInfo::isLink' => ['bool'], 'SplFileInfo::isReadable' => ['bool'], 'SplFileInfo::isWritable' => ['bool'], -'SplFileInfo::openFile' => ['SplFileObject', 'mode='=>'string', 'use_include_path='=>'bool', 'context='=>'resource'], -'SplFileInfo::setFileClass' => ['void', 'class_name='=>'string'], -'SplFileInfo::setInfoClass' => ['void', 'class_name='=>'string'], -'SplFileObject::__construct' => ['void', 'filename'=>'string', 'mode='=>'string', 'use_include_path='=>'bool', 'context='=>''], +'SplFileInfo::openFile' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'], +'SplFileInfo::setFileClass' => ['void', 'class='=>'string'], +'SplFileInfo::setInfoClass' => ['void', 'class='=>'string'], +'SplFileObject::__construct' => ['void', 'filename'=>'string', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'], 'SplFileObject::__toString' => ['string'], 'SplFileObject::current' => ['string|array|false'], 'SplFileObject::eof' => ['bool'], 'SplFileObject::fflush' => ['bool'], 'SplFileObject::fgetc' => ['string|false'], -'SplFileObject::fgetcsv' => ['list|array{0: null}|false|null', 'seperator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], +'SplFileObject::fgetcsv' => ['list|array{0: null}|false', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], 'SplFileObject::fgets' => ['string'], -'SplFileObject::flock' => ['bool', 'operation'=>'int', '&w_wouldblock='=>'int'], +'SplFileObject::flock' => ['bool', 'operation'=>'int', '&w_wouldBlock='=>'int'], 'SplFileObject::fpassthru' => ['int'], -'SplFileObject::fputcsv' => ['int|false', 'fields'=>'array', 'seperator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], +'SplFileObject::fputcsv' => ['int|false', 'fields'=>'array', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string', 'eol='=>'string', 'eol='=>'string'], 'SplFileObject::fread' => ['string|false', 'length'=>'int'], 'SplFileObject::fscanf' => ['array|int', 'format'=>'string', '&...w_vars='=>'string|int|float'], -'SplFileObject::fseek' => ['int', 'pos'=>'int', 'whence='=>'int'], +'SplFileObject::fseek' => ['int', 'offset'=>'int', 'whence='=>'int'], 'SplFileObject::fstat' => ['array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int, 9: int, 10: int, 11: int, 12: int, dev: int, ino: int, mode: int, nlink: int, uid: int, gid: int, rdev: int, size: int, atime: int, mtime: int, ctime: int, blksize: int, blocks: int}'], 'SplFileObject::ftell' => ['int|false'], 'SplFileObject::ftruncate' => ['bool', 'size'=>'int'], -'SplFileObject::fwrite' => ['int', 'string'=>'string', 'length='=>'int'], +'SplFileObject::fwrite' => ['int|false', 'data'=>'string', 'length='=>'int'], 'SplFileObject::getATime' => ['int|false'], 'SplFileObject::getBasename' => ['string', 'suffix='=>'string'], 'SplFileObject::getChildren' => ['null'], @@ -12360,7 +12360,7 @@ 'SplFileObject::getCTime' => ['int|false'], 'SplFileObject::getCurrentLine' => ['string'], 'SplFileObject::getExtension' => ['string'], -'SplFileObject::getFileInfo' => ['SplFileInfo', 'class_name='=>'string'], +'SplFileObject::getFileInfo' => ['SplFileInfo', 'class='=>'?string'], 'SplFileObject::getFilename' => ['string'], 'SplFileObject::getFlags' => ['int'], 'SplFileObject::getGroup' => ['int|false'], @@ -12370,7 +12370,7 @@ 'SplFileObject::getMTime' => ['int|false'], 'SplFileObject::getOwner' => ['int|false'], 'SplFileObject::getPath' => ['string'], -'SplFileObject::getPathInfo' => ['SplFileInfo|null', 'class_name='=>'string'], +'SplFileObject::getPathInfo' => ['SplFileInfo|null', 'class='=>'?string'], 'SplFileObject::getPathname' => ['string'], 'SplFileObject::getPerms' => ['int|false'], 'SplFileObject::getRealPath' => ['false|string'], @@ -12385,14 +12385,14 @@ 'SplFileObject::isWritable' => ['bool'], 'SplFileObject::key' => ['int'], 'SplFileObject::next' => ['void'], -'SplFileObject::openFile' => ['SplFileObject', 'mode='=>'string', 'use_include_path='=>'bool', 'context='=>'resource'], +'SplFileObject::openFile' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'], 'SplFileObject::rewind' => ['void'], -'SplFileObject::seek' => ['void', 'line_pos'=>'int'], -'SplFileObject::setCsvControl' => ['void', 'delimiter='=>'string', 'enclosure='=>'string', 'escape='=>'string'], -'SplFileObject::setFileClass' => ['void', 'class_name='=>'string'], +'SplFileObject::seek' => ['void', 'line'=>'int'], +'SplFileObject::setCsvControl' => ['void', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], +'SplFileObject::setFileClass' => ['void', 'class='=>'string'], 'SplFileObject::setFlags' => ['void', 'flags'=>'int'], -'SplFileObject::setInfoClass' => ['void', 'class_name='=>'string'], -'SplFileObject::setMaxLineLen' => ['void', 'max_len'=>'int'], +'SplFileObject::setInfoClass' => ['void', 'class='=>'string'], +'SplFileObject::setMaxLineLen' => ['void', 'maxLength'=>'int'], 'SplFileObject::valid' => ['bool'], 'SplFixedArray::__construct' => ['void', 'size='=>'int'], 'SplFixedArray::__wakeup' => ['void'], @@ -12526,24 +12526,24 @@ 'SplSubject::attach' => ['void', 'observer'=>'SplObserver'], 'SplSubject::detach' => ['void', 'observer'=>'SplObserver'], 'SplSubject::notify' => ['void'], -'SplTempFileObject::__construct' => ['void', 'max_memory='=>'int'], +'SplTempFileObject::__construct' => ['void', 'maxMemory='=>'int'], 'SplTempFileObject::__toString' => ['string'], -'SplTempFileObject::current' => ['array|false|string'], +'SplTempFileObject::current' => ['string|array|false'], 'SplTempFileObject::eof' => ['bool'], 'SplTempFileObject::fflush' => ['bool'], -'SplTempFileObject::fgetc' => ['false|string'], -'SplTempFileObject::fgetcsv' => ['list|array{0: null}|false|null', 'seperator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], +'SplTempFileObject::fgetc' => ['string|false'], +'SplTempFileObject::fgetcsv' => ['list|array{0: null}|false', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], 'SplTempFileObject::fgets' => ['string'], -'SplTempFileObject::flock' => ['bool', 'operation'=>'int', '&wouldblock='=>'int'], +'SplTempFileObject::flock' => ['bool', 'operation'=>'int', '&w_wouldBlock='=>'int'], 'SplTempFileObject::fpassthru' => ['int'], -'SplTempFileObject::fputcsv' => ['false|int', 'fields'=>'array', 'seperator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], -'SplTempFileObject::fread' => ['false|string', 'length'=>'int'], -'SplTempFileObject::fscanf' => ['bool', 'format'=>'string', '&...w_vars='=>'array|array|array'], -'SplTempFileObject::fseek' => ['int', 'pos'=>'int', 'whence='=>'int'], +'SplTempFileObject::fputcsv' => ['int|false', 'fields'=>'array', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string', 'eol='=>'string'], +'SplTempFileObject::fread' => ['string|false', 'length'=>'int'], +'SplTempFileObject::fscanf' => ['array|int', 'format'=>'string', '&...w_vars='=>'string|int|float'], +'SplTempFileObject::fseek' => ['int', 'offset'=>'int', 'whence='=>'int'], 'SplTempFileObject::fstat' => ['array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int, 9: int, 10: int, 11: int, 12: int, dev: int, ino: int, mode: int, nlink: int, uid: int, gid: int, rdev: int, size: int, atime: int, mtime: int, ctime: int, blksize: int, blocks: int}'], -'SplTempFileObject::ftell' => ['int'], +'SplTempFileObject::ftell' => ['int|false'], 'SplTempFileObject::ftruncate' => ['bool', 'size'=>'int'], -'SplTempFileObject::fwrite' => ['int', 'string'=>'string', 'length='=>'int'], +'SplTempFileObject::fwrite' => ['int|false', 'data'=>'string', 'length='=>'int'], 'SplTempFileObject::getATime' => ['int|false'], 'SplTempFileObject::getBasename' => ['string', 'suffix='=>'string'], 'SplTempFileObject::getChildren' => ['null'], @@ -12551,7 +12551,7 @@ 'SplTempFileObject::getCTime' => ['int|false'], 'SplTempFileObject::getCurrentLine' => ['string'], 'SplTempFileObject::getExtension' => ['string'], -'SplTempFileObject::getFileInfo' => ['SplFileInfo', 'class_name='=>'string'], +'SplTempFileObject::getFileInfo' => ['SplFileInfo', 'class='=>'?string'], 'SplTempFileObject::getFilename' => ['string'], 'SplTempFileObject::getFlags' => ['int'], 'SplTempFileObject::getGroup' => ['int|false'], @@ -12561,10 +12561,10 @@ 'SplTempFileObject::getMTime' => ['int|false'], 'SplTempFileObject::getOwner' => ['int|false'], 'SplTempFileObject::getPath' => ['string'], -'SplTempFileObject::getPathInfo' => ['SplFileInfo', 'class_name='=>'string'], +'SplTempFileObject::getPathInfo' => ['SplFileInfo|null', 'class='=>'?string'], 'SplTempFileObject::getPathname' => ['string'], 'SplTempFileObject::getPerms' => ['int|false'], -'SplTempFileObject::getRealPath' => ['string|false'], +'SplTempFileObject::getRealPath' => ['false|string'], 'SplTempFileObject::getSize' => ['int|false'], 'SplTempFileObject::getType' => ['string|false'], 'SplTempFileObject::hasChildren' => ['false'], @@ -12576,14 +12576,14 @@ 'SplTempFileObject::isWritable' => ['bool'], 'SplTempFileObject::key' => ['int'], 'SplTempFileObject::next' => ['void'], -'SplTempFileObject::openFile' => ['SplFileObject', 'mode='=>'string', 'use_include_path='=>'bool', 'context='=>'resource'], +'SplTempFileObject::openFile' => ['SplTempFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'], 'SplTempFileObject::rewind' => ['void'], -'SplTempFileObject::seek' => ['void', 'line_pos'=>'int'], -'SplTempFileObject::setCsvControl' => ['void', 'delimiter='=>'string', 'enclosure='=>'string', 'escape='=>'string'], -'SplTempFileObject::setFileClass' => ['void', 'class_name='=>'string'], +'SplTempFileObject::seek' => ['void', 'line'=>'int'], +'SplTempFileObject::setCsvControl' => ['void', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], +'SplTempFileObject::setFileClass' => ['void', 'class='=>'string'], 'SplTempFileObject::setFlags' => ['void', 'flags'=>'int'], -'SplTempFileObject::setInfoClass' => ['void', 'class_name='=>'string'], -'SplTempFileObject::setMaxLineLen' => ['void', 'max_len'=>'int'], +'SplTempFileObject::setInfoClass' => ['void', 'class='=>'string'], +'SplTempFileObject::setMaxLineLen' => ['void', 'maxLength'=>'int'], 'SplTempFileObject::valid' => ['bool'], 'SplType::__construct' => ['void', 'initial_value='=>'mixed', 'strict='=>'bool'], 'Spoofchecker::__construct' => ['void'], diff --git a/dictionaries/CallMap_71_delta.php b/dictionaries/CallMap_71_delta.php index 163e60c74ec..93bb8cae3ce 100644 --- a/dictionaries/CallMap_71_delta.php +++ b/dictionaries/CallMap_71_delta.php @@ -16,7 +16,7 @@ */ return [ 'added' => [ - 'Closure::fromCallable' => ['Closure', 'callable'=>'callable'], + 'Closure::fromCallable' => ['Closure', 'callback'=>'callable'], 'curl_multi_errno' => ['int|false', 'mh'=>'resource'], 'curl_share_errno' => ['int|false', 'sh'=>'resource'], 'curl_share_strerror' => ['?string', 'error_code'=>'int'], diff --git a/dictionaries/CallMap_73_delta.php b/dictionaries/CallMap_73_delta.php index d33ad5c5fa5..568603b6bc8 100644 --- a/dictionaries/CallMap_73_delta.php +++ b/dictionaries/CallMap_73_delta.php @@ -28,6 +28,7 @@ 'JsonException::getPrevious' => ['?Throwable'], 'JsonException::getTrace' => ['list\',args?:array}>'], 'JsonException::getTraceAsString' => ['string'], + 'Normalizer::getRawDecomposition' => ['?string', 'string'=>'string', 'form='=>'int'], 'SplPriorityQueue::isCorrupted' => ['bool'], 'array_key_first' => ['int|string|null', 'array'=>'array'], 'array_key_last' => ['int|string|null', 'array'=>'array'], @@ -40,6 +41,7 @@ 'hrtime' => ['array{0:int,1:int}|false', 'as_number='=>'false'], 'hrtime\'1' => ['int|float|false', 'as_number='=>'true'], 'is_countable' => ['bool', 'value'=>'mixed'], + 'normalizer_get_raw_decomposition' => ['string|null', 'string'=>'string', 'form='=>'int'], 'net_get_interfaces' => ['array>|false'], 'openssl_pkey_derive' => ['string|false', 'public_key'=>'mixed', 'private_key'=>'mixed', 'key_length='=>'?int'], 'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:?int,path?:?string,domain?:?string,secure?:?bool,httponly?:?bool,samesite?:?string}'], diff --git a/dictionaries/CallMap_74_delta.php b/dictionaries/CallMap_74_delta.php index dbd4408f49d..87872004a22 100644 --- a/dictionaries/CallMap_74_delta.php +++ b/dictionaries/CallMap_74_delta.php @@ -25,13 +25,21 @@ 'old' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'string'], 'new' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'?string'], ], + 'SplFileObject::fwrite' => [ + 'old' => ['int', 'data'=>'string', 'length='=>'int'], + 'new' => ['int|false', 'data'=>'string', 'length='=>'int'], + ], + 'SplTempFileObject::fwrite' => [ + 'old' => ['int', 'data'=>'string', 'length='=>'int'], + 'new' => ['int|false', 'data'=>'string', 'length='=>'int'], + ], 'array_merge' => [ - 'old' => ['array', '...arrays'=>'array'], - 'new' => ['array', '...arrays='=>'array'], + 'old' => ['array', '...arrays'=>'array'], + 'new' => ['array', '...arrays='=>'array'], ], 'array_merge_recursive' => [ - 'old' => ['array', '...arrays'=>'array'], - 'new' => ['array', '...arrays='=>'array'], + 'old' => ['array', '...arrays'=>'array'], + 'new' => ['array', '...arrays='=>'array'], ], 'gzread' => [ 'old' => ['string|0', 'stream'=>'resource', 'length'=>'int'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index 2bebb5bac2e..b2cc5c427eb 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -85,6 +85,10 @@ 'old' => ['void', 'message='=>'string', 'code='=>'int', 'severity='=>'int', 'filename='=>'string', 'line='=>'int', 'previous='=>'?Throwable'], 'new' => ['void', 'message='=>'string', 'code='=>'int', 'severity='=>'int', 'filename='=>'?string', 'line='=>'?int', 'previous='=>'?Throwable'], ], + 'finfo::__construct' => [ + 'old' => ['void', 'flags='=>'int', 'magic_database='=>'string'], + 'new' => ['void', 'flags='=>'int', 'magic_database='=>'?string'], + ], 'IntlDateFormatter::__construct' => [ 'old' => ['void', 'locale'=>'?string', 'datetype'=>'null|int', 'timetype'=>'null|int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'], 'new' => ['void', 'locale'=>'?string', 'dateType'=>'int', 'timeType'=>'int', 'timezone='=>'IntlTimeZone|DateTimeZone|string|null', 'calendar='=>'IntlCalendar|int|null', 'pattern='=>'?string'], @@ -146,8 +150,28 @@ 'new' => ['void', 'lenient'=>'bool'], ], 'IntlDateFormatter::setTimeZone' => [ - 'old' => ['null|false', 'zone'=>'IntlTimeZone|DateTimeZone|string|null'], - 'new' => ['null|false', 'timezone'=>'IntlTimeZone|DateTimeZone|string|null'], + 'old' => ['null|false', 'zone'=>'IntlTimeZone|DateTimeZone|string|null'], + 'new' => ['null|false', 'timezone'=>'IntlTimeZone|DateTimeZone|string|null'], + ], + 'Locale::getDisplayLanguage' => [ + 'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], + 'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], + ], + 'Locale::getDisplayName' => [ + 'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], + 'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], + ], + 'Locale::getDisplayRegion' => [ + 'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], + 'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], + ], + 'Locale::getDisplayScript' => [ + 'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], + 'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], + ], + 'Locale::getDisplayVariant' => [ + 'old' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], + 'new' => ['string', 'locale'=>'string', 'displayLocale='=>'?string'], ], 'NumberFormatter::__construct' => [ 'old' => ['void', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'], @@ -157,18 +181,6 @@ 'old' => ['NumberFormatter|null', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'], 'new' => ['NumberFormatter|null', 'locale'=>'string', 'style'=>'int', 'pattern='=>'?string'], ], - 'PDOStatement::bindColumn' => [ - 'old' => ['bool', 'column'=>'mixed', '&rw_param'=>'mixed', 'type='=>'int', 'maxlen='=>'int', 'driverdata='=>'mixed'], - 'new' => ['bool', 'column'=>'mixed', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'], - ], - 'PDOStatement::bindParam' => [ - 'old' => ['bool', 'paramno'=>'mixed', '&rw_param'=>'mixed', 'type='=>'int', 'maxlen='=>'int', 'driverdata='=>'mixed'], - 'new' => ['bool', 'param,'=>'string|int', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'], - ], - 'PDOStatement::bindValue' => [ - 'old' => ['bool', 'paramno'=>'mixed', 'param'=>'mixed', 'type='=>'int'], - 'new' => ['bool', 'param'=>'string|int', 'value'=>'mixed', 'type='=>'int'], - ], 'PDOStatement::debugDumpParams' => [ 'old' => ['void'], 'new' => ['bool|null'], @@ -193,10 +205,6 @@ 'old' => ['string|int|float|bool|null', 'column_number='=>'int'], 'new' => ['mixed', 'column='=>'int'], ], - 'PDOStatement::fetchObject' => [ - 'old' => ['object|false', 'class_name='=>'string', 'ctor_args='=>'array'], - 'new' => ['object|false', 'class='=>'?string', 'ctorArgs='=>'?array'], - ], 'PDOStatement::setFetchMode' => [ 'old' => ['bool', 'mode'=>'int'], 'new' => ['bool', 'mode'=>'int', '...args='=>'mixed'], @@ -273,6 +281,42 @@ 'old' => ['mixed', 'object='=>'object'], 'new' => ['mixed', 'object='=>'null|object'], ], + 'SplFileInfo::getFileInfo' => [ + 'old' => ['SplFileInfo', 'class='=>'string'], + 'new' => ['SplFileInfo', 'class='=>'?string'], + ], + 'SplFileInfo::getPathInfo' => [ + 'old' => ['SplFileInfo|null', 'class='=>'string'], + 'new' => ['SplFileInfo|null', 'class='=>'?string'], + ], + 'SplFileInfo::openFile' => [ + 'old' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'], + 'new' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'], + ], + 'SplFileObject::getFileInfo' => [ + 'old' => ['SplFileInfo', 'class='=>'string'], + 'new' => ['SplFileInfo', 'class='=>'?string'], + ], + 'SplFileObject::getPathInfo' => [ + 'old' => ['SplFileInfo|null', 'class='=>'string'], + 'new' => ['SplFileInfo|null', 'class='=>'?string'], + ], + 'SplFileObject::openFile' => [ + 'old' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'], + 'new' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'], + ], + 'SplTempFileObject::getFileInfo' => [ + 'old' => ['SplFileInfo', 'class='=>'string'], + 'new' => ['SplFileInfo', 'class='=>'?string'], + ], + 'SplTempFileObject::getPathInfo' => [ + 'old' => ['SplFileInfo|null', 'class='=>'string'], + 'new' => ['SplFileInfo|null', 'class='=>'?string'], + ], + 'SplTempFileObject::openFile' => [ + 'old' => ['SplTempFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'], + 'new' => ['SplTempFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'], + ], 'tidy::__construct' => [ 'old' => ['void', 'filename='=>'string', 'config='=>'array|string', 'encoding='=>'string', 'useIncludePath='=>'bool'], 'new' => ['void', 'filename='=>'?string', 'config='=>'array|string|null', 'encoding='=>'?string', 'useIncludePath='=>'bool'], diff --git a/dictionaries/CallMap_81_delta.php b/dictionaries/CallMap_81_delta.php index 081e4adf25b..6d76650b638 100644 --- a/dictionaries/CallMap_81_delta.php +++ b/dictionaries/CallMap_81_delta.php @@ -66,6 +66,14 @@ 'old' => ['DOMDocumentFragment|false'], 'new' => ['DOMDocumentFragment'], ], + 'SplFileObject::fputcsv' => [ + 'old' => ['int|false', 'fields'=>'array', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], + 'new' => ['int|false', 'fields'=>'array', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string', 'eol='=>'string'], + ], + 'SplTempFileObject::fputcsv' => [ + 'old' => ['int|false', 'fields'=>'array', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], + 'new' => ['int|false', 'fields'=>'array', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string', 'eol='=>'string'], + ], 'finfo_buffer' => [ 'old' => ['string|false', 'finfo'=>'resource', 'string'=>'string', 'flags='=>'int', 'context='=>'resource'], 'new' => ['string|false', 'finfo'=>'finfo', 'string'=>'string', 'flags='=>'int', 'context='=>'resource'], diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php index e4f52d08dff..b572739420a 100644 --- a/dictionaries/CallMap_historical.php +++ b/dictionaries/CallMap_historical.php @@ -335,9 +335,9 @@ 'ClosedGeneratorException::getTraceAsString' => ['string'], 'Closure::__construct' => ['void'], 'Closure::__invoke' => ['', '...args='=>''], - 'Closure::bind' => ['Closure|false', 'old'=>'Closure', 'to'=>'?object', 'scope='=>'object|string'], - 'Closure::bindTo' => ['Closure|false', 'new'=>'?object', 'newscope='=>'object|string'], - 'Closure::call' => ['', 'to'=>'object', '...parameters='=>''], + 'Closure::bind' => ['?Closure', 'closure'=>'Closure', 'newThis'=>'?object', 'newScope='=>'object|string|null'], + 'Closure::bindTo' => ['?Closure', 'newThis'=>'?object', 'newScope='=>'object|string|null'], + 'Closure::call' => ['mixed', 'newThis'=>'object', '...args='=>'mixed'], 'Collator::__construct' => ['void', 'locale'=>'string'], 'Collator::asort' => ['bool', '&rw_arr'=>'array', 'sort_flag='=>'int'], 'Collator::compare' => ['int|false', 'string1'=>'string', 'string2'=>'string'], @@ -1745,7 +1745,7 @@ 'Generator::next' => ['void'], 'Generator::rewind' => ['void'], 'Generator::send' => ['mixed', 'value'=>'mixed'], - 'Generator::throw' => ['mixed', 'exception'=>'Exception|Throwable'], + 'Generator::throw' => ['mixed', 'exception'=>'Throwable'], 'Generator::valid' => ['bool'], 'GlobIterator::__construct' => ['void', 'path'=>'string', 'flags='=>'int'], 'GlobIterator::count' => ['int'], @@ -3399,14 +3399,14 @@ 'Locale::acceptFromHttp' => ['string|false', 'header'=>'string'], 'Locale::canonicalize' => ['string', 'locale'=>'string'], 'Locale::composeLocale' => ['string', 'subtags'=>'array'], - 'Locale::filterMatches' => ['bool', 'langtag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'], + 'Locale::filterMatches' => ['?bool', 'languageTag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'], 'Locale::getAllVariants' => ['array', 'locale'=>'string'], 'Locale::getDefault' => ['string'], - 'Locale::getDisplayLanguage' => ['string', 'locale'=>'string', 'in_locale='=>'string'], - 'Locale::getDisplayName' => ['string', 'locale'=>'string', 'in_locale='=>'string'], - 'Locale::getDisplayRegion' => ['string', 'locale'=>'string', 'in_locale='=>'string'], - 'Locale::getDisplayScript' => ['string', 'locale'=>'string', 'in_locale='=>'string'], - 'Locale::getDisplayVariant' => ['string', 'locale'=>'string', 'in_locale='=>'string'], + 'Locale::getDisplayLanguage' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], + 'Locale::getDisplayName' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], + 'Locale::getDisplayRegion' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], + 'Locale::getDisplayScript' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], + 'Locale::getDisplayVariant' => ['string', 'locale'=>'string', 'displayLocale='=>'string'], 'Locale::getKeywords' => ['array|false', 'locale'=>'string'], 'Locale::getPrimaryLanguage' => ['string', 'locale'=>'string'], 'Locale::getRegion' => ['string', 'locale'=>'string'], @@ -4268,9 +4268,8 @@ 'NoRewindIterator::next' => ['void'], 'NoRewindIterator::rewind' => ['void'], 'NoRewindIterator::valid' => ['bool'], - 'Normalizer::getRawDecomposition' => ['string|null', 'input'=>'string'], - 'Normalizer::isNormalized' => ['bool', 'input'=>'string', 'form='=>'int'], - 'Normalizer::normalize' => ['string', 'input'=>'string', 'form='=>'int'], + 'Normalizer::isNormalized' => ['bool', 'string'=>'string', 'form='=>'int'], + 'Normalizer::normalize' => ['string|false', 'string'=>'string', 'form='=>'int'], 'NumberFormatter::__construct' => ['void', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'], 'NumberFormatter::create' => ['NumberFormatter|null', 'locale'=>'string', 'style'=>'int', 'pattern='=>'string'], 'NumberFormatter::format' => ['string|false', 'num'=>'', 'type='=>'int'], @@ -4710,7 +4709,7 @@ 'PDFlib::utf16_to_utf8' => ['string', 'utf16string'=>'string'], 'PDFlib::utf32_to_utf16' => ['string', 'utf32string'=>'string', 'ordering'=>'string'], 'PDFlib::utf8_to_utf16' => ['string', 'utf8string'=>'string', 'ordering'=>'string'], - 'PDO::__construct' => ['void', 'dsn'=>'string', 'username='=>'?string', 'passwd='=>'?string', 'options='=>'?array'], + 'PDO::__construct' => ['void', 'dsn'=>'string', 'username='=>'?string', 'password='=>'?string', 'options='=>'?array'], 'PDO::__sleep' => ['list'], 'PDO::__wakeup' => ['void'], 'PDO::beginTransaction' => ['bool'], @@ -4718,7 +4717,7 @@ 'PDO::cubrid_schema' => ['array', 'schema_type'=>'int', 'table_name='=>'string', 'col_name='=>'string'], 'PDO::errorCode' => ['?string'], 'PDO::errorInfo' => ['array{0: ?string, 1: ?int, 2: ?string, 3?: mixed, 4?: mixed}'], - 'PDO::exec' => ['int|false', 'query'=>'string'], + 'PDO::exec' => ['int|false', 'statement'=>'string'], 'PDO::getAttribute' => ['mixed', 'attribute'=>'int'], 'PDO::getAvailableDrivers' => ['array'], 'PDO::inTransaction' => ['bool'], @@ -4732,12 +4731,12 @@ 'PDO::pgsqlLOBCreate' => ['string'], 'PDO::pgsqlLOBOpen' => ['resource', 'oid'=>'string', 'mode='=>'string'], 'PDO::pgsqlLOBUnlink' => ['bool', 'oid'=>'string'], - 'PDO::prepare' => ['PDOStatement|false', 'statement'=>'string', 'options='=>'array'], - 'PDO::query' => ['PDOStatement|false', 'sql'=>'string'], - 'PDO::query\'1' => ['PDOStatement|false', 'sql'=>'string', 'fetch_column'=>'int', 'colno='=>'int'], - 'PDO::query\'2' => ['PDOStatement|false', 'sql'=>'string', 'fetch_class'=>'int', 'classname'=>'string', 'ctorargs'=>'array'], - 'PDO::query\'3' => ['PDOStatement|false', 'sql'=>'string', 'fetch_into'=>'int', 'object'=>'object'], - 'PDO::quote' => ['string|false', 'string'=>'string', 'paramtype='=>'int'], + 'PDO::prepare' => ['PDOStatement|false', 'query'=>'string', 'options='=>'array'], + 'PDO::query' => ['PDOStatement|false', 'query'=>'string'], + 'PDO::query\'1' => ['PDOStatement|false', 'query'=>'string', 'fetch_column'=>'int', 'colno='=>'int'], + 'PDO::query\'2' => ['PDOStatement|false', 'query'=>'string', 'fetch_class'=>'int', 'classname'=>'string', 'constructorArgs'=>'array'], + 'PDO::query\'3' => ['PDOStatement|false', 'query'=>'string', 'fetch_into'=>'int', 'object'=>'object'], + 'PDO::quote' => ['string|false', 'string'=>'string', 'type='=>'int'], 'PDO::rollBack' => ['bool'], 'PDO::setAttribute' => ['bool', 'attribute'=>'int', 'value'=>''], 'PDO::sqliteCreateAggregate' => ['bool', 'function_name'=>'string', 'step_func'=>'callable', 'finalize_func'=>'callable', 'num_args='=>'int'], @@ -4752,9 +4751,9 @@ 'PDOException::getTraceAsString' => ['string'], 'PDOStatement::__sleep' => ['list'], 'PDOStatement::__wakeup' => ['void'], - 'PDOStatement::bindColumn' => ['bool', 'column'=>'mixed', '&rw_param'=>'mixed', 'type='=>'int', 'maxlen='=>'int', 'driverdata='=>'mixed'], - 'PDOStatement::bindParam' => ['bool', 'paramno'=>'mixed', '&rw_param'=>'mixed', 'type='=>'int', 'maxlen='=>'int', 'driverdata='=>'mixed'], - 'PDOStatement::bindValue' => ['bool', 'paramno'=>'mixed', 'param'=>'mixed', 'type='=>'int'], + 'PDOStatement::bindColumn' => ['bool', 'column'=>'string|int', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'], + 'PDOStatement::bindParam' => ['bool', 'param'=>'string|int', '&rw_var'=>'mixed', 'type='=>'int', 'maxLength='=>'int', 'driverOptions='=>'mixed'], + 'PDOStatement::bindValue' => ['bool', 'param'=>'string|int', 'value'=>'mixed', 'type='=>'int'], 'PDOStatement::closeCursor' => ['bool'], 'PDOStatement::columnCount' => ['int'], 'PDOStatement::debugDumpParams' => ['void'], @@ -4764,8 +4763,8 @@ 'PDOStatement::fetch' => ['mixed', 'how='=>'int', 'orientation='=>'int', 'offset='=>'int'], 'PDOStatement::fetchAll' => ['array|false', 'how='=>'int', 'fetch_argument='=>'int|string|callable', 'ctor_args='=>'?array'], 'PDOStatement::fetchColumn' => ['string|int|float|bool|null', 'column_number='=>'int'], - 'PDOStatement::fetchObject' => ['object|false', 'class_name='=>'string', 'ctor_args='=>'array'], - 'PDOStatement::getAttribute' => ['mixed', 'attribute'=>'int'], + 'PDOStatement::fetchObject' => ['object|false', 'class='=>'?string', 'constructorArgs='=>'array'], + 'PDOStatement::getAttribute' => ['mixed', 'name'=>'int'], 'PDOStatement::getColumnMeta' => ['array|false', 'column'=>'int'], 'PDOStatement::nextRowset' => ['bool'], 'PDOStatement::rowCount' => ['int'], @@ -7520,14 +7519,14 @@ 'SplDoublyLinkedList::valid' => ['bool'], 'SplEnum::__construct' => ['void', 'initial_value='=>'mixed', 'strict='=>'bool'], 'SplEnum::getConstList' => ['array', 'include_default='=>'bool'], - 'SplFileInfo::__construct' => ['void', 'file_name'=>'string'], + 'SplFileInfo::__construct' => ['void', 'filename'=>'string'], 'SplFileInfo::__toString' => ['string'], 'SplFileInfo::__wakeup' => ['void'], 'SplFileInfo::getATime' => ['int|false'], 'SplFileInfo::getBasename' => ['string', 'suffix='=>'string'], 'SplFileInfo::getCTime' => ['int|false'], 'SplFileInfo::getExtension' => ['string'], - 'SplFileInfo::getFileInfo' => ['SplFileInfo', 'class_name='=>'string'], + 'SplFileInfo::getFileInfo' => ['SplFileInfo', 'class='=>'string'], 'SplFileInfo::getFilename' => ['string'], 'SplFileInfo::getGroup' => ['int|false'], 'SplFileInfo::getInode' => ['int|false'], @@ -7535,7 +7534,7 @@ 'SplFileInfo::getMTime' => ['int|false'], 'SplFileInfo::getOwner' => ['int|false'], 'SplFileInfo::getPath' => ['string'], - 'SplFileInfo::getPathInfo' => ['SplFileInfo|null', 'class_name='=>'string'], + 'SplFileInfo::getPathInfo' => ['SplFileInfo|null', 'class='=>'string'], 'SplFileInfo::getPathname' => ['string'], 'SplFileInfo::getPerms' => ['int|false'], 'SplFileInfo::getRealPath' => ['string|false'], @@ -7547,28 +7546,28 @@ 'SplFileInfo::isLink' => ['bool'], 'SplFileInfo::isReadable' => ['bool'], 'SplFileInfo::isWritable' => ['bool'], - 'SplFileInfo::openFile' => ['SplFileObject', 'mode='=>'string', 'use_include_path='=>'bool', 'context='=>'resource'], - 'SplFileInfo::setFileClass' => ['void', 'class_name='=>'string'], - 'SplFileInfo::setInfoClass' => ['void', 'class_name='=>'string'], - 'SplFileObject::__construct' => ['void', 'filename'=>'string', 'mode='=>'string', 'use_include_path='=>'bool', 'context='=>''], + 'SplFileInfo::openFile' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'], + 'SplFileInfo::setFileClass' => ['void', 'class='=>'string'], + 'SplFileInfo::setInfoClass' => ['void', 'class='=>'string'], + 'SplFileObject::__construct' => ['void', 'filename'=>'string', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'?resource'], 'SplFileObject::__toString' => ['string'], 'SplFileObject::current' => ['string|array|false'], 'SplFileObject::eof' => ['bool'], 'SplFileObject::fflush' => ['bool'], 'SplFileObject::fgetc' => ['string|false'], - 'SplFileObject::fgetcsv' => ['list|array{0: null}|false|null', 'seperator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], + 'SplFileObject::fgetcsv' => ['list|array{0: null}|false', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], 'SplFileObject::fgets' => ['string|false'], 'SplFileObject::fgetss' => ['string|false', 'allowable_tags='=>'string'], - 'SplFileObject::flock' => ['bool', 'operation'=>'int', '&w_wouldblock='=>'int'], + 'SplFileObject::flock' => ['bool', 'operation'=>'int', '&w_wouldBlock='=>'int'], 'SplFileObject::fpassthru' => ['int'], - 'SplFileObject::fputcsv' => ['int|false', 'fields'=>'array', 'seperator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], + 'SplFileObject::fputcsv' => ['int|false', 'fields'=>'array', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], 'SplFileObject::fread' => ['string|false', 'length'=>'int'], 'SplFileObject::fscanf' => ['array|int', 'format'=>'string', '&...w_vars='=>'string|int|float'], - 'SplFileObject::fseek' => ['int', 'pos'=>'int', 'whence='=>'int'], + 'SplFileObject::fseek' => ['int', 'offset'=>'int', 'whence='=>'int'], 'SplFileObject::fstat' => ['array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int, 9: int, 10: int, 11: int, 12: int, dev: int, ino: int, mode: int, nlink: int, uid: int, gid: int, rdev: int, size: int, atime: int, mtime: int, ctime: int, blksize: int, blocks: int}'], 'SplFileObject::ftell' => ['int|false'], 'SplFileObject::ftruncate' => ['bool', 'size'=>'int'], - 'SplFileObject::fwrite' => ['int', 'string'=>'string', 'length='=>'int'], + 'SplFileObject::fwrite' => ['int', 'data'=>'string', 'length='=>'int'], 'SplFileObject::getATime' => ['int|false'], 'SplFileObject::getBasename' => ['string', 'suffix='=>'string'], 'SplFileObject::getCTime' => ['int|false'], @@ -7576,7 +7575,7 @@ 'SplFileObject::getCsvControl' => ['array'], 'SplFileObject::getCurrentLine' => ['string|false'], 'SplFileObject::getExtension' => ['string'], - 'SplFileObject::getFileInfo' => ['SplFileInfo', 'class_name='=>'string'], + 'SplFileObject::getFileInfo' => ['SplFileInfo', 'class='=>'string'], 'SplFileObject::getFilename' => ['string'], 'SplFileObject::getFlags' => ['int'], 'SplFileObject::getGroup' => ['int|false'], @@ -7586,7 +7585,7 @@ 'SplFileObject::getMTime' => ['int|false'], 'SplFileObject::getOwner' => ['int|false'], 'SplFileObject::getPath' => ['string'], - 'SplFileObject::getPathInfo' => ['SplFileInfo|null', 'class_name='=>'string'], + 'SplFileObject::getPathInfo' => ['SplFileInfo|null', 'class='=>'string'], 'SplFileObject::getPathname' => ['string'], 'SplFileObject::getPerms' => ['int|false'], 'SplFileObject::getRealPath' => ['false|string'], @@ -7601,14 +7600,14 @@ 'SplFileObject::isWritable' => ['bool'], 'SplFileObject::key' => ['int'], 'SplFileObject::next' => ['void'], - 'SplFileObject::openFile' => ['SplFileObject', 'mode='=>'string', 'use_include_path='=>'bool', 'context='=>'resource'], + 'SplFileObject::openFile' => ['SplFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'], 'SplFileObject::rewind' => ['void'], - 'SplFileObject::seek' => ['void', 'line_pos'=>'int'], - 'SplFileObject::setCsvControl' => ['void', 'delimiter='=>'string', 'enclosure='=>'string', 'escape='=>'string'], - 'SplFileObject::setFileClass' => ['void', 'class_name='=>'string'], + 'SplFileObject::seek' => ['void', 'line'=>'int'], + 'SplFileObject::setCsvControl' => ['void', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], + 'SplFileObject::setFileClass' => ['void', 'class='=>'string'], 'SplFileObject::setFlags' => ['void', 'flags'=>'int'], - 'SplFileObject::setInfoClass' => ['void', 'class_name='=>'string'], - 'SplFileObject::setMaxLineLen' => ['void', 'max_len'=>'int'], + 'SplFileObject::setInfoClass' => ['void', 'class='=>'string'], + 'SplFileObject::setMaxLineLen' => ['void', 'maxLength'=>'int'], 'SplFileObject::valid' => ['bool'], 'SplFixedArray::__construct' => ['void', 'size='=>'int'], 'SplFixedArray::__wakeup' => ['void'], @@ -7741,25 +7740,25 @@ 'SplSubject::attach' => ['void', 'observer'=>'SplObserver'], 'SplSubject::detach' => ['void', 'observer'=>'SplObserver'], 'SplSubject::notify' => ['void'], - 'SplTempFileObject::__construct' => ['void', 'max_memory='=>'int'], + 'SplTempFileObject::__construct' => ['void', 'maxMemory='=>'int'], 'SplTempFileObject::__toString' => ['string'], - 'SplTempFileObject::current' => ['array|false|string'], + 'SplTempFileObject::current' => ['string|array|false'], 'SplTempFileObject::eof' => ['bool'], 'SplTempFileObject::fflush' => ['bool'], - 'SplTempFileObject::fgetc' => ['false|string'], - 'SplTempFileObject::fgetcsv' => ['list|array{0: null}|false|null', 'seperator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], + 'SplTempFileObject::fgetc' => ['string|false'], + 'SplTempFileObject::fgetcsv' => ['list|array{0: null}|false', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], 'SplTempFileObject::fgets' => ['string'], 'SplTempFileObject::fgetss' => ['string', 'allowable_tags='=>'string'], - 'SplTempFileObject::flock' => ['bool', 'operation'=>'int', '&wouldblock='=>'int'], + 'SplTempFileObject::flock' => ['bool', 'operation'=>'int', '&w_wouldBlock='=>'int'], 'SplTempFileObject::fpassthru' => ['int'], - 'SplTempFileObject::fputcsv' => ['false|int', 'fields'=>'array', 'seperator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], - 'SplTempFileObject::fread' => ['false|string', 'length'=>'int'], - 'SplTempFileObject::fscanf' => ['bool', 'format'=>'string', '&...w_vars='=>'array|array|array'], - 'SplTempFileObject::fseek' => ['int', 'pos'=>'int', 'whence='=>'int'], + 'SplTempFileObject::fputcsv' => ['int|false', 'fields'=>'array', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], + 'SplTempFileObject::fread' => ['string|false', 'length'=>'int'], + 'SplTempFileObject::fscanf' => ['array|int', 'format'=>'string', '&...w_vars='=>'string|int|float'], + 'SplTempFileObject::fseek' => ['int', 'offset'=>'int', 'whence='=>'int'], 'SplTempFileObject::fstat' => ['array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int, 8: int, 9: int, 10: int, 11: int, 12: int, dev: int, ino: int, mode: int, nlink: int, uid: int, gid: int, rdev: int, size: int, atime: int, mtime: int, ctime: int, blksize: int, blocks: int}'], - 'SplTempFileObject::ftell' => ['int'], + 'SplTempFileObject::ftell' => ['int|false'], 'SplTempFileObject::ftruncate' => ['bool', 'size'=>'int'], - 'SplTempFileObject::fwrite' => ['int', 'string'=>'string', 'length='=>'int'], + 'SplTempFileObject::fwrite' => ['int', 'data'=>'string', 'length='=>'int'], 'SplTempFileObject::getATime' => ['int|false'], 'SplTempFileObject::getBasename' => ['string', 'suffix='=>'string'], 'SplTempFileObject::getCTime' => ['int|false'], @@ -7767,7 +7766,7 @@ 'SplTempFileObject::getCsvControl' => ['array'], 'SplTempFileObject::getCurrentLine' => ['string'], 'SplTempFileObject::getExtension' => ['string'], - 'SplTempFileObject::getFileInfo' => ['SplFileInfo', 'class_name='=>'string'], + 'SplTempFileObject::getFileInfo' => ['SplFileInfo', 'class='=>'string'], 'SplTempFileObject::getFilename' => ['string'], 'SplTempFileObject::getFlags' => ['int'], 'SplTempFileObject::getGroup' => ['int|false'], @@ -7777,10 +7776,10 @@ 'SplTempFileObject::getMTime' => ['int|false'], 'SplTempFileObject::getOwner' => ['int|false'], 'SplTempFileObject::getPath' => ['string'], - 'SplTempFileObject::getPathInfo' => ['SplFileInfo', 'class_name='=>'string'], + 'SplTempFileObject::getPathInfo' => ['SplFileInfo|null', 'class='=>'string'], 'SplTempFileObject::getPathname' => ['string'], 'SplTempFileObject::getPerms' => ['int|false'], - 'SplTempFileObject::getRealPath' => ['string|false'], + 'SplTempFileObject::getRealPath' => ['false|string'], 'SplTempFileObject::getSize' => ['int|false'], 'SplTempFileObject::getType' => ['string|false'], 'SplTempFileObject::hasChildren' => ['false'], @@ -7792,14 +7791,14 @@ 'SplTempFileObject::isWritable' => ['bool'], 'SplTempFileObject::key' => ['int'], 'SplTempFileObject::next' => ['void'], - 'SplTempFileObject::openFile' => ['SplFileObject', 'mode='=>'string', 'use_include_path='=>'bool', 'context='=>'resource'], + 'SplTempFileObject::openFile' => ['SplTempFileObject', 'mode='=>'string', 'useIncludePath='=>'bool', 'context='=>'resource'], 'SplTempFileObject::rewind' => ['void'], - 'SplTempFileObject::seek' => ['void', 'line_pos'=>'int'], - 'SplTempFileObject::setCsvControl' => ['void', 'delimiter='=>'string', 'enclosure='=>'string', 'escape='=>'string'], - 'SplTempFileObject::setFileClass' => ['void', 'class_name='=>'string'], + 'SplTempFileObject::seek' => ['void', 'line'=>'int'], + 'SplTempFileObject::setCsvControl' => ['void', 'separator='=>'string', 'enclosure='=>'string', 'escape='=>'string'], + 'SplTempFileObject::setFileClass' => ['void', 'class='=>'string'], 'SplTempFileObject::setFlags' => ['void', 'flags'=>'int'], - 'SplTempFileObject::setInfoClass' => ['void', 'class_name='=>'string'], - 'SplTempFileObject::setMaxLineLen' => ['void', 'max_len'=>'int'], + 'SplTempFileObject::setInfoClass' => ['void', 'class='=>'string'], + 'SplTempFileObject::setMaxLineLen' => ['void', 'maxLength'=>'int'], 'SplTempFileObject::valid' => ['bool'], 'SplType::__construct' => ['void', 'initial_value='=>'mixed', 'strict='=>'bool'], 'Spoofchecker::__construct' => ['void'], @@ -9328,7 +9327,7 @@ 'apcu_delete' => ['bool', 'key'=>'string|APCuIterator'], 'apcu_delete\'1' => ['list', 'key'=>'string[]'], 'apcu_enabled' => ['bool'], - 'apcu_entry' => ['mixed', 'key'=>'string', 'generator'=>'callable', 'ttl='=>'int'], + 'apcu_entry' => ['mixed', 'key'=>'string', 'generator'=>'callable(string):mixed', 'ttl='=>'int'], 'apcu_exists' => ['bool', 'keys'=>'string'], 'apcu_exists\'1' => ['array', 'keys'=>'string[]'], 'apcu_fetch' => ['mixed|false', 'key'=>'string', '&w_success='=>'bool'], @@ -10510,10 +10509,10 @@ 'filter_list' => ['array'], 'filter_var' => ['mixed|false', 'value'=>'mixed', 'filter='=>'int', 'options='=>'array|int'], 'filter_var_array' => ['array|false|null', 'array'=>'array', 'options='=>'array|int', 'add_empty='=>'bool'], - 'finfo::__construct' => ['void', 'options='=>'int', 'magic_file='=>'string'], - 'finfo::buffer' => ['string|false', 'string'=>'string', 'options='=>'int', 'context='=>'resource'], - 'finfo::file' => ['string|false', 'file_name'=>'string', 'options='=>'int', 'context='=>'resource'], - 'finfo::set_flags' => ['bool', 'options'=>'int'], + 'finfo::__construct' => ['void', 'flags='=>'int', 'magic_database='=>'string'], + 'finfo::buffer' => ['string|false', 'string'=>'string', 'flags='=>'int', 'context='=>'?resource'], + 'finfo::file' => ['string|false', 'filename'=>'string', 'flags='=>'int', 'context='=>'?resource'], + 'finfo::set_flags' => ['bool', 'flags'=>'int'], 'finfo_buffer' => ['string|false', 'finfo'=>'resource', 'string'=>'string', 'flags='=>'int', 'context='=>'resource'], 'finfo_close' => ['bool', 'finfo'=>'resource'], 'finfo_file' => ['string|false', 'finfo'=>'resource', 'filename'=>'string', 'flags='=>'int', 'context='=>'resource'], @@ -12995,9 +12994,8 @@ 'ngettext' => ['string', 'singular'=>'string', 'plural'=>'string', 'count'=>'int'], 'nl2br' => ['string', 'string'=>'string', 'use_xhtml='=>'bool'], 'nl_langinfo' => ['string|false', 'item'=>'int'], - 'normalizer_get_raw_decomposition' => ['string|null', 'string'=>'string'], 'normalizer_is_normalized' => ['bool', 'string'=>'string', 'form='=>'int'], - 'normalizer_normalize' => ['string', 'string'=>'string', 'form='=>'int'], + 'normalizer_normalize' => ['string|false', 'string'=>'string', 'form='=>'int'], 'notes_body' => ['array', 'server'=>'string', 'mailbox'=>'string', 'msg_number'=>'int'], 'notes_copy_db' => ['bool', 'from_database_name'=>'string', 'to_database_name'=>'string'], 'notes_create_db' => ['bool', 'database_name'=>'string'], diff --git a/tests/Internal/Codebase/InternalCallMapHandlerTest.php b/tests/Internal/Codebase/InternalCallMapHandlerTest.php index c9130378962..8da1eb8997c 100644 --- a/tests/Internal/Codebase/InternalCallMapHandlerTest.php +++ b/tests/Internal/Codebase/InternalCallMapHandlerTest.php @@ -73,7 +73,6 @@ class InternalCallMapHandlerTest extends TestCase * @var array> */ private static array $ignoredFunctions = [ - 'apcu_entry', 'array_multisort', 'arrayiterator::asort', 'arrayiterator::ksort', @@ -103,10 +102,6 @@ class InternalCallMapHandlerTest extends TestCase 'cachingiterator::offsetset', 'cachingiterator::offsetunset', 'callbackfilteriterator::__construct', - 'closure::bind', - 'closure::bindto', - 'closure::call', - 'closure::fromcallable', 'collator::asort', 'collator::getattribute', 'collator::setattribute', @@ -198,11 +193,6 @@ class InternalCallMapHandlerTest extends TestCase 'filesystemiterator::setfileclass', 'filesystemiterator::setflags', 'filesystemiterator::setinfoclass', - 'finfo::__construct', - 'finfo::buffer', - 'finfo::file', - 'finfo::set_flags', - 'generator::throw', 'globiterator::__construct', 'globiterator::getfileinfo', 'globiterator::getpathinfo', @@ -371,12 +361,6 @@ class InternalCallMapHandlerTest extends TestCase 'jsonexception::__construct', 'limititerator::__construct', 'limititerator::seek', - 'locale::filtermatches', - 'locale::getdisplaylanguage', - 'locale::getdisplayname', - 'locale::getdisplayregion', - 'locale::getdisplayscript', - 'locale::getdisplayvariant', 'lzf_compress', 'lzf_decompress', 'mailparse_msg_extract_part', @@ -402,10 +386,6 @@ class InternalCallMapHandlerTest extends TestCase 'mysqli_stmt::__construct', 'mysqli_stmt::bind_param', 'mysqli_stmt_bind_param', - 'normalizer::getrawdecomposition', - 'normalizer::isnormalized', - 'normalizer::normalize', - 'normalizer_get_raw_decomposition', 'numberformatter::formatcurrency', 'numberformatter::getattribute', 'numberformatter::getsymbol', @@ -464,14 +444,6 @@ class InternalCallMapHandlerTest extends TestCase 'odbc_procedures', 'odbc_result', 'openssl_pkcs7_read', - 'pdo::__construct', - 'pdo::exec', - 'pdo::prepare', - 'pdo::quote', - 'pdostatement::bindcolumn', - 'pdostatement::bindparam', - 'pdostatement::fetchobject', - 'pdostatement::getattribute', 'phar::__construct', 'phar::addemptydir', 'phar::addfile', @@ -584,26 +556,6 @@ class InternalCallMapHandlerTest extends TestCase 'spldoublylinkedlist::offsetset', 'spldoublylinkedlist::setiteratormode', 'spldoublylinkedlist::unserialize', - 'splfileinfo::__construct', - 'splfileinfo::getfileinfo', - 'splfileinfo::getpathinfo', - 'splfileinfo::openfile', - 'splfileinfo::setfileclass', - 'splfileinfo::setinfoclass', - 'splfileobject::__construct', - 'splfileobject::fgetcsv', - 'splfileobject::flock', - 'splfileobject::fputcsv', - 'splfileobject::fseek', - 'splfileobject::fwrite', - 'splfileobject::getfileinfo', - 'splfileobject::getpathinfo', - 'splfileobject::openfile', - 'splfileobject::seek', - 'splfileobject::setcsvcontrol', - 'splfileobject::setfileclass', - 'splfileobject::setinfoclass', - 'splfileobject::setmaxlinelen', 'splfixedarray::fromarray', 'splfixedarray::offsetset', 'splmaxheap::compare', @@ -622,20 +574,6 @@ class InternalCallMapHandlerTest extends TestCase 'splstack::add', 'splstack::offsetset', 'splstack::unserialize', - 'spltempfileobject::__construct', - 'spltempfileobject::fgetcsv', - 'spltempfileobject::flock', - 'spltempfileobject::fputcsv', - 'spltempfileobject::fseek', - 'spltempfileobject::fwrite', - 'spltempfileobject::getfileinfo', - 'spltempfileobject::getpathinfo', - 'spltempfileobject::openfile', - 'spltempfileobject::seek', - 'spltempfileobject::setcsvcontrol', - 'spltempfileobject::setfileclass', - 'spltempfileobject::setinfoclass', - 'spltempfileobject::setmaxlinelen', 'sqlite3::__construct', 'sqlite3::open', 'sqlsrv_connect',