99. Araxis Merge File Comparison Report

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

99.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Model/ResourceModel/Dailydeal/GridCollection.php2018-04-08 11:01:42 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Model/ResourceModel/Dailydeal/GridCollection.php2023-06-10 07:26:10 +0000

99.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged6232
Changed527
Inserted00
Removed00

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

99.4 Active regular expressions

No regular expressions were active.

99.5 Comparison detail

1 <?php 1 <?php
2 namespace Smartwave\Dailydeals\Model\ResourceModel\Dailydeal\Grid; 2 namespace Smartwave\Dailydeals\Model\ResourceModel\Dailydeal\Grid;
3  3 
4 class Collection extends \Smartwave\Dailydeals\Model\ResourceModel\Dailydeal\Collection implements \Magento\Framework\Api\Search\SearchResultInterface 4 class Collection extends \Smartwave\Dailydeals\Model\ResourceModel\Dailydeal\Collection implements \Magento\Framework\Api\Search\SearchResultInterface
5 { 5 {
6     /** 6     /**
7      * Aggregations 7      * Aggregations
8      * 8      *
9      * @var \Magento\Framework\Search\AggregationInterface 9      * @var \Magento\Framework\Search\AggregationInterface
10      */ 10      */
11     protected $aggregations; 11     protected $aggregations;
12  12 
13     /** 13     /**
14      * constructor 14      * constructor
15      * 15      *
16      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory 16      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
17      * @param \Psr\Log\LoggerInterface $logger 17      * @param \Psr\Log\LoggerInterface $logger
18      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy 18      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
19      * @param \Magento\Framework\Event\ManagerInterface $eventManager 19      * @param \Magento\Framework\Event\ManagerInterface $eventManager
20      * @param $mainTable 20      * @param $mainTable
21      * @param $eventPrefix 21      * @param $eventPrefix
22      * @param $eventObject 22      * @param $eventObject
23      * @param $resourceModel 23      * @param $resourceModel
24      * @param $model 24      * @param $model
25      * @param $connection 25      * @param $connection
26      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource 26      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
27      */ 27      */
28     public function __construct( 28     public function __construct(
29         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory, 29         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
30         \Psr\Log\LoggerInterface $logger, 30         \Psr\Log\LoggerInterface $logger,
31         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy, 31         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
32         \Magento\Framework\Event\ManagerInterface $eventManager, 32         \Magento\Framework\Event\ManagerInterface $eventManager,
33         $mainTable, 33         $mainTable,
34         $eventPrefix, 34         $eventPrefix,
35         $eventObject, 35         $eventObject,
36         $resourceModel, 36         $resourceModel,
37         $model = 'Magento\Framework\View\Element\UiComponent\DataProvider\Document' 37         $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class,
38     ) { 38     ) {
39      39 
40         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager); 40         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager);
41         $this->_eventPrefix = $eventPrefix; 41         $this->_eventPrefix = $eventPrefix;
42         $this->_eventObject = $eventObject; 42         $this->_eventObject = $eventObject;
43         $this->_init($model, $resourceModel); 43         $this->_init($model, $resourceModel);
44         $this->setMainTable($mainTable); 44         $this->setMainTable($mainTable);
45     } 45     }
46  46 
47  47 
48     /** 48     /**
49      * @return \Magento\Framework\Search\AggregationInterface 49      * Get aggregation interface instance
    50      *
    51      * @return 
AggregationInterface
50      */ 52      */
51     public function getAggregations() 53     public function getAggregations()
52     { 54     {
53         return $this->aggregations; 55         return $this->aggregations;
54     } 56     }
55  57 
56     /** 58     /**
57      * @param \Magento\Framework\Search\AggregationInterface $aggregations 59      * Set aggregation interface instance
    60      *
    61      * @param 
AggregationInterface $aggregations
58      * @return $this 62      * @return $this
59      */ 63      */
60     public function setAggregations($aggregations) 64     public function setAggregations($aggregations)
61     { 65     {
62         $this->aggregations = $aggregations; 66         $this->aggregations = $aggregations;
63     } 67         
return $this;
64     
65     
66     /**    
67      * Retrieve all ids for collection    
68      * Backward compatibility with EAV collection    
69      *    
70      * @param int $limit    
71      * @param int $offset    
72      * @return array    
73      */    
74     public function getAllIds($limit = null, $offset = null)    
75     {    
76         return $this->getConnection()->fetchCol($this->_getAllIdsSelect($limit, $offset), $this->_bindParams);    
77     } 68     }
78  69 
79     /** 70     /**
80      * Get search criteria. 71      * Get search criteria.
81      * 72      *
82      * @return \Magento\Framework\Api\SearchCriteriaInterface|null 73      * @return \Magento\Framework\Api\SearchCriteriaInterface|null
83      */ 74      */
84     public function getSearchCriteria() 75     public function getSearchCriteria()
85     { 76     {
86         return null; 77         return null;
87     } 78     }
88  79 
89     /** 80     /**
90      * Set search criteria. 81      * Set search criteria.
91      * 82      *
92      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria 83      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
93      * @return $this 84      * @return $this
94      * @SuppressWarnings(PHPMD.UnusedFormalParameter) 85      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
95      */ 86      */
96     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null) 87     public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
97     { 88     {
98         return $this; 89         return $this;
99     } 90     }
100  91 
101     /** 92     /**
102      * Get total count. 93      * Get total count.
103      * 94      *
104      * @return int 95      * @return int
105      */ 96      */
106     public function getTotalCount() 97     public function getTotalCount()
107     { 98     {
108         return $this->getSize(); 99         return $this->getSize();
109     } 100     }
110  101 
111     /** 102     /**
112      * Set total count. 103      * Set total count.
113      * 104      *
114      * @param int $totalCount 105      * @param int $totalCount
115      * @return $this 106      * @return $this
116      * @SuppressWarnings(PHPMD.UnusedFormalParameter) 107      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
117      */ 108      */
118     public function setTotalCount($totalCount) 109     public function setTotalCount($totalCount)
119     { 110     {
120         return $this; 111         return $this;
121     } 112     }
122  113 
123     /** 114     /**
124      * Set items list. 115      * Set items list.
125      * 116      *
126      * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items 117      * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
127      * @return $this 118      * @return $this
128      * @SuppressWarnings(PHPMD.UnusedFormalParameter) 119      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
129      */ 120      */
130     public function setItems(array $items = null) 121     public function setItems(array $items = null)
131     { 122     {
132         return $this; 123         return $this;
133     } 124     }
134 } 125 }

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.