Skip to content

Commit 84311ef

Browse files
glo24157glo24157
committed
Merge branch 'no-author/reports-sales' into comm_prd_may_abhi_v1
2 parents 8fa9966 + 5932594 commit 84311ef

File tree

36 files changed

+91
-156
lines changed

36 files changed

+91
-156
lines changed

‎app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection/Initial.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Customers New Accounts Report collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Customer\Totals\Collection;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Event/Collection.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Report event collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Event;
1311

@@ -18,8 +16,6 @@
1816
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1917
{
2018
/**
21-
* Store Ids
22-
*
2319
* @var array
2420
*/
2521
protected $_storeIds;
@@ -36,8 +32,8 @@ protected function _construct()
3632

3733
/**
3834
* Add store ids filter
39-
* @codeCoverageIgnore
4035
*
36+
* @codeCoverageIgnore
4137
* @param array $storeIds
4238
* @return $this
4339
*/

‎app/code/Magento/Reports/Model/ResourceModel/Event/Type.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Report event type resource model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Event;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Event/Type/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Report event types collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Event\Type;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Helper.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Reports Mysql resource helper model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Reports\Model\ResourceModel\Product\Downloads;
88

99
/**
1010
* Product Downloads Report collection
1111
*
12-
* @author Magento Core Team <core@magentocommerce.com>
13-
*
1412
* @api
1513
* @since 100.0.2
1614
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)

‎app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66

7-
/**
8-
* @author Magento Core Team <core@magentocommerce.com>
9-
*/
107
namespace Magento\Reports\Model\ResourceModel\Product\Index\Collection;
118

129
/**
@@ -21,8 +18,6 @@
2118
abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
2219
{
2320
/**
24-
* Customer id
25-
*
2621
* @var null|int
2722
*/
2823
protected $_customerId = null;

‎app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Reports Compared Product Index Resource Model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Product\Index;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Product/Index/Compared/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Reports Compared Product Index Resource Collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Product\Index\Compared;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Reports Viewed Product Index Resource Model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Product\Index;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Product/Index/Viewed/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Reports Viewed Product Index Resource Collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Product\Index\Viewed;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Product Low Stock Report Collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Product\Lowstock;
1311

@@ -229,6 +227,7 @@ public function joinInventoryItem($fields = [])
229227
}
230228

231229
if (!is_array($fields)) {
230+
// phpstan:ignore
232231
if (empty($fields)) {
233232
$fields = [];
234233
} else {

‎app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Report Sold Products collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Product\Sold;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection/Initial.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Report Reviews collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Product\Sold\Collection;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Refresh/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Refresh Statistic Grid collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Refresh;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Report Reviews collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Report;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Report/Product/Viewed.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2012 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Most viewed product report aggregate resource model
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Report\Product;
1311

@@ -20,17 +18,17 @@ class Viewed extends \Magento\Sales\Model\ResourceModel\Report\AbstractReport
2018
/**
2119
* Aggregation key daily
2220
*/
23-
const AGGREGATION_DAILY = 'report_viewed_product_aggregated_daily';
21+
public const AGGREGATION_DAILY = 'report_viewed_product_aggregated_daily';
2422

2523
/**
2624
* Aggregation key monthly
2725
*/
28-
const AGGREGATION_MONTHLY = 'report_viewed_product_aggregated_monthly';
26+
public const AGGREGATION_MONTHLY = 'report_viewed_product_aggregated_monthly';
2927

3028
/**
3129
* Aggregation key yearly
3230
*/
33-
const AGGREGATION_YEARLY = 'report_viewed_product_aggregated_yearly';
31+
public const AGGREGATION_YEARLY = 'report_viewed_product_aggregated_yearly';
3432

3533
/**
3634
* Product resource instance

‎app/code/Magento/Reports/Model/ResourceModel/Review/Collection.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Report Reviews collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Review;
1311

@@ -47,7 +45,9 @@ public function addProductFilter($productId)
4745
*/
4846
public function resetSelect()
4947
{
48+
// phpstan:ignore "Call to an undefined static method"
5049
parent::resetSelect();
50+
// phpstan:ignore
5151
$this->_joinFields();
5252
return $this;
5353
}

‎app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Report Customers Review collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Review\Customer;
1311

‎app/code/Magento/Reports/Model/ResourceModel/Review/Product/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Report Products Review collection
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Reports\Model\ResourceModel\Review\Product;
1311

0 commit comments

Comments
 (0)