allow EnchantDict::__construct to use a PWL

Author: remicollet

ext/enchant/enchant.c

@@ -512,30 +512,37 @@ PHP_FUNCTION(enchant_broker_request_dict)
 }
 /* }}} */
 
-/* {{{ proto resource EnchantDict::__construct(resource broker, string tag)
-	create a new dictionary using tag, the non-empty language tag you wish to request
-	a dictionary for ("en_US", "de_DE", ...) */
+/* {{{ proto resource EnchantDict::__construct(resource broker, string tag [, string pwl])
+	create a new dictionary using tag or pwl */
 PHP_METHOD(EnchantDict, __construct)
 {
 	zval *broker;
 	enchant_broker *pbroker;
 	enchant_dict *dict;
 	EnchantDict *pdict;
-	char *tag;
-	size_t taglen;
+	char *tag, *pwl = NULL;
+	size_t taglen, pwllen = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os", &broker, enchant_broker_ce, &tag, &taglen) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|s", &broker, enchant_broker_ce, &tag, &taglen, &pwl, &pwllen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
 	PHP_ENCHANT_GET_BROKER;
 
-	if (taglen == 0) {
-		zend_value_error("Tag cannot be empty");
-		RETURN_THROWS();
+	if (pwllen) {
+		if (php_check_open_basedir_ex(pwl, 0)) {
+			zend_value_error("Open_basedir restriction in effect");
+			RETURN_THROWS();
+		}
+		pdict = enchant_broker_request_pwl_dict(pbroker->pbroker, pwl);
+	} else {
+		if (taglen == 0) {
+			zend_value_error("Tag cannot be empty");
+			RETURN_THROWS();
+		}
+		pdict = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag);
 	}
 
-	pdict = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag);
 	if (pdict) {
 		pbroker->nb_dict++;
 

ext/enchant/enchant.stub.php

@@ -31,7 +31,7 @@ public function describe(): ?array {}
 
 final class EnchantDict
 {
-	public function __construct(EnchantBroker $broker, string $tag) {}
+	public function __construct(EnchantBroker $broker, string $tag, ?string $tag = null) {}
 
 	/** @alias enchant_dict_quick_check */
 	public function checkAndSuggest(string $word, &$suggestions = null): bool {}

ext/enchant/enchant_arginfo.h

@@ -127,6 +127,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_EnchantDict___construct, 0, 0, 2)
 	ZEND_ARG_OBJ_INFO(0, broker, EnchantBroker, 0)
 	ZEND_ARG_TYPE_INFO(0, tag, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, tag, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_EnchantDict_checkAndSuggest, 0, 1, _IS_BOOL, 0)

ext/enchant/tests/construct.phpt

@@ -0,0 +1,19 @@
+--TEST--
+constructor raise exception()
+--SKIPIF--
+<?php
+if(!extension_loaded('enchant')) die('skip, enchant not loader');
+if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
+?>
+--FILE--
+<?php
+try {
+	new EnchantDict(new EnchantBroker, '');
+} catch (ValueError $e) {
+	echo $e->getMessage()."\n";
+}
+?>
+OK
+--EXPECTF--
+Tag cannot be empty
+OK

ext/enchant/tests/object.phpt

@@ -29,6 +29,11 @@ var_dump($dict->isAdded($w));
 
 echo "+ Suggest\n";
 var_dump(is_array($dict->suggest("soong")));
+
+echo "+ PWL\n";
+var_dump($dict = new EnchantDict($broker, '', __DIR__ . '/enchant_broker_request_pwl_dict.pwl'));
+var_dump($dict->check('php'));
+var_dump($dict->check('node'));
 ?>
 OK
 --EXPECTF--
@@ -50,4 +55,9 @@ bool(true)
 bool(true)
 + Suggest
 bool(true)
++ PWL
+object(EnchantDict)#%d (0) {
+}
+bool(true)
+bool(false)
 OK