From 88ec761548b66f58acc1a86cdd0fc164ca925476 Mon Sep 17 00:00:00 2001 From: SVN Migration Date: Sun, 15 Oct 2006 21:09:28 +0000 Subject: This commit was manufactured by cvs2svn to create branch 'PECL_OPENSSL'. --- ext/pspell/CREDITS | 2 - ext/pspell/README | 51 --- ext/pspell/config.m4 | 45 --- ext/pspell/config.w32 | 16 - ext/pspell/php_pspell.h | 32 -- ext/pspell/pspell.c | 922 ------------------------------------------ ext/pspell/pspell.dsp | 112 ----- ext/pspell/tests/001.phpt | 116 ------ ext/pspell/tests/002.phpt | 44 -- ext/pspell/tests/003.phpt | 39 -- ext/pspell/tests/004.phpt | 35 -- ext/pspell/tests/005.phpt | 46 --- ext/pspell/tests/wordlist.txt | 5 - 13 files changed, 1465 deletions(-) delete mode 100644 ext/pspell/CREDITS delete mode 100644 ext/pspell/README delete mode 100644 ext/pspell/config.m4 delete mode 100644 ext/pspell/config.w32 delete mode 100644 ext/pspell/php_pspell.h delete mode 100644 ext/pspell/pspell.c delete mode 100644 ext/pspell/pspell.dsp delete mode 100644 ext/pspell/tests/001.phpt delete mode 100644 ext/pspell/tests/002.phpt delete mode 100644 ext/pspell/tests/003.phpt delete mode 100644 ext/pspell/tests/004.phpt delete mode 100644 ext/pspell/tests/005.phpt delete mode 100644 ext/pspell/tests/wordlist.txt (limited to 'ext/pspell') diff --git a/ext/pspell/CREDITS b/ext/pspell/CREDITS deleted file mode 100644 index a7919d4b7c..0000000000 --- a/ext/pspell/CREDITS +++ /dev/null @@ -1,2 +0,0 @@ -Pspell -Vlad Krupin diff --git a/ext/pspell/README b/ext/pspell/README deleted file mode 100644 index 2e68a2cb9d..0000000000 --- a/ext/pspell/README +++ /dev/null @@ -1,51 +0,0 @@ -README file for pspell (spellchecker) module for PHP ----------------------------------------------------- - -The latest release of pspell is always available from - - http://aspell.net/ - -This module was developed and tested with aspell-.31.1 and pspell-.11.0.2, -although slightly earlier (and hopefully later) versions of those libraries -should work as well. - -General notes -------------- - -Please, note that somewhere around version .27.x (I believe) aspell stopped -working with the aspell module for php. This is due to the fact that the -author changed things around a bit, and suggested that people link to pspell -in the future rather than to aspell. That's exactly what this module is for. -It has the same basic functionality as aspell (and more features are being -added). I did not want to modify existing aspell module, because it would -break things for those who are using older aspell, or result in very ugly code. -Rather, I wrote a new module - pspell. - - -Building pspell on a Unix system --------------------------------- - -In order to use pspell, you need to have *both* aspell and pspell libraries -installed, and they have to be compatible with each other. Get the latest -release of both at the URL given above. - -I expect the libraries to be in /usr/local (that's the default when you -cofigure pspell and aspell with their 'configure' scripts woth no parameters). -If that location is different, please specify it in --with-pspell=PATH, where -PATH is the path you specified for pspell libraries. - -Notes on personalized dictionaries ----------------------------------- - -It is now possible to have personalized dictionaries with pspell. This is -achieved by opening a dictionary with pspell_new_personal() rather than -pspell_new() and specifying the custom dictionary as the first parameter. -The parameter probably should begin with '/' because otherwise it will -be relative to $HOME, which is probably set to "/root". This is probably not -what you want because you need write access for nobody to be able to write -to a dictionary. Once the dictionary is open, you can use -pspell_add_to_personal() to add words to the wordlist and finally -pspell_save_wordlist() to save it. - -Note that at this moment pspell_save_wordlist() will return TRUE, even if -there was an error. This will be changed once pspell library is fixed. \ No newline at end of file diff --git a/ext/pspell/config.m4 b/ext/pspell/config.m4 deleted file mode 100644 index 67e5b27605..0000000000 --- a/ext/pspell/config.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl -dnl $Id$ -dnl - -PHP_ARG_WITH(pspell,for PSPELL support, -[ --with-pspell[=DIR] Include PSPELL support. - GNU Aspell version 0.50.0 or higher required]) - -if test "$PHP_PSPELL" != "no"; then - PHP_NEW_EXTENSION(pspell, pspell.c, $ext_shared) - if test "$PHP_PSPELL" != "yes"; then - PSPELL_SEARCH_DIRS=$PHP_PSPELL - else - PSPELL_SEARCH_DIRS="/usr/local /usr" - fi - for i in $PSPELL_SEARCH_DIRS; do - if test -f $i/include/pspell/pspell.h; then - PSPELL_DIR=$i - PSPELL_INCDIR=$i/include/pspell - elif test -f $i/include/pspell.h; then - PSPELL_DIR=$i - PSPELL_INCDIR=$i/include - fi - done - - if test -z "$PSPELL_DIR"; then - AC_MSG_ERROR(Cannot find pspell) - fi - - PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR - - PHP_ADD_LIBRARY_WITH_PATH(pspell, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD) - - dnl Add -laspell to LIBS if it exists - PHP_CHECK_LIBRARY(aspell,new_aspell_config, - [ - PHP_ADD_LIBRARY_WITH_PATH(aspell, $PSPELL_LIBDIR, PSPELL_SHARED_LIBADD) - ], [], [ - -L$PSPELL_LIBDIR - ]) - - PHP_ADD_INCLUDE($PSPELL_INCDIR) - PHP_SUBST(PSPELL_SHARED_LIBADD) - AC_DEFINE(HAVE_PSPELL,1,[ ]) -fi diff --git a/ext/pspell/config.w32 b/ext/pspell/config.w32 deleted file mode 100644 index 741a4bc8f0..0000000000 --- a/ext/pspell/config.w32 +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ -// vim:ft=javascript - -ARG_WITH("pspell", "pspell/aspell (whatever it's called this month) support", "no"); - -if (PHP_PSPELL != "no") { - - if (CHECK_HEADER_ADD_INCLUDE("pspell.h", "CFLAGS_PSPELL", PHP_PHP_BUILD + "\\include\\pspell;" + PHP_PSPELL) && - CHECK_LIB("aspell*.lib", "pspell", PHP_PSPELL)) { - EXTENSION('pspell', 'pspell.c'); - AC_DEFINE('HAVE_PSPELL', 1); - } else { - WARNING("pspell not enabled; libraries and headers not found"); - } -} - diff --git a/ext/pspell/php_pspell.h b/ext/pspell/php_pspell.h deleted file mode 100644 index 70d3ac0188..0000000000 --- a/ext/pspell/php_pspell.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2006 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Vlad Krupin | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#ifndef _PSPELL_H -#define _PSPELL_H -#if HAVE_PSPELL -extern zend_module_entry pspell_module_entry; -#define pspell_module_ptr &pspell_module_entry -#else -#define pspell_module_ptr NULL -#endif - -#define phpext_pspell_ptr pspell_module_ptr - -#endif /* _PSPELL_H */ diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c deleted file mode 100644 index be4076fc3a..0000000000 --- a/ext/pspell/pspell.c +++ /dev/null @@ -1,922 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2006 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Vlad Krupin | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#define IS_EXT_MODULE - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "php.h" - -#include -#include -#include - -#if HAVE_PSPELL - -/* this will enforce compatibility in .12 version (broken after .11.2) */ -#define USE_ORIGINAL_MANAGER_FUNCS - -#include "php_pspell.h" -#include -#include "ext/standard/info.h" - -#define PSPELL_FAST 1L -#define PSPELL_NORMAL 2L -#define PSPELL_BAD_SPELLERS 3L -#define PSPELL_SPEED_MASK_INTERNAL 3L -#define PSPELL_RUN_TOGETHER 8L - -/* Largest ignored word can be 999 characters (this seems sane enough), - * and it takes 3 bytes to represent that (see pspell_config_ignore) - */ -#define PSPELL_LARGEST_WORD 3 - -static PHP_MINIT_FUNCTION(pspell); -static PHP_MINFO_FUNCTION(pspell); -static PHP_FUNCTION(pspell_new); -static PHP_FUNCTION(pspell_new_personal); -static PHP_FUNCTION(pspell_new_config); -static PHP_FUNCTION(pspell_check); -static PHP_FUNCTION(pspell_suggest); -static PHP_FUNCTION(pspell_store_replacement); -static PHP_FUNCTION(pspell_add_to_personal); -static PHP_FUNCTION(pspell_add_to_session); -static PHP_FUNCTION(pspell_clear_session); -static PHP_FUNCTION(pspell_save_wordlist); -static PHP_FUNCTION(pspell_config_create); -static PHP_FUNCTION(pspell_config_runtogether); -static PHP_FUNCTION(pspell_config_mode); -static PHP_FUNCTION(pspell_config_ignore); -static PHP_FUNCTION(pspell_config_personal); -static PHP_FUNCTION(pspell_config_dict_dir); -static PHP_FUNCTION(pspell_config_data_dir); -static PHP_FUNCTION(pspell_config_repl); -static PHP_FUNCTION(pspell_config_save_repl); - -/* {{{ pspell_functions[] - */ -static zend_function_entry pspell_functions[] = { - PHP_FE(pspell_new, NULL) - PHP_FE(pspell_new_personal, NULL) - PHP_FE(pspell_new_config, NULL) - PHP_FE(pspell_check, NULL) - PHP_FE(pspell_suggest, NULL) - PHP_FE(pspell_store_replacement, NULL) - PHP_FE(pspell_add_to_personal, NULL) - PHP_FE(pspell_add_to_session, NULL) - PHP_FE(pspell_clear_session, NULL) - PHP_FE(pspell_save_wordlist, NULL) - PHP_FE(pspell_config_create, NULL) - PHP_FE(pspell_config_runtogether, NULL) - PHP_FE(pspell_config_mode, NULL) - PHP_FE(pspell_config_ignore, NULL) - PHP_FE(pspell_config_personal, NULL) - PHP_FE(pspell_config_dict_dir, NULL) - PHP_FE(pspell_config_data_dir, NULL) - PHP_FE(pspell_config_repl, NULL) - PHP_FE(pspell_config_save_repl, NULL) - {NULL, NULL, NULL} -}; -/* }}} */ - -static int le_pspell, le_pspell_config; - -zend_module_entry pspell_module_entry = { - STANDARD_MODULE_HEADER, - "pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES -}; - -#ifdef COMPILE_DL_PSPELL -ZEND_GET_MODULE(pspell) -#endif - -static void php_pspell_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) -{ - PspellManager *manager = (PspellManager *)rsrc->ptr; - - delete_pspell_manager(manager); -} - -static void php_pspell_close_config(zend_rsrc_list_entry *rsrc TSRMLS_DC) -{ - PspellConfig *config = (PspellConfig *)rsrc->ptr; - - delete_pspell_config(config); -} - -#define PSPELL_FETCH_CONFIG \ - convert_to_long_ex(conf); \ - config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), &type); \ - if (config == NULL || type != le_pspell_config) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a PSPELL config index", Z_LVAL_PP(conf)); \ - RETURN_FALSE; \ - } \ - -#define PSPELL_FETCH_MANAGER \ - convert_to_long_ex(scin); \ - manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); \ - if (!manager || type != le_pspell) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a PSPELL result index", Z_LVAL_PP(scin)); \ - RETURN_FALSE; \ - } \ - -/* {{{ PHP_MINIT_FUNCTION - */ -static PHP_MINIT_FUNCTION(pspell) -{ - REGISTER_LONG_CONSTANT("PSPELL_FAST", PSPELL_FAST, CONST_PERSISTENT | CONST_CS); - REGISTER_LONG_CONSTANT("PSPELL_NORMAL", PSPELL_NORMAL, CONST_PERSISTENT | CONST_CS); - REGISTER_LONG_CONSTANT("PSPELL_BAD_SPELLERS", PSPELL_BAD_SPELLERS, CONST_PERSISTENT | CONST_CS); - REGISTER_LONG_CONSTANT("PSPELL_RUN_TOGETHER", PSPELL_RUN_TOGETHER, CONST_PERSISTENT | CONST_CS); - le_pspell = zend_register_list_destructors_ex(php_pspell_close, NULL, "pspell", module_number); - le_pspell_config = zend_register_list_destructors_ex(php_pspell_close_config, NULL, "pspell config", module_number); - return SUCCESS; -} -/* }}} */ - -/* {{{ proto int pspell_new(string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) - Load a dictionary */ -static PHP_FUNCTION(pspell_new) -{ - zval **language,**spelling,**jargon,**encoding,**pmode; - long mode = 0L, speed = 0L; - int argc; - int ind; - -#ifdef PHP_WIN32 - TCHAR aspell_dir[200]; - TCHAR data_dir[220]; - TCHAR dict_dir[220]; - HKEY hkey; - DWORD dwType,dwLen; -#endif - - PspellCanHaveError *ret; - PspellManager *manager; - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc < 1 || argc > 5 || zend_get_parameters_ex(argc,&language,&spelling,&jargon,&encoding,&pmode) == FAILURE) { - WRONG_PARAM_COUNT; - } - - config = new_pspell_config(); - -#ifdef PHP_WIN32 - /* If aspell was installed using installer, we should have a key - * pointing to the location of the dictionaries - */ - if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) { - RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen); - RegCloseKey(hkey); - strcpy(data_dir, aspell_dir); - strcat(data_dir, "\\data"); - strcpy(dict_dir, aspell_dir); - strcat(dict_dir, "\\dict"); - - pspell_config_replace(config, "data-dir", data_dir); - pspell_config_replace(config, "dict-dir", dict_dir); - } -#endif - - convert_to_string_ex(language); - pspell_config_replace(config, "language-tag", Z_STRVAL_PP(language)); - - if(argc > 1){ - convert_to_string_ex(spelling); - if(Z_STRLEN_PP(spelling) > 0){ - pspell_config_replace(config, "spelling", Z_STRVAL_PP(spelling)); - } - } - - if(argc > 2){ - convert_to_string_ex(jargon); - if(Z_STRLEN_PP(jargon) > 0){ - pspell_config_replace(config, "jargon", Z_STRVAL_PP(jargon)); - } - } - - if(argc > 3){ - convert_to_string_ex(encoding); - if(Z_STRLEN_PP(encoding) > 0){ - pspell_config_replace(config, "encoding", Z_STRVAL_PP(encoding)); - } - } - - if(argc > 4){ - convert_to_long_ex(pmode); - mode = Z_LVAL_PP(pmode); - speed = mode & PSPELL_SPEED_MASK_INTERNAL; - - /* First check what mode we want (how many suggestions) */ - if(speed == PSPELL_FAST){ - pspell_config_replace(config, "sug-mode", "fast"); - }else if(speed == PSPELL_NORMAL){ - pspell_config_replace(config, "sug-mode", "normal"); - }else if(speed == PSPELL_BAD_SPELLERS){ - pspell_config_replace(config, "sug-mode", "bad-spellers"); - } - - /* Then we see if run-together words should be treated as valid components */ - if(mode & PSPELL_RUN_TOGETHER){ - pspell_config_replace(config, "run-together", "true"); - } - } - - ret = new_pspell_manager(config); - delete_pspell_config(config); - - if(pspell_error_number(ret) != 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret)); - RETURN_FALSE; - } - - manager = to_pspell_manager(ret); - ind = zend_list_insert(manager, le_pspell); - RETURN_LONG(ind); -} -/* }}} */ - -/* {{{ proto int pspell_new_personal(string personal, string language [, string spelling [, string jargon [, string encoding [, int mode]]]]) - Load a dictionary with a personal wordlist*/ -static PHP_FUNCTION(pspell_new_personal) -{ - zval **personal, **language,**spelling,**jargon,**encoding,**pmode; - long mode = 0L, speed = 0L; - int argc; - int ind; - -#ifdef PHP_WIN32 - TCHAR aspell_dir[200]; - TCHAR data_dir[220]; - TCHAR dict_dir[220]; - HKEY hkey; - DWORD dwType,dwLen; -#endif - - PspellCanHaveError *ret; - PspellManager *manager; - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc < 2 || argc > 6 || zend_get_parameters_ex(argc,&personal,&language,&spelling,&jargon,&encoding,&pmode) == FAILURE) { - WRONG_PARAM_COUNT; - } - - config = new_pspell_config(); - -#ifdef PHP_WIN32 - /* If aspell was installed using installer, we should have a key - * pointing to the location of the dictionaries - */ - if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) { - RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen); - RegCloseKey(hkey); - strcpy(data_dir, aspell_dir); - strcat(data_dir, "\\data"); - strcpy(dict_dir, aspell_dir); - strcat(dict_dir, "\\dict"); - - pspell_config_replace(config, "data-dir", data_dir); - pspell_config_replace(config, "dict-dir", dict_dir); - } -#endif - - convert_to_string_ex(personal); - - if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(personal), NULL, CHECKUID_CHECK_FILE_AND_DIR))) { - RETURN_FALSE; - } - - if (php_check_open_basedir(Z_STRVAL_PP(personal) TSRMLS_CC)) { - RETURN_FALSE; - } - - pspell_config_replace(config, "personal", Z_STRVAL_PP(personal)); - pspell_config_replace(config, "save-repl", "false"); - - convert_to_string_ex(language); - pspell_config_replace(config, "language-tag", Z_STRVAL_PP(language)); - - if(argc > 2){ - convert_to_string_ex(spelling); - if(Z_STRLEN_PP(spelling) > 0){ - pspell_config_replace(config, "spelling", Z_STRVAL_PP(spelling)); - } - } - - if(argc > 3){ - convert_to_string_ex(jargon); - if(Z_STRLEN_PP(jargon) > 0){ - pspell_config_replace(config, "jargon", Z_STRVAL_PP(jargon)); - } - } - - if(argc > 4){ - convert_to_string_ex(encoding); - if(Z_STRLEN_PP(encoding) > 0){ - pspell_config_replace(config, "encoding", Z_STRVAL_PP(encoding)); - } - } - - if(argc > 5){ - convert_to_long_ex(pmode); - mode = Z_LVAL_PP(pmode); - speed = mode & PSPELL_SPEED_MASK_INTERNAL; - - /* First check what mode we want (how many suggestions) */ - if(speed == PSPELL_FAST){ - pspell_config_replace(config, "sug-mode", "fast"); - }else if(speed == PSPELL_NORMAL){ - pspell_config_replace(config, "sug-mode", "normal"); - }else if(speed == PSPELL_BAD_SPELLERS){ - pspell_config_replace(config, "sug-mode", "bad-spellers"); - } - - /* Then we see if run-together words should be treated as valid components */ - if(mode & PSPELL_RUN_TOGETHER){ - pspell_config_replace(config, "run-together", "true"); - } - } - - ret = new_pspell_manager(config); - delete_pspell_config(config); - - if(pspell_error_number(ret) != 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret)); - RETURN_FALSE; - } - - manager = to_pspell_manager(ret); - ind = zend_list_insert(manager, le_pspell); - RETURN_LONG(ind); -} -/* }}} */ - -/* {{{ proto int pspell_new_config(int config) - Load a dictionary based on the given config */ -static PHP_FUNCTION(pspell_new_config) -{ - int type; - zval **conf; - int argc; - int ind; - - PspellCanHaveError *ret; - PspellManager *manager; - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 1 || zend_get_parameters_ex(argc,&conf) == FAILURE) { - WRONG_PARAM_COUNT; - } - - PSPELL_FETCH_CONFIG; - - ret = new_pspell_manager(config); - - if(pspell_error_number(ret) != 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret)); - RETURN_FALSE; - } - - manager = to_pspell_manager(ret); - ind = zend_list_insert(manager, le_pspell); - RETURN_LONG(ind); -} -/* }}} */ - -/* {{{ proto bool pspell_check(int pspell, string word) - Returns true if word is valid */ -static PHP_FUNCTION(pspell_check) -{ - int type; - zval **scin,**word; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_string_ex(word); - - PSPELL_FETCH_MANAGER; - - if(pspell_manager_check(manager, Z_STRVAL_PP(word))){ - RETURN_TRUE; - }else{ - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto array pspell_suggest(int pspell, string word) - Returns array of suggestions */ -static PHP_FUNCTION(pspell_suggest) -{ - zval **scin, **word; - int argc; - PspellManager *manager; - int type; - const PspellWordList *wl; - const char *sug; - - argc = ZEND_NUM_ARGS(); - if(argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_string_ex(word); - PSPELL_FETCH_MANAGER; - - array_init(return_value); - - wl = pspell_manager_suggest(manager, Z_STRVAL_PP(word)); - if(wl){ - PspellStringEmulation *els = pspell_word_list_elements(wl); - while((sug = pspell_string_emulation_next(els)) != 0){ - add_next_index_string(return_value,(char *)sug,1); - } - delete_pspell_string_emulation(els); - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL had a problem. details: %s ", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto bool pspell_store_replacement(int pspell, string misspell, string correct) - Notify the dictionary of a user-selected replacement */ -static PHP_FUNCTION(pspell_store_replacement) -{ - int type; - zval **scin,**miss,**corr; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 3 || zend_get_parameters_ex(argc, &scin,&miss,&corr) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_string_ex(miss); - convert_to_string_ex(corr); - PSPELL_FETCH_MANAGER; - - pspell_manager_store_replacement(manager, Z_STRVAL_PP(miss), Z_STRVAL_PP(corr)); - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_store_replacement() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto bool pspell_add_to_personal(int pspell, string word) - Adds a word to a personal list */ -static PHP_FUNCTION(pspell_add_to_personal) -{ - int type; - zval **scin,**word; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_string_ex(word); - PSPELL_FETCH_MANAGER; - - /*If the word is empty, we have to return; otherwise we'll segfault! ouch!*/ - if(Z_STRLEN_PP(word) == 0){ - RETURN_FALSE; - } - - pspell_manager_add_to_personal(manager, Z_STRVAL_PP(word)); - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_add_to_personal() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto bool pspell_add_to_session(int pspell, string word) - Adds a word to the current session */ -static PHP_FUNCTION(pspell_add_to_session) -{ - int type; - zval **scin,**word; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc, &scin,&word) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_string_ex(word); - PSPELL_FETCH_MANAGER; - - /*If the word is empty, we have to return; otherwise we'll segfault! ouch!*/ - if(Z_STRLEN_PP(word) == 0){ - RETURN_FALSE; - } - - pspell_manager_add_to_session(manager, Z_STRVAL_PP(word)); - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_add_to_session() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto bool pspell_clear_session(int pspell) - Clears the current session */ -static PHP_FUNCTION(pspell_clear_session) -{ - int type; - zval **scin; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 1 || zend_get_parameters_ex(argc, &scin) == FAILURE) { - WRONG_PARAM_COUNT; - } - - PSPELL_FETCH_MANAGER; - - pspell_manager_clear_session(manager); - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_clear_session() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } -} -/* }}} */ - -/* {{{ proto bool pspell_save_wordlist(int pspell) - Saves the current (personal) wordlist */ -static PHP_FUNCTION(pspell_save_wordlist) -{ - int type; - zval **scin; - PspellManager *manager; - - int argc; - argc = ZEND_NUM_ARGS(); - if (argc != 1 || zend_get_parameters_ex(argc, &scin) == FAILURE) { - WRONG_PARAM_COUNT; - } - - PSPELL_FETCH_MANAGER; - - pspell_manager_save_all_word_lists(manager); - - if(pspell_manager_error_number(manager) == 0){ - RETURN_TRUE; - }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "pspell_save_wordlist() gave error: %s", pspell_manager_error_message(manager)); - RETURN_FALSE; - } - -} -/* }}} */ - -/* {{{ proto int pspell_config_create(string language [, string spelling [, string jargon [, string encoding]]]) - Create a new config to be used later to create a manager */ -static PHP_FUNCTION(pspell_config_create) -{ - zval **language,**spelling,**jargon,**encoding; - int argc; - int ind; - - PspellConfig *config; - -#ifdef PHP_WIN32 - TCHAR aspell_dir[200]; - TCHAR data_dir[220]; - TCHAR dict_dir[220]; - HKEY hkey; - DWORD dwType,dwLen; -#endif - - argc = ZEND_NUM_ARGS(); - if (argc < 1 || argc > 4 || zend_get_parameters_ex(argc,&language,&spelling,&jargon,&encoding) == FAILURE) { - WRONG_PARAM_COUNT; - } - - config = new_pspell_config(); - -#ifdef PHP_WIN32 - /* If aspell was installed using installer, we should have a key - * pointing to the location of the dictionaries - */ - if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) { - RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen); - RegCloseKey(hkey); - strcpy(data_dir, aspell_dir); - strcat(data_dir, "\\data"); - strcpy(dict_dir, aspell_dir); - strcat(dict_dir, "\\dict"); - - pspell_config_replace(config, "data-dir", data_dir); - pspell_config_replace(config, "dict-dir", dict_dir); - } -#endif - - convert_to_string_ex(language); - pspell_config_replace(config, "language-tag", Z_STRVAL_PP(language)); - - if(argc > 1){ - convert_to_string_ex(spelling); - if(Z_STRLEN_PP(spelling) > 0){ - pspell_config_replace(config, "spelling", Z_STRVAL_PP(spelling)); - } - } - - if(argc > 2){ - convert_to_string_ex(jargon); - if(Z_STRLEN_PP(jargon) > 0){ - pspell_config_replace(config, "jargon", Z_STRVAL_PP(jargon)); - } - } - - if(argc > 3){ - convert_to_string_ex(encoding); - if(Z_STRLEN_PP(encoding) > 0){ - pspell_config_replace(config, "encoding", Z_STRVAL_PP(encoding)); - } - } - - /* By default I do not want to write anything anywhere because it'll try to write to $HOME - which is not what we want */ - pspell_config_replace(config, "save-repl", "false"); - - ind = zend_list_insert(config, le_pspell_config); - RETURN_LONG(ind); -} -/* }}} */ - -/* {{{ proto bool pspell_config_runtogether(int conf, bool runtogether) - Consider run-together words as valid components */ -static PHP_FUNCTION(pspell_config_runtogether) -{ - int type; - zval **conf, **runtogether; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&conf,&runtogether) == FAILURE) { - WRONG_PARAM_COUNT; - } - - PSPELL_FETCH_CONFIG; - - convert_to_boolean_ex(runtogether); - pspell_config_replace(config, "run-together", Z_LVAL_PP(runtogether) ? "true" : "false"); - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto bool pspell_config_mode(int conf, long mode) - Select mode for config (PSPELL_FAST, PSPELL_NORMAL or PSPELL_BAD_SPELLERS) */ -static PHP_FUNCTION(pspell_config_mode) -{ - int type; - zval **conf, **mode; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&conf,&mode) == FAILURE) { - WRONG_PARAM_COUNT; - } - - PSPELL_FETCH_CONFIG; - - convert_to_long_ex(mode); - - /* First check what mode we want (how many suggestions) */ - if(Z_LVAL_PP(mode) == PSPELL_FAST){ - pspell_config_replace(config, "sug-mode", "fast"); - }else if(Z_LVAL_PP(mode) == PSPELL_NORMAL){ - pspell_config_replace(config, "sug-mode", "normal"); - }else if(Z_LVAL_PP(mode) == PSPELL_BAD_SPELLERS){ - pspell_config_replace(config, "sug-mode", "bad-spellers"); - } - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto bool pspell_config_ignore(int conf, int ignore) - Ignore words <= n chars */ -static PHP_FUNCTION(pspell_config_ignore) -{ - int type; - zval **conf, **pignore; - int argc; - - int loc = PSPELL_LARGEST_WORD; - char ignore_str[PSPELL_LARGEST_WORD + 1]; - long ignore = 0L; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&conf,&pignore) == FAILURE) { - WRONG_PARAM_COUNT; - } - - PSPELL_FETCH_CONFIG; - - convert_to_long_ex(pignore); - ignore = Z_LVAL_PP(pignore); - - /* The following is a very hackish way to convert a long to a string - (actually only the numbers 0-999 will get converted properly, but that should - be sufficient). If anyone knows of a better way to convert an integer to a string, - please, fix it.*/ - ignore_str[loc] = '\0'; - while(ignore > 0){ - if(loc == 0){ - break; - } - ignore_str[--loc] = '0' + (ignore % 10); - ignore /= 10; - } - if(ignore_str[loc] == '\0'){ - ignore_str[--loc] = '0'; - } - - pspell_config_replace(config, "ignore", &ignore_str[loc]); - RETURN_TRUE; -} -/* }}} */ - -static void pspell_config_path(INTERNAL_FUNCTION_PARAMETERS, char *option) -{ - int type; - zval **conf, **value; - int argc; - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc, &conf, &value) == FAILURE) { - WRONG_PARAM_COUNT; - } - - PSPELL_FETCH_CONFIG; - - convert_to_string_ex(value); - - if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(value), NULL, CHECKUID_CHECK_FILE_AND_DIR))) { - RETURN_FALSE; - } - - if (php_check_open_basedir(Z_STRVAL_PP(value) TSRMLS_CC)) { - RETURN_FALSE; - } - - pspell_config_replace(config, option, Z_STRVAL_PP(value)); - - RETURN_TRUE; -} - -/* {{{ proto bool pspell_config_personal(int conf, string personal) - Use a personal dictionary for this config */ -static PHP_FUNCTION(pspell_config_personal) -{ - pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "personal"); -} -/* }}} */ - -/* {{{ proto bool pspell_config_dict_dir(int conf, string directory) - location of the main word list */ -static PHP_FUNCTION(pspell_config_dict_dir) -{ - pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "dict-dir"); -} -/* }}} */ - -/* {{{ proto bool pspell_config_data_dir(int conf, string directory) - location of language data files */ -static PHP_FUNCTION(pspell_config_data_dir) -{ - pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, "data-dir"); -} -/* }}} */ - -/* {{{ proto bool pspell_config_repl(int conf, string repl) - Use a personal dictionary with replacement pairs for this config */ -static PHP_FUNCTION(pspell_config_repl) -{ - int type; - zval **conf, **repl; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&conf,&repl) == FAILURE) { - WRONG_PARAM_COUNT; - } - - PSPELL_FETCH_CONFIG; - - pspell_config_replace(config, "save-repl", "true"); - - convert_to_string_ex(repl); - - if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(repl), NULL, CHECKUID_CHECK_FILE_AND_DIR))) { - RETURN_FALSE; - } - - if (php_check_open_basedir(Z_STRVAL_PP(repl) TSRMLS_CC)) { - RETURN_FALSE; - } - - pspell_config_replace(config, "repl", Z_STRVAL_PP(repl)); - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto bool pspell_config_save_repl(int conf, bool save) - Save replacement pairs when personal list is saved for this config */ -static PHP_FUNCTION(pspell_config_save_repl) -{ - int type; - zval **conf, **save; - int argc; - - PspellConfig *config; - - argc = ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc,&conf,&save) == FAILURE) { - WRONG_PARAM_COUNT; - } - - PSPELL_FETCH_CONFIG; - - convert_to_boolean_ex(save); - pspell_config_replace(config, "save-repl", Z_LVAL_PP(save) ? "true" : "false"); - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ PHP_MINFO_FUNCTION - */ -static PHP_MINFO_FUNCTION(pspell) -{ - php_info_print_table_start(); - php_info_print_table_row(2, "PSpell Support", "enabled"); - php_info_print_table_end(); -} -/* }}} */ - -#endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ diff --git a/ext/pspell/pspell.dsp b/ext/pspell/pspell.dsp deleted file mode 100644 index f310099d89..0000000000 --- a/ext/pspell/pspell.dsp +++ /dev/null @@ -1,112 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pspell" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=pspell - Win32 Debug_TS -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pspell.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pspell.mak" CFG="pspell - Win32 Debug_TS" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pspell - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "pspell - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pspell - Win32 Debug_TS" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "pspell___Win32_Debug_TS" -# PROP BASE Intermediate_Dir "pspell___Win32_Debug_TS" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_TS" -# PROP Intermediate_Dir "Debug_TS" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\zlib" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\zlib" /I "..\..\TSRM" /I "..\..\..\aspell\include\pspell" /I "..\..\..\php_build\include\pspell." /D ZEND_DEBUG=1 /D "_DEBUG" /D ZTS=1 /D HAVE_PSPELL=1 /D "COMPILE_DL_PSPELL" /D "WIN32" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSPELL_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_pspell.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" -# ADD LINK32 php5ts_debug.lib aspell-15.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_pspell.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\aspell\lib" - -!ELSEIF "$(CFG)" == "pspell - Win32 Release_TS" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "pspell___Win32_Release_TS" -# PROP BASE Intermediate_Dir "pspell___Win32_Release_TS" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_TS" -# PROP Intermediate_Dir "Release_TS" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSPELL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\zlib" /I "..\..\TSRM" /I "..\..\..\aspell\include\pspell" /I "..\..\..\php_build\include\pspell" /D ZEND_DEBUG=0 /D "NDEBUG" /D ZTS=1 /D HAVE_PSPELL=1 /D "COMPILE_DL_PSPELL" /D "WIN32" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSPELL_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 php5ts.lib aspell-15.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_pspell.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\aspell\lib" - -!ENDIF - -# Begin Target - -# Name "pspell - Win32 Debug_TS" -# Name "pspell - Win32 Release_TS" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\pspell.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\php_pspell.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/ext/pspell/tests/001.phpt b/ext/pspell/tests/001.phpt deleted file mode 100644 index 0a22352eef..0000000000 --- a/ext/pspell/tests/001.phpt +++ /dev/null @@ -1,116 +0,0 @@ ---TEST-- -pspell basic tests (warning: may fail with pspell/aspell < GNU Aspell 0.50.3) ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -I : true -will : true -not : true -buy : true -this : true -record : true -it : true -is : true -scratched : true -Sorry : true -I : true -will : true -not : true -buy : true -this : true -record : true -it : true -is : true -scratched : true -Uh : true -no : true -no : true -no : true -This : true -is : true -a : true -tobacconists : true -Ah : true -I : true -will : true -not : true -buy : true -this : true -tobacconists : true -it : true -is : true -scratched : true -No : true -no : true -no : true -no : true -Tobacco : true -um : true -cigarettes : true -holds : true -up : true -a : true -pack : true -Ya : true -Seegarets : ..false -Possible spellings:%s,Regrets,%s,Cigarettes,%s -Ya : true -Uh : true -My : true -hovercraft : true -is : true -full : true -of : true -eels : true -Sorry : true -My : true -hovercraft : true -pantomimes : true -puffing : true -a : true -cigarette : true -is : true -full : true -of : true -eels : true -pretends : true -to : true -strike : true -a : true -match : true -Ahh : ..false -Possible spellings:%sAh,Aha,%s -matches : true diff --git a/ext/pspell/tests/002.phpt b/ext/pspell/tests/002.phpt deleted file mode 100644 index 5e29a1e629..0000000000 --- a/ext/pspell/tests/002.phpt +++ /dev/null @@ -1,44 +0,0 @@ ---TEST-- -pspell session ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -Warning: Wrong parameter count for pspell_check() in %s002.php on line 5 -NULL -bool(false) -bool(false) -bool(true) -bool(true) - -Notice: Object of class stdClass could not be converted to int in %s002.php on line 12 - -Warning: pspell_clear_session(): 1 is not a PSPELL result index in %s002.php on line 12 -bool(false) -bool(true) -bool(false) diff --git a/ext/pspell/tests/003.phpt b/ext/pspell/tests/003.phpt deleted file mode 100644 index 33aa2dac6d..0000000000 --- a/ext/pspell/tests/003.phpt +++ /dev/null @@ -1,39 +0,0 @@ ---TEST-- -pspell_config_ignore ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -bool(false) - -Warning: pspell_new_config(): PSPELL couldn't open the dictionary. reason: The encoding "b0rked" is not known.%sThis could also mean that the file "%sb0rked.%s" could not be opened for reading or does not exist. in %s003.php on line 9 - -Warning: pspell_check(): 0 is not a PSPELL result index in %s003.php on line 10 -bool(false) ---- -bool(true) -bool(true) -bool(true) diff --git a/ext/pspell/tests/004.phpt b/ext/pspell/tests/004.phpt deleted file mode 100644 index 80602bce39..0000000000 --- a/ext/pspell/tests/004.phpt +++ /dev/null @@ -1,35 +0,0 @@ ---TEST-- -pspell configs ---SKIPIF-- - ---FILE-- - ---EXPECT-- -bool(true) -bool(true) -bool(false) ---- -bool(true) -bool(true) -bool(true) diff --git a/ext/pspell/tests/005.phpt b/ext/pspell/tests/005.phpt deleted file mode 100644 index 8aeb206031..0000000000 --- a/ext/pspell/tests/005.phpt +++ /dev/null @@ -1,46 +0,0 @@ ---TEST-- -pspell configs ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -Warning: pspell_new_personal(): PSPELL couldn't open the dictionary. reason: The file "%s005.php" is not in the proper format. in %s005.php on line 5 -bool(false) -bool(true) --- -bool(true) -bool(false) -bool(true) -bool(true) --- -bool(true) -bool(true) diff --git a/ext/pspell/tests/wordlist.txt b/ext/pspell/tests/wordlist.txt deleted file mode 100644 index e9d8da7ca3..0000000000 --- a/ext/pspell/tests/wordlist.txt +++ /dev/null @@ -1,5 +0,0 @@ -personal_ws-1.1 en 4 -dfnvnsafksfksf -fg -iufrsn -jsksjfsjf -- cgit v1.2.1