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

91.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Controller/AdminhtmlDailydeal.php2018-03-14 03:45:26 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/code/Smartwave/Dailydeals/Controller/AdminhtmlDailydeal.php2018-03-14 03:45:26 +0000

91.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1126
Changed00
Inserted00
Removed00

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

91.4 Active regular expressions

No regular expressions were active.

91.5 Comparison detail

1 <?php 1 <?php
2 namespace Smartwave\Dailydeals\Controller\Adminhtml; 2 namespace Smartwave\Dailydeals\Controller\Adminhtml;
3  3 
4 abstract class Dailydeal extends \Magento\Backend\App\Action 4 abstract class Dailydeal extends \Magento\Backend\App\Action
5 { 5 {
6     /** 6     /**
7      * Dailydeal Factory 7      * Dailydeal Factory
8      * 8      *
9      * @var \Smartwave\Dailydeals\Model\DailydealFactory 9      * @var \Smartwave\Dailydeals\Model\DailydealFactory
10      */ 10      */
11     protected $dailydealFactory; 11     protected $dailydealFactory;
12  12 
13     /** 13     /**
14      * Core registry 14      * Core registry
15      * 15      *
16      * @var \Magento\Framework\Registry 16      * @var \Magento\Framework\Registry
17      */ 17      */
18     protected $coreRegistry; 18     protected $coreRegistry;
19  19 
20     /** 20     /**
21      * Result redirect factory 21      * Result redirect factory
22      * 22      *
23      * @var \Magento\Backend\Model\View\Result\RedirectFactory 23      * @var \Magento\Backend\Model\View\Result\RedirectFactory
24      */ 24      */
25     protected $resultRedirectFactory; 25     protected $resultRedirectFactory;
26  26 
27     /** 27     /**
28      * constructor 28      * constructor
29      * 29      *
30      * @param \Smartwave\Dailydeals\Model\DailydealFactory $dailydealFactory 30      * @param \Smartwave\Dailydeals\Model\DailydealFactory $dailydealFactory
31      * @param \Magento\Framework\Registry $coreRegistry 31      * @param \Magento\Framework\Registry $coreRegistry
32      * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory 32      * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
33      * @param \Magento\Backend\App\Action\Context $context 33      * @param \Magento\Backend\App\Action\Context $context
34      */ 34      */
35     public function __construct( 35     public function __construct(
36         \Smartwave\Dailydeals\Model\DailydealFactory $dailydealFactory, 36         \Smartwave\Dailydeals\Model\DailydealFactory $dailydealFactory,
37         \Magento\Framework\Registry $coreRegistry, 37         \Magento\Framework\Registry $coreRegistry,
38         \Magento\Backend\App\Action\Context $context 38         \Magento\Backend\App\Action\Context $context
39     ) { 39     ) {
40      40     
41         $this->dailydealFactory      = $dailydealFactory; 41         $this->dailydealFactory      = $dailydealFactory;
42         $this->coreRegistry          = $coreRegistry; 42         $this->coreRegistry          = $coreRegistry;
43         $this->resultRedirectFactory = $context->getResultRedirectFactory(); 43         $this->resultRedirectFactory = $context->getResultRedirectFactory();
44         parent::__construct($context); 44         parent::__construct($context);
45     } 45     }
46  46 
47     /** 47     /**
48      * Init Dailydeal 48      * Init Dailydeal
49      * 49      *
50      * @return \Smartwave\Dailydeals\Model\Dailydeal 50      * @return \Smartwave\Dailydeals\Model\Dailydeal
51      */ 51      */
52     protected function initDailydeal() 52     protected function initDailydeal()
53     { 53     {
54         $dailydealId  = (int) $this->getRequest()->getParam('dailydeal_id'); 54         $dailydealId  = (int) $this->getRequest()->getParam('dailydeal_id');
55         /** @var \Smartwave\Dailydeals\Model\Dailydeal $dailydeal */ 55         /** @var \Smartwave\Dailydeals\Model\Dailydeal $dailydeal */
56         $dailydeal    = $this->dailydealFactory->create(); 56         $dailydeal    = $this->dailydealFactory->create();
57         if ($dailydealId) { 57         if ($dailydealId) {
58             $dailydeal->load($dailydealId); 58             $dailydeal->load($dailydealId);
59         } 59         }
60         $this->coreRegistry->register('sw_dailydeals_dailydeal', $dailydeal); 60         $this->coreRegistry->register('sw_dailydeals_dailydeal', $dailydeal);
61         return $dailydeal; 61         return $dailydeal;
62     } 62     }
63 } 63 }