fixing static tests

Author: JacobBrownAustin

setup/src/Magento/Setup/Fixtures/FixtureModel.php

@@ -19,15 +19,12 @@
  */
 class FixtureModel
 {
-    /**
-     * Area code
-     */
-    const AREA_CODE = 'adminhtml';
+    public const AREA_CODE = 'adminhtml';
 
     /**
      * Fixtures file name pattern
      */
-    const FIXTURE_PATTERN = '?*Fixture.php';
+    private const FIXTURE_PATTERN = '?*Fixture.php';
 
     /**
      * Application object
@@ -121,13 +118,18 @@ public function loadFixtures()
             );
             $this->loadFixture($fixture);
         }
-        foreach($this->getFixturesFromRegistry() as $fixture) {
+        foreach ($this->getFixturesFromRegistry() as $fixture) {
             $this->loadFixture($fixture);
         }
         ksort($this->fixtures);
         return $this;
     }
 
+    /**
+     * Gets Fixtures from FixtureRegistry and gets instances of them from ObjectManager
+     *
+     * @return array
+     */
     private function getFixturesFromRegistry() : array
     {
         $fixtureRegistry = $this->getObjectManager()->create(FixtureRegistry::class);
@@ -141,6 +143,12 @@ private function getFixturesFromRegistry() : array
         return $fixtures;
     }
 
+    /**
+     * Loads fixture into $this->>fixturesByName and $this->fixtures
+     *
+     * @param Fixture $fixture
+     * @return void
+     */
     private function loadFixture(Fixture $fixture)
     {
         $fixtureClassName = get_class($fixture);
@@ -178,7 +186,8 @@ public function getFixtures()
 
     /**
      * Returns fixture by name
-     * @param $name string
+     *
+     * @param string $name
      * @return Fixture
      * @throws \Magento\Setup\Exception
      */
@@ -253,14 +262,15 @@ public function resetObjectManager()
     }
 
     /**
+     * Gets instance of FixtureConfig from ObjectManager
+     *
      * @return FixtureConfig
      */
     private function getConfig()
     {
         if (null === $this->config) {
             $this->config = $this->getObjectManager()->get(FixtureConfig::class);
         }
-
         return $this->config;
     }
 

setup/src/Magento/Setup/Fixtures/FixtureRegistry.php

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 /**
  * Registry for fixtures
  */
@@ -15,12 +17,12 @@ class FixtureRegistry
     /**
      * List of fixtures applied to the application
      *
-     * @var Fixture[]
+     * @var string[]
      */
     private $fixtures = [];
 
     /**
-     * @param array $fixtures
+     * @param string[] $fixtures
      */
     public function __construct(array $fixtures = [])
     {
@@ -36,5 +38,4 @@ public function getFixtures() :array
     {
         return $this->fixtures;
     }
-
 }

setup/src/Magento/Setup/Fixtures/StoresFixture.php

@@ -41,11 +41,11 @@
  */
 class StoresFixture extends Fixture
 {
-    const DEFAULT_WEBSITE_COUNT = 1;
+    private const DEFAULT_WEBSITE_COUNT = 1;
 
-    const DEFAULT_STORE_COUNT = 1;
+    private const DEFAULT_STORE_COUNT = 1;
 
-    const DEFAULT_STORE_VIEW_COUNT = 1;
+    private const DEFAULT_STORE_VIEW_COUNT = 1;
 
     /**
      * @var int
@@ -132,7 +132,6 @@ class StoresFixture extends Fixture
      */
     private $storeViewIds;
 
-
     /**
      * @var string[]
      */
@@ -179,7 +178,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD)
      */
     public function execute()
@@ -195,17 +195,13 @@ public function execute()
         ) {
             return;
         }
-
         //Get existing entities counts
         $storeGroups = $this->storeManager->getGroups();
         $this->storeGroupsIds= array_keys($storeGroups);
-
         foreach ($storeGroups as $storeGroupId => $storeGroup) {
             $this->storeGroupsToWebsites[$storeGroupId] = $storeGroup->getWebsiteId();
         }
-
         $this->websiteIds = array_values(array_unique($this->storeGroupsToWebsites));
-
         $this->defaultWebsite = $this->storeManager->getWebsite();
         $this->defaultStoreGroup = $this->storeManager->getGroup();
         $this->defaultWebsiteId = $this->defaultWebsite->getId();
@@ -219,6 +215,7 @@ public function execute()
 
     /**
      * Generating web sites
+     *
      * @return void
      */
     private function generateWebsites()
@@ -245,18 +242,17 @@ private function generateWebsites()
 
     /**
      * Generating store groups ('stores' on frontend)
+     *
      * @return void
      */
     private function generateStoreGroups()
     {
         $existedStoreGroupCount = count($this->storeGroupsIds);
         $existedWebsitesCount = count($this->websiteIds);
-
         while ($existedStoreGroupCount < $this->storeGroupsCount) {
             $websiteId = $this->websiteIds[$existedStoreGroupCount % $existedWebsitesCount];
             $storeGroupName = sprintf('Store Group %d - website_id_%d', ++$existedStoreGroupCount, $websiteId);
             $storeGroupCode = sprintf('store_group_%d', $existedStoreGroupCount);
-
             $storeGroup = clone $this->defaultStoreGroup;
             $storeGroup->addData(
                 [
@@ -275,16 +271,15 @@ private function generateStoreGroups()
 
     /**
      * Generating store views
+     *
      * @return void
      */
     private function generateStoreViews()
     {
         $localesList = $this->localeConfig->getAllowedLocales();
         $localesListCount = count($localesList);
-
         $existedStoreViewsCount = count($this->storeViewIds);
         $existedStoreGroupCount = count($this->storeGroupsIds);
-
         while ($existedStoreViewsCount < $this->storesCount) {
             $groupId = $this->storeGroupsIds[$existedStoreViewsCount % $existedStoreGroupCount];
             $websiteId = $this->storeGroupsToWebsites[$groupId];
@@ -296,7 +291,6 @@ private function generateStoreViews()
                 $websiteId,
                 $groupId
             );
-
             $store->addData(
                 [
                     'store_id' => null,
@@ -306,12 +300,13 @@ private function generateStoreViews()
                     'code' => $storeCode
                 ]
             )->save();
-
             $this->saveStoreLocale($store->getId(), $localesList[$existedStoreViewsCount % $localesListCount]);
         }
     }
 
     /**
+     * Saves store into locale
+     *
      * @param int $storeId
      * @param string $localeCode
      * @return void
@@ -347,21 +342,20 @@ private function getStoreCategoryId($storeGroupName)
                 ->setDefaultSortBy('name')
                 ->setIsActive(true)
                 ->save();
-
             return $category->getId();
         }
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getActionTitle()
     {
         return 'Generating websites, stores and store views';
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function introduceParamLabels()
     {
@@ -385,6 +379,11 @@ private function getDefaultCategoryId()
         return $this->defaultParentCategoryId;
     }
 
+    /**
+     * Gets the website codes that were created by this object
+     *
+     * @return string[]
+     */
     public function getWebsiteCodes()
     {
         return $this->websiteCodes;