diff --git a/resources/fileTemplates/internal/Magento Backend Controller Class.php.ft b/resources/fileTemplates/internal/Magento Backend Controller Class.php.ft
index b0556dc04..656be6882 100644
--- a/resources/fileTemplates/internal/Magento Backend Controller Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento Backend Controller Class.php.ft	
@@ -15,7 +15,7 @@ class ${NAME}#if (${EXTENDS}) extends ${EXTENDS}#end#if (${IMPLEMENTS}) implemen
     /**
      * Authorization level of a basic admin session
      */
-    const ADMIN_RESOURCE = '${ACL}';
+    public const ADMIN_RESOURCE = '${ACL}';
 
 #end
     /**
diff --git a/resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.ft b/resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.ft
index e38b07066..d20fba2b5 100644
--- a/resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.ft	
@@ -12,31 +12,31 @@ use $use;
 class ${CLASS_NAME} implements ${IMPLEMENTS}
 {
     /**
-     * @var ${MODULE_DATA_SETUP_INTERFACE}
-     */
-     private $moduleDataSetup;
+    * @var ${MODULE_DATA_SETUP_INTERFACE}
+    */
+    private ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup;
 
-     /**
-     * @var ${EAV_SETUP_FACTORY}
-     */
-    private $eavSetupFactory;
+    /**
+    * @var ${EAV_SETUP_FACTORY}
+    */
+    private ${EAV_SETUP_FACTORY} $eavSetupFactory;
 
     /**
-     * @var ${EAV_CONFIG_CLASS}
-     */
-    private $eavConfig;
+    * @var ${EAV_CONFIG_CLASS}
+    */
+    private ${EAV_CONFIG_CLASS} $eavConfig;
 
     /**
-     * @var ${ATTRIBUTE_RESOURCE}
-     */
-    private $attributeResource;
+    * @var ${ATTRIBUTE_RESOURCE}
+    */
+    private ${ATTRIBUTE_RESOURCE} $attributeResource;
 
-     /**
-     * @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup
-     * @param ${EAV_SETUP_FACTORY} $eavSetupFactory
-     * @param ${EAV_CONFIG_CLASS} $eavConfig
-     * @param ${ATTRIBUTE_RESOURCE} $attributeResource
-     */
+    /**
+    * @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup
+    * @param ${EAV_SETUP_FACTORY} $eavSetupFactory
+    * @param ${EAV_CONFIG_CLASS} $eavConfig
+    * @param ${ATTRIBUTE_RESOURCE} $attributeResource
+    */
     public function __construct(
         ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup,
         ${EAV_SETUP_FACTORY} $eavSetupFactory,
diff --git a/resources/fileTemplates/internal/Magento Data Model Interface.php.ft b/resources/fileTemplates/internal/Magento Data Model Interface.php.ft
index efa91463e..f3266be53 100644
--- a/resources/fileTemplates/internal/Magento Data Model Interface.php.ft	
+++ b/resources/fileTemplates/internal/Magento Data Model Interface.php.ft	
@@ -16,7 +16,7 @@ interface ${NAME}
             #set ($propertyData = $property.split(";"))
             #set ($propertyUpperSnake = $propertyData.get(0))
             #set ($propertyLowerSnake = $propertyData.get(1))
-            const $propertyUpperSnake = "$propertyLowerSnake";
+            public const $propertyUpperSnake = "$propertyLowerSnake";
         #end
     #end
     #if (${PROPERTIES})
diff --git a/resources/fileTemplates/internal/Magento Data Model.php.ft b/resources/fileTemplates/internal/Magento Data Model.php.ft
index f49f33387..f350c4dc7 100644
--- a/resources/fileTemplates/internal/Magento Data Model.php.ft	
+++ b/resources/fileTemplates/internal/Magento Data Model.php.ft	
@@ -26,7 +26,7 @@ class ${NAME} #if (${EXTENDS})extends ${EXTENDS} #end #if (${IMPLEMENTS} && $has
             #set ($propertyData = $property.split(";"))
             #set ($propertyUpperSnake = $propertyData.get(0))
             #set ($propertyLowerSnake = $propertyData.get(1))
-                const $propertyUpperSnake = "$propertyLowerSnake";
+                public const $propertyUpperSnake = "$propertyLowerSnake";
             #end
 
     #end
diff --git a/resources/fileTemplates/internal/Magento Delete Entity By Id Command.php.ft b/resources/fileTemplates/internal/Magento Delete Entity By Id Command.php.ft
index 97db4d570..9ac2957f6 100644
--- a/resources/fileTemplates/internal/Magento Delete Entity By Id Command.php.ft	
+++ b/resources/fileTemplates/internal/Magento Delete Entity By Id Command.php.ft	
@@ -16,17 +16,17 @@ class ${CLASS_NAME}
     /**
      * @var ${LOGGER}
      */
-    private $logger;
+    private ${LOGGER} $logger;
 
     /**
      * @var ${MODEL_FACTORY}
      */
-    private $modelFactory;
+    private ${MODEL_FACTORY} $modelFactory;
 
     /**
      * @var ${RESOURCE}
      */
-    private $resource;
+    private ${RESOURCE} $resource;
 
     /**
      * @param ${LOGGER} $logger
diff --git a/resources/fileTemplates/internal/Magento Eav Attribute Data Patch Class.php.ft b/resources/fileTemplates/internal/Magento Eav Attribute Data Patch Class.php.ft
index 7c6813869..db30f4113 100644
--- a/resources/fileTemplates/internal/Magento Eav Attribute Data Patch Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento Eav Attribute Data Patch Class.php.ft	
@@ -15,12 +15,12 @@ class ${CLASS_NAME} implements ${IMPLEMENTS} {
      /**
      * @var ${MODULE_DATA_SETUP_INTERFACE}
      */
-     private $moduleDataSetup;
+     private ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup;
 
     /**
      * @var ${EAV_SETUP_FACTORY}
      */
-    private $eavSetupFactory;
+    private ${EAV_SETUP_FACTORY} $eavSetupFactory;
 
     /**
      * @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup
diff --git a/resources/fileTemplates/internal/Magento Entity Data Mapper.php.ft b/resources/fileTemplates/internal/Magento Entity Data Mapper.php.ft
index 12644efb2..16dc7748b 100644
--- a/resources/fileTemplates/internal/Magento Entity Data Mapper.php.ft	
+++ b/resources/fileTemplates/internal/Magento Entity Data Mapper.php.ft	
@@ -16,7 +16,7 @@ class ${CLASS_NAME}
     /**
      * @var ${DTO_FACTORY}
      */
-    private $entityDtoFactory;
+    private ${DTO_FACTORY} $entityDtoFactory;
 
     /**
      * @param ${DTO_FACTORY} $entityDtoFactory
diff --git a/resources/fileTemplates/internal/Magento Entity Delete Controller Class.php.ft b/resources/fileTemplates/internal/Magento Entity Delete Controller Class.php.ft
index 8c83d6c23..678a0e5e7 100644
--- a/resources/fileTemplates/internal/Magento Entity Delete Controller Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento Entity Delete Controller Class.php.ft	
@@ -18,12 +18,12 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS_POST}, ${IMPLEMEN
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
+    public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
 
     /**
      * @var ${DELETE_COMMAND}
      */
-    private $deleteByIdCommand;
+    private ${DELETE_COMMAND} $deleteByIdCommand;
 
     /**
      * @param Context $context
diff --git a/resources/fileTemplates/internal/Magento Entity Edit Action Controller Class.php.ft b/resources/fileTemplates/internal/Magento Entity Edit Action Controller Class.php.ft
index 14bc769dd..15feb43c9 100644
--- a/resources/fileTemplates/internal/Magento Entity Edit Action Controller Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento Entity Edit Action Controller Class.php.ft	
@@ -18,7 +18,7 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS}
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
+    public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
 
     /**
      * Edit ${ENTITY_NAME} action.
diff --git a/resources/fileTemplates/internal/Magento Entity Index Adminhtml Controller Class.php.ft b/resources/fileTemplates/internal/Magento Entity Index Adminhtml Controller Class.php.ft
index 0573d9fa8..d88a1a5c2 100644
--- a/resources/fileTemplates/internal/Magento Entity Index Adminhtml Controller Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento Entity Index Adminhtml Controller Class.php.ft	
@@ -16,7 +16,7 @@ class ${CLASS_NAME} extends ${PARENT_CLASS_NAME} implements ${HTTP_GET_METHOD}
     /**
      * Authorization level of a basic admin session.
      */
-    const ADMIN_RESOURCE = '${ACL}';
+    public const ADMIN_RESOURCE = '${ACL}';
 
     /**
      * Execute action based on request and return result.
diff --git a/resources/fileTemplates/internal/Magento Entity New Action Controller Class.php.ft b/resources/fileTemplates/internal/Magento Entity New Action Controller Class.php.ft
index 36989b2c2..dd78e2e3b 100644
--- a/resources/fileTemplates/internal/Magento Entity New Action Controller Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento Entity New Action Controller Class.php.ft	
@@ -18,7 +18,7 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS}
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
+    public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
 
     /**
      * Create new ${ENTITY_NAME} action.
diff --git a/resources/fileTemplates/internal/Magento Entity Save Controller Class.php.ft b/resources/fileTemplates/internal/Magento Entity Save Controller Class.php.ft
index d15b064b4..16d4604bf 100644
--- a/resources/fileTemplates/internal/Magento Entity Save Controller Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento Entity Save Controller Class.php.ft	
@@ -18,22 +18,22 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS}
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
+    public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
 
      /**
      * @var ${DATA_PERSISTOR}
      */
-    private $dataPersistor;
+    private ${DATA_PERSISTOR} $dataPersistor;
 
     /**
      * @var ${SAVE_COMMAND}
      */
-    private $saveCommand;
+    private ${SAVE_COMMAND} $saveCommand;
 
     /**
      * @var ${ENTITY_DTO_FACTORY}
      */
-    private $entityDataFactory;
+    private ${ENTITY_DTO_FACTORY} $entityDataFactory;
 
     /**
      * @param Context $context
diff --git a/resources/fileTemplates/internal/Magento Get List Query Model.php.ft b/resources/fileTemplates/internal/Magento Get List Query Model.php.ft
index bff40b0fd..655c8f6bc 100644
--- a/resources/fileTemplates/internal/Magento Get List Query Model.php.ft	
+++ b/resources/fileTemplates/internal/Magento Get List Query Model.php.ft	
@@ -16,27 +16,27 @@ class ${CLASS_NAME}
     /**
      * @var ${COLLECTION_PROCESSOR_TYPE}
      */
-    private $collectionProcessor;
+    private ${COLLECTION_PROCESSOR_TYPE} $collectionProcessor;
 
     /**
      * @var ${ENTITY_COLLECTION_FACTORY_TYPE}
      */
-    private $entityCollectionFactory;
+    private ${ENTITY_COLLECTION_FACTORY_TYPE} $entityCollectionFactory;
 
     /**
      * @var ${ENTITY_DATA_MAPPER_TYPE}
      */
-    private $entityDataMapper;
+    private ${ENTITY_DATA_MAPPER_TYPE} $entityDataMapper;
 
     /**
      * @var ${SEARCH_CRITERIA_BUILDER_TYPE}
      */
-    private $searchCriteriaBuilder;
+    private ${SEARCH_CRITERIA_BUILDER_TYPE} $searchCriteriaBuilder;
 
     /**
      * @var ${SEARCH_RESULT_FACTORY_TYPE}
      */
-    private $searchResultFactory;
+    private ${SEARCH_RESULT_FACTORY_TYPE} $searchResultFactory;
 
     /**
      * @param ${COLLECTION_PROCESSOR_TYPE} $collectionProcessor
diff --git a/resources/fileTemplates/internal/Magento Grid Ui Component Action Column Class.php.ft b/resources/fileTemplates/internal/Magento Grid Ui Component Action Column Class.php.ft
index 79dc781ca..5095b6754 100644
--- a/resources/fileTemplates/internal/Magento Grid Ui Component Action Column Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento Grid Ui Component Action Column Class.php.ft	
@@ -27,7 +27,7 @@ class ${CLASS_NAME} extends ${PARENT_CLASS}
     /**
      * @var ${URL}
      */
-    private $urlBuilder;
+    private ${URL} $urlBuilder;
 
     /**
      * @param ${CONTEXT} $context
diff --git a/resources/fileTemplates/internal/Magento Module Setup Patch File.php.ft b/resources/fileTemplates/internal/Magento Module Setup Patch File.php.ft
index 37885e515..14becc2d4 100644
--- a/resources/fileTemplates/internal/Magento Module Setup Patch File.php.ft	
+++ b/resources/fileTemplates/internal/Magento Module Setup Patch File.php.ft	
@@ -14,7 +14,7 @@ class ${CLASS_NAME} implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
diff --git a/resources/fileTemplates/internal/Magento PHP Form Generic Button Block Class.php.ft b/resources/fileTemplates/internal/Magento PHP Form Generic Button Block Class.php.ft
index aafe31dc4..4c71974d8 100644
--- a/resources/fileTemplates/internal/Magento PHP Form Generic Button Block Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento PHP Form Generic Button Block Class.php.ft	
@@ -16,12 +16,12 @@ class ${CLASS_NAME}
     /**
      * @var ${CONTEXT}
      */
-    private $context;
+    private ${CONTEXT} $context;
 
     /**
      * @var ${URL}
      */
-    private $urlBuilder;
+    private ${URL} $urlBuilder;
 
     /**
      * @param ${CONTEXT} $context
diff --git a/resources/fileTemplates/internal/Magento Save Entity Command Model.php.ft b/resources/fileTemplates/internal/Magento Save Entity Command Model.php.ft
index 98a1b61ea..3a59dc3f0 100644
--- a/resources/fileTemplates/internal/Magento Save Entity Command Model.php.ft	
+++ b/resources/fileTemplates/internal/Magento Save Entity Command Model.php.ft	
@@ -16,17 +16,17 @@ class ${CLASS_NAME}
     /**
      * @var ${LOGGER}
      */
-    private $logger;
+    private ${LOGGER} $logger;
 
     /**
      * @var ${MODEL_FACTORY}
      */
-    private $modelFactory;
+    private ${MODEL_FACTORY} $modelFactory;
 
     /**
      * @var ${RESOURCE}
      */
-    private $resource;
+    private ${RESOURCE} $resource;
 
     /**
      * @param ${LOGGER} $logger
diff --git a/resources/fileTemplates/internal/Magento UI Component Custom Data Provider Class.php.ft b/resources/fileTemplates/internal/Magento UI Component Custom Data Provider Class.php.ft
index b435459b2..04cc715ce 100644
--- a/resources/fileTemplates/internal/Magento UI Component Custom Data Provider Class.php.ft	
+++ b/resources/fileTemplates/internal/Magento UI Component Custom Data Provider Class.php.ft	
@@ -22,12 +22,12 @@ class ${CLASS_NAME} extends ${EXTENDS}
 /**
      * @var ${GET_LIST_QUERY_TYPE}
      */
-    private $getListQuery;
+    private ${GET_LIST_QUERY_TYPE} $getListQuery;
 
     /**
      * @var ${SEARCH_RESULT_FACTORY}
      */
-    private $searchResultFactory;
+    private ${SEARCH_RESULT_FACTORY} $searchResultFactory;
 
     /**
      * @var array
diff --git a/testData/actions/generation/generator/CategoryAttributePropertySetupPatchGenerator/generateFile/AddTestAttributeCategoryAttribute.php b/testData/actions/generation/generator/CategoryAttributePropertySetupPatchGenerator/generateFile/AddTestAttributeCategoryAttribute.php
index 0c43f12d0..62737b6c6 100644
--- a/testData/actions/generation/generator/CategoryAttributePropertySetupPatchGenerator/generateFile/AddTestAttributeCategoryAttribute.php
+++ b/testData/actions/generation/generator/CategoryAttributePropertySetupPatchGenerator/generateFile/AddTestAttributeCategoryAttribute.php
@@ -14,12 +14,12 @@ class AddTestAttributeCategoryAttribute implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @var EavSetupFactory
      */
-    private $eavSetupFactory;
+    private EavSetupFactory $eavSetupFactory;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
diff --git a/testData/actions/generation/generator/CustomerAttributeSetupPatchGenerator/generateMultiselectAttributeDataPatch/AddMultiselectTestCustomerAttribute.php b/testData/actions/generation/generator/CustomerAttributeSetupPatchGenerator/generateMultiselectAttributeDataPatch/AddMultiselectTestCustomerAttribute.php
index 9f9592123..274631055 100644
--- a/testData/actions/generation/generator/CustomerAttributeSetupPatchGenerator/generateMultiselectAttributeDataPatch/AddMultiselectTestCustomerAttribute.php
+++ b/testData/actions/generation/generator/CustomerAttributeSetupPatchGenerator/generateMultiselectAttributeDataPatch/AddMultiselectTestCustomerAttribute.php
@@ -16,22 +16,22 @@ class AddMultiselectTestCustomerAttribute implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @var EavSetupFactory
      */
-    private $eavSetupFactory;
+    private EavSetupFactory $eavSetupFactory;
 
     /**
      * @var Config
      */
-    private $eavConfig;
+    private Config $eavConfig;
 
     /**
      * @var Attribute
      */
-    private $attributeResource;
+    private Attribute $attributeResource;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
diff --git a/testData/actions/generation/generator/DataModelGenerator/generateDataModelWithoutInterface/Sample.php b/testData/actions/generation/generator/DataModelGenerator/generateDataModelWithoutInterface/Sample.php
index f1cf0e634..f150b9c29 100644
--- a/testData/actions/generation/generator/DataModelGenerator/generateDataModelWithoutInterface/Sample.php
+++ b/testData/actions/generation/generator/DataModelGenerator/generateDataModelWithoutInterface/Sample.php
@@ -9,8 +9,8 @@ class Sample extends DataObject
     /**
      * String constants for property names.
      */
-    const ID_PROPERTY = "id_property";
-    const SAMPLE_PROPERTY = "sample_property";
+    public const ID_PROPERTY = "id_property";
+    public const SAMPLE_PROPERTY = "sample_property";
 
     /**
      * Getter for IdProperty.
diff --git a/testData/actions/generation/generator/DataModelInterfaceGenerator/generateDataModelInterface/SampleInterface.php b/testData/actions/generation/generator/DataModelInterfaceGenerator/generateDataModelInterface/SampleInterface.php
index f34598737..77940c693 100644
--- a/testData/actions/generation/generator/DataModelInterfaceGenerator/generateDataModelInterface/SampleInterface.php
+++ b/testData/actions/generation/generator/DataModelInterfaceGenerator/generateDataModelInterface/SampleInterface.php
@@ -7,8 +7,8 @@ interface SampleInterface
     /**
      * String constants for property names
      */
-    const ID_PROPERTY = "id_property";
-    const SAMPLE_PROPERTY = "sample_property";
+    public const ID_PROPERTY = "id_property";
+    public const SAMPLE_PROPERTY = "sample_property";
 
     /**
      * Getter for IdProperty.
diff --git a/testData/actions/generation/generator/DeleteEntityCommandGenerator/generateDeleteEntityByIdCommandFile/DeleteByIdCommand.php b/testData/actions/generation/generator/DeleteEntityCommandGenerator/generateDeleteEntityByIdCommandFile/DeleteByIdCommand.php
index 4842f10ae..d58c87f42 100644
--- a/testData/actions/generation/generator/DeleteEntityCommandGenerator/generateDeleteEntityByIdCommandFile/DeleteByIdCommand.php
+++ b/testData/actions/generation/generator/DeleteEntityCommandGenerator/generateDeleteEntityByIdCommandFile/DeleteByIdCommand.php
@@ -19,17 +19,17 @@ class DeleteByIdCommand
     /**
      * @var LoggerInterface
      */
-    private $logger;
+    private LoggerInterface $logger;
 
     /**
      * @var BookModelFactory
      */
-    private $modelFactory;
+    private BookModelFactory $modelFactory;
 
     /**
      * @var BookResource
      */
-    private $resource;
+    private BookResource $resource;
 
     /**
      * @param LoggerInterface $logger
diff --git a/testData/actions/generation/generator/DeleteEntityGenerator/generateDeleteEntityFile/Delete.php b/testData/actions/generation/generator/DeleteEntityGenerator/generateDeleteEntityFile/Delete.php
index 92594d159..ca631516e 100644
--- a/testData/actions/generation/generator/DeleteEntityGenerator/generateDeleteEntityFile/Delete.php
+++ b/testData/actions/generation/generator/DeleteEntityGenerator/generateDeleteEntityFile/Delete.php
@@ -23,12 +23,12 @@ class Delete extends Action implements HttpPostActionInterface, HttpGetActionInt
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Foo_Bar::company_id';
+    public const ADMIN_RESOURCE = 'Foo_Bar::company_id';
 
     /**
      * @var DeleteByIdCommand
      */
-    private $deleteByIdCommand;
+    private DeleteByIdCommand $deleteByIdCommand;
 
     /**
      * @param Context $context
diff --git a/testData/actions/generation/generator/EditEntityActionGenerator/generateEditEntityActionFile/Edit.php b/testData/actions/generation/generator/EditEntityActionGenerator/generateEditEntityActionFile/Edit.php
index 68f3ef1c2..7a6d776d5 100644
--- a/testData/actions/generation/generator/EditEntityActionGenerator/generateEditEntityActionFile/Edit.php
+++ b/testData/actions/generation/generator/EditEntityActionGenerator/generateEditEntityActionFile/Edit.php
@@ -18,7 +18,7 @@ class Edit extends Action implements HttpGetActionInterface
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Foo_Bar::management';
+    public const ADMIN_RESOURCE = 'Foo_Bar::management';
 
     /**
      * Edit Book action.
diff --git a/testData/actions/generation/generator/EntityDataMapperClassGenerator/generateEntityDataMapperFile/UnicornDataMapper.php b/testData/actions/generation/generator/EntityDataMapperClassGenerator/generateEntityDataMapperFile/UnicornDataMapper.php
index 28c6aeef0..df38a85a7 100644
--- a/testData/actions/generation/generator/EntityDataMapperClassGenerator/generateEntityDataMapperFile/UnicornDataMapper.php
+++ b/testData/actions/generation/generator/EntityDataMapperClassGenerator/generateEntityDataMapperFile/UnicornDataMapper.php
@@ -16,7 +16,7 @@ class UnicornDataMapper
     /**
      * @var UnicornDataInterfaceFactory
      */
-    private $entityDtoFactory;
+    private UnicornDataInterfaceFactory $entityDtoFactory;
 
     /**
      * @param UnicornDataInterfaceFactory $entityDtoFactory
diff --git a/testData/actions/generation/generator/FormGenericButtonBlockGenerator/generateFormGenericButtonBlockFile/GenericButton.php b/testData/actions/generation/generator/FormGenericButtonBlockGenerator/generateFormGenericButtonBlockFile/GenericButton.php
index 18f8b2d7e..333d04350 100644
--- a/testData/actions/generation/generator/FormGenericButtonBlockGenerator/generateFormGenericButtonBlockFile/GenericButton.php
+++ b/testData/actions/generation/generator/FormGenericButtonBlockGenerator/generateFormGenericButtonBlockFile/GenericButton.php
@@ -14,12 +14,12 @@ class GenericButton
     /**
      * @var Context
      */
-    private $context;
+    private Context $context;
 
     /**
      * @var UrlInterface
      */
-    private $urlBuilder;
+    private UrlInterface $urlBuilder;
 
     /**
      * @param Context $context
diff --git a/testData/actions/generation/generator/GridActionColumnFileGenerator/generateGridActionColumnFile/BookBlockActions.php b/testData/actions/generation/generator/GridActionColumnFileGenerator/generateGridActionColumnFile/BookBlockActions.php
index 357366f19..fa5aec54e 100644
--- a/testData/actions/generation/generator/GridActionColumnFileGenerator/generateGridActionColumnFile/BookBlockActions.php
+++ b/testData/actions/generation/generator/GridActionColumnFileGenerator/generateGridActionColumnFile/BookBlockActions.php
@@ -27,7 +27,7 @@ class BookBlockActions extends Column
     /**
      * @var UrlInterface
      */
-    private $urlBuilder;
+    private UrlInterface $urlBuilder;
 
     /**
      * @param ContextInterface $context
diff --git a/testData/actions/generation/generator/IndexControllerGenerator/generateIndexControllerFile/Index.php b/testData/actions/generation/generator/IndexControllerGenerator/generateIndexControllerFile/Index.php
index 1cdce7b35..5a56f6e07 100644
--- a/testData/actions/generation/generator/IndexControllerGenerator/generateIndexControllerFile/Index.php
+++ b/testData/actions/generation/generator/IndexControllerGenerator/generateIndexControllerFile/Index.php
@@ -16,7 +16,7 @@ class Index extends Action implements HttpGetActionInterface
     /**
      * Authorization level of a basic admin session.
      */
-    const ADMIN_RESOURCE = 'Foo_Bar::book_management';
+    public const ADMIN_RESOURCE = 'Foo_Bar::book_management';
 
     /**
      * Execute action based on request and return result.
diff --git a/testData/actions/generation/generator/ModuleControllerClassGenerator/generateBackendControllerFile/BackendSaveAction.php b/testData/actions/generation/generator/ModuleControllerClassGenerator/generateBackendControllerFile/BackendSaveAction.php
index 6cb7caa0a..56f2a0b43 100644
--- a/testData/actions/generation/generator/ModuleControllerClassGenerator/generateBackendControllerFile/BackendSaveAction.php
+++ b/testData/actions/generation/generator/ModuleControllerClassGenerator/generateBackendControllerFile/BackendSaveAction.php
@@ -13,7 +13,7 @@ class BackendSaveAction extends Action implements HttpPostActionInterface
     /**
      * Authorization level of a basic admin session
      */
-    const ADMIN_RESOURCE = 'Foo_Bar::entity';
+    public const ADMIN_RESOURCE = 'Foo_Bar::entity';
 
     /**
      * Execute action based on request and return result
diff --git a/testData/actions/generation/generator/ModuleSetupDataPatchGenerator/generateModuleSetupDataPatchFile/TestClassPatch.php b/testData/actions/generation/generator/ModuleSetupDataPatchGenerator/generateModuleSetupDataPatchFile/TestClassPatch.php
index f220c92c0..ac12df19d 100644
--- a/testData/actions/generation/generator/ModuleSetupDataPatchGenerator/generateModuleSetupDataPatchFile/TestClassPatch.php
+++ b/testData/actions/generation/generator/ModuleSetupDataPatchGenerator/generateModuleSetupDataPatchFile/TestClassPatch.php
@@ -13,7 +13,7 @@ class TestClassPatch implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
diff --git a/testData/actions/generation/generator/NewActionEntityGenerator/generateNewActionEntityFile/NewAction.php b/testData/actions/generation/generator/NewActionEntityGenerator/generateNewActionEntityFile/NewAction.php
index 6140d1520..c19d07fb2 100644
--- a/testData/actions/generation/generator/NewActionEntityGenerator/generateNewActionEntityFile/NewAction.php
+++ b/testData/actions/generation/generator/NewActionEntityGenerator/generateNewActionEntityFile/NewAction.php
@@ -18,7 +18,7 @@ class NewAction extends Action implements HttpGetActionInterface
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Foo_Bar::company_id';
+    public const ADMIN_RESOURCE = 'Foo_Bar::company_id';
 
     /**
      * Create new Company action.
diff --git a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFile/AddTestAttribute.php b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFile/AddTestAttribute.php
index 129a8f068..043330099 100644
--- a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFile/AddTestAttribute.php
+++ b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFile/AddTestAttribute.php
@@ -14,12 +14,12 @@ class AddTestAttribute implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @var EavSetupFactory
      */
-    private $eavSetupFactory;
+    private EavSetupFactory $eavSetupFactory;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
diff --git a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithApplyToAttribute/AddAppliedToAttribute.php b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithApplyToAttribute/AddAppliedToAttribute.php
index 90be38a37..99f207909 100644
--- a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithApplyToAttribute/AddAppliedToAttribute.php
+++ b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithApplyToAttribute/AddAppliedToAttribute.php
@@ -14,12 +14,12 @@ class AddAppliedToAttribute implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @var EavSetupFactory
      */
-    private $eavSetupFactory;
+    private EavSetupFactory $eavSetupFactory;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
diff --git a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithBooleanSourceModel/AddBooleanInputAttributeAttribute.php b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithBooleanSourceModel/AddBooleanInputAttributeAttribute.php
index 574350b72..c52e521ae 100644
--- a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithBooleanSourceModel/AddBooleanInputAttributeAttribute.php
+++ b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithBooleanSourceModel/AddBooleanInputAttributeAttribute.php
@@ -14,12 +14,12 @@ class AddBooleanInputAttributeAttribute implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @var EavSetupFactory
      */
-    private $eavSetupFactory;
+    private EavSetupFactory $eavSetupFactory;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
diff --git a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithGeneratedSourceModel/AddAttributeWithCustomSourceAttribute.php b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithGeneratedSourceModel/AddAttributeWithCustomSourceAttribute.php
index 2dc15f408..f55514539 100644
--- a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithGeneratedSourceModel/AddAttributeWithCustomSourceAttribute.php
+++ b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithGeneratedSourceModel/AddAttributeWithCustomSourceAttribute.php
@@ -14,12 +14,12 @@ class AddAttributeWithCustomSourceAttribute implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @var EavSetupFactory
      */
-    private $eavSetupFactory;
+    private EavSetupFactory $eavSetupFactory;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
diff --git a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithOptions/AddAttributeWithOptionsAttribute.php b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithOptions/AddAttributeWithOptionsAttribute.php
index 2a1a353ca..c3a6db4d4 100644
--- a/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithOptions/AddAttributeWithOptionsAttribute.php
+++ b/testData/actions/generation/generator/ProductAttributePropertySetupPatchGenerator/generateFileWithOptions/AddAttributeWithOptionsAttribute.php
@@ -14,12 +14,12 @@ class AddAttributeWithOptionsAttribute implements DataPatchInterface
     /**
      * @var ModuleDataSetupInterface
      */
-    private $moduleDataSetup;
+    private ModuleDataSetupInterface $moduleDataSetup;
 
     /**
      * @var EavSetupFactory
      */
-    private $eavSetupFactory;
+    private EavSetupFactory $eavSetupFactory;
 
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
diff --git a/testData/actions/generation/generator/QueryModelGenerator/generateGetListQueryModelFile/GetListQuery.php b/testData/actions/generation/generator/QueryModelGenerator/generateGetListQueryModelFile/GetListQuery.php
index d1d2182e1..d7e25c906 100644
--- a/testData/actions/generation/generator/QueryModelGenerator/generateGetListQueryModelFile/GetListQuery.php
+++ b/testData/actions/generation/generator/QueryModelGenerator/generateGetListQueryModelFile/GetListQuery.php
@@ -19,27 +19,27 @@ class GetListQuery
     /**
      * @var CollectionProcessorInterface
      */
-    private $collectionProcessor;
+    private CollectionProcessorInterface $collectionProcessor;
 
     /**
      * @var CollectionFactory
      */
-    private $entityCollectionFactory;
+    private CollectionFactory $entityCollectionFactory;
 
     /**
      * @var BookDataMapper
      */
-    private $entityDataMapper;
+    private BookDataMapper $entityDataMapper;
 
     /**
      * @var SearchCriteriaBuilder
      */
-    private $searchCriteriaBuilder;
+    private SearchCriteriaBuilder $searchCriteriaBuilder;
 
     /**
      * @var SearchResultsInterfaceFactory
      */
-    private $searchResultFactory;
+    private SearchResultsInterfaceFactory $searchResultFactory;
 
     /**
      * @param CollectionProcessorInterface $collectionProcessor
diff --git a/testData/actions/generation/generator/SaveEntityActionGenerator/generateSaveEntityActionWithInterfaceFile/Save.php b/testData/actions/generation/generator/SaveEntityActionGenerator/generateSaveEntityActionWithInterfaceFile/Save.php
index 1780a3a7b..1958ca565 100644
--- a/testData/actions/generation/generator/SaveEntityActionGenerator/generateSaveEntityActionWithInterfaceFile/Save.php
+++ b/testData/actions/generation/generator/SaveEntityActionGenerator/generateSaveEntityActionWithInterfaceFile/Save.php
@@ -24,22 +24,22 @@ class Save extends Action implements HttpPostActionInterface
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Foo_Bar::company_id';
+    public const ADMIN_RESOURCE = 'Foo_Bar::company_id';
 
     /**
      * @var DataPersistorInterface
      */
-    private $dataPersistor;
+    private DataPersistorInterface $dataPersistor;
 
     /**
      * @var SaveCommand
      */
-    private $saveCommand;
+    private SaveCommand $saveCommand;
 
     /**
      * @var CompanyInterfaceFactory
      */
-    private $entityDataFactory;
+    private CompanyInterfaceFactory $entityDataFactory;
 
     /**
      * @param Context $context
diff --git a/testData/actions/generation/generator/SaveEntityActionGenerator/generateSaveEntityActionWithoutInterfaceFile/Save.php b/testData/actions/generation/generator/SaveEntityActionGenerator/generateSaveEntityActionWithoutInterfaceFile/Save.php
index 4875c60da..af283294a 100644
--- a/testData/actions/generation/generator/SaveEntityActionGenerator/generateSaveEntityActionWithoutInterfaceFile/Save.php
+++ b/testData/actions/generation/generator/SaveEntityActionGenerator/generateSaveEntityActionWithoutInterfaceFile/Save.php
@@ -24,22 +24,22 @@ class Save extends Action implements HttpPostActionInterface
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Foo_Bar::company_id';
+    public const ADMIN_RESOURCE = 'Foo_Bar::company_id';
 
     /**
      * @var DataPersistorInterface
      */
-    private $dataPersistor;
+    private DataPersistorInterface $dataPersistor;
 
     /**
      * @var SaveCommand
      */
-    private $saveCommand;
+    private SaveCommand $saveCommand;
 
     /**
      * @var CompanyDataFactory
      */
-    private $entityDataFactory;
+    private CompanyDataFactory $entityDataFactory;
 
     /**
      * @param Context $context
diff --git a/testData/actions/generation/generator/SaveEntityCommandGenerator/generateSaveEntityCommandFile/SaveCommand.php b/testData/actions/generation/generator/SaveEntityCommandGenerator/generateSaveEntityCommandFile/SaveCommand.php
index 433510de6..f40a6113f 100644
--- a/testData/actions/generation/generator/SaveEntityCommandGenerator/generateSaveEntityCommandFile/SaveCommand.php
+++ b/testData/actions/generation/generator/SaveEntityCommandGenerator/generateSaveEntityCommandFile/SaveCommand.php
@@ -18,17 +18,17 @@ class SaveCommand
     /**
      * @var LoggerInterface
      */
-    private $logger;
+    private LoggerInterface $logger;
 
     /**
      * @var BookModelFactory
      */
-    private $modelFactory;
+    private BookModelFactory $modelFactory;
 
     /**
      * @var BookResource
      */
-    private $resource;
+    private BookResource $resource;
 
     /**
      * @param LoggerInterface $logger
diff --git a/testData/actions/generation/generator/UiComponentGridDataProviderGenerator/generateDataProviderWithInjectedGetListQuery/GridDataProvider.php b/testData/actions/generation/generator/UiComponentGridDataProviderGenerator/generateDataProviderWithInjectedGetListQuery/GridDataProvider.php
index 514896290..a003e4b62 100644
--- a/testData/actions/generation/generator/UiComponentGridDataProviderGenerator/generateDataProviderWithInjectedGetListQuery/GridDataProvider.php
+++ b/testData/actions/generation/generator/UiComponentGridDataProviderGenerator/generateDataProviderWithInjectedGetListQuery/GridDataProvider.php
@@ -19,12 +19,12 @@ class GridDataProvider extends DataProvider
     /**
      * @var GetListQuery
      */
-    private $getListQuery;
+    private GetListQuery $getListQuery;
 
     /**
      * @var SearchResultFactory
      */
-    private $searchResultFactory;
+    private SearchResultFactory $searchResultFactory;
 
     /**
      * @var array