Skip to content

Commit cb75883

Browse files
committed
Add missing View and TestSuite property renames for CakePHP 6.0
Adds property rename rules for: - View package: View, ViewBuilder, ViewBlock, Cell, Helper, FormHelper, HtmlHelper, TextHelper, UrlHelper, StringTemplate, WidgetLocator, various widgets, form contexts - TestSuite package: IntegrationTestTrait, TestCase, StringCompareTrait, EventFired constraints - Validation: ValidatorAwareTrait - Log: SyslogLog._levelMap These properties follow the PSR naming convention change from underscore-prefixed to non-prefixed names.
1 parent a95a6f6 commit cb75883

1 file changed

Lines changed: 59 additions & 1 deletion

File tree

config/rector/sets/cakephp60.php

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,13 @@
242242
'Cake\I18n\Time' => ['_jsonEncodeFormat'],
243243
'Cake\I18n\I18n' => ['_collection', '_defaultLocale'],
244244
'Cake\I18n\Number' => ['_formatters', '_defaultCurrency', '_defaultCurrencyFormat'],
245+
'Cake\I18n\PluralRules' => ['_rulesMap'],
245246
'Cake\I18n\TranslatorRegistry' => ['_loaders', '_defaultFormatter', '_useFallback', '_cacher'],
246247
],
247248
'Log' => [
248249
'Cake\Log\Log' => ['_dirtyConfig', '_levels', '_levelMap'],
249250
'Cake\Log\Engine\ConsoleLog' => ['_output'],
250-
'Cake\Log\Engine\SyslogLog' => ['_open'],
251+
'Cake\Log\Engine\SyslogLog' => ['_levelMap', '_open'],
251252
'Cake\Log\Engine\FileLog' => ['_path', '_file', '_size'],
252253
],
253254
'Mailer' => [
@@ -345,11 +346,68 @@
345346
'_fields', '_providers', '_defaultProviders', '_presenceMessages',
346347
'_useI18n', '_allowEmptyMessages', '_allowEmptyFlags', '_stopOnFailure',
347348
],
349+
'Cake\Validation\ValidatorAwareTrait' => ['_validatorClass', '_validators'],
348350
'Cake\Validation\ValidationSet' => [
349351
'_rules', '_validatePresent', '_allowEmpty',
350352
],
351353
'Cake\Validation\Validation' => ['_pattern'],
352354
],
355+
'View' => [
356+
'Cake\View\Cell' => ['_validCellOptions', '_cache'],
357+
'Cake\View\Helper' => ['_View'],
358+
'Cake\View\HelperRegistry' => ['_View'],
359+
'Cake\View\StringTemplate' => ['_compactAttributes', '_configStack', '_compiled'],
360+
'Cake\View\StringTemplateTrait' => ['_templater'],
361+
// Can't rename _helpers as it conflicts with View::$helpers (config array)
362+
'Cake\View\View' => [
363+
'_ext', '_passedVars', '_paths', '_pathsForPlugin',
364+
'_parents', '_current', '_currentType', '_stack', '_viewBlockClass',
365+
],
366+
'Cake\View\ViewBlock' => ['_blocks', '_active', '_discardActiveBufferOnEnd'],
367+
'Cake\View\ViewBuilder' => [
368+
'_templatePath', '_template', '_plugin', '_theme', '_layout',
369+
'_autoLayout', '_layoutPath', '_name', '_className', '_options',
370+
'_configMergeStrategy', '_vars',
371+
],
372+
'Cake\View\ViewVarsTrait' => ['_viewBuilder'],
373+
374+
'Cake\View\Form\ArrayContext' => ['_context'],
375+
'Cake\View\Form\EntityContext' => [
376+
'_context', '_rootName', '_isCollection', '_tables', '_validator',
377+
],
378+
'Cake\View\Form\FormContext' => ['_form', '_validator'],
379+
380+
'Cake\View\Helper\FormHelper' => [
381+
'_defaultWidgets', '_locator', '_context', '_contextFactory',
382+
'_lastAction', '_valueSources', '_groupedInputTypes',
383+
],
384+
'Cake\View\Helper\HtmlHelper' => ['_includedAssets', '_scriptBlockOptions'],
385+
'Cake\View\Helper\IdGeneratorTrait' => ['_idPrefix', '_idSuffixes'],
386+
'Cake\View\Helper\TextHelper' => ['_placeholders'],
387+
'Cake\View\Helper\UrlHelper' => ['_assetUrlClassName'],
388+
389+
'Cake\View\Widget\BasicWidget' => ['_templates'],
390+
'Cake\View\Widget\ButtonWidget' => ['_templates'],
391+
'Cake\View\Widget\DateTimeWidget' => ['_templates'],
392+
'Cake\View\Widget\LabelWidget' => ['_templates', '_labelTemplate'],
393+
'Cake\View\Widget\MultiCheckboxWidget' => ['_label'],
394+
'Cake\View\Widget\NestingLabelWidget' => ['_labelTemplate'],
395+
'Cake\View\Widget\RadioWidget' => ['_label'],
396+
'Cake\View\Widget\WidgetLocator' => ['_widgets', '_templates', '_view'],
397+
'Cake\View\Widget\YearWidget' => ['_select'],
398+
],
399+
'TestSuite' => [
400+
'Cake\TestSuite\Constraint\EventFired' => ['_eventManager'],
401+
'Cake\TestSuite\Constraint\EventFiredWith' => ['_eventManager', '_dataKey', '_dataValue'],
402+
'Cake\TestSuite\IntegrationTestTrait' => [
403+
'_request', '_response', '_exception', '_session', '_cookie',
404+
'_controller', '_viewName', '_layoutName', '_requestSession',
405+
'_securityToken', '_csrfToken', '_retainFlashMessages', '_flashMessages',
406+
'_cookieEncryptionKey', '_unlockedFields', '_csrfKeyName',
407+
],
408+
'Cake\TestSuite\StringCompareTrait' => ['_compareBasePath', '_updateComparisons'],
409+
'Cake\TestSuite\TestCase' => ['_configure', '_capturedError'],
410+
],
353411
];
354412

355413
foreach ($map as $definitions) {

0 commit comments

Comments
 (0)