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

86.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Controller/Adminhtml/DailydealIndex.php2018-03-14 03:43:38 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Controller/Adminhtml/DailydealIndex.php2018-03-14 03:43:38 +0000

86.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1138
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 <?php 1 <?php
2 namespace Smartwave\Dailydeals\Controller\Adminhtml\Dailydeal; 2 namespace Smartwave\Dailydeals\Controller\Adminhtml\Dailydeal;
3  3 
4 class Index extends \Magento\Backend\App\Action 4 class Index extends \Magento\Backend\App\Action
5 { 5 {
6     /** 6     /**
7      * Page result factory 7      * Page result factory
8      * 8      *
9      * @var \Magento\Framework\View\Result\PageFactory 9      * @var \Magento\Framework\View\Result\PageFactory
10      */ 10      */
11     protected $resultPageFactory; 11     protected $resultPageFactory;
12  12 
13     /** 13     /**
14      * Page factory 14      * Page factory
15      * 15      *
16      * @var \Magento\Backend\Model\View\Result\Page 16      * @var \Magento\Backend\Model\View\Result\Page
17      */ 17      */
18     protected $resultPage; 18     protected $resultPage;
19  19 
20     /** 20     /**
21      * constructor 21      * constructor
22      * 22      *
23      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory 23      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
24      * @param \Magento\Backend\App\Action\Context $context 24      * @param \Magento\Backend\App\Action\Context $context
25      */ 25      */
26     public function __construct( 26     public function __construct(
27         \Magento\Framework\View\Result\PageFactory $resultPageFactory, 27         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
28         \Magento\Backend\App\Action\Context $context 28         \Magento\Backend\App\Action\Context $context
29     ) { 29     ) {
30      30     
31         $this->resultPageFactory = $resultPageFactory; 31         $this->resultPageFactory = $resultPageFactory;
32         parent::__construct($context); 32         parent::__construct($context);
33     } 33     }
34  34 
35     /** 35     /**
36      * execute the action 36      * execute the action
37      * 37      *
38      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Framework\View\Result\Page 38      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Framework\View\Result\Page
39      */ 39      */
40     public function execute() 40     public function execute()
41     { 41     {
42         $this->setPageData(); 42         $this->setPageData();
43         return $this->getResultPage(); 43         return $this->getResultPage();
44     } 44     }
45     /** 45     /**
46      * instantiate result page object 46      * instantiate result page object
47      * 47      *
48      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Framework\View\Result\Page 48      * @return \Magento\Backend\Model\View\Result\Page|\Magento\Framework\View\Result\Page
49      */ 49      */
50     public function getResultPage() 50     public function getResultPage()
51     { 51     {
52         if (is_null($this->resultPage)) { 52         if (is_null($this->resultPage)) {
53             $this->resultPage = $this->resultPageFactory->create(); 53             $this->resultPage = $this->resultPageFactory->create();
54         } 54         }
55         return $this->resultPage; 55         return $this->resultPage;
56     } 56     }
57     /** 57     /**
58      * set page data 58      * set page data
59      * 59      *
60      * @return $this 60      * @return $this
61      */ 61      */
62     protected function setPageData() 62     protected function setPageData()
63     { 63     {
64         $resultPage = $this->getResultPage(); 64         $resultPage = $this->getResultPage();
65         //$resultPage->setActiveMenu('Smartwave_Dailydeals::dailydeal'); 65         //$resultPage->setActiveMenu('Smartwave_Dailydeals::dailydeal');
66         $resultPage->getConfig()->getTitle()->prepend((__('Dailydeals'))); 66         $resultPage->getConfig()->getTitle()->prepend((__('Dailydeals')));
67         return $this; 67         return $this;
68     } 68     }
69 } 69 }