86. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2024-03-04 14:38:48 +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.

86.1 Files compared

#LocationFileLast Modified
1/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.7/app/code/Smartwave/Porto/etcdi.xml2022-11-23 08:13:25 +0000
2/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.8/app/code/Smartwave/Porto/etcdi.xml2022-11-23 08:13:25 +0000

86.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1232
Changed00
Inserted00
Removed00

86.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

86.4 Active regular expressions

No regular expressions were active.

86.5 Comparison detail

1 <?xml  1 <?xml 
2  version="1.0" 2  version="1.0"
3 ?> 3 ?>
4 <!-- 4 <!--
5 /** 5 /**
6  * Copyright © 2015 Magento. All rights reserved. 6  * Copyright © 2015 Magento. All rights reserved.
7  * See COPYING.txt for license details. 7  * See COPYING.txt for license details.
8  */ 8  */
9 --> 9 -->
10 <config  10 <config 
11  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  11  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
12  xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd" 12  xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd"
13 > 13 >
14       14      
15  <type  15  <type 
16   name="Smartwave\Porto\Block\Template" 16   name="Smartwave\Porto\Block\Template"
17  > 17  >
18            18           
19   <arguments> 19   <arguments>
20                 20                
21    <argument  21    <argument 
22     name="customTemplate 22     name="customTemplate
23     xsi:type="array" 23     xsi:type="array"
24    > 24    >
25                      25                     
26     <item  26     <item 
27      name="context"  27      name="context" 
28      xsi:type="string" 28      xsi:type="string"
29     > 29     >
30      \Magento\Framework\View\Element\Template\Context 30      \Magento\Framework\View\Element\Template\Context
31     </item> 31     </item>
32                      32                     
33     <item  33     <item 
34      name="registry"  34      name="registry" 
35      xsi:type="string" 35      xsi:type="string"
36     > 36     >
37      \Magento\Framework\Registry 37      \Magento\Framework\Registry
38     </item> 38     </item>
39                  39                 
40    </argument> 40    </argument>
41             41            
42   </arguments> 42   </arguments>
43        43       
44  </type> 44  </type>
45       45      
46  <type  46  <type 
47   name="Smartwave\Porto\Block\CategoryCollection" 47   name="Smartwave\Porto\Block\CategoryCollection"
48  > 48  >
49            49           
50   <arguments> 50   <arguments>
51                 51                
52    <argument  52    <argument 
53     name="categoryCollection"  53     name="categoryCollection" 
54     xsi:type="array" 54     xsi:type="array"
55    > 55    >
56                      56                     
57     <item  57     <item 
58      name="context"  58      name="context" 
59      xsi:type="string" 59      xsi:type="string"
60     > 60     >
61      \Magento\Framework\View\Element\Template\Context 61      \Magento\Framework\View\Element\Template\Context
62     </item> 62     </item>
63                      63                     
64     <item  64     <item 
65      name="helper"  65      name="helper" 
66      xsi:type="string" 66      xsi:type="string"
67     > 67     >
68      \Magento\Catalog\Helper\Category 68      \Magento\Catalog\Helper\Category
69     </item> 69     </item>
70                      70                     
71     <item  71     <item 
72      name="flatstate"  72      name="flatstate" 
73      xsi:type="string" 73      xsi:type="string"
74     > 74     >
75      \Magento\Catalog\Model\Indexer\Category\Flat\State 75      \Magento\Catalog\Model\Indexer\Category\Flat\State
76     </item> 76     </item>
77                      77                     
78     <item  78     <item 
79      name="menu 79      name="menu
80      xsi:type="string" 80      xsi:type="string"
81     > 81     >
82      \Magento\Theme\Block\Html\Topmenu 82      \Magento\Theme\Block\Html\Topmenu
83     </item> 83     </item>
84                  84                 
85    </argument> 85    </argument>
86             86            
87   </arguments> 87   </arguments>
88        88       
89  </type> 89  </type>
90       90      
91  <preferenc 91  <preferenc
92   for="Magento\Catalog\Controller\Category\View"  92   for="Magento\Catalog\Controller\Category\View" 
93   type="Smartwave\Porto\Controller\Category\View"  93   type="Smartwave\Porto\Controller\Category\View" 
94  /> 94  />
95       95      
96  <preferenc 96  <preferenc
97   for="Magento\CatalogSearch\Controller\Result\Index 97   for="Magento\CatalogSearch\Controller\Result\Index
98   type="Smartwave\Porto\Controller\CatalogSearch\Result\Index"  98   type="Smartwave\Porto\Controller\CatalogSearch\Result\Index" 
99  /> 99  />
100       100      
101  <preferenc 101  <preferenc
102   for="Magento\Catalog\Helper\Product\View 102   for="Magento\Catalog\Helper\Product\View
103   type="Smartwave\Porto\Helper\Product\View"  103   type="Smartwave\Porto\Helper\Product\View" 
104  /> 104  />
105       105      
106  <type  106  <type 
107   name="Magento\Framework\View\Result\Page" 107   name="Magento\Framework\View\Result\Page"
108  > 108  >
109            109           
110   <plugin  110   <plugin 
111    name="updateBodyClass"  111    name="updateBodyClass" 
112    type="Smartwave\Porto\Plugin\UpdateBodyClass" 112    type="Smartwave\Porto\Plugin\UpdateBodyClass"
113   /> 113   />
114        114       
115  </type> 115  </type>
116 </config> 116 </config>