Adjusted tests

VitaliyBoyko · VitaliyBoyko · commit d5a8ff4f4752 · 2022-11-24T15:35:36.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+     * @var CompanyInterfaceFactory
      */
-    private $entityDataFactory;
+    private CompanyInterfaceFactory $entityDataFactory;
 
     /**
      * @param Context $context
diff --git 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
@@ -19,12 +19,12 @@ class GridDataProvider extends DataProvider
     /**
      * @var GetListQuery
      */
-    private $getListQuery;
+    private GetListQuery $getListQuery;
 
     /**
      * @var SearchResultFactory
      */
-    private $searchResultFactory;
+    private SearchResultFactory $searchResultFactory;
 
     /**
      * @var array

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Edit extends Action implements HttpGetActionInterface`
`18`	`18`	`*`
`19`	`19`	`* @see _isAllowed()`
`20`	`20`	`*/`
`21`		`- const ADMIN_RESOURCE = 'Foo_Bar::management';`
	`21`	`+ public const ADMIN_RESOURCE = 'Foo_Bar::management';`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* Edit Book action.`