169. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01:03 +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.

169.1 Files compared

#	Location	File	Last Modified
1	Porto v4.0.4/Porto Theme/app/code/Smartwave/Porto/Model/Config/Design/Minicart	Icon.php	2021-01-07 04:33:30 +0000
2	Porto v4.0.5/Porto Theme/app/code/Smartwave/Porto/Model/Config/Design/Minicart	Icon.php	2021-01-07 04:33:30 +0000

169.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	1	42
Changed	0	0
Inserted	0	0
Removed	0	0

169.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

169.4 Active regular expressions

No regular expressions were active.

169.5 Comparison detail

1	<?php	1	<?php
2	namespace Smartwave\Porto\Model\Config\Design\Minicart;	2	namespace Smartwave\Porto\Model\Config\Design\Minicart;
3		3
4	class Icon implements \Magento\Framework\Option\ArrayInterface	4	class Icon implements \Magento\Framework\Option\ArrayInterface
5	{	5	{
6	public function toOptionArray()	6	public function toOptionArray()
7	{	7	{
8	return [	8	return [
9	['value' => '1', 'label' => __('Design 1')],	9	['value' => '1', 'label' => __('Design 1')],
10	['value' => '2', 'label' => __('Design 2')]	10	['value' => '2', 'label' => __('Design 2')]
11	];	11	];
12	}	12	}
13		13
14	public function toArray()	14	public function toArray()
15	{	15	{
16	return [	16	return [
17	'1' => __('Design 1'),	17	'1' => __('Design 1'),
18	'2' => __('Design 2')	18	'2' => __('Design 2')
19	];	19	];
20	}	20	}
21	}	21	}