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

102.1 Files compared

#	Location	File	Last Modified
1	/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.7/app/code/Smartwave/Porto/Model/Config/Settings/Category	Type.php	2021-03-20 01:29:27 +0000
2	/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.8/app/code/Smartwave/Porto/Model/Config/Settings/Category	Type.php	2023-12-03 09:32:00 +0000

102.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	70
Changed	2	24
Inserted	0	0
Removed	0	0

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

102.4 Active regular expressions

No regular expressions were active.

102.5 Comparison detail

1	<?php	1	<?php
2	namespace Smartwave\Porto\Model\Config\Settings\Category;	2	namespace Smartwave\Porto\Model\Config\Settings\Category;
3		3
4	class Type implements \Magento\Framework\Option\ArrayInterface	4	class Type 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' => __('Type 1')],	9	» ['value' => '1', 'label' => __('Type 1')],
10	» ['value' => '2', 'label' => __('Type 2')],	10	» ['value' => '2', 'label' => __('Type 2')],
11	» ['value' => '3', 'label' => __('Type 3')],	11	» ['value' => '3', 'label' => __('Type 3')],
12	» ['value' => '4', 'label' => __('Type 4')],	12	» ['value' => '4', 'label' => __('Type 4')],
13	» ['value' => '5', 'label' => __('Type 5')],	13	» ['value' => '5', 'label' => __('Type 5')],
14	» ['value' => '6', 'label' => __('Type 6')],	14	» ['value' => '6', 'label' => __('Type 6')],
15	» ['value' => '7', 'label' => __('Type 7')],	15	» ['value' => '7', 'label' => __('Type 7')],
16	» ['value' => '8', 'label' => __('Type 8')],	16	» ['value' => '8', 'label' => __('Type 8')],
17	» ['value' => '9', 'label' => __('Type 9')],	17	» ['value' => '9', 'label' => __('Type 9')],
18	» ['value' => '10', 'label' => __('Type 10')]	18	» ['value' => '10', 'label' => __('Type 10')],
		19	» ['value' => '11', 'label' => __('Type 11')],
		20	» ['value' => '12', 'label' => __('Type 12')],
		21	» ['value' => '13', 'label' => __('Type 13')],
		22	» ['value' => '14', 'label' => __('Type 14')],
		23	» ['value' => '15', 'label' => __('Type 15')],
		24	» ['value' => '16', 'label' => __('Type 16')],
		25	» ['value' => '17', 'label' => __('Type 17')],
		26	» ['value' => '18', 'label' => __('Type 18')],
		27	» ['value' => '19', 'label' => __('Type 19')],
		28	» ['value' => '20', 'label' => __('Type 20')]
19	];	29	];
20	}	30	}
21		31
22	public function toArray()	32	public function toArray()
23	{	33	{
24	return [	34	return [
25	» '1' => __('Type 1'),	35	» '1' => __('Type 1'),
26	» '2' => __('Type 2'),	36	» '2' => __('Type 2'),
27	» '3' => __('Type 3'),	37	» '3' => __('Type 3'),
28	» '4' => __('Type 4'),	38	» '4' => __('Type 4'),
29	» '5' => __('Type 5'),	39	» '5' => __('Type 5'),
30	» '6' => __('Type 6'),	40	» '6' => __('Type 6'),
31	» '7' => __('Type 7'),	41	» '7' => __('Type 7'),
32	» '8' => __('Type 8'),	42	» '8' => __('Type 8'),
33	» '9' => __('Type 9'),	43	» '9' => __('Type 9'),
34	» '9' => __('Type 10')	44	» '10' => __('Type 10'),
		45	» '11' => __('Type 11'),
		46	» '12' => __('Type 12'),
		47	» '13' => __('Type 13'),
		48	» '14' => __('Type 14'),
		49	» '15' => __('Type 15'),
		50	» '16' => __('Type 16'),
		51	» '17' => __('Type 17'),
		52	» '18' => __('Type 18'),
		53	» '19' => __('Type 19'),
		54	» '20' => __('Type 20')
35	];	55	];
36	}	56	}
37	}	57	}