diff --git a/config/drupal-10/drupal-10-all-deprecations.php b/config/drupal-10/drupal-10-all-deprecations.php index 43cbdd84..b30750c6 100644 --- a/config/drupal-10/drupal-10-all-deprecations.php +++ b/config/drupal-10/drupal-10-all-deprecations.php @@ -10,6 +10,7 @@ Drupal10SetList::DRUPAL_100, Drupal10SetList::DRUPAL_101, Drupal10SetList::DRUPAL_102, + Drupal10SetList::DRUPAL_103, ]); $rectorConfig->bootstrapFiles([ diff --git a/config/drupal-10/drupal-10.3-deprecations.php b/config/drupal-10/drupal-10.3-deprecations.php new file mode 100644 index 00000000..ad76fea6 --- /dev/null +++ b/config/drupal-10/drupal-10.3-deprecations.php @@ -0,0 +1,15 @@ +ruleWithConfiguration(FunctionToStaticRector::class, [ + new FunctionToStaticConfiguration('10.3.0', 'file_icon_class', 'Drupal\file\IconMimeTypes', 'getIconClass'), + new FunctionToStaticConfiguration('10.3.0', 'file_icon_map', 'Drupal\file\IconMimeTypes', 'getGenericMimeType'), + ]); +}; diff --git a/src/Set/Drupal10SetList.php b/src/Set/Drupal10SetList.php index 768e2eba..724dd993 100644 --- a/src/Set/Drupal10SetList.php +++ b/src/Set/Drupal10SetList.php @@ -12,4 +12,5 @@ final class Drupal10SetList implements SetListInterface public const DRUPAL_100 = __DIR__.'/../../config/drupal-10/drupal-10.0-deprecations.php'; public const DRUPAL_101 = __DIR__.'/../../config/drupal-10/drupal-10.1-deprecations.php'; public const DRUPAL_102 = __DIR__.'/../../config/drupal-10/drupal-10.2-deprecations.php'; + public const DRUPAL_103 = __DIR__.'/../../config/drupal-10/drupal-10.3-deprecations.php'; } diff --git a/stubs/Drupal/Drupal.php b/stubs/Drupal/Drupal.php index 3746b919..558338c4 100644 --- a/stubs/Drupal/Drupal.php +++ b/stubs/Drupal/Drupal.php @@ -5,5 +5,5 @@ } class Drupal { - const VERSION = '10.2.x-dev'; + const VERSION = '10.99.x-dev'; } diff --git a/tests/src/Rector/Deprecation/FunctionToServiceRector/config/configured_rule.php b/tests/src/Rector/Deprecation/FunctionToServiceRector/config/configured_rule.php index 984b6730..6bfbfe98 100644 --- a/tests/src/Rector/Deprecation/FunctionToServiceRector/config/configured_rule.php +++ b/tests/src/Rector/Deprecation/FunctionToServiceRector/config/configured_rule.php @@ -14,5 +14,6 @@ new FunctionToServiceConfiguration('9.3.0', 'file_move', 'file.repository', 'move'), new FunctionToServiceConfiguration('9.3.0', 'file_save_data', 'file.repository', 'writeData'), new FunctionToServiceConfiguration('10.1.0', 'drupal_theme_rebuild', 'theme.registry', 'reset'), + new FunctionToServiceConfiguration('10.2.0', '_drupal_flush_css_js', 'asset.query_string', 'reset'), ]); }; diff --git a/tests/src/Rector/Deprecation/FunctionToStaticRector/config/configured_rule.php b/tests/src/Rector/Deprecation/FunctionToStaticRector/config/configured_rule.php index c3777670..5c2cec68 100644 --- a/tests/src/Rector/Deprecation/FunctionToStaticRector/config/configured_rule.php +++ b/tests/src/Rector/Deprecation/FunctionToStaticRector/config/configured_rule.php @@ -12,5 +12,7 @@ new FunctionToStaticConfiguration('8.1.0', 'file_directory_os_temp', 'Drupal\Component\FileSystem\FileSystem', 'getOsTemporaryDirectory'), new FunctionToStaticConfiguration('10.1.0', 'drupal_rewrite_settings', 'Drupal\Core\Site\SettingsEditor', 'rewrite', [0 => 1, 1 => 0]), new FunctionToStaticConfiguration('10.2.0', 'format_size', 'Drupal\Core\StringTranslation\ByteSizeMarkup', 'create'), + new FunctionToStaticConfiguration('10.3.0', 'file_icon_class', 'Drupal\file\IconMimeTypes', 'getIconClass'), + new FunctionToStaticConfiguration('10.3.0', 'file_icon_map', 'Drupal\file\IconMimeTypes', 'getGenericMimeType'), ]); }; diff --git a/tests/src/Rector/Deprecation/FunctionToStaticRector/fixture/function_to_static_call.php.inc b/tests/src/Rector/Deprecation/FunctionToStaticRector/fixture/function_to_static_call.php.inc index 9d42c5d2..3191188a 100644 --- a/tests/src/Rector/Deprecation/FunctionToStaticRector/fixture/function_to_static_call.php.inc +++ b/tests/src/Rector/Deprecation/FunctionToStaticRector/fixture/function_to_static_call.php.inc @@ -16,6 +16,16 @@ function simple_example_os_temp() { function simple_example_format_size() { $size_literal = format_size(81862076662); } + +function simple_example_file_icon_class() { + $mime_type = 'application/pdf'; + $classes = [ + 'file', + 'file--' . file_icon_class($mime_type), + ]; + + $generic_mime = file_icon_map($mime_type); +} ?> ----- \Drupal\Core\StringTranslation\ByteSizeMarkup::create(81862076662), fn() => format_size(81862076662)); } + +function simple_example_file_icon_class() { + $mime_type = 'application/pdf'; + $classes = [ + 'file', + 'file--' . \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '10.3.0', fn() => \Drupal\file\IconMimeTypes::getIconClass($mime_type), fn() => file_icon_class($mime_type)), + ]; + + $generic_mime = \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '10.3.0', fn() => \Drupal\file\IconMimeTypes::getGenericMimeType($mime_type), fn() => file_icon_map($mime_type)); +} ?>