Skip to content

cleanup underscore properties in I18n package #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LordSimal wants to merge 2 commits into
base: 6.x
Choose a base branch
from
+22 −7
Open

cleanup underscore properties in I18n package #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9341c9
cleanup underscore properties in I18n package
LordSimal Jan 11, 2026
efaa51f
adjust CI
LordSimal Jan 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.1', '8.2', '8.3', '8.4']
php-version: ['8.2', '8.3', '8.4']
prefer-lowest: ['']
include:
- php-version: '8.1'
- php-version: '8.2'
prefer-lowest: 'prefer-lowest'

steps:
Expand Down Expand Up @@ -47,27 +47,27 @@ jobs:
run: |
if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
make install-dev-lowest
elif ${{ matrix.php-version == '8.1' }}; then
elif ${{ matrix.php-version == '8.2' }}; then
make install-dev-ignore-reqs
else
make install-dev
fi

- name: Setup problem matchers for PHPUnit
if: matrix.php-version == '8.1'
if: matrix.php-version == '8.2'
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run PHPUnit
run: |
if [[ "${{ matrix.php-version }}" == "8.1" && "${{ matrix.prefer-lowest }}" != "prefer-lowest" ]]; then
if [[ "${{ matrix.php-version }}" == "8.2" && "${{ matrix.prefer-lowest }}" != "prefer-lowest" ]]; then
export CODECOVERAGE=1
vendor/bin/phpunit --display-incomplete --display-skipped --coverage-clover=coverage.xml
else
vendor/bin/phpunit
fi

- name: Submit code coverage
if: matrix.php-version == '8.1' && matrix.prefer-lowest != 'prefer-lowest'
if: matrix.php-version == '8.2' && matrix.prefer-lowest != 'prefer-lowest'
uses: codecov/codecov-action@v5

cs-stan:
Expand All @@ -80,7 +80,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
extensions: mbstring, intl
tools: cs2pr
coverage: none
Expand Down
15 changes: 15 additions & 0 deletions config/rector/sets/cakephp60.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
'Controller' => [
'Cake\Controller\ComponentRegistry' => ['_Controller'],
'Cake\Controller\Controller' => ['_components'],
'Cake\Controller\Component' => ['_registry'],
],
'Core' => [
'Cake\Core\Configure\Engine\IniConfig' => ['_extension', '_section'],
Expand Down Expand Up @@ -234,6 +235,20 @@
'Cake\Http\Session\CacheSession' => ['_options'],
],

'I18n' => [
'Cake\I18n\MessagesFileLoader' => ['_name', '_plugin', '_locale', '_extension'],
'Cake\I18n\ChainMessagesLoader' => ['_loaders'],
// Can't rename _toStringFormat as it conflicts with ChronosDate::toStringFormat
'Cake\I18n\Date' => ['_jsonEncodeFormat'],
// Can't rename _toStringFormat as it conflicts with Chronos::toStringFormat
'Cake\I18n\DateTime' => ['_jsonEncodeFormat'],
// Can't rename _toStringFormat as it conflicts with ChronosTime::toStringFormat
'Cake\I18n\Time' => ['_jsonEncodeFormat'],
'Cake\I18n\I18n' => ['_collection', '_defaultLocale'],
'Cake\I18n\Number' => ['_formatters', '_defaultCurrency', '_defaultCurrencyFormat'],
'Cake\I18n\TranslatorRegistry' => ['_loaders', '_defaultFormatter', '_useFallback', '_cacher'],
],

'ORM' => [
'Cake\ORM\Association' => [
'_name', '_className', '_bindingKey', '_foreignKey', '_conditions',
Expand Down
Loading