Skip to content

Commit ec423eb

Browse files
committed
Fixes integration tests
1 parent f01cf3b commit ec423eb

File tree

8 files changed

+22
-53
lines changed

8 files changed

+22
-53
lines changed

app/code/Magento/CatalogImportExport/Model/Export/Product.php

-7
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,6 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
116116
*/
117117
protected $_productTypeModels = [];
118118

119-
/**
120-
* Array of pairs store ID to its code.
121-
*
122-
* @var array
123-
*/
124-
protected $_storeIdToCode = [];
125-
126119
/**
127120
* Array of Website ID-to-code.
128121
*

app/code/Magento/Dhl/Model/Carrier.php

-7
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,6 @@ class Carrier extends AbstractDhl implements CarrierInterface
115115
*/
116116
protected $_request;
117117

118-
/**
119-
* Rate result data
120-
*
121-
* @var Result|null
122-
*/
123-
protected $_result;
124-
125118
/**
126119
* Countries parameters data
127120
*

app/code/Magento/Fedex/Model/Carrier.php

-7
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
8080
*/
8181
protected $_request = null;
8282

83-
/**
84-
* Rate result data
85-
*
86-
* @var Result|null
87-
*/
88-
protected $_result = null;
89-
9083
/**
9184
* Path to wsdl file of rate service
9285
*

app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,11 @@ abstract class AbstractEntity
146146
protected $_storeManager;
147147

148148
/**
149+
* Array of pairs store ID to its code.
150+
*
149151
* @var array
150152
*/
151-
private $_storeIdToCode = [];
153+
protected $_storeIdToCode = [];
152154

153155
/**
154156
* @var array

app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ abstract class AbstractCarrier extends \Magento\Framework\DataObject implements
4747
protected $_isFixed = false;
4848

4949
/**
50-
* @var ?RateResult
50+
* Rate result data
51+
*
52+
* @var RateResult|null
5153
*/
52-
private $_result;
54+
protected $_result = null;
5355

5456
/**
5557
* @var string[]

app/code/Magento/Ups/Model/Carrier.php

-7
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
8686
*/
8787
protected $_request;
8888

89-
/**
90-
* Rate result data
91-
*
92-
* @var Result
93-
*/
94-
protected $_result;
95-
9689
/**
9790
* @var float
9891
*/

app/code/Magento/Usps/Model/Carrier.php

-7
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
9393
*/
9494
protected $_request = null;
9595

96-
/**
97-
* Rate result data
98-
*
99-
* @var Result|null
100-
*/
101-
protected $_result = null;
102-
10396
/**
10497
* Default cgi gateway url
10598
*

pub/errors/processor.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,21 @@ class Processor
110110
*/
111111
public $reportUrl;
112112

113+
/**
114+
* @var string
115+
*/
116+
public $_reportDir;
117+
118+
/**
119+
* @var string
120+
*/
121+
public $_indexDir;
122+
123+
/**
124+
* @var string
125+
*/
126+
public $_errorDir;
127+
113128
/**
114129
* Server script name
115130
*
@@ -155,21 +170,6 @@ class Processor
155170
*/
156171
private $documentRoot;
157172

158-
/**
159-
* @var string
160-
*/
161-
private $_errorDir;
162-
163-
/**
164-
* @var string
165-
*/
166-
private $_reportDir;
167-
168-
/**
169-
* @var string
170-
*/
171-
private $_indexDir;
172-
173173
/**
174174
* @param Http $response
175175
* @param Json $serializer

0 commit comments

Comments
 (0)