37. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-11-23 04:31:23 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

37.1 Files compared

#LocationFileLast Modified
1/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme 4.0.6/app/code/Smartwave/Porto/HelperCssconfig.php2017-12-10 12:29:30 +0000
2/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme 4.0.7/app/code/Smartwave/Porto/HelperCssconfig.php2017-12-10 12:29:30 +0000

37.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1156
Changed00
Inserted00
Removed00

37.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

37.4 Active regular expressions

No regular expressions were active.

37.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © 2015 Magento. All rights reserved. 3  * Copyright © 2015 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6 namespace Smartwave\Porto\Helper; 6 namespace Smartwave\Porto\Helper;
7  7 
8 class Cssconfig extends \Magento\Framework\App\Helper\AbstractHelper 8 class Cssconfig extends \Magento\Framework\App\Helper\AbstractHelper
9 { 9 {
10     protected $_storeManager; 10     protected $_storeManager;
11     protected $generatedCssFolder; 11     protected $generatedCssFolder;
12     protected $generatedCssPath; 12     protected $generatedCssPath;
13     protected $generatedCssDir; 13     protected $generatedCssDir;
14      14     
15     /** 15     /**
16      * @param \Magento\Framework\App\Helper\Context $context 16      * @param \Magento\Framework\App\Helper\Context $context
17      * @param \Magento\Store\Model\StoreManagerInterface $storeManager 17      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
18      * @param \Magento\Catalog\Model\Session $catalogSession 18      * @param \Magento\Catalog\Model\Session $catalogSession
19      * @param \Magento\Framework\Stdlib\StringUtils $string 19      * @param \Magento\Framework\Stdlib\StringUtils $string
20      * @param Category $catalogCategory 20      * @param Category $catalogCategory
21      * @param Product $catalogProduct 21      * @param Product $catalogProduct
22      * @param \Magento\Framework\Registry $coreRegistry 22      * @param \Magento\Framework\Registry $coreRegistry
23      * @param \Magento\Catalog\Model\Template\Filter\Factory $templateFilterFactory 23      * @param \Magento\Catalog\Model\Template\Filter\Factory $templateFilterFactory
24      * @param string $templateFilterModel 24      * @param string $templateFilterModel
25      * @param \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyFactory 25      * @param \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyFactory
26      * @param Config $taxConfig 26      * @param Config $taxConfig
27      * @param \Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory $quoteDetailsFactory 27      * @param \Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory $quoteDetailsFactory
28      * @param \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $quoteDetailsItemFactory 28      * @param \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $quoteDetailsItemFactory
29      * @param \Magento\Tax\Api\TaxCalculationInterface $taxCalculationService 29      * @param \Magento\Tax\Api\TaxCalculationInterface $taxCalculationService
30      * @param CustomerSession $customerSession 30      * @param CustomerSession $customerSession
31      * @param PriceCurrencyInterface $priceCurrency 31      * @param PriceCurrencyInterface $priceCurrency
32      * @param ProductRepositoryInterface $productRepository 32      * @param ProductRepositoryInterface $productRepository
33      * @param CategoryRepositoryInterface $categoryRepository 33      * @param CategoryRepositoryInterface $categoryRepository
34      * @param \Magento\Customer\Api\GroupRepositoryInterface $customerGroupRepository 34      * @param \Magento\Customer\Api\GroupRepositoryInterface $customerGroupRepository
35      * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory 35      * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressFactory
36      * @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory 36      * @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionFactory
37      * @SuppressWarnings(PHPMD.ExcessiveParameterList) 37      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
38      */ 38      */
39     public function __construct( 39     public function __construct(
40         \Magento\Framework\App\Helper\Context $context, 40         \Magento\Framework\App\Helper\Context $context,
41         \Magento\Store\Model\StoreManagerInterface $storeManager 41         \Magento\Store\Model\StoreManagerInterface $storeManager
42     ) { 42     ) {
43         $this->_storeManager = $storeManager; 43         $this->_storeManager = $storeManager;
44          44         
45         $base = BP; 45         $base = BP;
46          46         
47         $this->generatedCssFolder = 'porto/configed_css/'; 47         $this->generatedCssFolder = 'porto/configed_css/';
48         $this->generatedCssPath = 'pub/media/'.$this->generatedCssFolder; 48         $this->generatedCssPath = 'pub/media/'.$this->generatedCssFolder;
49         $this->generatedCssDir = $base.'/'.$this->generatedCssPath; 49         $this->generatedCssDir = $base.'/'.$this->generatedCssPath;
50          50         
51         parent::__construct($context); 51         parent::__construct($context);
52     } 52     }
53      53     
54     public function getBaseMediaUrl() 54     public function getBaseMediaUrl()
55     { 55     {
56         return $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA); 56         return $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
57     } 57     }
58      58     
59     public function getCssConfigDir() 59     public function getCssConfigDir()
60     { 60     {
61         return $this->generatedCssDir; 61         return $this->generatedCssDir;
62     } 62     }
63      63     
64     public function getSettingsFile() 64     public function getSettingsFile()
65     { 65     {
66         return $this->getBaseMediaUrl(). $this->generatedCssFolder . 'settings_' . $this->_storeManager->getStore()->getCode() . '.css'; 66         return $this->getBaseMediaUrl(). $this->generatedCssFolder . 'settings_' . $this->_storeManager->getStore()->getCode() . '.css';
67     } 67     }
68      68     
69     public function getDesignFile() 69     public function getDesignFile()
70     { 70     {
71         return $this->getBaseMediaUrl(). $this->generatedCssFolder . 'design_' . $this->_storeManager->getStore()->getCode() . '.css'; 71         return $this->getBaseMediaUrl(). $this->generatedCssFolder . 'design_' . $this->_storeManager->getStore()->getCode() . '.css';
72     } 72     }
73      73     
74     public function getPortoWebDir() 74     public function getPortoWebDir()
75     { 75     {
76         return $this->getBaseMediaUrl().'porto/web/'; 76         return $this->getBaseMediaUrl().'porto/web/';
77     } 77     }
78 } 78 }