Skip to content

Commit ec5598b

Browse files
author
He, Joan(johe)
committed
Merge pull request #56 from magento-extensibility/develop
[Extensibility] bug fixes
2 parents 550f10e + c9b1de3 commit ec5598b

File tree

173 files changed

+1717
-857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+1717
-857
lines changed

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/SuccessTest.php‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎app/code/Magento/Backend/Block/Page/Locale.php‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,18 @@
5353
<block class="Magento\Framework\View\Element\Template" name="page.actions.toolbar" template="Magento_Backend::pageactions.phtml" after="-"/>
5454
</referenceContainer>
5555
<referenceContainer name="footer">
56-
<block class="Magento\Backend\Block\Page\Locale" name="locale.switcher" template="Magento_Backend::page/locale.phtml"/>
57-
<container name="legal" htmlTag="div" htmlClass="footer-legal col-m-6 col-m-offset-1">
58-
<block class="Magento\Backend\Block\Page\Footer" name="version" as="version" />
59-
<block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright" />
60-
<block class="Magento\Framework\View\Element\Template" name="report" as="report" template="Magento_Backend::page/report.phtml">
61-
<arguments>
62-
<argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
63-
</arguments>
64-
</block>
56+
<container name="legal" htmlTag="div" htmlClass="footer-legal">
57+
<container name="legal.copyright" htmlTag="p" htmlClass="copyright col-m-6">
58+
<block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright" />
59+
</container>
60+
<container name="legal.system" htmlTag="div" htmlClass="footer-legal-system col-m-6">
61+
<block class="Magento\Backend\Block\Page\Footer" name="version" as="version" />
62+
<block class="Magento\Framework\View\Element\Template" name="report" as="report" template="Magento_Backend::page/report.phtml">
63+
<arguments>
64+
<argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
65+
</arguments>
66+
</block>
67+
</container>
6568
</container>
6669
</referenceContainer>
6770
<referenceContainer name="backend.page">

‎app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<p class="copyright">
11-
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
12-
<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>
13-
</p>
10+
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
11+
<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>

‎app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎app/code/Magento/Backup/Model/Config/Backend/Cron.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class Cron extends \Magento\Framework\App\Config\Value
3232
* @param \Magento\Framework\Model\Context $context
3333
* @param \Magento\Framework\Registry $registry
3434
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
35+
* @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
3536
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3637
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
3738
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
@@ -42,6 +43,7 @@ public function __construct(
4243
\Magento\Framework\Model\Context $context,
4344
\Magento\Framework\Registry $registry,
4445
\Magento\Framework\App\Config\ScopeConfigInterface $config,
46+
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
4547
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
4648
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
4749
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
@@ -50,13 +52,13 @@ public function __construct(
5052
) {
5153
$this->_runModelPath = $runModelPath;
5254
$this->_configValueFactory = $configValueFactory;
53-
parent::__construct($context, $registry, $config, $resource, $resourceCollection, $data);
55+
parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
5456
}
5557

5658
/**
5759
* Cron settings after save
5860
*
59-
* @return void
61+
* @return $this
6062
* @throws \Magento\Framework\Exception\LocalizedException
6163
*/
6264
public function afterSave()
@@ -102,5 +104,6 @@ public function afterSave()
102104
} catch (\Exception $e) {
103105
throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t save the Cron expression.'));
104106
}
107+
return parent::afterSave();
105108
}
106109
}

‎app/code/Magento/Braintree/Model/System/Config/Backend/Countrycreditcard.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class Countrycreditcard extends \Magento\Framework\App\Config\Value
1616
* @param \Magento\Framework\Model\Context $context
1717
* @param \Magento\Framework\Registry $registry
1818
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
19+
* @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
1920
* @param \Magento\Framework\Math\Random $mathRandom
2021
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
2122
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
@@ -25,13 +26,14 @@ public function __construct(
2526
\Magento\Framework\Model\Context $context,
2627
\Magento\Framework\Registry $registry,
2728
\Magento\Framework\App\Config\ScopeConfigInterface $config,
29+
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
2830
\Magento\Framework\Math\Random $mathRandom,
2931
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
3032
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
3133
array $data = []
3234
) {
3335
$this->mathRandom = $mathRandom;
34-
parent::__construct($context, $registry, $config, $resource, $resourceCollection, $data);
36+
parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
3537
}
3638

3739
/**

‎app/code/Magento/Bundle/Setup/InstallData.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
8686
'input' => '',
8787
'class' => '',
8888
'source' => '',
89-
'global' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_GLOBAL,
89+
'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
9090
'visible' => true,
9191
'required' => true,
9292
'user_defined' => false,
@@ -112,7 +112,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
112112
'input' => '',
113113
'class' => '',
114114
'source' => '',
115-
'global' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_GLOBAL,
115+
'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
116116
'visible' => false,
117117
'required' => true,
118118
'user_defined' => false,
@@ -137,7 +137,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
137137
'input' => '',
138138
'class' => '',
139139
'source' => '',
140-
'global' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_GLOBAL,
140+
'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
141141
'visible' => false,
142142
'required' => true,
143143
'user_defined' => false,
@@ -164,7 +164,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
164164
'input' => 'select',
165165
'class' => '',
166166
'source' => 'Magento\Bundle\Model\Product\Attribute\Source\Price\View',
167-
'global' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_GLOBAL,
167+
'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
168168
'visible' => true,
169169
'required' => true,
170170
'user_defined' => false,
@@ -190,7 +190,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
190190
'input' => '',
191191
'class' => '',
192192
'source' => '',
193-
'global' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_GLOBAL,
193+
'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
194194
'visible' => false,
195195
'required' => true,
196196
'user_defined' => false,

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,14 @@ protected function _prepareForm()
213213
}
214214

215215
$scopes = [
216-
\Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_STORE => __('Store View'),
217-
\Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_WEBSITE => __('Website'),
218-
\Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_GLOBAL => __('Global'),
216+
\Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE => __('Store View'),
217+
\Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE => __('Website'),
218+
\Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL => __('Global'),
219219
];
220220

221221
if ($attributeObject->getAttributeCode() == 'status' || $attributeObject->getAttributeCode() == 'tax_class_id'
222222
) {
223-
unset($scopes[\Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_STORE]);
223+
unset($scopes[\Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE]);
224224
}
225225

226226
$fieldset->addField(

0 commit comments

Comments
 (0)