Skip to content

Fix example output (screen) inconsistent with code#5600

Merged
jordikroon merged 3 commits into
php:masterfrom
lacatoire:fix/screen-output-mismatches
Jun 15, 2026
Merged

Fix example output (screen) inconsistent with code#5600
jordikroon merged 3 commits into
php:masterfrom
lacatoire:fix/screen-output-mismatches

Conversation

@lacatoire

Copy link
Copy Markdown
Member

Several example output blocks did not match what the code produces (found during a doc-fr vs doc-en comparison). Each change was verified against the actual code, most of them run empirically.

Covers: oop5 inheritance, mktime, dom construct, Ds (map/pair/vector), memcached fetch, mongodb bson/cursor, spl rewind, uri getQuery, wincache delete, yaf config-ini, yar examples.

Comment thread reference/yar/examples.xml Outdated
lacatoire and others added 2 commits June 14, 2026 19:19
@jordikroon
jordikroon force-pushed the fix/screen-output-mismatches branch from c30a773 to a9e20da Compare June 14, 2026 17:19
@jordikroon
jordikroon merged commit df78bd1 into php:master Jun 15, 2026
2 checks passed
KentarouTakeda added a commit to php/doc-ja that referenced this pull request Jun 27, 2026
* PHP 8.5 の新定数・新例外クラスを翻訳

原文に追加された PHP 8.5 の新機能を翻訳。

- reference/filter — FILTER_THROW_ON_FAILURE と例外クラス2件 (Filter\FilterException, Filter\FilterFailedException)、float の科学的記法 (php/doc-en@3d4ee5f, php/doc-en@1c5ff30)
- reference/curl — CURLINFO_* 5件・CURLFOLLOW_* 3件・CURLOPT_INFILESIZE_LARGE (php/doc-en@ee972f5, php/doc-en@e7e81a1)
- reference/openssl — OPENSSL_PKCS1_PSS_PADDING と PKCS7 定数4件 (php/doc-en@6eadfc4)

* ReturnTypeWillChange に将来の strict な戻り値型に関する警告を翻訳

原文 php/doc-en@0019a7e に追加された、暫定的な戻り値型フェーズに関する警告を翻訳。

* サンプル出力とコードの不整合の修正を原文に同期

原文 php/doc-en#5600 でのサンプル出力 (screen) とコードの不整合修正に追従 (php/doc-en@df78bd1)。

language/oop5 (1), reference/spl (1), reference/datetime (1), reference/uri (1), reference/dom (1), reference/memcached (1), reference/yaf (1), reference/wincache (1)
yaf は DocBook 5.2 マークアップ追従 (php/doc-en@4d17b7b) も含む。

* radius_get_vendor_attr() の戻り値型ヒントの修正を原文に同期

原文 php/doc-en@4047ef2 での戻り値型ヒント修正 (array → array|false) に追従。
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants