From a557683a0c1ec47fb7797758fccd3686bbec4bba Mon Sep 17 00:00:00 2001 From: Sergii Ivashchenko Date: Fri, 21 Dec 2018 15:07:06 +0000 Subject: [PATCH] Fixed static tests --- .../Bundle/Product/Edit/Crosssell.php | 5 ++- .../Bundle/Product/Edit/CrosssellGrid.php | 5 ++- .../Adminhtml/Bundle/Product/Edit/Related.php | 5 ++- .../Bundle/Product/Edit/RelatedGrid.php | 5 ++- .../Adminhtml/Bundle/Product/Edit/Upsell.php | 5 ++- .../Adminhtml/Product/Edit/Tab/Crosssell.php | 2 + .../Adminhtml/Product/Edit/Tab/Related.php | 2 + .../Adminhtml/Product/Edit/Tab/Upsell.php | 2 + .../Adminhtml/Product/Crosssell.php | 5 ++- .../Adminhtml/Product/CrosssellGrid.php | 5 ++- .../Controller/Adminhtml/Product/Related.php | 7 +++- .../Adminhtml/Product/RelatedGrid.php | 4 +- .../Controller/Adminhtml/Product/Upsell.php | 5 ++- .../Adminhtml/Product/UpsellGrid.php | 5 ++- .../Magento/Deploy/Collector/Collector.php | 42 ++++++++++++------- .../Downloadable/Product/Edit/Crosssell.php | 5 ++- .../Product/Edit/CrosssellGrid.php | 5 ++- .../Downloadable/Product/Edit/Related.php | 5 ++- .../Downloadable/Product/Edit/RelatedGrid.php | 5 ++- .../Downloadable/Product/Edit/Upsell.php | 5 ++- .../Downloadable/Product/Edit/UpsellGrid.php | 5 ++- .../Vault/Model/PaymentTokenRepository.php | 6 ++- 22 files changed, 107 insertions(+), 33 deletions(-) diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php index bc51a0f44be0d..08fac66c4a4fe 100644 --- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php +++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Crosssell.php @@ -6,6 +6,9 @@ */ namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrossel; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class Crosssell * @@ -13,6 +16,6 @@ * @deprecated Not used since cross-sell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml */ -class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell +class Crosssell extends CatalogCrossel implements HttpPostActionInterface { } diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php index 18668b6be4dcd..b301d6ee2fea9 100644 --- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php +++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/CrosssellGrid.php @@ -6,6 +6,9 @@ */ namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class CrosssellGrid * @@ -13,6 +16,6 @@ * @deprecated Not used since cross-sell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml */ -class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid +class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface { } diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php index f17031e30f9b7..7534cfddcaadf 100644 --- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php +++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Related.php @@ -6,6 +6,9 @@ */ namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class Related * @@ -13,6 +16,6 @@ * @deprecated Not used since related products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml */ -class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related +class Related extends CatalogRelated implements HttpPostActionInterface { } diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php index 01cd7705c02d6..e0fc9226663f4 100644 --- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php +++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/RelatedGrid.php @@ -6,6 +6,9 @@ */ namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class RelatedGrid * @@ -13,6 +16,6 @@ * @deprecated Not used since related products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml */ -class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid +class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface { } diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php index 6bbf55862cf24..239b13970e696 100644 --- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php +++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit/Upsell.php @@ -6,6 +6,9 @@ */ namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class Upsell * @@ -13,6 +16,6 @@ * @deprecated Not used since upsell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml */ -class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell +class Upsell extends CatalogUpsell implements HttpPostActionInterface { } diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php index 0d4a3c0da5943..e5ce59c550af1 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php @@ -10,6 +10,8 @@ use Magento\Catalog\Model\Product; /** + * Crossel product edit tab + * * @api * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @since 100.0.2 diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php index 5063d920c9109..c8153df41430e 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php @@ -9,6 +9,8 @@ use Magento\Backend\Block\Widget\Grid\Extended; /** + * Related product edit tab + * * @api * @since 100.0.2 * @deprecated Not used since related products grid moved to UI components. diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php index 51136acfe990b..41ad72ca39e53 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php @@ -6,6 +6,8 @@ namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab; /** + * Upsell product edit tab + * * @api * @since 100.0.2 * @deprecated Not used since upsell products grid moved to UI components. diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php index ab60dd1f4a72a..e51d3ffe94ae2 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Crosssell.php @@ -6,6 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class Crosssell * @@ -13,7 +16,7 @@ * @deprecated Not used since cross-sell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml */ -class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product +class Crosssell extends Product implements HttpPostActionInterface { /** * @var \Magento\Framework\View\Result\LayoutFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php index 4b573d26f97cf..5039d0c052b5d 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/CrosssellGrid.php @@ -6,6 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class CrosssellGrid * @@ -13,7 +16,7 @@ * @deprecated Not used since cross-sell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml */ -class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product +class CrosssellGrid extends Product implements HttpPostActionInterface { /** * @var \Magento\Framework\View\Result\LayoutFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php index 2348b84182623..f54f8d469c3e8 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Related.php @@ -7,6 +7,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class Related * @@ -14,7 +17,7 @@ * @deprecated Not used since related products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml */ -class Related extends \Magento\Catalog\Controller\Adminhtml\Product +class Related extends Product implements HttpPostActionInterface { /** * @var \Magento\Framework\View\Result\LayoutFactory @@ -36,6 +39,8 @@ public function __construct( } /** + * Execute + * * @return \Magento\Framework\View\Result\Layout */ public function execute() diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php index af69402e3f740..b1092bba0d369 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/RelatedGrid.php @@ -7,6 +7,8 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class RelatedGrid * @@ -14,6 +16,6 @@ * @deprecated Not used since related products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml */ -class RelatedGrid extends Related +class RelatedGrid extends Related implements HttpPostActionInterface { } diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php index 858f12dde7bbc..1cec8e8678797 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Upsell.php @@ -6,6 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class Upsell * @@ -13,7 +16,7 @@ * @deprecated Not used since upsell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml */ -class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product +class Upsell extends Product implements HttpPostActionInterface { /** * @var \Magento\Framework\View\Result\LayoutFactory diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php index 7631fc592d21c..581531e7c93fb 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/UpsellGrid.php @@ -6,6 +6,9 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class UpsellGrid * @@ -13,7 +16,7 @@ * @deprecated Not used since upsell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml */ -class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product +class UpsellGrid extends Product implements HttpPostActionInterface { /** * @var \Magento\Framework\View\Result\LayoutFactory diff --git a/app/code/Magento/Deploy/Collector/Collector.php b/app/code/Magento/Deploy/Collector/Collector.php index 9dd66828d4820..5974297a76cc7 100644 --- a/app/code/Magento/Deploy/Collector/Collector.php +++ b/app/code/Magento/Deploy/Collector/Collector.php @@ -8,6 +8,7 @@ use Magento\Deploy\Source\SourcePool; use Magento\Deploy\Package\Package; use Magento\Deploy\Package\PackageFactory; +use Magento\Deploy\Package\PackageFile; use Magento\Framework\Module\Manager; use Magento\Framework\View\Asset\PreProcessor\FileNameResolver; @@ -65,18 +66,19 @@ class Collector implements CollectorInterface * @param SourcePool $sourcePool * @param FileNameResolver $fileNameResolver * @param PackageFactory $packageFactory + * @param Manager|null $moduleManager */ public function __construct( SourcePool $sourcePool, FileNameResolver $fileNameResolver, PackageFactory $packageFactory, - Manager $moduleManager = null + Manager $moduleManager = null ) { $this->sourcePool = $sourcePool; $this->fileNameResolver = $fileNameResolver; $this->packageFactory = $packageFactory; $this->moduleManager = $moduleManager ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Framework\Module\Manager::class); + ->get(\Magento\Framework\Module\Manager::class); } /** @@ -92,18 +94,7 @@ public function collect() continue; } $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName())); - $params = [ - 'area' => $file->getArea(), - 'theme' => $file->getTheme(), - 'locale' => $file->getLocale(), - 'module' => $file->getModule(), - 'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea()) - ]; - foreach ($this->packageDefaultValues as $name => $value) { - if (!isset($params[$name])) { - $params[$name] = $value; - } - } + $params = $this->getParams($file); $packagePath = "{$params['area']}/{$params['theme']}/{$params['locale']}"; if (!isset($packages[$packagePath])) { $packages[$packagePath] = $this->packageFactory->create($params); @@ -115,4 +106,27 @@ public function collect() } return $packages; } + + /** + * Retrieve package params + * + * @param PackageFile $file + * @return array + */ + private function getParams(PackageFile $file) + { + $params = [ + 'area' => $file->getArea(), + 'theme' => $file->getTheme(), + 'locale' => $file->getLocale(), + 'module' => $file->getModule(), + 'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea()) + ]; + foreach ($this->packageDefaultValues as $name => $value) { + if (!isset($params[$name])) { + $params[$name] = $value; + } + } + return $params; + } } diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php index bd5229f4b7077..85f9ad39c4df5 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Crosssell.php @@ -6,6 +6,9 @@ */ namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\Crosssell as CatalogCrosssell; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class Crosssell * @@ -13,6 +16,6 @@ * @deprecated Not used since cross-sell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml */ -class Crosssell extends \Magento\Catalog\Controller\Adminhtml\Product\Crosssell +class Crosssell extends CatalogCrosssell implements HttpPostActionInterface { } diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php index 5fc6ea0e6c7cb..b6c25bdec9f14 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/CrosssellGrid.php @@ -6,6 +6,9 @@ */ namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid as CatalogCrosssellGrid; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class CrosssellGrid * @@ -13,6 +16,6 @@ * @deprecated Not used since cross-sell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/crosssell_product_listing.xml */ -class CrosssellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\CrosssellGrid +class CrosssellGrid extends CatalogCrosssellGrid implements HttpPostActionInterface { } diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php index 4ec043ca0b442..0352d97bca93a 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Related.php @@ -6,6 +6,9 @@ */ namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\Related as CatalogRelated; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class Related * @@ -13,6 +16,6 @@ * @deprecated Not used since related products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml */ -class Related extends \Magento\Catalog\Controller\Adminhtml\Product\Related +class Related extends CatalogRelated implements HttpPostActionInterface { } diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php index 796c97b183b21..11e9c4eb5e3af 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/RelatedGrid.php @@ -6,6 +6,9 @@ */ namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid as CatalogRelatedGrid; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class RelatedGrid * @@ -13,6 +16,6 @@ * @deprecated Not used since related products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/related_product_listing.xml */ -class RelatedGrid extends \Magento\Catalog\Controller\Adminhtml\Product\RelatedGrid +class RelatedGrid extends CatalogRelatedGrid implements HttpPostActionInterface { } diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php index 653a104d18b23..a8581f38c419b 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Upsell.php @@ -6,6 +6,9 @@ */ namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\Upsell as CatalogUpsell; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class Upsell * @@ -13,6 +16,6 @@ * @deprecated Not used since upsell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml */ -class Upsell extends \Magento\Catalog\Controller\Adminhtml\Product\Upsell +class Upsell extends CatalogUpsell implements HttpPostActionInterface { } diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php index a9717e45f0398..3e28a96948a77 100644 --- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php +++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/UpsellGrid.php @@ -6,6 +6,9 @@ */ namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit; +use Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid as CatalogUpsellGrid; +use Magento\Framework\App\Action\HttpPostActionInterface; + /** * Class UpsellGrid * @@ -13,6 +16,6 @@ * @deprecated Not used since upsell products grid moved to UI components. * @see Magento_Catalog::view/adminhtml/ui_component/upsell_product_listing.xml */ -class UpsellGrid extends \Magento\Catalog\Controller\Adminhtml\Product\UpsellGrid +class UpsellGrid extends CatalogUpsellGrid implements HttpPostActionInterface { } diff --git a/app/code/Magento/Vault/Model/PaymentTokenRepository.php b/app/code/Magento/Vault/Model/PaymentTokenRepository.php index a4d6f7ea7f65a..9fc6f4ab97ca7 100644 --- a/app/code/Magento/Vault/Model/PaymentTokenRepository.php +++ b/app/code/Magento/Vault/Model/PaymentTokenRepository.php @@ -58,13 +58,15 @@ class PaymentTokenRepository implements PaymentTokenRepositoryInterface private $collectionProcessor; /** - * @param \Magento\Vault\Model\ResourceModel\PaymentToken $resourceModel + * PaymentTokenRepository constructor. + * + * @param PaymentTokenResourceModel $resourceModel * @param PaymentTokenFactory $paymentTokenFactory * @param FilterBuilder $filterBuilder * @param SearchCriteriaBuilder $searchCriteriaBuilder * @param PaymentTokenSearchResultsInterfaceFactory $searchResultsFactory * @param CollectionFactory $collectionFactory - * @param CollectionProcessorInterface | null $collectionProcessor + * @param CollectionProcessorInterface|null $collectionProcessor */ public function __construct( PaymentTokenResourceModel $resourceModel,