Skip to content

chore(deps): bump the php-production group across 1 directory with 7 updates - #7024

Merged
ttokoro20240902 merged 3 commits into
4.4from
dependabot/composer/php-production-af86448be2
Aug 7, 2026
Merged

chore(deps): bump the php-production group across 1 directory with 7 updates#7024
ttokoro20240902 merged 3 commits into
4.4from
dependabot/composer/php-production-af86448be2

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github Aug 5, 2026

Copy link
Copy Markdown
Contributor

Bumps the php-production group with 6 updates in the / directory:

Package From To
composer/ca-bundle 1.5.12 1.5.13
friendsofphp/php-cs-fixer 3.94.2 3.95.18
nanasess/bcmath-polyfill 1.0.2 1.1.0
nesbot/carbon 3.13.0 3.13.1
setasign/fpdi 2.6.7 2.6.8
twig/twig 3.27.0 3.28.0

Updates composer/ca-bundle from 1.5.12 to 1.5.13

Release notes

Sourced from composer/ca-bundle's releases.

1.5.13

Full Changelog: composer/ca-bundle@1.5.12...1.5.13

Commits

Updates friendsofphp/php-cs-fixer from 3.94.2 to 3.95.18

Release notes

Sourced from friendsofphp/php-cs-fixer's releases.

v3.95.18 Adalbertus

What's Changed

New Contributors

Full Changelog: PHP-CS-Fixer/PHP-CS-Fixer@v3.95.17...v3.95.18

v3.95.17 Adalbertus

What's Changed

Full Changelog: PHP-CS-Fixer/PHP-CS-Fixer@v3.95.16...v3.95.17

v3.95.16 Adalbertus

What's Changed

New Contributors

Full Changelog: PHP-CS-Fixer/PHP-CS-Fixer@v3.95.15...v3.95.16

v3.95.15 Adalbertus

What's Changed

Full Changelog: PHP-CS-Fixer/PHP-CS-Fixer@v3.95.14...v3.95.15

v3.95.14 Adalbertus

What's Changed

... (truncated)

Changelog

Sourced from friendsofphp/php-cs-fixer's changelog.

Changelog for v3.95.18

  • CI: attach provenance and SBOM attestations to the released image (#9751)
  • deps: bump the phpstan group in /dev-tools with 2 updates (#9748)
  • deps: update dev-tools (#9754)
  • perf: Limit token search in simplified_if_return (#9747)

Changelog for v3.95.17

  • perf: Token::equals() - Avoid building intermediary arrays (#9739)
  • perf: Tokens::findSequence() - improve looping logic (#9737)

Changelog for v3.95.16

  • fix: NoSuperfluousPhpdocTagsFixer with multiple hidden params (#9736)
  • fix: PowToExponentiationFixer - do not produce two consecutive whitespace tokens (#9735)
  • chore: do not remove ParaUnit for PHPUnit v13, as they are now compatible (#9579)
  • CI: introduce perf as new PR type (#9742)
  • deps: update dev deps (#9743)
  • test: AbstractIntegrationTestCase - externalized FixerFactory creation (#9744)

Changelog for v3.95.15

  • fix: self-update - fix "Access Denied" error when running on Windows (#9731)

Changelog for v3.95.14

  • fix: ClassAttributesSeparationFixer - handle property with hooks as last class element (#9724)
  • fix: SingleClassElementPerStatementFixer - do not break PHP syntax when splitting properties with disjunctive normal form type (#9723)
  • fix: TrailingCommaInMultilineFixer - do not add trailing comma after first-class callable (#9722)
  • chore: add code coverage ignore annotations to parallel runner and worker (#9721)
  • chore: cleanup FunctionToConstantFixer (#9719)
  • test: HeaderCommentFixerTest - improve invalid configuration types (#9728)
  • test: ClassDefinitionFixerTest - improve PHPDocs (#9726)
  • test: ConfigurationResolverTest - fix types (#9725)
  • test: GeneralAttributeRemoveFixerTest - improve data provider types (#9727)
  • test: ProjectCodeTest - improve PHPDocs (#9730)
  • deps: allow to run PHPUnit v12 directly for project, without future-ready CI workarounds (#9580)
  • deps: bump shipmonk/dead-code-detector from 1.3.0 to 1.3.1 in /dev-tools in the shipmonk group across 1 directory (#9718)
  • deps: bump the phpstan group in /dev-tools with 2 updates (#9717)

Changelog for v3.95.13

  • fix: SelfAccessorFixer - do not replace constant with same name as class in the middle of a static access chain (#9716)

... (truncated)

Commits
  • a8b4e42 prepared the 3.95.18 release
  • d1fc711 CI: attach provenance and SBOM attestations to the released image (#9751)
  • 8122d72 perf: Limit token search in simplified_if_return (#9747)
  • 8d343c9 deps: update dev-tools (#9754)
  • 2ab241b deps: bump the phpstan group in /dev-tools with 2 updates (#9748)
  • c06de30 bumped version
  • 0ee8842 prepared the 3.95.17 release
  • 28828d9 perf: Tokens::findSequence() - improve looping logic (#9737)
  • 9a4fb45 perf: Token::equals() - Avoid building intermediary arrays (#9739)
  • 2940253 bumped version
  • Additional commits viewable in compare view

Updates nanasess/bcmath-polyfill from 1.0.2 to 1.1.0

Release notes

Sourced from nanasess/bcmath-polyfill's releases.

v1.1.0

This release completes PHP 8.4 bcmath compatibility. It adds bcdivmod(), implements all eight RoundingMode cases (including the directional modes), and reworks rounding to use exact arbitrary-precision string arithmetic — fixing a precision bug and significantly improving performance. Interoperability with symfony/polyfill-php84 is now documented.

✨ Added

  • bcdivmod() — returns the quotient and remainder of a division in a single call (PHP 8.4). It is built on arbitrary-precision division, so it works without the native bcmath extension (unlike symfony/polyfill-php84, which delegates to native bc). (#39)
  • All four directional RoundingMode cases for bcround(): TowardsZero, AwayFromZero, PositiveInfinity, and NegativeInfinity, alongside the existing four half-modes. (#36)

🐛 Fixed

  • Exact HalfEven / HalfOdd rounding. bcround() no longer falls back to a floating-point path, so results stay correct for large and high-precision numbers. Previously, digits beyond IEEE-754 precision were corrupted — e.g. bcround('12345678901234567890.5', 0, RoundingMode::HalfEven) returned 12345678901234567168 instead of 12345678901234567890.
  • Extremely large negative $precision values no longer risk excessive memory allocation when the result is zero.

🔧 Changed

  • Rounding rewritten as pure string-digit arithmetic (no BigInteger in the rounding path). It now matches native bcround() across every mode and precision, and makes bcround() / bcceil() roughly 5–6× faster.
  • RoundingMode is now a pure enum, matching native PHP 8.4 (no backing value; ->value, from() and tryFrom() are unavailable). This enum was not part of any previous release, so no released code is affected.

⚠️ Minor compatibility note

  • The parameter name of bcfloor() / bcceil() / bcround() changed from $operand to $num, to match the native signature. Positional calls are unaffected (e.g. bcround('1.5', 2)); only named-argument calls need updating: bcround(operand: '1.5') → bcround(num: '1.5').

🤝 Interoperability with symfony/polyfill-php84

symfony/polyfill-php84 declares the same PHP 8.4 bc functions, but only when the native bcmath extension is already loaded. When both packages are installed on PHP 8.2/8.3 with the extension, either implementation may win depending on autoload order (guarded by function_exists(), so there is no fatal redeclaration). Because this package now uses a native-compatible string algorithm, the numeric results are identical in either case. See the README for details.

🧪 Internal / CI

  • Enabled 8 previously-skipped official php-src PHPT tests across PHP 8.1–8.5: bcdivmod, bcdivmod_by_zero, bcround_all, bcround_away_from_zero, bcround_ceiling, bcround_floor, bcround_toward_zero, and bcround_early_return.

Refs #81 · Closes #36 · Closes #39

Full Changelog: nanasess/bcmath-polyfill@1.0.3...1.1.0

v1.0.3

What's Changed

🐛 Bug Fixes

Fix Rector 2.4+ scoped polyfill collision with RoundingMode (#56, #57)

Prior releases failed with a fatal error in environments that dev-require rector/rector: ^2.4:

PHP Fatal error:  Cannot declare enum RoundingMode, because the name is already
in use in /path/to/vendor/nanasess/bcmath-polyfill/lib/RoundingMode.php on line 16

Rector 2.4.0+ ships a scoped polyfill (vendor/rector/rector/vendor/symfony/polyfill-php84/Resources/RoundingMode.php) that declares a global class RoundingMode via class_alias on PHP < 8.4. The previous guard !enum_exists('RoundingMode') could not detect a preexisting class definition, so the polyfill tried to declare its enum on top of the class and crashed.

The guard was rewritten to !class_exists('RoundingMode', false), which correctly detects both:

  • The native PHP 8.4+ RoundingMode enum (enums are reported as classes by class_exists() since PHP 8.1)
  • Classes aliased into the global namespace by third-party scoped polyfills (Rector 2.4+, etc.)

The second argument false prevents autoload from triggering, so third-party stub files are not accidentally executed.

... (truncated)

Commits
  • a0fe849 Merge pull request #80 from nanasess/dependabot/github_actions/anthropics/cla...
  • 7254174 Merge pull request #79 from nanasess/dependabot/github_actions/stefanzweifel/...
  • a5f236e Merge branch 'main' into dependabot/github_actions/anthropics/claude-code-act...
  • 13d1653 Merge branch 'main' into dependabot/github_actions/stefanzweifel/git-auto-com...
  • 3b6ddcd Merge pull request #82 from nanasess/worktree-feat+symfony-compat-rounding
  • 6267255 refactor: レビュー指摘対応(divmod高速化・helper検証共通化・巨大負precision対策)
  • eadaa38 docs: README の比較表に symfony/polyfill-php84 を追加、phpstan の既存エラーを解消
  • 7a3eab6 ci: 解消済み phpt を docker-phpt-tests の skip から除外し README を更新
  • 872e5bf test: 方向系モード・高精度丸め・bcdivmod のテストを追加/更新
  • 80d4d4b feat: 丸めを文字列アルゴリズム化し全RoundingMode対応・bcdivmod追加
  • Additional commits viewable in compare view

Updates nesbot/carbon from 3.13.0 to 3.13.1

Release notes

Sourced from nesbot/carbon's releases.

3.13.1

What's Changed

Full Changelog: CarbonPHP/carbon@3.13.0...3.13.1

Commits
  • 2937ad3 Merge pull request #135 from CarbonPHP/fix/issue-134-translation-spacing
  • 89bc9b4 Remove redundant comment
  • b408fed Skip PHPUnit warnings for Laravel 13
  • b75f65e Fix spacing in translations
  • 1c1554b Add test for the issue #134
  • e4037d3 Merge pull request #3346 from briannesbitt/job/update-sponsors
  • d8c4a39 Update sponsors
  • e75648c Merge pull request #3345 from briannesbitt/job/update-sponsors
  • 1b2c0c0 Update sponsors
  • 3601de3 Merge pull request #3344 from briannesbitt/dependabot/github_actions/actions/...
  • Additional commits viewable in compare view

Updates phpseclib/phpseclib from 3.0.55 to 3.0.56

Release notes

Sourced from phpseclib/phpseclib's releases.

3.0.56

  • RSA: don't use OpenSSL for PSS on OpenSSL < 3.1.0 (#2156)
  • SFTP: throw TimeoutExceptions on timeout vs UnexpectedValueException (#2152)
  • SFTP/Stream: use default context if one isn't explicitly provided (#2154)
Changelog

Sourced from phpseclib/phpseclib's changelog.

3.0.56 - 2026-08-02

  • RSA: don't use OpenSSL for PSS on OpenSSL < 3.1.0 (#2156)
  • SFTP: throw TimeoutExceptions on timeout vs UnexpectedValueException (#2152)
  • SFTP/Stream: use default context if one isn't explicitly provided (#2154)
Commits
  • 7adbbe3 CHANGELOG: add new release (3.0.56)
  • 37e3742 SFTP: throw TimeoutExceptions on timeout vs UnexpectedValueException
  • 9e167c9 Merge branch '2.0' into 3.0
  • 449d678 Merge branch '2.0' of github.com:phpseclib/phpseclib into 2.0
  • 99b62d0 Merge branch '1.0' into 2.0
  • bcfbdd2 BACKERS: hyperlink Greg Mayes
  • c224fbb Merge branch '2.0' into 3.0
  • db3332c Merge branch '1.0' into 2.0
  • 684ee2d BACKERS: add herodevs and Greg Mayes
  • dd46117 Merge branch '3.0' of github.com:phpseclib/phpseclib into 3.0
  • Additional commits viewable in compare view

Updates setasign/fpdi from 2.6.7 to 2.6.8

Release notes

Sourced from setasign/fpdi's releases.

FPDI 2.6.8

Fixes

  • Handle filter exceptions of faulty streams in Page::getContentStream() (fixes #252).

Tweaks

  • Optimized handling of recursion in xref-table parsing.
Commits
  • 881945b Updated version constant
  • 1f227b5 Merge pull request #257 from Setasign/development
  • 1eac11f Update README.md
  • 3fd0b31 Merge pull request #256 from Setasign/development
  • 3f01c08 Merge branch 'master' into development
  • 32b24a9 Update release.yml
  • 4ba8a11 Merge pull request #255 from Setasign/development
  • 0ca4920 Handle filter exceptions of faulty streams in Page::getContentStream(). (Fi...
  • be50a1e Merge pull request #254 from Setasign/development
  • c62f222 Update zizmor.yml
  • Additional commits viewable in compare view

Updates twig/twig from 3.27.0 to 3.28.0

Release notes

Sourced from twig/twig's releases.

v3.28.0

Changelog (twigphp/Twig@v3.27.1...v3.28.0)

  • bug #4850 Render backed enums using their backing value in the html_attr function (@​fabpot)
  • minor #4845 Add documention note about variable scope of override blocks in { embed ... only } (@​andy-blum)
  • minor #4843 Define macros at the template root in the cache macro fixture (@​fabpot)
  • bug #4841 Fix Markup truthiness in boolean expressions (@​xtrime-ru)
  • bug #4842 Fix a PHP 8.5 chr() deprecation when decoding octal string escapes (@​austinderrick)
  • feature #4292 Introduce a CorrectnessNodeVisitor to validate that templates are semantically correct (@​fabpot)
  • feature #4840 Mark Markup as final (@​fabpot)
  • feature #4838 Allow calling a macro with a dynamic name via the dot operator (@​fabpot)
  • bug #4835 Fix markdown_to_html mangling content that starts with a blank line (@​fabpot)
  • feature #4819 Add an allow-list for tests to the sandbox security policy (@​fabpot)
  • minor #4837 Reduce memory usage of the context restoration compiled at the end of for loops (@​fabpot)
  • feature #4816 Add an always_allowed_in_sandbox flag for filters, functions, and tags (@​fabpot)
  • feature #4834 Track the source offset of each token and expose it in syntax errors (@​fabpot)
  • minor #4836 Document how to customize the markdown_to_html converter (@​fabpot)
  • minor #4662 CoreExtension::getAttribute: small improvement regarding getter/isser/hasser (@​gharlan)
  • bug #4825 Make the include() function return a Markup object (@​fabpot)
  • bug #4830 Fix nested block() resolution when a directly rendered block calls parent() (@​fabpot)
  • minor #4827 Document {#--#} as the replacement for the deprecated spaceless filter (@​fabpot)
  • bug #4828 Stop reporting a skipped test in IntegrationTestCase when there is no legacy test to run (@​fabpot)
  • minor #4829 Document storing an enum in a variable to avoid repeating its FQCN (@​fabpot)
  • bug #4824 Cast printed expressions to string so values that cannot be converted to a string (arrays, non-Stringable objects, ...) report a usable stack trace at the print location (@​stof, @​fabpot)
  • feature #4826 Make IntegrationTestCase and NodeTestCase compatible with PHPUnit 11 (@​fabpot)
  • feature #4823 Skip the sandbox __toString check on arguments whose PHP parameter type cannot implicitly coerce to string (@​fabpot)

v3.27.1

Changelog (twigphp/Twig@v3.27.0...v3.27.1)

  • bug #4822 Fix inconsistent array access with a Stringable key (@​fabpot)
  • bug #4821 Preserve IteratorAggregate identity in sandbox __toString walker (@​fabpot)
Changelog

Sourced from twig/twig's changelog.

3.28.0 (2026-07-03)

  • Render backed enums using their backing value in the html_attr function
  • Fix empty Markup values being treated as truthy in and, or, xor, not, ternary, and elvis expressions
  • Fix a PHP 8.5 chr() deprecation when decoding an octal string escape sequence larger than \377 (such as "\777")
  • Mark Twig\Markup as @final; it will be final in Twig 4.0
  • Reduce memory usage and speed up the context restoration compiled at the end of for loops
  • Allow calling a macro with a dynamic name via the dot operator (macros.(name)(args))
  • Report the column number in syntax errors and expose it via Error::getTemplateColumn()
  • Track the source offset of each token and expose it via Token::getOffset()
  • Fix nested block() calls to resolve against the overriding template when a block rendered through block(name, template) calls parent()
  • Deprecate the possibility to use a block tag within a capture node (like set)
  • Deprecate the possibility to use a block tag within a capture node (like set) in child templates
  • Deprecate using a macro, extends, or use tag outside the root of a template
  • Stop reporting a skipped test in IntegrationTestCase when there is no legacy test to run
  • Fix markdown_to_html to strip the indentation shared by all lines instead of mangling content that starts with a blank line
  • Make the IntegrationTestCase and NodeTestCase test helpers compatible with PHPUnit 11
  • Cast printed expressions to string so values that cannot be converted to a string (arrays, non-Stringable objects, ...) report a usable stack trace at the print location
  • Make the include() function return a Markup object so an assigned result is not re-escaped when printed
  • Skip the sandbox __toString check on arguments whose PHP parameter type cannot implicitly coerce to string
  • Document the criteria for marking a callable or tag as always allowed in a sandbox, and the list of built-in tags, filters, and functions that will be always allowed in Twig 4.0
  • Add an always_allowed_in_sandbox option for filters, functions, and tests, and an isAlwaysAllowedInSandbox() method for token parsers, to let authors mark callables and tags that are always allowed in sandbox mode without explicit allow-listing
  • Add an allow-list for tests to Twig\Sandbox\SecurityPolicy, with the safe built-in tests flagged as always allowed so they keep working without allow-listing

3.27.1 (2026-05-30)

  • Fix array access with a Stringable key to coerce the key to string consistently instead of throwing in the optimized path
  • Fix sandbox replacing IteratorAggregate arguments (e.g. Symfony's FormView) by a plain array
Commits
  • 597c12e Prepare the 3.28.0 release
  • 6a175a5 bug #4850 Render backed enums using their backing value in the html_attr func...
  • 9323a82 Render backed enums using their backing value in the html_attr function
  • ec0f5d5 Tweak previous merge
  • 4007231 minor #4845 Add documention note about variable scope of override blocks in {...
  • 068a2e6 Add documention note about variable scope of override blocks in {% embed ... ...
  • f6152fe minor #4843 Define macros at the template root in the cache macro fixture (fa...
  • 424d2f1 Define the macro at the template root in the cache macro fixture
  • e3b8e15 Update CHANGELOG
  • 2f202b0 bug #4841 Fix Markup truthiness in boolean expressions (xtrime-ru)
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

@dependabot
chore(deps): bump the php-production group across 1 directory with 7 …
2a2e041 
…updates

Bumps the php-production group with 6 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [composer/ca-bundle](https://github.com/composer/ca-bundle) | `1.5.12` | `1.5.13` |
| [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) | `3.94.2` | `3.95.18` |
| [nanasess/bcmath-polyfill](https://github.com/nanasess/bcmath-polyfill) | `1.0.2` | `1.1.0` |
| [nesbot/carbon](https://github.com/CarbonPHP/carbon) | `3.13.0` | `3.13.1` |
| [setasign/fpdi](https://github.com/Setasign/FPDI) | `2.6.7` | `2.6.8` |
| [twig/twig](https://github.com/twigphp/Twig) | `3.27.0` | `3.28.0` |



Updates `composer/ca-bundle` from 1.5.12 to 1.5.13
- [Release notes](https://github.com/composer/ca-bundle/releases)
- [Commits](composer/ca-bundle@1.5.12...1.5.13)

Updates `friendsofphp/php-cs-fixer` from 3.94.2 to 3.95.18
- [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases)
- [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md)
- [Commits](PHP-CS-Fixer/PHP-CS-Fixer@v3.94.2...v3.95.18)

Updates `nanasess/bcmath-polyfill` from 1.0.2 to 1.1.0
- [Release notes](https://github.com/nanasess/bcmath-polyfill/releases)
- [Commits](nanasess/bcmath-polyfill@1.0.2...1.1.0)

Updates `nesbot/carbon` from 3.13.0 to 3.13.1
- [Release notes](https://github.com/CarbonPHP/carbon/releases)
- [Commits](CarbonPHP/carbon@3.13.0...3.13.1)

Updates `phpseclib/phpseclib` from 3.0.55 to 3.0.56
- [Release notes](https://github.com/phpseclib/phpseclib/releases)
- [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
- [Commits](phpseclib/phpseclib@3.0.55...3.0.56)

Updates `setasign/fpdi` from 2.6.7 to 2.6.8
- [Release notes](https://github.com/Setasign/FPDI/releases)
- [Commits](Setasign/FPDI@v2.6.7...v2.6.8)

Updates `twig/twig` from 3.27.0 to 3.28.0
- [Release notes](https://github.com/twigphp/Twig/releases)
- [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG)
- [Commits](twigphp/Twig@v3.27.0...v3.28.0)

---
updated-dependencies:
- dependency-name: composer/ca-bundle
  dependency-version: 1.5.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: php-production
- dependency-name: friendsofphp/php-cs-fixer
  dependency-version: 3.95.18
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: php-production
- dependency-name: nanasess/bcmath-polyfill
  dependency-version: 1.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: php-production
- dependency-name: nesbot/carbon
  dependency-version: 3.13.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: php-production
- dependency-name: phpseclib/phpseclib
  dependency-version: 3.0.56
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: php-production
- dependency-name: setasign/fpdi
  dependency-version: 2.6.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: php-production
- dependency-name: twig/twig
  dependency-version: 3.28.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: php-production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot Bot added dependencies Pull requests that update a dependency file php Pull requests that update Php code labels Aug 5, 2026
@ttokoro20240902
ttokoro20240902 self-requested a review August 5, 2026 08:08
@ttokoro20240902 @claude
test: twig 3.28.0 の SyntaxError メッセージ変更に追従
313ced9 
twig/twig 3.28.0 で「Report the column number in syntax errors」
(twigphp/Twig#4834) が入り、SyntaxError のメッセージ末尾が
`at line N` から `at line N column M` に変わった。

TwigLintValidatorTest::testInValidTemplate が末尾の句点まで含めて
アサートしていたため、composer.lock の twig 3.27.0 -> 3.28.0 で
PHPUnit の全マトリクスが fail していた。

composer.json の制約は `"twig/twig": "^3.21"` で 3.28 未満も許容するため、
版差で変わらない行番号までを含有判定に変更する。
`{% endfo %}` 側は 3.28.0 でも column が付かないが、同種の破綻を避けて
同じ書き方に揃える。

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
nanasess
nanasess approved these changes Aug 6, 2026
View reviewed changes

@nanasess nanasess left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

ttokoro20240902 added a commit that referenced this pull request Aug 6, 2026
@ttokoro20240902
docs(skills): 4.4 取り込み後の実体照合と検証で見つけた記述漏れを補う
895e396 
#7013 のマージで esbuild が入ったので、eccube-asset の記述を
esbuild.config.mjs とリポジトリの実体で 1 項目ずつ照合した。
実体と合っていなかった点、および実装にあって書かれていなかった点を直す。

eccube-asset

- 「対象」の SCSS ソースに install を挙げていたが、
  html/template/install に scss ディレクトリは存在せず JS エントリだけ。
  SCSS は default / admin の 2 つに訂正する。
- 「生成物」を html/template/*/assets/css/*.css と広く書いていたが、
  実際に scss から生成されるのは style.* / app.* / bootstrap.* の 3 系統のみ。
  install/assets/css/dashboard.css と
  admin/assets/css/tempusdominus-bootstrap-4*.css は対応する scss が無い
  手管理ファイルで、再ビルドしても更新されない。両者を書き分ける。
- 上記を踏まえ「css/ 配下すべてを生成物と決めつける」を「よくある間違い」に追加。

eccube-contributing

- .husky/pre-push は dev コンテナ XML が無いとき先に
  bin/console cache:clear --env=dev を実行する（無いと rector が全ファイル
  read error で落ちるため）。初回 push が長い理由が分からないと
  異常と誤認するので追記する。

eccube-phpunit

- 依存ライブラリの例外メッセージを全文アサートしない、を追加。
  twig/twig 3.28.0 の「Report the column number in syntax errors」
  (twigphp/Twig#4834) で `at line N.` が `at line N column M.` に変わり、
  composer.lock の更新だけで PHPUnit の全マトリクスが落ちた実例がある。
  composer.json の制約は ^3.21 で 3.28 も許容するため、版差で変わらない
  部分だけを含有判定する。

なお TwigLintValidatorTest 自体の修正は #7024 に含まれるため本 PR では触らない。
@ttokoro20240902 ttokoro20240902 mentioned this pull request Aug 6, 2026
Open
3 tasks
@ttokoro20240902 ttokoro20240902 mentioned this pull request Aug 7, 2026
Closed
@ttokoro20240902

ttokoro20240902 commented Aug 7, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

（当初「#7034 として切り出した」と書いていた内容を、状況の変化に合わせて書き換えています）

twig 3.28.0 のテスト追随コミット（313ced9b）は、一度 4.4 への単独 PR #7034 として切り出しましたが、この PR の composer.lock 衝突を解消して本 PR に集約したため #7034 は close しました。テスト修正は 313ced9b のまま本 PR に含まれています。

@dependabot rebase はかけないでください。 ブランチが base から作り直され、手動コミット 2 つが両方とも失われます。

  • 313ced9b … twig 3.28.0 の SyntaxError メッセージ変更へのテスト追随
  • 7fcddf1df0 … 4.4 を取り込んだ composer.lock の衝突解消

現在 mergeable = MERGEABLE、承認 2 件も維持されています。

@ttokoro20240902 @claude
Merge branch '4.4' into dependabot/composer/php-production-af86448be2
7fcddf1 
composer.lock は JSON として機械的に合成した。4.4 側（MCP 関連 34 パッケージ）を
ベースに、本 PR がバンプする 13 パッケージ＋新規 1（ergebnis/agent-detector）の
エントリだけを差し替えている。content-hash は composer.json が 4.4 側のものなので
4.4 の値を採用。

テキストマージでは 5 ハンクが衝突するが、両側が触った symfony/event-dispatcher と
symfony/filesystem はどちらも v7.4.15 で内容が完全に一致しており、実質の衝突は無い。

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@ttokoro20240902

ttokoro20240902 commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

composer.lock の衝突を解消して push しました（7fcddf1df0）。承認 2 件はそのまま維持されています。

4.4 側で MCP 関連（symfony/mcp-bundle 0.12 / mcp/sdk 0.7 ほか 34 パッケージ）が入ったことによる衝突でした。テキストマージだと 5 ハンク衝突しますが、両側が触った symfony/event-dispatcher と symfony/filesystem はどちらも v7.4.15 で内容が完全に一致しており、実質の衝突はありません。

lock は JSON として機械的に合成しています（4.4 の lock をベースに、本 PR がバンプする 13 パッケージ＋新規 1 のエントリだけを差し替え）。検証したのは次の 4 点です。

  • 本 PR の bump が全て入っている
  • 4.4 側の変更が 1 件も失われていない
  • packages が名前順のまま
  • content-hash は composer.json 側（4.4）と一致（composer validate の lock チェックが pass）

先ほど「切り出した」とコメントした #7034 は close しました。この PR をそのままマージできます。マージ後は #7033 に @dependabot rebase をかければ 17 fail が解消するはずです。

@ttokoro20240902 ttokoro20240902 mentioned this pull request Aug 7, 2026
Closed
@ttokoro20240902
ttokoro20240902 merged commit 19641de into 4.4 Aug 7, 2026
132 checks passed
@ttokoro20240902
ttokoro20240902 deleted the dependabot/composer/php-production-af86448be2 branch August 7, 2026 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nanasess nanasess nanasess approved these changes
@ttokoro20240902 ttokoro20240902 ttokoro20240902 approved these changes
@dotani1111 dotani1111 Awaiting requested review from dotani1111

Assignees

No one assigned

Labels

dependencies Pull requests that update a dependency file php Pull requests that update Php code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ttokoro20240902 @nanasess