Merge pull request #61 from bartoszherba/issue-47

Remove Helper classes and replace appropriate code with new implementation

Author: chevli

.travis.yml

@@ -33,9 +33,9 @@ install:
 before_script:
   - sh -c "if [ '$TEST_SUITE' = 'configurator' ]; then ./Test/Integration/setup-magento.sh $MAGE_VERSION; fi"
 script:
-  - sh -c "if [ '$TEST_SUITE' = 'phpcs' ]; then php vendor/bin/phpcs --standard=PSR2 Model/ Console/ Test/ Helper/; fi"
-  - sh -c "if [ '$TEST_SUITE' = 'phpcs' ]; then php vendor/bin/phpmd Model/,Console/,Test/,Helper/ text cleancode,codesize,controversial,design,naming,unusedcode; fi"
-  - sh -c "if [ '$TEST_SUITE' = 'phpcs' ]; then php vendor/bin/phpcpd Model/ Console/ Test/ Helper/; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'phpcs' ]; then php vendor/bin/phpcs --standard=PSR2 Model/ Console/ Test/; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'phpcs' ]; then php vendor/bin/phpmd Model/,Console/,Test/ text cleancode,codesize,controversial,design,naming,unusedcode; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'phpcs' ]; then php vendor/bin/phpcpd Model/ Console/ Test/; fi"
   - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then php vendor/bin/phpunit --coverage-clover build/logs/clover.xml Test/Unit/; fi"
   - sh -c "if [ '$TEST_SUITE' = 'configurator' ]; then ./Test/Integration/run-configurator.sh; fi"
 notifications:

Component/Pages.php

@@ -2,12 +2,13 @@
 
 namespace CtiDigital\Configurator\Component;
 
-use CtiDigital\Configurator\Helper\Component;
 use CtiDigital\Configurator\Exception\ComponentException;
 use CtiDigital\Configurator\Api\LoggerInterface;
 use Magento\Cms\Api\Data\PageInterfaceFactory;
 use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -33,28 +34,31 @@ class Pages extends YamlComponentAbstract
     /** @var StoreManagerInterface */
     protected $storeManager;
 
-    /** @var Component */
-    protected $componentHelper;
-
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
 
     /**
      * Pages constructor.
+     *
      * @param LoggerInterface $log
      * @param ObjectManagerInterface $objectManager
      * @param PageRepositoryInterface $pageRepository
      * @param PageInterfaceFactory $pageFactory
-     * @param Component $componentHelper
+     * @param StoreRepositoryInterface $storeRepository
      */
     public function __construct(
         LoggerInterface $log,
         ObjectManagerInterface $objectManager,
         PageRepositoryInterface $pageRepository,
         PageInterfaceFactory $pageFactory,
-        Component $componentHelper
+        StoreRepositoryInterface $storeRepository
     ) {
         $this->pageFactory = $pageFactory;
         $this->pageRepository = $pageRepository;
-        $this->componentHelper = $componentHelper;
+        $this->storeRepository = $storeRepository;
+
         parent::__construct($log, $objectManager);
     }
 
@@ -91,7 +95,7 @@ protected function processPage($identifier, $data)
             foreach ($data['page'] as $pageData) {
                 if (isset($pageData['stores'])) {
                     foreach ($pageData['stores'] as $storeCode) {
-                        $store = $this->componentHelper->getStoreByCode($storeCode);
+                        $store = $this->storeRepository->get($storeCode);
                         $pageId = $this->pageFactory->create()->checkIdentifier($identifier, $store->getId());
                     }
                 } else {
@@ -152,7 +156,7 @@ protected function processPage($identifier, $data)
 
                     $stores = array();
                     foreach ($pageData['stores'] as $code) {
-                        $stores[] = $this->componentHelper->getStoreByCode($code)->getId();
+                        $stores[] = $store = $this->storeRepository->get($code)->getId();
                     }
 
                     $page->setStores($stores);
@@ -168,7 +172,7 @@ protected function processPage($identifier, $data)
                 }
 
             }
-        } catch (ComponentException $e) {
+        } catch (NoSuchEntityException $e) {
             $this->log->logError($e->getMessage());
         }
 

Helper/Component.php

@@ -5,24 +5,29 @@
 use CtiDigital\Configurator\Component\Pages;
 use Magento\Cms\Api\PageRepositoryInterface;
 use Magento\Cms\Api\Data\PageInterfaceFactory;
-use CtiDigital\Configurator\Helper\Component;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\StoreRepository;
 
 class PagesTest extends ComponentAbstractTestCase
 {
-
     protected function componentSetUp()
     {
+        /** @var PageRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject $pageRepository */
         $pageRepository = $this->getMock(PageRepositoryInterface::class);
+        /** @var PageInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject $pageFactory */
         $pageFactory = $this->getMock(PageInterfaceFactory::class);
-        $componentHelper = $this->getMock(Component::class, [], [], '', false);
+        /** @var StoreRepository|\PHPUnit_Framework_MockObject_MockObject $storeRepository */
+        $storeRepository = $this->getMockBuilder(StoreRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->component =
             new Pages(
                 $this->logInterface,
                 $this->objectManager,
                 $pageRepository,
                 $pageFactory,
-                $componentHelper
+                $storeRepository
             );
 
         $this->className = Pages::class;