From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 22 Oct 2020 12:56:00 +0000 (+0200)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66757b5cf4a34eef01a7df247cab8ff465710169;p=php

Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix parameter name of pspell_config_save_repl()
---

66757b5cf4a34eef01a7df247cab8ff465710169
diff --cc ext/pspell/pspell.stub.php
index 606052c21e,cf15fb35eb..a10de4b9f9
--- a/ext/pspell/pspell.stub.php
+++ b/ext/pspell/pspell.stub.php
@@@ -14,24 -11,38 +14,24 @@@ function pspell_new_personal
      string $jargon = "",
      string $encoding = "",
      int $mode = 0
 -): int|false {}
 -
 -function pspell_new_config(int $config): int|false {}
 -
 -function pspell_check(int $dictionary, string $word): bool {}
 -
 -function pspell_suggest(int $dictionary, string $word): array|false {}
 -
 -function pspell_store_replacement(int $dictionary, string $misspelled, string $correct): bool {}
 -
 -function pspell_add_to_personal(int $dictionary, string $word): bool {}
 -
 -function pspell_add_to_session(int $dictionary, string $word): bool {}
 -
 -function pspell_clear_session(int $dictionary): bool {}
 -
 -function pspell_save_wordlist(int $dictionary): bool {}
 -
 -function pspell_config_create(string $language, string $spelling = "", string $jargon = "", string $encoding = ""): int {}
 -
 -function pspell_config_runtogether(int $config, bool $allow): bool {}
 -
 -function pspell_config_mode(int $config, int $mode): bool {}
 -
 -function pspell_config_ignore(int $config, int $min_length): bool {}
 -
 -function pspell_config_personal(int $config, string $filename): bool {}
 -
 -function pspell_config_dict_dir(int $config, string $directory): bool {}
 -
 -function pspell_config_data_dir(int $config, string $directory): bool {}
 -
 -function pspell_config_repl(int $config, string $filename): bool {}
 -
 -function pspell_config_save_repl(int $config, bool $save): bool {}
 +): PSpell|false {}
 +
 +function pspell_new_config(PSpellConfig $config): PSpell|false {}
 +
 +function pspell_check(PSpell $dictionary, string $word): bool {}
 +function pspell_suggest(PSpell $dictionary, string $word): array|false {}
 +function pspell_store_replacement(PSpell $dictionary, string $misspelled, string $correct): bool {}
 +function pspell_add_to_personal(PSpell $dictionary, string $word): bool {}
 +function pspell_add_to_session(PSpell $dictionary, string $word): bool {}
 +function pspell_clear_session(PSpell $dictionary): bool {}
 +function pspell_save_wordlist(PSpell $dictionary): bool {}
 +
 +function pspell_config_create(string $language, string $spelling = "", string $jargon = "", string $encoding = ""): PSpellConfig {}
 +function pspell_config_runtogether(PSpellConfig $config, bool $allow): bool {}
 +function pspell_config_mode(PSpellConfig $config, int $mode): bool {}
 +function pspell_config_ignore(PSpellConfig $config, int $min_length): bool {}
 +function pspell_config_personal(PSpellConfig $config, string $filename): bool {}
 +function pspell_config_dict_dir(PSpellConfig $config, string $directory): bool {}
 +function pspell_config_data_dir(PSpellConfig $config, string $directory): bool {}
 +function pspell_config_repl(PSpellConfig $config, string $filename): bool {}
- function pspell_config_save_repl(PSpellConfig $dictionary, bool $save): bool {}
++function pspell_config_save_repl(PSpellConfig $config, bool $save): bool {}
diff --cc ext/pspell/pspell_arginfo.h
index a73b27a734,102907461c..f3b7b55310
--- a/ext/pspell/pspell_arginfo.h
+++ b/ext/pspell/pspell_arginfo.h
@@@ -1,7 -1,7 +1,7 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: c5195a21d76b23878f26d592ee75bea68941ce51 */
 - * Stub hash: 1d201126072be285aa2dd3c0136cb7cc261f5841 */
++ * Stub hash: efc4c20a1507cfba58ec265a2fe6f61b1e0f8a61 */
  
 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pspell_new, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_pspell_new, 0, 1, PSpell, MAY_BE_FALSE)
  	ZEND_ARG_TYPE_INFO(0, language, IS_STRING, 0)
  	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, spelling, IS_STRING, 0, "\"\"")
  	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, jargon, IS_STRING, 0, "\"\"")
@@@ -85,7 -85,7 +85,7 @@@ ZEND_END_ARG_INFO(
  #define arginfo_pspell_config_repl arginfo_pspell_config_personal
  
  ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pspell_config_save_repl, 0, 2, _IS_BOOL, 0)
- 	ZEND_ARG_OBJ_INFO(0, dictionary, PSpellConfig, 0)
 -	ZEND_ARG_TYPE_INFO(0, config, IS_LONG, 0)
++	ZEND_ARG_OBJ_INFO(0, config, PSpellConfig, 0)
  	ZEND_ARG_TYPE_INFO(0, save, _IS_BOOL, 0)
  ZEND_END_ARG_INFO()