Msi/source management ui

.gitignore

@@ -66,3 +66,4 @@ atlassian*
 !/vendor/.htaccess
 /generated/*
 !/generated/.htaccess
+.DS_Store

.travis.yml

@@ -22,19 +22,22 @@ env:
  - MAGENTO_HOST_NAME="magento2.travis"
  matrix:
  - TEST_SUITE=unit
+ - TEST_SUITE=static
+ - TEST_SUITE=js GRUNT_COMMAND=spec
+ - TEST_SUITE=js GRUNT_COMMAND=static
  - TEST_SUITE=integration INTEGRATION_INDEX=1
  - TEST_SUITE=integration INTEGRATION_INDEX=2
  - TEST_SUITE=integration INTEGRATION_INDEX=3
- - TEST_SUITE=static
- - TEST_SUITE=js
  - TEST_SUITE=functional ACCEPTANCE_INDEX=1
  - TEST_SUITE=functional ACCEPTANCE_INDEX=2
 matrix:
  exclude:
  - php: 7.0
  env: TEST_SUITE=static
  - php: 7.0
- env: TEST_SUITE=js
+ env: TEST_SUITE=js GRUNT_COMMAND=spec
+ - php: 7.0
+ env: TEST_SUITE=js GRUNT_COMMAND=static
  - php: 7.0
  env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
  - php: 7.0
@@ -49,4 +52,11 @@ cache:
 before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh
-script: ./dev/travis/script.sh
+script:
+ # Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
+ - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
+ - test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
+
+ # The scripts for grunt/phpunit type tests
+ - if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
+ - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi

CONTRIBUTING.md

@@ -29,3 +29,8 @@ If you are a new GitHub user, we recommend that you create your own [free github
 3. Create and test your work.
 4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
+
+## Code of Conduct
+
+Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
+The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).

app/code/Magento/Backend/Ui/Component/Control/SaveSplitButton.php

@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Ui\Component\Control;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\Ui\Component\Control\Container;
+
+/**
+ * @api
+ */
+class SaveSplitButton implements ButtonProviderInterface
+{
+ /**
+ * @var string
+ */
+ private $saveTarget;
+
+ /**
+ * @param string $saveTarget
+ */
+ public function __construct($saveTarget)
+ {
+ $this->saveTarget = $saveTarget;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getButtonData()
+ {
+ return [
+ 'label' => __('Save &amp; Continue'),
+ 'class' => 'save primary',
+ 'data_attribute' => [
+ 'mage-init' => [
+ 'buttonAdapter' => [
+ 'actions' => [
+ [
+ 'targetName' => $this->saveTarget,
+ 'actionName' => 'save',
+ 'params' => [
+ // first param is redirect flag
+ false,
+ ]
+ ]
+ ]
+ ]
+ ]
+ ],
+ 'class_name' => Container::SPLIT_BUTTON,
+ 'options' => $this->getOptions(),
+ 'sort_order' => 40,
+ ];
+ }
+
+ /**
+ * @return array
+ */
+ private function getOptions()
+ {
+ $options = [
+ [
+ 'label' => __('Save &amp; Close'),
+ 'data_attribute' => [
+ 'mage-init' => [
+ 'buttonAdapter' => [
+ 'actions' => [
+ [
+ 'targetName' => $this->saveTarget,
+ 'actionName' => 'save',
+ 'params' => [
+ // first param is redirect flag
+ true,
+ ],
+ ],
+ ],
+ ],
+ ],
+ ],
+ 'sort_order' => 10,
+ ],
+ [
+ 'label' => __('Save &amp; New'),
+ 'data_attribute' => [
+ 'mage-init' => [
+ 'buttonAdapter' => [
+ 'actions' => [
+ [
+ 'targetName' => $this->saveTarget,
+ 'actionName' => 'save',
+ 'params' => [
+ // first param is redirect flag, second is data that will be added to post
+ // request
+ true,
+ [
+ 'redirect_to_new' => 1,
+ ],
+ ],
+ ],
+ ],
+ ],
+ ],
+ ],
+ 'sort_order' => 20,
+ ],
+ ];
+ return $options;
+ }
+}

app/code/Magento/Backend/Ui/Component/Listing/Column/EditAction.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Ui\Component\Listing\Column;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
+
+/**
+ * @api
+ */
+class EditAction extends Column
+{
+ /**
+ * @var UrlInterface
+ */
+ private $urlBuilder;
+
+ /**
+ * @param ContextInterface $context
+ * @param UiComponentFactory $uiComponentFactory
+ * @param UrlInterface $urlBuilder
+ * @param array $components
+ * @param array $data
+ */
+ public function __construct(
+ ContextInterface $context,
+ UiComponentFactory $uiComponentFactory,
+ UrlInterface $urlBuilder,
+ array $components = [],
+ array $data = []
+ ) {
+ $this->urlBuilder = $urlBuilder;
+ parent::__construct($context, $uiComponentFactory, $components, $data);
+ }
+
+ /**
+ * @param array $dataSource
+ * @return array
+ */
+ public function prepareDataSource(array $dataSource)
+ {
+ if (isset($dataSource['data']['items'])) {
+ foreach ($dataSource['data']['items'] as &$item) {
+ if (isset($item[$item['id_field_name']])) {
+ $editUrlPath = $this->getData('config/editUrlPath') ?: '#';
+ $item[$this->getData('name')] = [
+ 'edit' => [
+ 'href' => $this->urlBuilder->getUrl($editUrlPath, [
+ $item['id_field_name'] => $item[$item['id_field_name']],
+ ]),
+ 'label' => __('Edit')
+ ]
+ ];
+ unset($item);
+ }
+ }
+ }
+ return $dataSource;
+ }
+}

app/code/Magento/Backend/composer.json

@@ -18,6 +18,7 @@
  "magento/module-translation": "100.2.*",
  "magento/module-require-js": "100.2.*",
  "magento/module-config": "100.2.*",
+ "magento/module-ui": "100.2.*",
  "magento/framework": "100.2.*"
  },
  "suggest": {

app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml

@@ -43,7 +43,7 @@
  data-validate="{required:true}"
  value=""
  placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>"
- autocomplete="off"
+ autocomplete="new-password"
  />
  </div>
  </div>

app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml

@@ -73,7 +73,7 @@
  <fieldset class="admin__fieldset password-box-container">
  <div class="admin__field field _required">
  <label for="password" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('User Password')?></span></label>
- <div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="off"></div>
+ <div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="new-password"></div>
  </div>
 
  <div class="admin__field field maintenance-checkbox-container">
@@ -119,7 +119,7 @@
  <span><?php /* @escapeNotVerified */ echo __('FTP Password') ?></span>
  </label>
  <div class="admin__field-control">
- <input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="off">
+ <input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="new-password">
  </div>
  </div>
  <div class="admin__field field">

app/code/Magento/Braintree/Block/Paypal/Button.php

@@ -5,13 +5,13 @@
  */
 namespace Magento\Braintree\Block\Paypal;
 
-use Magento\Checkout\Model\Session;
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Ui\ConfigProvider;
 use Magento\Catalog\Block\ShortcutInterface;
-use Magento\Framework\View\Element\Template;
+use Magento\Checkout\Model\Session;
 use Magento\Framework\Locale\ResolverInterface;
-use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Payment\Model\MethodInterface;
 
 /**
@@ -110,7 +110,7 @@ public function getContainerId()
  */
  public function getLocale()
  {
- return strtolower($this->localeResolver->getLocale());
+ return $this->localeResolver->getLocale();
  }
 
  /**

app/code/Magento/Braintree/Model/LocaleResolver.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model;
+
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+
+class LocaleResolver implements ResolverInterface
+{
+ /**
+ * @var ResolverInterface
+ */
+ private $resolver;
+
+ /**
+ * @var Config
+ */
+ private $config;
+
+ /**
+ * @param ResolverInterface $resolver
+ * @param Config $config
+ */
+ public function __construct(ResolverInterface $resolver, Config $config)
+ {
+ $this->resolver = $resolver;
+ $this->config = $config;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getDefaultLocalePath()
+ {
+ return $this->resolver->getDefaultLocalePath();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setDefaultLocale($locale)
+ {
+ return $this->resolver->setDefaultLocale($locale);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getDefaultLocale()
+ {
+ return $this->resolver->getDefaultLocale();
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setLocale($locale = null)
+ {
+ return $this->resolver->setLocale($locale);
+ }
+
+ /**
+ * Gets store's locale or the `en_US` locale if store's locale does not supported by PayPal.
+ *
+ * @return string
+ */
+ public function getLocale()
+ {
+ $locale = $this->resolver->getLocale();
+ $allowedLocales = $this->config->getValue('supported_locales');
+
+ return strpos($allowedLocales, $locale) !== false ? $locale : 'en_US';
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function emulate($scopeId)
+ {
+ return $this->resolver->emulate($scopeId);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function revert()
+ {
+ return $this->resolver->revert();
+ }
+}

app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php

@@ -54,7 +54,7 @@ public function getConfig()
  'title' => $this->config->getTitle(),
  'isAllowShippingAddressOverride' => $this->config->isAllowToEditShippingAddress(),
  'merchantName' => $this->config->getMerchantName(),
- 'locale' => strtolower($this->resolver->getLocale()),
+ 'locale' => $this->resolver->getLocale(),
  'paymentAcceptanceMarkSrc' =>
  'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
  'vaultCode' => self::PAYPAL_VAULT_CODE,