Skip to content

Commit 429558b

Browse files
committed
MAGETWO-69036: Lazy-loaders cause fatal errors in production mode on cloud
1 parent 2b56594 commit 429558b

File tree

17 files changed

+35
-16
lines changed

17 files changed

+35
-16
lines changed

app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
8383
* @param Builder $productBuilder
8484
* @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
8585
* @param AttributeGroupInterfaceFactory|null $attributeGroupFactory
86+
* @throws \RuntimeException
8687
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
8788
*/
8889
public function __construct(

app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class Builder
4646
* @param Registry $registry
4747
* @param WysiwygModel\Config $wysiwygConfig
4848
* @param StoreFactory|null $storeFactory
49+
* @throws \RuntimeException
4950
*/
5051
public function __construct(
5152
ProductFactory $productFactory,

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ class Helper
9494
* @param ProductLinks $productLinks
9595
* @param Js $jsHelper
9696
* @param DateFilter $dateFilter
97-
* @param LinkTypeProvider $linkTypeProvider
98-
* @param CustomOptionFactory $customOptionFactory
99-
* @param ProductLinkFactory $productLinkFactory
100-
* @param ProductRepository $productRepository
101-
* @param CustomOptionFactory $customOptionFactory
102-
* @param DateTime $dateTimeFilter
103-
* @param LinkResolver $linkResolver
97+
* @param LinkTypeProvider|null $linkTypeProvider
98+
* @param CustomOptionFactory|null $customOptionFactory
99+
* @param ProductLinkFactory|null $productLinkFactory
100+
* @param ProductRepository|null $productRepository
101+
* @param DateTime|null $dateTimeFilter
102+
* @param LinkResolver|null $linkResolver
103+
* @throws \RuntimeException
104104
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
105105
*/
106106
public function __construct(

app/code/Magento/Catalog/Model/Product/Option/Repository.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
5858
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
5959
* @param \Magento\Catalog\Model\ResourceModel\Product\Option $optionResource
6060
* @param Converter $converter
61-
* @param \Magento\Catalog\Model\Product\OptionFactory $optionFactory
62-
* @param \Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory $collectionFactory
61+
* @param \Magento\Catalog\Model\Product\OptionFactory|null $optionFactory
62+
* @param \Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory|null $collectionFactory
63+
* @throws \RuntimeException
6364
*/
6465
public function __construct(
6566
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -257,6 +258,7 @@ private function getMetadataPool()
257258

258259
/**
259260
* @return \Magento\Framework\EntityManager\HydratorPool
261+
* @throws \RuntimeException
260262
* @deprecated
261263
*/
262264
private function getHydratorPool()

app/code/Magento/Catalog/Model/ProductLink/Repository.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@ class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
8484
* @param LinksInitializer $linkInitializer
8585
* @param Management $linkManagement
8686
* @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
87-
* @param ProductLinkInterfaceFactory $productLinkFactory
88-
* @param ProductLinkExtensionFactory $productLinkExtensionFactory
87+
* @param ProductLinkInterfaceFactory|null $productLinkFactory
88+
* @param ProductLinkExtensionFactory|null $productLinkExtensionFactory
89+
* @throws \RuntimeException
8990
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
9091
*/
9192
public function __construct(

app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
9696
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
9797
* @param \Magento\Catalog\Model\Config $catalogConfig
9898
* @param \Magento\Framework\Event\ManagerInterface $eventManager
99-
* @param string $connectionName
100-
* @param CategoryFlatCollectionFactory $categoryFlatCollectionFactory
99+
* @param string|null $connectionName
100+
* @param CategoryFlatCollectionFactory|null $categoryFlatCollectionFactory
101+
* @throws \RuntimeException
101102
*/
102103
public function __construct(
103104
\Magento\Framework\Model\ResourceModel\Db\Context $context,

app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class Cart extends \Magento\Customer\Controller\Adminhtml\Index
5757
* @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
5858
* @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
5959
* @param QuoteFactory|null $quoteFactory
60+
* @throws \RuntimeException
6061
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
6162
*/
6263
public function __construct(

app/code/Magento/Customer/Model/Customer/DataProvider.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
142142
* @param array $data
143143
* @param FileProcessorFactory|null $fileProcessorFactory
144144
* @throws \Magento\Framework\Exception\LocalizedException
145+
* @throws \RuntimeException
145146
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
146147
*/
147148
public function __construct(

app/code/Magento/Customer/Model/Metadata/Form/File.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class File extends AbstractData
7373
* @param Filesystem $fileSystem
7474
* @param UploaderFactory $uploaderFactory
7575
* @param FileProcessorFactory|null $fileProcessorFactory
76+
* @throws \RuntimeException
7677
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7778
*/
7879
public function __construct(

app/code/Magento/Directory/Model/Currency/Import/Webservicex.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Webservicex extends \Magento\Directory\Model\Currency\Import\AbstractImpor
2424
/**
2525
* Http Client Factory
2626
*
27-
* @var ZendClientFactory|null
27+
* @var ZendClientFactory
2828
*/
2929
protected $httpClientFactory;
3030

@@ -39,6 +39,7 @@ class Webservicex extends \Magento\Directory\Model\Currency\Import\AbstractImpor
3939
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
4040
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
4141
* @param ZendClientFactory|null $httpClientFactory
42+
* @throws \RuntimeException
4243
*/
4344
public function __construct(
4445
\Magento\Directory\Model\CurrencyFactory $currencyFactory,

0 commit comments

Comments
 (0)