Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 8ef4d4a

Browse files
author
Joan He
committed
MAGETWO-89260: Fix Travis build issues
- fix static test failure
1 parent 99526e7 commit 8ef4d4a

File tree

14 files changed

+186
-185
lines changed

14 files changed

+186
-185
lines changed

‎app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,9 @@ protected function setUp()
330330

331331
$this->mediaGalleryEntryFactoryMock =
332332
$this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory::class)
333-
->setMethods(['create'])
334-
->disableOriginalConstructor()
335-
->getMock();
333+
->setMethods(['create'])
334+
->disableOriginalConstructor()
335+
->getMock();
336336

337337
$this->metadataServiceMock = $this->createMock(\Magento\Catalog\Api\ProductAttributeRepositoryInterface::class);
338338
$this->attributeValueFactory = $this->getMockBuilder(\Magento\Framework\Api\AttributeValueFactory::class)
@@ -1171,19 +1171,19 @@ public function testSetMediaGalleryEntries()
11711171
];
11721172

11731173
$entryMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class)
1174-
->setMethods(
1175-
[
1176-
'getId',
1177-
'getFile',
1178-
'getLabel',
1179-
'getPosition',
1180-
'isDisabled',
1181-
'types',
1182-
'getContent',
1183-
'getMediaType'
1184-
]
1185-
)
1186-
->getMockForAbstractClass();
1174+
->setMethods(
1175+
[
1176+
'getId',
1177+
'getFile',
1178+
'getLabel',
1179+
'getPosition',
1180+
'isDisabled',
1181+
'types',
1182+
'getContent',
1183+
'getMediaType'
1184+
]
1185+
)
1186+
->getMockForAbstractClass();
11871187

11881188
$result = [
11891189
'value_id' => 1,

‎app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,33 @@ public function __construct(ComponentRegistrar $componentRegistrar)
5353
protected function configure()
5454
{
5555
$this->setName(self::COMMAND_NAME)
56-
->setDescription('Generate patch and put it in specific folder.')
57-
->setDefinition([
58-
new InputArgument(
59-
self::MODULE_NAME,
60-
InputArgument::REQUIRED,
61-
'Module name'
62-
),
63-
new InputArgument(
64-
self::INPUT_KEY_PATCH_NAME,
65-
InputArgument::REQUIRED,
66-
'Patch name'
67-
),
68-
new InputOption(
69-
self::INPUT_KEY_IS_REVERTABLE,
70-
null,
71-
InputOption::VALUE_OPTIONAL,
72-
'Check whether patch is revertable or not.',
73-
false
74-
),
75-
new InputOption(
76-
self::INPUT_KEY_PATCH_TYPE,
77-
null,
78-
InputOption::VALUE_OPTIONAL,
79-
'Find out what type of patch should be generated.',
80-
'data'
81-
),
82-
]);
56+
->setDescription('Generate patch and put it in specific folder.')
57+
->setDefinition([
58+
new InputArgument(
59+
self::MODULE_NAME,
60+
InputArgument::REQUIRED,
61+
'Module name'
62+
),
63+
new InputArgument(
64+
self::INPUT_KEY_PATCH_NAME,
65+
InputArgument::REQUIRED,
66+
'Patch name'
67+
),
68+
new InputOption(
69+
self::INPUT_KEY_IS_REVERTABLE,
70+
null,
71+
InputOption::VALUE_OPTIONAL,
72+
'Check whether patch is revertable or not.',
73+
false
74+
),
75+
new InputOption(
76+
self::INPUT_KEY_PATCH_TYPE,
77+
null,
78+
InputOption::VALUE_OPTIONAL,
79+
'Find out what type of patch should be generated.',
80+
'data'
81+
),
82+
]);
8383

8484
parent::configure();
8585
}

‎app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,21 @@ protected function configure()
4848
{
4949
$this->setName("newrelic:create:deploy-marker");
5050
$this->setDescription("Check the deploy queue for entries and create an appropriate deploy marker.")
51-
->addArgument(
52-
'message',
53-
InputArgument::REQUIRED,
54-
'Deploy Message?'
55-
)
56-
->addArgument(
57-
'change_log',
58-
InputArgument::REQUIRED,
59-
'Change Log?'
60-
)
61-
->addArgument(
62-
'user',
63-
InputArgument::OPTIONAL,
64-
'Deployment User'
65-
);
51+
->addArgument(
52+
'message',
53+
InputArgument::REQUIRED,
54+
'Deploy Message?'
55+
)
56+
->addArgument(
57+
'change_log',
58+
InputArgument::REQUIRED,
59+
'Change Log?'
60+
)
61+
->addArgument(
62+
'user',
63+
InputArgument::OPTIONAL,
64+
'Deployment User'
65+
);
6666
parent::configure();
6767
}
6868

‎app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@ public function testUpdateProductOptions(
6464
->method('getEvent')
6565
->will($this->returnValue($eventObject));
6666

67-
$objectManager = new ObjectManager($this);
68-
$taxObserverObject = $objectManager->getObject(
69-
\Magento\Tax\Observer\UpdateProductOptionsObserver::class,
70-
[
71-
'taxData' => $taxData,
72-
'registry' => $registry,
73-
]
74-
);
75-
76-
$taxObserverObject->execute($observerObject);
77-
78-
$this->assertEquals($expected, $frameworkObject->getAdditionalOptions());
67+
$objectManager = new ObjectManager($this);
68+
$taxObserverObject = $objectManager->getObject(
69+
\Magento\Tax\Observer\UpdateProductOptionsObserver::class,
70+
[
71+
'taxData' => $taxData,
72+
'registry' => $registry,
73+
]
74+
);
75+
76+
$taxObserverObject->execute($observerObject);
77+
78+
$this->assertEquals($expected, $frameworkObject->getAdditionalOptions());
7979
}
8080

8181
/**

‎app/code/Magento/Theme/Model/Design/Backend/File.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ public function beforeSave()
8989
$values = $this->getValue();
9090
$value = reset($values) ?: [];
9191
if (!isset($value['file'])) {
92-
throw new LocalizedException(
93-
__('%1 does not contain field \'file\'', $this->getData('field_config/field'))
94-
);
92+
throw new LocalizedException(
93+
__('%1 does not contain field \'file\'', $this->getData('field_config/field'))
94+
);
9595
}
9696
if (isset($value['exists'])) {
9797
$this->setValue($value['file']);

0 commit comments

Comments
 (0)