Skip to content

Commit 5318971

Browse files
remicolletremicollet
committed
Revert "convert enchant resources to objects of new classes - EnchantBroker - EnchantDict add OO interface deprecate enchant_broker_free* (use unset instead) deprecate ENCHANT_MYSPELL and ENCHANT_ISPELL constants"
This reverts commit 7db4c24.
1 parent ea1bebb commit 5318971

32 files changed

+282
-618
lines changed

‎ext/enchant/enchant.c‎

Lines changed: 142 additions & 217 deletions
Large diffs are not rendered by default.

‎ext/enchant/enchant.stub.php‎

Lines changed: 52 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2,129 +2,94 @@
22

33
/** @generate-function-entries */
44

5-
final class EnchantBroker
6-
{
7-
/** @alias enchant_broker_init */
8-
public function __construct() {}
5+
/** @return resource|false */
6+
function enchant_broker_init() {}
97

10-
/** @alias enchant_broker_get_error */
11-
public function getError(): string|false {}
12-
13-
/** @alias enchant_broker_list_dicts */
14-
public function listDicts(): ?array {}
15-
16-
/** @alias enchant_broker_request_dict */
17-
public function requestDict(string $tag): EnchantDict|false {}
18-
19-
/** @alias enchant_broker_request_pwl_dict */
20-
public function requestPWL(string $filename): EnchantDict|false {}
21-
22-
/** @alias enchant_broker_dict_exists */
23-
public function isDict(string $tag): bool {}
24-
25-
/** @alias enchant_broker_set_ordering */
26-
public function setOrdering(string $tag, string $ordering): bool {}
27-
28-
/** @alias enchant_broker_describe */
29-
public function describe(): ?array {}
30-
}
31-
32-
final class EnchantDict
33-
{
34-
public function __construct(EnchantBroker $broker, string $tag, ?string $pwl = null) {}
35-
36-
/** @alias enchant_dict_quick_check */
37-
public function checkAndSuggest(string $word, &$suggestions = null): bool {}
38-
39-
/** @alias enchant_dict_check */
40-
public function check(string $word): bool {}
41-
42-
/** @alias enchant_dict_suggest */
43-
public function suggest(string $word): ?array {}
44-
45-
/** @alias enchant_dict_add */
46-
public function add(string $word): void {}
47-
48-
/** @alias enchant_dict_add_to_session */
49-
public function addToSession(string $word): void {}
50-
51-
/** @alias enchant_dict_is_added */
52-
public function isAdded(string $word): bool {}
53-
54-
/** @alias enchant_dict_store_replacement */
55-
public function storeReplacement(string $mis, string $cor): void {}
56-
57-
/** @alias enchant_dict_get_error */
58-
public function getError(): string|false {}
59-
60-
/** @alias enchant_dict_describe */
61-
public function describe(): array {}
62-
}
63-
64-
function enchant_broker_init(): EnchantBroker|false {}
8+
/** @param resource $broker */
9+
function enchant_broker_free($broker): bool {}
6510

6611
/**
67-
* @deprecated
12+
* @param resource $broker
13+
* @return string|false
6814
*/
69-
function enchant_broker_free(EnchantBroker $broker): bool {}
70-
71-
function enchant_broker_get_error(EnchantBroker $broker): string|false {}
15+
function enchant_broker_get_error($broker) {}
7216

7317
/**
18+
* @param resource $broker
7419
* @deprecated
7520
*/
76-
function enchant_broker_set_dict_path(EnchantBroker $broker, int $name, string $value): bool {}
21+
function enchant_broker_set_dict_path($broker, int $name, string $value): bool {}
7722

7823
/**
24+
* @param resource $broker
7925
* @deprecated
8026
*/
81-
function enchant_broker_get_dict_path(EnchantBroker $broker, int $name): string|false {}
82-
83-
function enchant_broker_list_dicts(EnchantBroker $broker): ?array {}
27+
function enchant_broker_get_dict_path($broker, int $name): string|false {}
8428

85-
function enchant_broker_request_dict(EnchantBroker $broker, string $tag): EnchantDict|false {}
29+
/** @param resource $broker */
30+
function enchant_broker_list_dicts($broker): ?array {}
8631

87-
function enchant_broker_request_pwl_dict(EnchantBroker $broker, string $filename): EnchantDict|false {}
32+
/**
33+
* @param resource $broker
34+
* @return resource|false
35+
*/
36+
function enchant_broker_request_dict($broker, string $tag) {}
8837

8938
/**
90-
* @deprecated
91-
*/
92-
function enchant_broker_free_dict(EnchantDict $dict): bool {}
39+
* @param resource $broker
40+
* @return resource|false
41+
*/
42+
function enchant_broker_request_pwl_dict($broker, string $filename) {}
9343

94-
function enchant_broker_dict_exists(EnchantBroker $broker, string $tag): bool {}
44+
/** @param resource $dict */
45+
function enchant_broker_free_dict($dict): bool {}
9546

96-
function enchant_broker_set_ordering(EnchantBroker $broker, string $tag, string $ordering): bool {}
47+
/** @param resource $broker */
48+
function enchant_broker_dict_exists($broker, string $tag): bool {}
9749

98-
function enchant_broker_describe(EnchantBroker $broker): ?array {}
50+
/** @param resource $broker */
51+
function enchant_broker_set_ordering($broker, string $tag, string $ordering): bool {}
9952

100-
function enchant_dict_quick_check(EnchantDict $dict, string $word, &$suggestions = null): bool {}
53+
/** @param resource $broker */
54+
function enchant_broker_describe($broker): ?array {}
10155

102-
function enchant_dict_check(EnchantDict $dict, string $word): bool {}
56+
/** @param resource $dict */
57+
function enchant_dict_quick_check($dict, string $word, &$suggestions = null): bool {}
10358

104-
function enchant_dict_suggest(EnchantDict $dict, string $word): ?array {}
59+
/** @param resource $dict */
60+
function enchant_dict_check($dict, string $word): bool {}
10561

106-
function enchant_dict_add(EnchantDict $dict, string $word): void {}
62+
/** @param resource $dict */
63+
function enchant_dict_suggest($dict, string $word): ?array {}
64+
65+
/** @param resource $dict */
66+
function enchant_dict_add($dict, string $word): void {}
10767

10868
/**
69+
* @param resource $dict
10970
* @alias enchant_dict_add
11071
* @deprecated
11172
*/
112-
function enchant_dict_add_to_personal(EnchantDict $dict, string $word): void {}
73+
function enchant_dict_add_to_personal($dict, string $word): void {}
11374

114-
function enchant_dict_add_to_session(EnchantDict $dict, string $word): void {}
75+
/** @param resource $dict */
76+
function enchant_dict_add_to_session($dict, string $word): void {}
11577

116-
function enchant_dict_is_added(EnchantDict $dict, string $word): bool {}
78+
/** @param resource $dict */
79+
function enchant_dict_is_added($dict, string $word): bool {}
11780

11881
/**
11982
* @param resource $dict
12083
* @alias enchant_dict_is_added
12184
* @deprecated
12285
*/
123-
function enchant_dict_is_in_session(EnchantDict $dict, string $word): bool {}
124-
125-
function enchant_dict_store_replacement(EnchantDict $dict, string $mis, string $cor): void {}
86+
function enchant_dict_is_in_session($dict, string $word): bool {}
12687

127-
function enchant_dict_get_error(EnchantDict $dict): string|false {}
88+
/** @param resource $dict */
89+
function enchant_dict_store_replacement($dict, string $mis, string $cor): void {}
12890

129-
function enchant_dict_describe(EnchantDict $dict): array {}
91+
/** @param resource $dict */
92+
function enchant_dict_get_error($dict): string|false {}
13093

94+
/** @param resource $dict */
95+
function enchant_dict_describe($dict): array {}

0 commit comments

Comments
 (0)