17. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-07-12 04:42:36 +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.

17.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/code/Mageplaza/LayeredNavigation/etcdi.xml2022-12-08 01:34:28 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/code/Mageplaza/LayeredNavigation/etcdi.xml2023-07-12 02:31:58 +0000

17.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged4730
Changed00
Inserted321
Removed00

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

17.4 Active regular expressions

No regular expressions were active.

17.5 Comparison detail

1 <?xml  1 <?xml 
2  version="1.0" 2  version="1.0"
3 ?> 3 ?>
4 <!-- 4 <!--
5 /** 5 /**
6  * Mageplaza 6  * Mageplaza
7  * 7  *
8  * NOTICE OF LICENSE 8  * NOTICE OF LICENSE
9  * 9  *
10  * This source file is subject to the Mageplaza.com license that is 10  * This source file is subject to the Mageplaza.com license that is
11  * available through the world-wide-web at this URL: 11  * available through the world-wide-web at this URL:
12  * https://www.mageplaza.com/LICENSE.txt 12  * https://www.mageplaza.com/LICENSE.txt
13  * 13  *
14  * DISCLAIMER 14  * DISCLAIMER
15  * 15  *
16  * Do not edit or add to this file if you wish to upgrade this extension to newer 16  * Do not edit or add to this file if you wish to upgrade this extension to newer
17  * version in the future. 17  * version in the future.
18  * 18  *
19  * @category    Mageplaza 19  * @category    Mageplaza
20  * @package     Mageplaza_LayeredNavigation 20  * @package     Mageplaza_LayeredNavigation
21  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/) 21  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
22  * @license     https://www.mageplaza.com/LICENSE.txt 22  * @license     https://www.mageplaza.com/LICENSE.txt
23  */ 23  */
24 --> 24 -->
25 <config  25 <config 
26  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  26  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
27  xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd" 27  xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"
28 > 28 >
29       29      
30  <virtualType  30  <virtualType 
31   name="categoryFilterList"  31   name="categoryFilterList" 
32   type="Magento\Catalog\Model\Layer\FilterList" 32   type="Magento\Catalog\Model\Layer\FilterList"
33  > 33  >
34            34           
35   <arguments> 35   <arguments>
36                 36                
37    <argument  37    <argument 
38     name="filters"  38     name="filters" 
39     xsi:type="array" 39     xsi:type="array"
40    > 40    >
41                      41                     
42     <item  42     <item 
43      name="attribute"  43      name="attribute" 
44      xsi:type="string" 44      xsi:type="string"
45     > 45     >
46      Mageplaza\LayeredNavigation\Model\Layer\Filter\Attribute 46      Mageplaza\LayeredNavigation\Model\Layer\Filter\Attribute
47     </item> 47     </item>
48                      48                     
49     <item  49     <item 
50      name="price"  50      name="price" 
51      xsi:type="string" 51      xsi:type="string"
52     > 52     >
53      Mageplaza\LayeredNavigation\Model\Layer\Filter\Price 53      Mageplaza\LayeredNavigation\Model\Layer\Filter\Price
54     </item> 54     </item>
55                      55                     
56     <item  56     <item 
57      name="category"  57      name="category" 
58      xsi:type="string" 58      xsi:type="string"
59     > 59     >
60      Mageplaza\LayeredNavigation\Model\Layer\Filter\Category 60      Mageplaza\LayeredNavigation\Model\Layer\Filter\Category
61     </item> 61     </item>
62                  62                 
63    </argument> 63    </argument>
64             64            
65   </arguments> 65   </arguments>
66        66       
67  </virtualType> 67  </virtualType>
68       68      
69  <virtualType  69  <virtualType 
70   name="searchFilterList"  70   name="searchFilterList" 
71   type="Magento\Catalog\Model\Layer\FilterList" 71   type="Magento\Catalog\Model\Layer\FilterList"
72  > 72  >
73            73           
74   <arguments> 74   <arguments>
75                 75                
76    <argument  76    <argument 
77     name="filters"  77     name="filters" 
78     xsi:type="array" 78     xsi:type="array"
79    > 79    >
80                      80                     
81     <item  81     <item 
82      name="attribute"  82      name="attribute" 
83      xsi:type="string" 83      xsi:type="string"
84     > 84     >
85      Mageplaza\LayeredNavigation\Model\Layer\Filter\Attribute 85      Mageplaza\LayeredNavigation\Model\Layer\Filter\Attribute
86     </item> 86     </item>
87                      87                     
88     <item  88     <item 
89      name="price"  89      name="price" 
90      xsi:type="string" 90      xsi:type="string"
91     > 91     >
92      Mageplaza\LayeredNavigation\Model\Layer\Filter\Price 92      Mageplaza\LayeredNavigation\Model\Layer\Filter\Price
93     </item> 93     </item>
94                      94                     
95     <item  95     <item 
96      name="category"  96      name="category" 
97      xsi:type="string" 97      xsi:type="string"
98     > 98     >
99      Mageplaza\LayeredNavigation\Model\Layer\Filter\Category 99      Mageplaza\LayeredNavigation\Model\Layer\Filter\Category
100     </item> 100     </item>
101                  101                 
102    </argument> 102    </argument>
103             103            
104   </arguments> 104   </arguments>
105        105       
106  </virtualType> 106  </virtualType>
107       107      
108  <virtualType  108  <virtualType 
109   name="Magento\CatalogSearch\Model\ResourceModel\Fulltext\CollectionFactory"  109   name="Magento\CatalogSearch\Model\ResourceModel\Fulltext\CollectionFactory" 
110   type="Magento\Catalog\Model\ResourceModel\Product\CollectionFactory" 110   type="Magento\Catalog\Model\ResourceModel\Product\CollectionFactory"
111  > 111  >
112            112           
113   <arguments> 113   <arguments>
114                 114                
115    <argument  115    <argument 
116     name="instanceName"  116     name="instanceName" 
117     xsi:type="string" 117     xsi:type="string"
118    > 118    >
119     Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\Collection 119     Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\Collection
120    </argument> 120    </argument>
121             121            
122   </arguments> 122   </arguments>
123        123       
124  </virtualType> 124  </virtualType>
125       125      
126  <virtualType  126  <virtualType 
127   name="Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollection"  127   name="Magento\CatalogSearch\Model\ResourceModel\Fulltext\SearchCollection" 
128   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\Collection" 128   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\Collection"
129  > 129  >
130            130           
131   <arguments> 131   <arguments>
132                 132                
133    <argument  133    <argument 
134     name="searchRequestName"  134     name="searchRequestName" 
135     xsi:type="string" 135     xsi:type="string"
136    > 136    >
137     quick_search_container 137     quick_search_container
138    </argument> 138    </argument>
139             139            
140   </arguments> 140   </arguments>
141        141       
142  </virtualType> 142  </virtualType>
143   143  
144       144      
145  <virtualType  145  <virtualType 
146   name="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\SearchCollectionFactory"  146   name="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\SearchCollectionFactory" 
147   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\CollectionFactory" 147   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\CollectionFactory"
148  > 148  >
149            149           
150   <arguments> 150   <arguments>
151                 151                
152    <argument  152    <argument 
153     name="instanceName"  153     name="instanceName" 
154     xsi:type="string" 154     xsi:type="string"
155    > 155    >
156     Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\SearchCollection 156     Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\SearchCollection
157    </argument> 157    </argument>
158             158            
159   </arguments> 159   </arguments>
160        160       
161  </virtualType> 161  </virtualType>
162   162  
163       163      
164  <virtualType  164  <virtualType 
165   name="mpElasticsearchCategoryCollection"  165   name="mpElasticsearchCategoryCollection" 
166   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\Collection" 166   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\Collection"
167  > 167  >
168            168           
169   <arguments> 169   <arguments>
170                 170                
171    <argument  171    <argument 
172     name="searchRequestName"  172     name="searchRequestName" 
173     xsi:type="string" 173     xsi:type="string"
174    > 174    >
175     catalog_view_container 175     catalog_view_container
176    </argument> 176    </argument>
177                 177                
178    <argument  178    <argument 
179     name="searchCriteriaResolverFactory"  179     name="searchCriteriaResolverFactory" 
180     xsi:type="object" 180     xsi:type="object"
181    > 181    >
182     elasticsearchSearchCriteriaResolverFactory 182     elasticsearchSearchCriteriaResolverFactory
183    </argument> 183    </argument>
184                 184                
185    <argument  185    <argument 
186     name="searchResultApplierFactory"  186     name="searchResultApplierFactory" 
187     xsi:type="object" 187     xsi:type="object"
188    > 188    >
189     elasticsearchSearchResultApplier\Factory 189     elasticsearchSearchResultApplier\Factory
190    </argument> 190    </argument>
191                 191                
192    <argument  192    <argument 
193     name="totalRecordsResolverFactory"  193     name="totalRecordsResolverFactory" 
194     xsi:type="object" 194     xsi:type="object"
195    > 195    >
196     elasticsearchTotalRecordsResolver\Factory 196     elasticsearchTotalRecordsResolver\Factory
197    </argument> 197    </argument>
198                 198                
199    <argument  199    <argument 
200     name="defaultFilterStrategyApplyChecker"  200     name="defaultFilterStrategyApplyChecker" 
201     xsi:type="object" 201     xsi:type="object"
202    > 202    >
203     Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\DefaultFilterStrategyApplyChecker 203     Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\DefaultFilterStrategyApplyChecker
204    </argument> 204    </argument>
205             205            
206   </arguments> 206   </arguments>
207        207       
208  </virtualType> 208  </virtualType>
209       209      
210  <virtualType  210  <virtualType 
211   name="mpElasticsearchCategoryCollectionFactory"  211   name="mpElasticsearchCategoryCollectionFactory" 
212   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\SearchCollectionFactory" 212   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\SearchCollectionFactory"
213  > 213  >
214            214           
215   <arguments> 215   <arguments>
216                 216                
217    <argument  217    <argument 
218     name="instanceName"  218     name="instanceName" 
219     xsi:type="string" 219     xsi:type="string"
220    > 220    >
221     mpElasticsearchCategoryCollection 221     mpElasticsearchCategoryCollection
222    </argument> 222    </argument>
223             223            
224   </arguments> 224   </arguments>
225        225       
226  </virtualType> 226  </virtualType>
227       227      
228  <virtualType  228  <virtualType 
229   name="elasticsearchLayerCategoryItemCollectionProvider"  229   name="elasticsearchLayerCategoryItemCollectionProvider" 
230   type="Magento\Elasticsearch\Model\Layer\Category\ItemCollectionProvider" 230   type="Magento\Elasticsearch\Model\Layer\Category\ItemCollectionProvider"
231  > 231  >
232            232           
233   <arguments> 233   <arguments>
234                 234                
235    <argument  235    <argument 
236     name="factories"  236     name="factories" 
237     xsi:type="array" 237     xsi:type="array"
238    > 238    >
239                      239                     
240     <item  240     <item 
241      name="elasticsearch7 241      name="elasticsearch7
242      xsi:type="object" 242      xsi:type="object"
243     > 243     >
244      mpElasticsearchCategoryCollectionFactory 244      mpElasticsearchCategoryCollectionFactory
245     </item> 245     </item>
246                  246                     
    247     <item 
    248      name="opensearch" 
    249      xsi:type="object"
    250     >
    251      mpElasticsearchCategoryCollectionFactory
    252     </item>
    253                 
247    </argument> 254    </argument>
248             255            
249   </arguments> 256   </arguments>
250        257       
251  </virtualType> 258  </virtualType>
252   259  
253       260      
254  <virtualType  261  <virtualType 
255   name="mpElasticsearchFulltextSearchCollection"  262   name="mpElasticsearchFulltextSearchCollection" 
256   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\Collection" 263   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\Collection"
257  > 264  >
258            265           
259   <arguments> 266   <arguments>
260                 267                
261    <argument  268    <argument 
262     name="searchRequestName"  269     name="searchRequestName" 
263     xsi:type="string" 270     xsi:type="string"
264    > 271    >
265     quick_search_container 272     quick_search_container
266    </argument> 273    </argument>
267                 274                
268    <argument  275    <argument 
269     name="searchCriteriaResolverFactory"  276     name="searchCriteriaResolverFactory" 
270     xsi:type="object" 277     xsi:type="object"
271    > 278    >
272     elasticsearchSearchCriteriaResolverFactory 279     elasticsearchSearchCriteriaResolverFactory
273    </argument> 280    </argument>
274                 281                
275    <argument  282    <argument 
276     name="searchResultApplierFactory"  283     name="searchResultApplierFactory" 
277     xsi:type="object" 284     xsi:type="object"
278    > 285    >
279     elasticsearchSearchResultApplier\Factory 286     elasticsearchSearchResultApplier\Factory
280    </argument> 287    </argument>
281                 288                
282    <argument  289    <argument 
283     name="totalRecordsResolverFactory"  290     name="totalRecordsResolverFactory" 
284     xsi:type="object" 291     xsi:type="object"
285    > 292    >
286     elasticsearchTotalRecordsResolver\Factory 293     elasticsearchTotalRecordsResolver\Factory
287    </argument> 294    </argument>
288                 295                
289    <argument  296    <argument 
290     name="defaultFilterStrategyApplyChecker"  297     name="defaultFilterStrategyApplyChecker" 
291     xsi:type="object" 298     xsi:type="object"
292    > 299    >
293     Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\DefaultFilterStrategyApplyChecker 300     Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\DefaultFilterStrategyApplyChecker
294    </argument> 301    </argument>
295             302            
296   </arguments> 303   </arguments>
297        304       
298  </virtualType> 305  </virtualType>
299       306      
300  <virtualType  307  <virtualType 
301   name="mpElasticsearchFulltextSearchCollectionFactory"  308   name="mpElasticsearchFulltextSearchCollectionFactory" 
302   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\SearchCollectionFactory" 309   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\SearchCollectionFactory"
303  > 310  >
304            311           
305   <arguments> 312   <arguments>
306                 313                
307    <argument  314    <argument 
308     name="instanceName"  315     name="instanceName" 
309     xsi:type="string" 316     xsi:type="string"
310    > 317    >
311     mpElasticsearchFulltextSearchCollection 318     mpElasticsearchFulltextSearchCollection
312    </argument> 319    </argument>
313             320            
314   </arguments> 321   </arguments>
315        322       
316  </virtualType> 323  </virtualType>
317       324      
318  <virtualType  325  <virtualType 
319   name="elasticsearchLayerSearchItemCollectionProvider"  326   name="elasticsearchLayerSearchItemCollectionProvider" 
320   type="Magento\Elasticsearch\Model\Layer\Search\ItemCollectionProvider" 327   type="Magento\Elasticsearch\Model\Layer\Search\ItemCollectionProvider"
321  > 328  >
322            329           
323   <arguments> 330   <arguments>
324                 331                
325    <argument  332    <argument 
326     name="factories"  333     name="factories" 
327     xsi:type="array" 334     xsi:type="array"
328    > 335    >
329                      336                     
330     <item  337     <item 
331      name="elasticsearch7 338      name="elasticsearch7
332      xsi:type="object" 339      xsi:type="object"
333     > 340     >
334      mpElasticsearchFulltextSearchCollectionFactory 341      mpElasticsearchFulltextSearchCollectionFactory
335     </item> 342     </item>
336                  343                     
    344     <item 
    345      name="opensearch" 
    346      xsi:type="object"
    347     >
    348      mpElasticsearchFulltextSearchCollectionFactory
    349     </item>
    350                 
337    </argument> 351    </argument>
338             352            
339   </arguments> 353   </arguments>
340        354       
341  </virtualType> 355  </virtualType>
342   356  
343       357      
344  <type  358  <type 
345   name="Magento\Framework\App\PageCache\Identifier" 359   name="Magento\Framework\App\PageCache\Identifier"
346  > 360  >
347            361           
348   <plugin  362   <plugin 
349    name="mplayerPagecacheIdentifier"  363    name="mplayerPagecacheIdentifier" 
350    type="Mageplaza\LayeredNavigation\Plugin\PageCache\Identifier"  364    type="Mageplaza\LayeredNavigation\Plugin\PageCache\Identifier" 
351   /> 365   />
352        366       
353  </type> 367  </type>
354       368      
355  <type  369  <type 
356   name="Magento\Framework\App\PageCache\Kernel" 370   name="Magento\Framework\App\PageCache\Kernel"
357  > 371  >
358            372           
359   <plugin  373   <plugin 
360    name="mplayerProcessRequest"  374    name="mplayerProcessRequest" 
361    type="Mageplaza\LayeredNavigation\Plugin\PageCache\ProcessRequest"  375    type="Mageplaza\LayeredNavigation\Plugin\PageCache\ProcessRequest" 
362   /> 376   />
363        377       
364  </type> 378  </type>
    379  
    380      
    381  <preferenc
    382   for="Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplier"
    383                  
    384   type="Mageplaza\LayeredNavigation\Model\ResourceModel\Fulltext\Collection\SearchResultApplier"
    385  />
365 </config> 386 </config>