Skip to content

Commit 77bc8e5

Browse files
VitaliyBoykoVitaliyBoyko
authored
Merge pull request #1260 from vitaliyboykocontributor/constant-visibility-type-declarations
Constant visibility type declarations
2 parents c8f351a + 727e4a8 commit 77bc8e5

File tree

42 files changed

+103
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+103
-103
lines changed

‎resources/fileTemplates/internal/Magento Backend Controller Class.php.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ${NAME}#if (${EXTENDS}) extends ${EXTENDS}#end#if (${IMPLEMENTS}) implemen
1515
/**
1616
* Authorization level of a basic admin session
1717
*/
18-
const ADMIN_RESOURCE = '${ACL}';
18+
public const ADMIN_RESOURCE = '${ACL}';
1919

2020
#end
2121
/**

‎resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.ft

+19-19
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ use $use;
1212
class ${CLASS_NAME} implements ${IMPLEMENTS}
1313
{
1414
/**
15-
* @var ${MODULE_DATA_SETUP_INTERFACE}
16-
*/
17-
private $moduleDataSetup;
15+
* @var ${MODULE_DATA_SETUP_INTERFACE}
16+
*/
17+
private ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup;
1818

19-
/**
20-
* @var ${EAV_SETUP_FACTORY}
21-
*/
22-
private $eavSetupFactory;
19+
/**
20+
* @var ${EAV_SETUP_FACTORY}
21+
*/
22+
private ${EAV_SETUP_FACTORY} $eavSetupFactory;
2323

2424
/**
25-
* @var ${EAV_CONFIG_CLASS}
26-
*/
27-
private $eavConfig;
25+
* @var ${EAV_CONFIG_CLASS}
26+
*/
27+
private ${EAV_CONFIG_CLASS} $eavConfig;
2828

2929
/**
30-
* @var ${ATTRIBUTE_RESOURCE}
31-
*/
32-
private $attributeResource;
30+
* @var ${ATTRIBUTE_RESOURCE}
31+
*/
32+
private ${ATTRIBUTE_RESOURCE} $attributeResource;
3333

34-
/**
35-
* @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup
36-
* @param ${EAV_SETUP_FACTORY} $eavSetupFactory
37-
* @param ${EAV_CONFIG_CLASS} $eavConfig
38-
* @param ${ATTRIBUTE_RESOURCE} $attributeResource
39-
*/
34+
/**
35+
* @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup
36+
* @param ${EAV_SETUP_FACTORY} $eavSetupFactory
37+
* @param ${EAV_CONFIG_CLASS} $eavConfig
38+
* @param ${ATTRIBUTE_RESOURCE} $attributeResource
39+
*/
4040
public function __construct(
4141
${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup,
4242
${EAV_SETUP_FACTORY} $eavSetupFactory,

‎resources/fileTemplates/internal/Magento Data Model Interface.php.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interface ${NAME}
1616
#set ($propertyData = $property.split(";"))
1717
#set ($propertyUpperSnake = $propertyData.get(0))
1818
#set ($propertyLowerSnake = $propertyData.get(1))
19-
const $propertyUpperSnake = "$propertyLowerSnake";
19+
public const $propertyUpperSnake = "$propertyLowerSnake";
2020
#end
2121
#end
2222
#if (${PROPERTIES})

‎resources/fileTemplates/internal/Magento Data Model.php.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ${NAME} #if (${EXTENDS})extends ${EXTENDS} #end #if (${IMPLEMENTS} && $has
2626
#set ($propertyData = $property.split(";"))
2727
#set ($propertyUpperSnake = $propertyData.get(0))
2828
#set ($propertyLowerSnake = $propertyData.get(1))
29-
const $propertyUpperSnake = "$propertyLowerSnake";
29+
public const $propertyUpperSnake = "$propertyLowerSnake";
3030
#end
3131

3232
#end

‎resources/fileTemplates/internal/Magento Delete Entity By Id Command.php.ft

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ class ${CLASS_NAME}
1616
/**
1717
* @var ${LOGGER}
1818
*/
19-
private $logger;
19+
private ${LOGGER} $logger;
2020

2121
/**
2222
* @var ${MODEL_FACTORY}
2323
*/
24-
private $modelFactory;
24+
private ${MODEL_FACTORY} $modelFactory;
2525

2626
/**
2727
* @var ${RESOURCE}
2828
*/
29-
private $resource;
29+
private ${RESOURCE} $resource;
3030

3131
/**
3232
* @param ${LOGGER} $logger

‎resources/fileTemplates/internal/Magento Eav Attribute Data Patch Class.php.ft

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ class ${CLASS_NAME} implements ${IMPLEMENTS} {
1515
/**
1616
* @var ${MODULE_DATA_SETUP_INTERFACE}
1717
*/
18-
private $moduleDataSetup;
18+
private ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup;
1919

2020
/**
2121
* @var ${EAV_SETUP_FACTORY}
2222
*/
23-
private $eavSetupFactory;
23+
private ${EAV_SETUP_FACTORY} $eavSetupFactory;
2424

2525
/**
2626
* @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup

‎resources/fileTemplates/internal/Magento Entity Data Mapper.php.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ${CLASS_NAME}
1616
/**
1717
* @var ${DTO_FACTORY}
1818
*/
19-
private $entityDtoFactory;
19+
private ${DTO_FACTORY} $entityDtoFactory;
2020

2121
/**
2222
* @param ${DTO_FACTORY} $entityDtoFactory

‎resources/fileTemplates/internal/Magento Entity Delete Controller Class.php.ft

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS_POST}, ${IMPLEMEN
1818
*
1919
* @see _isAllowed()
2020
*/
21-
const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
21+
public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
2222

2323
/**
2424
* @var ${DELETE_COMMAND}
2525
*/
26-
private $deleteByIdCommand;
26+
private ${DELETE_COMMAND} $deleteByIdCommand;
2727

2828
/**
2929
* @param Context $context

‎resources/fileTemplates/internal/Magento Entity Edit Action Controller Class.php.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS}
1818
*
1919
* @see _isAllowed()
2020
*/
21-
const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
21+
public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
2222

2323
/**
2424
* Edit ${ENTITY_NAME} action.

‎resources/fileTemplates/internal/Magento Entity Index Adminhtml Controller Class.php.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ${CLASS_NAME} extends ${PARENT_CLASS_NAME} implements ${HTTP_GET_METHOD}
1616
/**
1717
* Authorization level of a basic admin session.
1818
*/
19-
const ADMIN_RESOURCE = '${ACL}';
19+
public const ADMIN_RESOURCE = '${ACL}';
2020

2121
/**
2222
* Execute action based on request and return result.

‎resources/fileTemplates/internal/Magento Entity New Action Controller Class.php.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS}
1818
*
1919
* @see _isAllowed()
2020
*/
21-
const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
21+
public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
2222

2323
/**
2424
* Create new ${ENTITY_NAME} action.

‎resources/fileTemplates/internal/Magento Entity Save Controller Class.php.ft

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ class ${CLASS_NAME} extends ${EXTENDS} implements ${IMPLEMENTS}
1818
*
1919
* @see _isAllowed()
2020
*/
21-
const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
21+
public const ADMIN_RESOURCE = '${ADMIN_RESOURCE}';
2222

2323
/**
2424
* @var ${DATA_PERSISTOR}
2525
*/
26-
private $dataPersistor;
26+
private ${DATA_PERSISTOR} $dataPersistor;
2727

2828
/**
2929
* @var ${SAVE_COMMAND}
3030
*/
31-
private $saveCommand;
31+
private ${SAVE_COMMAND} $saveCommand;
3232

3333
/**
3434
* @var ${ENTITY_DTO_FACTORY}
3535
*/
36-
private $entityDataFactory;
36+
private ${ENTITY_DTO_FACTORY} $entityDataFactory;
3737

3838
/**
3939
* @param Context $context

‎resources/fileTemplates/internal/Magento Get List Query Model.php.ft

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ class ${CLASS_NAME}
1616
/**
1717
* @var ${COLLECTION_PROCESSOR_TYPE}
1818
*/
19-
private $collectionProcessor;
19+
private ${COLLECTION_PROCESSOR_TYPE} $collectionProcessor;
2020

2121
/**
2222
* @var ${ENTITY_COLLECTION_FACTORY_TYPE}
2323
*/
24-
private $entityCollectionFactory;
24+
private ${ENTITY_COLLECTION_FACTORY_TYPE} $entityCollectionFactory;
2525

2626
/**
2727
* @var ${ENTITY_DATA_MAPPER_TYPE}
2828
*/
29-
private $entityDataMapper;
29+
private ${ENTITY_DATA_MAPPER_TYPE} $entityDataMapper;
3030

3131
/**
3232
* @var ${SEARCH_CRITERIA_BUILDER_TYPE}
3333
*/
34-
private $searchCriteriaBuilder;
34+
private ${SEARCH_CRITERIA_BUILDER_TYPE} $searchCriteriaBuilder;
3535

3636
/**
3737
* @var ${SEARCH_RESULT_FACTORY_TYPE}
3838
*/
39-
private $searchResultFactory;
39+
private ${SEARCH_RESULT_FACTORY_TYPE} $searchResultFactory;
4040

4141
/**
4242
* @param ${COLLECTION_PROCESSOR_TYPE} $collectionProcessor

‎resources/fileTemplates/internal/Magento Grid Ui Component Action Column Class.php.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ${CLASS_NAME} extends ${PARENT_CLASS}
2727
/**
2828
* @var ${URL}
2929
*/
30-
private $urlBuilder;
30+
private ${URL} $urlBuilder;
3131

3232
/**
3333
* @param ${CONTEXT} $context

‎resources/fileTemplates/internal/Magento Module Setup Patch File.php.ft

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ${CLASS_NAME} implements DataPatchInterface
1414
/**
1515
* @var ModuleDataSetupInterface
1616
*/
17-
private $moduleDataSetup;
17+
private ModuleDataSetupInterface $moduleDataSetup;
1818

1919
/**
2020
* @param ModuleDataSetupInterface $moduleDataSetup

‎resources/fileTemplates/internal/Magento PHP Form Generic Button Block Class.php.ft

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ class ${CLASS_NAME}
1616
/**
1717
* @var ${CONTEXT}
1818
*/
19-
private $context;
19+
private ${CONTEXT} $context;
2020

2121
/**
2222
* @var ${URL}
2323
*/
24-
private $urlBuilder;
24+
private ${URL} $urlBuilder;
2525

2626
/**
2727
* @param ${CONTEXT} $context

‎resources/fileTemplates/internal/Magento Save Entity Command Model.php.ft

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ class ${CLASS_NAME}
1616
/**
1717
* @var ${LOGGER}
1818
*/
19-
private $logger;
19+
private ${LOGGER} $logger;
2020

2121
/**
2222
* @var ${MODEL_FACTORY}
2323
*/
24-
private $modelFactory;
24+
private ${MODEL_FACTORY} $modelFactory;
2525

2626
/**
2727
* @var ${RESOURCE}
2828
*/
29-
private $resource;
29+
private ${RESOURCE} $resource;
3030

3131
/**
3232
* @param ${LOGGER} $logger

‎resources/fileTemplates/internal/Magento UI Component Custom Data Provider Class.php.ft

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ class ${CLASS_NAME} extends ${EXTENDS}
2222
/**
2323
* @var ${GET_LIST_QUERY_TYPE}
2424
*/
25-
private $getListQuery;
25+
private ${GET_LIST_QUERY_TYPE} $getListQuery;
2626

2727
/**
2828
* @var ${SEARCH_RESULT_FACTORY}
2929
*/
30-
private $searchResultFactory;
30+
private ${SEARCH_RESULT_FACTORY} $searchResultFactory;
3131

3232
/**
3333
* @var array

‎testData/actions/generation/generator/CategoryAttributePropertySetupPatchGenerator/generateFile/AddTestAttributeCategoryAttribute.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ class AddTestAttributeCategoryAttribute implements DataPatchInterface
1414
/**
1515
* @var ModuleDataSetupInterface
1616
*/
17-
private $moduleDataSetup;
17+
private ModuleDataSetupInterface $moduleDataSetup;
1818

1919
/**
2020
* @var EavSetupFactory
2121
*/
22-
private $eavSetupFactory;
22+
private EavSetupFactory $eavSetupFactory;
2323

2424
/**
2525
* @param ModuleDataSetupInterface $moduleDataSetup

‎testData/actions/generation/generator/CustomerAttributeSetupPatchGenerator/generateMultiselectAttributeDataPatch/AddMultiselectTestCustomerAttribute.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ class AddMultiselectTestCustomerAttribute implements DataPatchInterface
1616
/**
1717
* @var ModuleDataSetupInterface
1818
*/
19-
private $moduleDataSetup;
19+
private ModuleDataSetupInterface $moduleDataSetup;
2020

2121
/**
2222
* @var EavSetupFactory
2323
*/
24-
private $eavSetupFactory;
24+
private EavSetupFactory $eavSetupFactory;
2525

2626
/**
2727
* @var Config
2828
*/
29-
private $eavConfig;
29+
private Config $eavConfig;
3030

3131
/**
3232
* @var Attribute
3333
*/
34-
private $attributeResource;
34+
private Attribute $attributeResource;
3535

3636
/**
3737
* @param ModuleDataSetupInterface $moduleDataSetup

‎testData/actions/generation/generator/DataModelGenerator/generateDataModelWithoutInterface/Sample.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ class Sample extends DataObject
99
/**
1010
* String constants for property names.
1111
*/
12-
const ID_PROPERTY = "id_property";
13-
const SAMPLE_PROPERTY = "sample_property";
12+
public const ID_PROPERTY = "id_property";
13+
public const SAMPLE_PROPERTY = "sample_property";
1414

1515
/**
1616
* Getter for IdProperty.

‎testData/actions/generation/generator/DataModelInterfaceGenerator/generateDataModelInterface/SampleInterface.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ interface SampleInterface
77
/**
88
* String constants for property names
99
*/
10-
const ID_PROPERTY = "id_property";
11-
const SAMPLE_PROPERTY = "sample_property";
10+
public const ID_PROPERTY = "id_property";
11+
public const SAMPLE_PROPERTY = "sample_property";
1212

1313
/**
1414
* Getter for IdProperty.

‎testData/actions/generation/generator/DeleteEntityCommandGenerator/generateDeleteEntityByIdCommandFile/DeleteByIdCommand.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ class DeleteByIdCommand
1919
/**
2020
* @var LoggerInterface
2121
*/
22-
private $logger;
22+
private LoggerInterface $logger;
2323

2424
/**
2525
* @var BookModelFactory
2626
*/
27-
private $modelFactory;
27+
private BookModelFactory $modelFactory;
2828

2929
/**
3030
* @var BookResource
3131
*/
32-
private $resource;
32+
private BookResource $resource;
3333

3434
/**
3535
* @param LoggerInterface $logger

‎testData/actions/generation/generator/DeleteEntityGenerator/generateDeleteEntityFile/Delete.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ class Delete extends Action implements HttpPostActionInterface, HttpGetActionInt
2323
*
2424
* @see _isAllowed()
2525
*/
26-
const ADMIN_RESOURCE = 'Foo_Bar::company_id';
26+
public const ADMIN_RESOURCE = 'Foo_Bar::company_id';
2727

2828
/**
2929
* @var DeleteByIdCommand
3030
*/
31-
private $deleteByIdCommand;
31+
private DeleteByIdCommand $deleteByIdCommand;
3232

3333
/**
3434
* @param Context $context

0 commit comments

Comments
 (0)