Merge remote-tracking branch 'origin/develop'

# Conflicts: # .travis.yml
firegento · Mar 8, 2020 · e323752 · e323752
2 parents a38e7dd + 0e26e86
commit e323752
Show file tree

Hide file tree

Showing 37 changed files with 251 additions and 81 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,3 @@
-# Copyright © 2016 FireGento e.V.
-# See LICENSE.md bundled with this module for license details.
 sudo: required
 dist: trusty
 addons:
@@ -8,10 +6,9 @@ addons:
     - mysql-server-5.6
     - mysql-client-core-5.6
     - mysql-client-5.6
-
 env:
   global:
-  - COVERAGE: FALSE
+  - COVERAGE: false
 
 matrix:
   fast_finish: true
@@ -21,28 +18,29 @@ matrix:
   - php: 7.1
     env: MAGENTO_VERSION=2.2.*
   - php: 7.2
-    env: MAGENTO_VERSION=2.3.0
+    env: MAGENTO_VERSION=2.3.0 CODE_QUALITY=true
   - php: 7.2
     env: MAGENTO_VERSION=2.3.*
-  - php: 7.3
-    env: MAGENTO_VERSION=2.3.0 CODE_QUALITY=true
   - php: 7.3
     env: MAGENTO_VERSION=2.3.*
 
+
 language: php
+
 cache:
   directories:
   - "$HOME/.composer/cache"
   - "$HOME/.php-cs-fixer"
   - "$HOME/.local"
 
 before_install:
-- "./Test/script/travis_before_install.sh"
+  - echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - "./Test/script/travis_before_install.sh"
 
 install:
-- echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > $HOME/.composer/auth.json
-- export MAGENTO_ROOT=`mktemp -d /tmp/mage.XXXXXXXX`
-- "./Test/script/travis_install_magento.sh $MAGENTO_VERSION"
+  - echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > $HOME/.composer/auth.json
+  - export MAGENTO_ROOT=`mktemp -d /tmp/mage.XXXXXXXX`
+  - "./Test/script/travis_install_magento.sh $MAGENTO_VERSION"
 
 script:
-- "./Test/script/travis_script.sh"
+  - "./Test/script/travis_script.sh"
diff --git a/Block/Imprint/Content.php b/Block/Imprint/Content.php
@@ -67,6 +67,8 @@ public function getCountry()
     }
 
     /**
+     *  Get Website
+     *
      * Retrieve the setting "website". If parameter checkForProtocol is true,
      * check if there is a valid protocol given, otherwise add http:// manually.
      *
@@ -90,8 +92,8 @@ public function getWeb($checkForProtocol = false)
     /**
      * Try to limit spam by generating a javascript email link
      *
-     * @param boolean true
-     * @return string
+     * @param bool $antispam
+     * @return mixed|string
      */
     public function getEmail($antispam = false)
     {
@@ -122,7 +124,7 @@ public function getEmail($antispam = false)
     /**
      * Generate JS code
      *
-     * @param $parts
+     * @param mixed $parts
      * @return string
      */
     public function getEmailJs($parts)
@@ -135,6 +137,8 @@ public function getEmailJs($parts)
     }
 
     /**
+     * Get Imprint Value
+     *
      * @param string $field
      * @return mixed
      */

diff --git a/Block/Price/Details.php b/Block/Price/Details.php
@@ -45,13 +45,15 @@ class Details extends \Magento\Framework\View\Element\Template
     private $taxHelper;
 
     /**
+     * Details constructor.
+     *
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \FireGento\MageSetup\Model\System\Config         $magesetupConfig
-     * @param \Magento\Customer\Model\Session                  $customerSession
-     * @param GroupRepository                                  $groupRepository
-     * @param \Magento\Tax\Model\Calculation\Proxy             $taxCalculation
-     * @param \Magento\Tax\Helper\Data                         $taxHelper
-     * @param array                                            $data
+     * @param \FireGento\MageSetup\Model\System\Config $magesetupConfig
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param GroupRepository $groupRepository
+     * @param \Magento\Tax\Model\Calculation\Proxy $taxCalculation
+     * @param \Magento\Tax\Helper\Data $taxHelper
+     * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -73,6 +75,8 @@ public function __construct(
     }
 
     /**
+     * Se saleable item
+     *
      * @param \Magento\Framework\Pricing\SaleableInterface $saleableItem
      */
     public function setSaleableItem(\Magento\Framework\Pricing\SaleableInterface $saleableItem)
@@ -82,6 +86,8 @@ public function setSaleableItem(\Magento\Framework\Pricing\SaleableInterface $sa
     }
 
     /**
+     * Get formatted tax rate
+     *
      * @return string
      */
     public function getFormattedTaxRate()
@@ -94,6 +100,8 @@ public function getFormattedTaxRate()
     }
 
     /**
+     * Get price display type
+     *
      * @return int
      */
     public function getPriceDisplayType()
@@ -102,6 +110,8 @@ public function getPriceDisplayType()
     }
 
     /**
+     * Inclunding shipping coast
+     *
      * @return bool
      */
     public function isIncludingShippingCosts()
@@ -114,6 +124,8 @@ public function isIncludingShippingCosts()
     }
 
     /**
+     * Show Shipping link
+     *
      * @return bool
      */
     public function canShowShippingLink()
@@ -128,6 +140,8 @@ public function canShowShippingLink()
     }
 
     /**
+     * Get shipping cost url
+     *
      * @return string|bool
      */
     public function getShippingCostUrl()
@@ -136,6 +150,8 @@ public function getShippingCostUrl()
     }
 
     /**
+     * Get tax percent by saleable item
+     *
      * @return float|int
      */
     private function getTaxPercentBySaleableItem()

diff --git a/Block/Product/Delivery.php b/Block/Product/Delivery.php
@@ -5,6 +5,11 @@
  */
 namespace FireGento\MageSetup\Block\Product;
 
+/**
+ * Class Delivery
+ *
+ * @package FireGento\MageSetup\Block\Product
+ */
 class Delivery extends \Magento\Catalog\Block\Product\View\Description
 {
     /**

diff --git a/Command/SetupRunCommand.php b/Command/SetupRunCommand.php
@@ -66,6 +66,8 @@ class SetupRunCommand extends Command
     private $subProcessorPool;
 
     /**
+     * SetupRunCommand constructor.
+     *
      * @param SetupServiceFactory $setupService
      * @param ConfigFactory $magesetupConfig
      * @param SubProcessorPool $subProcessorPool
@@ -95,7 +97,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -107,6 +109,8 @@ protected function configure()
     }
 
     /**
+     * Setup command
+     *
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return int Non zero if invalid type, 0 otherwise

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -11,10 +11,18 @@
 
 /**
  * Class AroundRenderPlugin
+ *
  * @package FireGento\MageSetup\Helper
  */
 class Data extends AbstractHelper
 {
+    /**
+     * Get config value
+     *
+     * @param mixed $field
+     * @param mixed $storeId
+     * @return mixed
+     */
     public function getConfigValue($field, $storeId = null)
     {
         return $this->scopeConfig->getValue(

diff --git a/Model/Config.php b/Model/Config.php
@@ -40,9 +40,11 @@ class Config implements ConfigInterface
     private $loadedConfig;
 
     /**
-     * @param Reader         $reader
+     * Config constructor.
+     *
+     * @param Reader $reader
      * @param CacheInterface $cache
-     * @param string         $country
+     * @param mixed $country
      */
     public function __construct(
         Reader $reader,
@@ -57,6 +59,8 @@ public function __construct(
     }
 
     /**
+     * Get country
+     *
      * @return string
      */
     public function getCountry()
@@ -65,6 +69,8 @@ public function getCountry()
     }
 
     /**
+     * Get allowed countries
+     *
      * @return array
      */
     public function getAllowedCountries()
@@ -81,6 +87,8 @@ public function getAllowedCountries()
     }
 
     /**
+     * Get system config
+     *
      * @return array
      */
     public function getSystemConfig()
@@ -94,6 +102,8 @@ public function getSystemConfig()
     }
 
     /**
+     * Get tax classes
+     *
      * @return array|bool
      */
     public function getTaxClasses()
@@ -106,6 +116,8 @@ public function getTaxClasses()
     }
 
     /**
+     * Get tax calculation rates
+     *
      * @return array|bool
      */
     public function getTaxCalculationRates()
@@ -118,6 +130,8 @@ public function getTaxCalculationRates()
     }
 
     /**
+     * Get tax calculation rules
+     *
      * @return array|bool
      */
     public function getTaxCalculationRules()
@@ -130,6 +144,8 @@ public function getTaxCalculationRules()
     }
 
     /**
+     * Get agreements
+     *
      * @return array|bool
      */
     public function getAgreements()
@@ -142,6 +158,8 @@ public function getAgreements()
     }
 
     /**
+     * Get cms pages
+     *
      * @return array|bool
      */
     public function getCmsPages()
@@ -154,6 +172,8 @@ public function getCmsPages()
     }
 
     /**
+     * Get cms blocks
+     *
      * @return array|bool
      */
     public function getCmsBlocks()

diff --git a/Model/Config/Converter.php b/Model/Config/Converter.php
@@ -13,6 +13,8 @@
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
+     * Convert
+     *
      * @param \DOMDocument $source
      * @return array
      */
@@ -57,6 +59,8 @@ public function convert($source)
     }
 
     /**
+     * Get one tier config
+     *
      * @param \DOMElement $node
      * @return array
      */
@@ -76,6 +80,8 @@ public function getOneTierConfig(\DOMElement $node)
     }
 
     /**
+     * Get tax config
+     *
      * @param \DOMElement $node
      * @return array
      */
@@ -124,6 +130,8 @@ public function getTaxConfig(\DOMElement $node)
     }
 
     /**
+     * Get two tier config
+     *
      * @param \DOMElement $node
      * @return array
      */