|
38 | 38 |
|
39 | 39 | $rectorConfig->ruleWithConfiguration(RenamePropertyRector::class, [ |
40 | 40 | new RenameProperty('Cake\ORM\Entity', '_accessible', 'patchable'), |
| 41 | + // View::$_helpers conflicts with View::$helpers (config array), so rename to $helperRegistry |
| 42 | + new RenameProperty('Cake\View\View', '_helpers', 'helperRegistry'), |
41 | 43 | ]); |
42 | 44 |
|
43 | 45 | $rectorConfig->ruleWithConfiguration(RenameStringRector::class, [ |
|
242 | 244 | 'Cake\I18n\Time' => ['_jsonEncodeFormat'], |
243 | 245 | 'Cake\I18n\I18n' => ['_collection', '_defaultLocale'], |
244 | 246 | 'Cake\I18n\Number' => ['_formatters', '_defaultCurrency', '_defaultCurrencyFormat'], |
| 247 | + 'Cake\I18n\PluralRules' => ['_rulesMap'], |
245 | 248 | 'Cake\I18n\TranslatorRegistry' => ['_loaders', '_defaultFormatter', '_useFallback', '_cacher'], |
246 | 249 | ], |
247 | 250 | 'Log' => [ |
248 | 251 | 'Cake\Log\Log' => ['_dirtyConfig', '_levels', '_levelMap'], |
249 | 252 | 'Cake\Log\Engine\ConsoleLog' => ['_output'], |
250 | | - 'Cake\Log\Engine\SyslogLog' => ['_open'], |
| 253 | + 'Cake\Log\Engine\SyslogLog' => ['_levelMap', '_open'], |
251 | 254 | 'Cake\Log\Engine\FileLog' => ['_path', '_file', '_size'], |
252 | 255 | ], |
253 | 256 | 'Mailer' => [ |
|
345 | 348 | '_fields', '_providers', '_defaultProviders', '_presenceMessages', |
346 | 349 | '_useI18n', '_allowEmptyMessages', '_allowEmptyFlags', '_stopOnFailure', |
347 | 350 | ], |
| 351 | + 'Cake\Validation\ValidatorAwareTrait' => ['_validatorClass', '_validators'], |
348 | 352 | 'Cake\Validation\ValidationSet' => [ |
349 | 353 | '_rules', '_validatePresent', '_allowEmpty', |
350 | 354 | ], |
351 | 355 | 'Cake\Validation\Validation' => ['_pattern'], |
352 | 356 | ], |
| 357 | + 'View' => [ |
| 358 | + 'Cake\View\Cell' => ['_validCellOptions', '_cache'], |
| 359 | + 'Cake\View\Helper' => ['_View'], |
| 360 | + 'Cake\View\HelperRegistry' => ['_View'], |
| 361 | + 'Cake\View\StringTemplate' => ['_compactAttributes', '_configStack', '_compiled'], |
| 362 | + 'Cake\View\StringTemplateTrait' => ['_templater'], |
| 363 | + // Can't rename _helpers as it conflicts with View::$helpers (config array) |
| 364 | + 'Cake\View\View' => [ |
| 365 | + '_ext', '_passedVars', '_paths', '_pathsForPlugin', |
| 366 | + '_parents', '_current', '_currentType', '_stack', '_viewBlockClass', |
| 367 | + ], |
| 368 | + 'Cake\View\ViewBlock' => ['_blocks', '_active', '_discardActiveBufferOnEnd'], |
| 369 | + 'Cake\View\ViewBuilder' => [ |
| 370 | + '_templatePath', '_template', '_plugin', '_theme', '_layout', |
| 371 | + '_autoLayout', '_layoutPath', '_name', '_className', '_options', |
| 372 | + '_configMergeStrategy', '_vars', |
| 373 | + ], |
| 374 | + 'Cake\View\ViewVarsTrait' => ['_viewBuilder'], |
| 375 | + |
| 376 | + 'Cake\View\Form\ArrayContext' => ['_context'], |
| 377 | + 'Cake\View\Form\EntityContext' => [ |
| 378 | + '_context', '_rootName', '_isCollection', '_tables', '_validator', |
| 379 | + ], |
| 380 | + 'Cake\View\Form\FormContext' => ['_form', '_validator'], |
| 381 | + |
| 382 | + 'Cake\View\Helper\FormHelper' => [ |
| 383 | + '_defaultWidgets', '_locator', '_context', '_contextFactory', |
| 384 | + '_lastAction', '_valueSources', '_groupedInputTypes', |
| 385 | + ], |
| 386 | + 'Cake\View\Helper\HtmlHelper' => ['_includedAssets', '_scriptBlockOptions'], |
| 387 | + 'Cake\View\Helper\IdGeneratorTrait' => ['_idPrefix', '_idSuffixes'], |
| 388 | + 'Cake\View\Helper\TextHelper' => ['_placeholders'], |
| 389 | + 'Cake\View\Helper\UrlHelper' => ['_assetUrlClassName'], |
| 390 | + |
| 391 | + 'Cake\View\Widget\BasicWidget' => ['_templates'], |
| 392 | + 'Cake\View\Widget\ButtonWidget' => ['_templates'], |
| 393 | + 'Cake\View\Widget\DateTimeWidget' => ['_templates'], |
| 394 | + 'Cake\View\Widget\LabelWidget' => ['_templates', '_labelTemplate'], |
| 395 | + 'Cake\View\Widget\MultiCheckboxWidget' => ['_label'], |
| 396 | + 'Cake\View\Widget\NestingLabelWidget' => ['_labelTemplate'], |
| 397 | + 'Cake\View\Widget\RadioWidget' => ['_label'], |
| 398 | + 'Cake\View\Widget\WidgetLocator' => ['_widgets', '_templates', '_view'], |
| 399 | + 'Cake\View\Widget\YearWidget' => ['_select'], |
| 400 | + ], |
| 401 | + 'TestSuite' => [ |
| 402 | + 'Cake\TestSuite\Constraint\EventFired' => ['_eventManager'], |
| 403 | + 'Cake\TestSuite\Constraint\EventFiredWith' => ['_eventManager', '_dataKey', '_dataValue'], |
| 404 | + 'Cake\TestSuite\IntegrationTestTrait' => [ |
| 405 | + '_request', '_response', '_exception', '_session', '_cookie', |
| 406 | + '_controller', '_viewName', '_layoutName', '_requestSession', |
| 407 | + '_securityToken', '_csrfToken', '_retainFlashMessages', '_flashMessages', |
| 408 | + '_cookieEncryptionKey', '_unlockedFields', '_csrfKeyName', |
| 409 | + ], |
| 410 | + 'Cake\TestSuite\StringCompareTrait' => ['_compareBasePath', '_updateComparisons'], |
| 411 | + 'Cake\TestSuite\TestCase' => ['_configure', '_capturedError'], |
| 412 | + ], |
353 | 413 | ]; |
354 | 414 |
|
355 | 415 | foreach ($map as $definitions) { |
|
0 commit comments