Merge pull request #192 from magento-engcom/99_strict_typing

#99 - Add Strict Typing

app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php

@@ -49,9 +49,9 @@ public function __construct(
      */
     public function execute(): ResultInterface
     {
-        $sourceId = $this->getRequest()->getParam(SourceInterface::SOURCE_ID);
+        $sourceId = (int)$this->getRequest()->getParam(SourceInterface::SOURCE_ID);
         try {
-            $source = $this->sourceRepository->get((int)$sourceId);
+            $source = $this->sourceRepository->get($sourceId);
 
             /** @var Page $result */
             $result = $this->resultFactory->create(ResultFactory::TYPE_PAGE);

app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php

@@ -66,28 +66,27 @@ public function execute(): ResultInterface
         if ($request->isXmlHttpRequest() && $request->isPost() && $requestData) {
             foreach ($requestData as $itemData) {
                 try {
-                    $source = $this->sourceRepository->get(
-                        $itemData[SourceInterface::SOURCE_ID]
-                    );
+                    $sourceId = (int)$itemData[SourceInterface::SOURCE_ID];
+                    $source = $this->sourceRepository->get($sourceId);
                     $this->dataObjectHelper->populateWithArray($source, $itemData, SourceInterface::class);
                     $this->sourceRepository->save($source);
                 } catch (NoSuchEntityException $e) {
                     $errorMessages[] = __(
                         '[ID: %value] The Source does not exist.',
-                        ['value' => $itemData[SourceInterface::SOURCE_ID]]
+                        ['value' => $sourceId]
                     );
                 } catch (ValidationException $e) {
                     foreach ($e->getErrors() as $localizedError) {
                         $errorMessages[] = __('[ID: %value] %message', [
-                            'value' => $itemData[SourceInterface::SOURCE_ID],
+                            'value' => $sourceId,
                             'message' => $localizedError->getMessage()
                         ]);
                     }
                 } catch (CouldNotSaveException $e) {
                     $errorMessages[] = __(
                         '[ID: %value] %message',
                         [
-                            'value' => $itemData[SourceInterface::SOURCE_ID],
+                            'value' => $sourceId,
                             'message' => $e->getMessage()
                         ]
                     );

app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php

@@ -56,6 +56,7 @@ public function execute(): ResultInterface
         }
 
         try {
+            $stockId = (int)$stockId;
             $this->stockRepository->deleteById($stockId);
             $this->messageManager->addSuccessMessage(__('The Stock has been deleted.'));
             $resultRedirect->setPath('*/*');

app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php

@@ -49,9 +49,9 @@ public function __construct(
      */
     public function execute(): ResultInterface
     {
-        $stockId = $this->getRequest()->getParam(StockInterface::STOCK_ID);
+        $stockId = (int)$this->getRequest()->getParam(StockInterface::STOCK_ID);
         try {
-            $stock = $this->stockRepository->get((int)$stockId);
+            $stock = $this->stockRepository->get($stockId);
 
             /** @var Page $result */
             $result = $this->resultFactory->create(ResultFactory::TYPE_PAGE);

app/code/Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php

@@ -66,26 +66,25 @@ public function execute(): ResultInterface
         if ($request->isXmlHttpRequest() && $request->isPost() && $requestData) {
             foreach ($requestData as $itemData) {
                 try {
-                    $stock = $this->stockRepository->get(
-                        $itemData[StockInterface::STOCK_ID]
-                    );
+                    $stockId = (int)$itemData[StockInterface::STOCK_ID];
+                    $stock = $this->stockRepository->get($stockId);
                     $this->dataObjectHelper->populateWithArray($stock, $itemData, StockInterface::class);
                     $this->stockRepository->save($stock);
                 } catch (NoSuchEntityException $e) {
                     $errorMessages[] = __(
                         '[ID: %value] The Stock does not exist.',
-                        ['value' => $itemData[StockInterface::STOCK_ID]]
+                        ['value' => $stockId]
                     );
                 } catch (ValidationException $e) {
                     foreach ($e->getErrors() as $localizedError) {
                         $errorMessages[] = __('[ID: %value] %message', [
-                            'value' => $itemData[StockInterface::STOCK_ID],
+                            'value' => $stockId,
                             'message' => $localizedError->getMessage()
                         ]);
                     }
                 } catch (CouldNotSaveException $e) {
                     $errorMessages[] = __('[ID: %value] %message', [
-                        'value' => $itemData[StockInterface::STOCK_ID],
+                        'value' => $stockId,
                         'message' => $e->getMessage()
                     ]);
                 }

app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php

@@ -63,6 +63,7 @@ public function execute(): ResultInterface
         $deletedItemsCount = 0;
         foreach ($this->massActionFilter->getIds() as $id) {
             try {
+                $id = (int)$id;
                 $this->stockRepository->deleteById($id);
                 $deletedItemsCount++;
             } catch (CouldNotDeleteException $e) {

app/code/Magento/Inventory/Controller/Adminhtml/Stock/StockSourceLinkProcessor.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Controller\Adminhtml\Stock;
 
 use Magento\Framework\Exception\InputException;
@@ -66,12 +68,12 @@ public function __construct(
     }
 
     /**
-     * @param string $stockId
+     * @param int $stockId
      * @param array $stockSourceLinksData
      * @return void
      * @throws InputException
      */
-    public function process($stockId, array $stockSourceLinksData)
+    public function process(int $stockId, array $stockSourceLinksData)
     {
         $this->validateStockSourceData($stockSourceLinksData);
 

app/code/Magento/Inventory/Model/OptionSource/CarrierSource.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\OptionSource;
 
 use Magento\Framework\Data\OptionSourceInterface;

app/code/Magento/Inventory/Model/OptionSource/RegionSource.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\OptionSource;
 
 use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;

app/code/Magento/Inventory/Model/OptionSource/SourceItemStatus.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\OptionSource;
 
 use Magento\Framework\Data\OptionSourceInterface;

app/code/Magento/Inventory/Model/Reservation/ReservationBuilder.php

@@ -133,6 +133,9 @@ public function build(): ReservationInterface
         return $reservation;
     }
 
+    /**
+     * @return ValidationResult
+     */
     private function validate()
     {
         $errors = [];
@@ -153,7 +156,8 @@ private function validate()
     }
 
     /**
-     * Used to clean state after object creation.
+     * Used to clean state after object creation
+     * @return void
      */
     private function reset()
     {
@@ -170,7 +174,7 @@ private function reset()
      * @param array $array
      * @return array
      */
-    private function convertArrayKeysFromSnakeToCamelCase(array $array)
+    private function convertArrayKeysFromSnakeToCamelCase(array $array): array
     {
         $convertedArrayKeys = $this->snakeToCamelCaseConverter->convert(array_keys($array));
         return array_combine($convertedArrayKeys, array_values($array));

app/code/Magento/Inventory/Model/ResourceModel/PredefinedId.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel;
 
 use Magento\Framework\Exception\LocalizedException;

app/code/Magento/Inventory/Model/ResourceModel/Reservation/ReservationCleanup.php

@@ -28,8 +28,6 @@ class ReservationCleanup implements ReservationCleanupInterface
     private $groupConcatMaxLen;
 
     /**
-     * ReservationCleanup constructor.
-     *
      * @param ResourceConnection $resource
      * @param int $groupConcatMaxLen
      */

app/code/Magento/Inventory/Model/ResourceModel/Source.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel;
 
 use Exception;

app/code/Magento/Inventory/Model/ResourceModel/Source/Collection.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel\Source;
 
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;

app/code/Magento/Inventory/Model/ResourceModel/SourceCarrierLink.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;

app/code/Magento/Inventory/Model/ResourceModel/SourceCarrierLink/Collection.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel\SourceCarrierLink;
 
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;

app/code/Magento/Inventory/Model/ResourceModel/SourceItem.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;

app/code/Magento/Inventory/Model/ResourceModel/SourceItem/Collection.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel\SourceItem;
 
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;

app/code/Magento/Inventory/Model/ResourceModel/SourceItem/SaveMultiple.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel\SourceItem;
 
 use Magento\Framework\App\ResourceConnection;

app/code/Magento/Inventory/Model/ResourceModel/Stock.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;

app/code/Magento/Inventory/Model/ResourceModel/Stock/Collection.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel\Stock;
 
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;

app/code/Magento/Inventory/Model/ResourceModel/StockSourceLink.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;

app/code/Magento/Inventory/Model/ResourceModel/StockSourceLink/Collection.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel\StockSourceLink;
 
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;

app/code/Magento/Inventory/Model/ResourceModel/StockSourceLink/SaveMultiple.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\ResourceModel\StockSourceLink;
 
 use Magento\Framework\App\ResourceConnection;
@@ -34,7 +36,7 @@ public function __construct(
      * @param int $stockId
      * @return void
      */
-    public function execute(array $sourceIds, $stockId)
+    public function execute(array $sourceIds, int $stockId)
     {
         if (!count($sourceIds)) {
             return;

app/code/Magento/Inventory/Model/Source.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model;
 
 use Magento\Framework\Model\AbstractExtensibleModel;

app/code/Magento/Inventory/Model/Source/Command/Get.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\Source\Command;
 
 use Magento\Framework\Exception\NoSuchEntityException;

app/code/Magento/Inventory/Model/Source/Command/GetInterface.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\Source\Command;
 
 use Magento\Framework\Exception\NoSuchEntityException;

app/code/Magento/Inventory/Model/Source/Command/GetList.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\Source\Command;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;

app/code/Magento/Inventory/Model/Source/Command/GetListInterface.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\Source\Command;
 
 use Magento\Framework\Api\SearchCriteriaInterface;

app/code/Magento/Inventory/Model/Source/Command/Save.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\Source\Command;
 
 use Magento\Framework\Exception\CouldNotSaveException;
@@ -60,7 +62,7 @@ public function execute(SourceInterface $source): int
 
         try {
             $this->sourceResource->save($source);
-            return $source->getSourceId();
+            return (int)$source->getSourceId();
         } catch (\Exception $e) {
             $this->logger->error($e->getMessage());
             throw new CouldNotSaveException(__('Could not save Source'), $e);

app/code/Magento/Inventory/Model/Source/Command/SaveInterface.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Inventory\Model\Source\Command;
 
 use Magento\Framework\Exception\CouldNotSaveException;