From 528864d82c4661dac997198d3cb542232fbf1037 Mon Sep 17 00:00:00 2001 From: Daniel Anderson Date: Sun, 3 Feb 2019 05:20:50 -0800 Subject: [PATCH 01/10] Direct STDERR output when listing crontab to /dev/null When installing crontab on systems using fcron the output from STDERR is captured and inserted into the updated crontab. An example from a fresh install follows. While fcron does not outright complain about this when saving the file, it is messy and quite avoidable. 2019-02-03 13:18:18 INFO listing magento's fcrontab #~ MAGENTO START 7cd0a74c421051ec6cce8936eb9edd02 * * * * * /usr/lib64/php7.2/bin/php /var/www/magento/bin/magento cron:run 2>&1 | grep -v "Ran jobs by schedule" >> /var/www/magento/var/log/magento.cron.log * * * * * /usr/lib64/php7.2/bin/php /var/www/magento/update/cron.php >> /var/www/magento/var/log/update.cron.log * * * * * /usr/lib64/php7.2/bin/php /var/www/magento/bin/magento setup:cron:run >> /var/www/magento/var/log/setup.cron.log #~ MAGENTO END 7cd0a74c421051ec6cce8936eb9edd02 --- lib/internal/Magento/Framework/Crontab/CrontabManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Crontab/CrontabManager.php b/lib/internal/Magento/Framework/Crontab/CrontabManager.php index 6049b7fba6d44..37ced978c5567 100644 --- a/lib/internal/Magento/Framework/Crontab/CrontabManager.php +++ b/lib/internal/Magento/Framework/Crontab/CrontabManager.php @@ -182,7 +182,7 @@ private function cleanMagentoSection($content) private function getCrontabContent() { try { - $content = (string)$this->shell->execute('crontab -l'); + $content = (string)$this->shell->execute('crontab -l 2>/dev/null'); } catch (LocalizedException $e) { return ''; } From 1651f9080e57a7aa9763d84c6b31a29c610d74a1 Mon Sep 17 00:00:00 2001 From: Yogesh Suhagiya Date: Wed, 6 Feb 2019 18:11:11 +0530 Subject: [PATCH 02/10] Corrected the translation for comment tag --- .../system/paypal_payflowpro_with_express_checkout.xml | 4 ++-- app/code/Magento/Paypal/i18n/en_US.csv | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml index 6090025024dd7..3e9de03b854c1 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml @@ -6,7 +6,7 @@ */ --> - + 0 @@ -30,7 +30,7 @@ - + See Details. " +"PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit® - at no additional cost to you. + You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit®. + Learn More","PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit® - at no additional cost to you. + You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit®. + Learn More" \ No newline at end of file From 23a5f01eb54801afcb16f09bf4589c112790a1a7 Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Fri, 1 Mar 2019 08:45:40 +0200 Subject: [PATCH 03/10] magento/magento2#20951 Direct STDERR output when listing crontab to /dev/null Fix unit test failures --- .../Framework/Crontab/Test/Unit/CrontabManagerTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php index b160eb0a7f95e..b07703d2bd0ba 100644 --- a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php +++ b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php @@ -58,7 +58,7 @@ public function testGetTasksNoCrontab() $this->shellMock->expects($this->once()) ->method('execute') - ->with('crontab -l', []) + ->with('crontab -l 2>/dev/null', []) ->willThrowException($localizedException); $this->assertEquals([], $this->crontabManager->getTasks()); @@ -74,7 +74,7 @@ public function testGetTasks($content, $tasks) { $this->shellMock->expects($this->once()) ->method('execute') - ->with('crontab -l', []) + ->with('crontab -l 2>/dev/null', []) ->willReturn($content); $this->assertEquals($tasks, $this->crontabManager->getTasks()); @@ -127,7 +127,7 @@ public function testRemoveTasksWithException() $this->shellMock->expects($this->at(0)) ->method('execute') - ->with('crontab -l', []) + ->with('crontab -l 2>/dev/null', []) ->willReturn(''); $this->shellMock->expects($this->at(1)) @@ -148,7 +148,7 @@ public function testRemoveTasks($contentBefore, $contentAfter) { $this->shellMock->expects($this->at(0)) ->method('execute') - ->with('crontab -l', []) + ->with('crontab -l 2>/dev/null', []) ->willReturn($contentBefore); $this->shellMock->expects($this->at(1)) @@ -276,7 +276,7 @@ public function testSaveTasks($tasks, $content, $contentToSave) $this->shellMock->expects($this->at(0)) ->method('execute') - ->with('crontab -l', []) + ->with('crontab -l 2>/dev/null', []) ->willReturn($content); $this->shellMock->expects($this->at(1)) From eb95a3ffa41efa9739d39e9a8309b69ad1e91878 Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Tue, 19 Mar 2019 13:24:16 +0200 Subject: [PATCH 04/10] Reader integration test refactor. Dependency on actual config removed. --- .../Config/Structure/Reader/ConverterStub.php | 14 +- .../Config/Structure/Reader/ReaderStub.php | 12 +- .../Config/Structure/Reader/ReaderTest.php | 146 + .../Structure/Reader/_files}/config.xml | 0 .../Config/Structure/Reader/ReaderTest.php | 135 - .../Reader/_files/expected/config.xml | 2626 ----------------- 6 files changed, 165 insertions(+), 2768 deletions(-) rename dev/tests/integration/testsuite/Magento/{Paypal => Config}/Model/Config/Structure/Reader/ConverterStub.php (63%) rename dev/tests/integration/testsuite/Magento/{Paypal => Config}/Model/Config/Structure/Reader/ReaderStub.php (53%) create mode 100644 dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php rename dev/tests/integration/testsuite/Magento/{Paypal/Model/Config/Structure/Reader/_files/actual => Config/Model/Config/Structure/Reader/_files}/config.xml (100%) delete mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php delete mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php similarity index 63% rename from dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php index 223ef35c0dcd3..7493d31f02b31 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php +++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php @@ -3,14 +3,20 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Paypal\Model\Config\Structure\Reader; +declare(strict_types=1); + +namespace Magento\Config\Model\Config\Structure\Reader; + +use Magento\Config\Model\Config\Structure\Converter; /** - * Class ConverterStub + * Class ConverterStub used for ReaderTest. */ -class ConverterStub extends \Magento\Config\Model\Config\Structure\Converter +class ConverterStub extends Converter { /** + * Convert dom document wrapper. + * * @param \DOMDocument $document * @return array|null */ @@ -20,7 +26,7 @@ public function getArrayData(\DOMDocument $document) } /** - * Convert dom document + * Convert dom document. * * @param \DOMNode $source * @return array diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php similarity index 53% rename from dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php index ed1366ad737f9..866ff91678ec4 100644 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php +++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php @@ -3,14 +3,20 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Paypal\Model\Config\Structure\Reader; +declare(strict_types=1); + +namespace Magento\Config\Model\Config\Structure\Reader; + +use Magento\Config\Model\Config\Structure\Reader; /** - * Class ReaderStub + * Class ReaderStub used for testing protected Reader::_readFiles() method. */ -class ReaderStub extends \Magento\Config\Model\Config\Structure\Reader +class ReaderStub extends Reader { /** + * Wrapper for protected Reader::_readFiles() method. + * * @param array $fileList * @return array * @throws \Magento\Framework\Exception\LocalizedException diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php new file mode 100644 index 0000000000000..eef8e68458d91 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php @@ -0,0 +1,146 @@ +objectManager = Bootstrap::getObjectManager(); + $this->fileUtility = Files::init(); + + $this->validationStateMock = $this->getMockBuilder(ValidationStateInterface::class) + ->setMethods(['isValidationRequired']) + ->getMockForAbstractClass(); + $this->schemaLocatorMock = $this->getMockBuilder(SchemaLocator::class) + ->disableOriginalConstructor() + ->setMethods(['getPerFileSchema']) + ->getMock(); + $this->fileResolverMock = $this->getMockBuilder(FileResolverInterface::class) + ->getMockForAbstractClass(); + + $this->validationStateMock->expects($this->atLeastOnce()) + ->method('isValidationRequired') + ->willReturn(false); + $this->schemaLocatorMock->expects($this->atLeastOnce()) + ->method('getPerFileSchema') + ->willReturn(false); + + $this->converter = $this->objectManager->create(ConverterStub::class); + + //Isolate test from actual configuration, and leave only sample data. + $this->compiler = $this->getMockBuilder(CompilerInterface::class) + ->disableOriginalConstructor() + ->setMethods(['compile']) + ->getMockForAbstractClass(); + + $this->reader = $this->objectManager->create( + ReaderStub::class, + [ + 'fileResolver' => $this->fileResolverMock, + 'converter' => $this->converter, + 'schemaLocator' => $this->schemaLocatorMock, + 'validationState' => $this->validationStateMock, + 'fileName' => 'no_existing_file.xml', + 'compiler' => $this->compiler, + 'domDocumentClass' => Dom::class + ] + ); + } + + /** + * The test checks the file structure after processing the nodes responsible for inserting content. + * + * @return void + */ + public function testXmlConvertedConfigurationAndCompereStructure() + { + $actual = $this->reader->readFiles(['actual' => $this->getContent()]); + + $document = new \DOMDocument(); + $document->loadXML($this->getContent()); + + $expected = $this->converter->getArrayData($document); + + $this->assertEquals($expected, $actual); + } + + /** + * Get config sample data for test. + * + * @return string + */ + protected function getContent() + { + $files = $this->fileUtility->getFiles([BP . static::CONFIG], 'config.xml'); + + return file_get_contents(reset($files)); + } +} diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml similarity index 100% rename from dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php deleted file mode 100644 index 6b966a045c982..0000000000000 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php +++ /dev/null @@ -1,135 +0,0 @@ -objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); - $this->fileUtility = \Magento\Framework\App\Utility\Files::init(); - - $this->validationStateMock = $this->getMockBuilder(\Magento\Framework\Config\ValidationStateInterface::class) - ->setMethods(['isValidationRequired']) - ->getMockForAbstractClass(); - $this->schemaLocatorMock = $this->getMockBuilder(\Magento\Config\Model\Config\SchemaLocator::class) - ->disableOriginalConstructor() - ->setMethods(['getPerFileSchema']) - ->getMock(); - $this->fileResolverMock = $this->getMockBuilder(\Magento\Framework\Config\FileResolverInterface::class) - ->getMockForAbstractClass(); - - $this->validationStateMock->expects($this->atLeastOnce()) - ->method('isValidationRequired') - ->willReturn(false); - $this->schemaLocatorMock->expects($this->atLeastOnce()) - ->method('getPerFileSchema') - ->willReturn(false); - - /** @var \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub $converter */ - $this->converter = $this->objectManager->create( - \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub::class - ); - - $this->reader = $this->objectManager->create( - \Magento\Paypal\Model\Config\Structure\Reader\ReaderStub::class, - [ - 'fileResolver' => $this->fileResolverMock, - 'converter' => $this->converter, - 'schemaLocator' => $this->schemaLocatorMock, - 'validationState' => $this->validationStateMock, - 'fileName' => 'no_existing_file.xml', - 'domDocumentClass' => \Magento\Framework\Config\Dom::class - ] - ); - } - - /** - * The test checks the file structure after processing the nodes responsible for inserting content - * - * @return void - */ - public function testXmlConvertedConfigurationAndCompereStructure() - { - $actual = $this->reader->readFiles(['actual' => $this->getActualContent()]); - - $document = new \DOMDocument(); - $document->loadXML($this->getExpectedContent()); - - $expected = $this->converter->getArrayData($document); - - $this->assertEquals($expected, $actual); - } - - /** - * @return string - */ - protected function getActualContent() - { - $files = $this->fileUtility->getFiles([BP . static::ACTUAL], 'config.xml'); - - return file_get_contents(reset($files)); - } - - /** - * @return string - */ - protected function getExpectedContent() - { - $files = $this->fileUtility->getFiles([BP . static::EXPECTED], 'config.xml'); - - return file_get_contents(reset($files)); - } -} diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml deleted file mode 100644 index 222b9974177de..0000000000000 --- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml +++ /dev/null @@ -1,2626 +0,0 @@ - - - - -
- - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - If not specified, Default Country from General Config will be used - Magento\Paypal\Block\Adminhtml\System\Config\Field\Country - Magento\Paypal\Model\System\Config\Source\MerchantCountry - Magento\Paypal\Model\System\Config\Backend\MerchantCountry - paypal/general/merchant_country - - - - - paypal-top-section paypal-recommended-header - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - - paypal-top-section paypal-other-header - \Magento\Config\Block\System\Config\Form\Fieldset - - - - paypal-top-section payments-other-header - \Magento\Config\Block\System\Config\Form\Fieldset - -
-
- - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - paypal-other-section - Includes Express Checkout)]]> - payment/payflowpro/active - 1 - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - payment/payflowpro/partner - 1 - - - - payment/payflowpro/user - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - payment/payflowpro/vendor - 1 - - - - payment/payflowpro/pwd - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - payment/payflowpro/sandbox_flag - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflowpro/use_proxy - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflowpro/proxy_host - - 1 - - 1 - - - - payment/payflowpro/proxy_port - - 1 - - 1 - - - - - payment/payflowpro/active - Magento\Config\Model\Config\Source\Yesno - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment - - - - - - - Magento\Config\Model\Config\Source\Yesno - payment/payflowpro_cc_vault/active - 1 - - - - - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - It is recommended to set this value to "Debit or Credit Card" per store views. - payment/payflowpro/title - 1 - - - - payment/payflowpro_cc_vault/title - - - - payment/payflowpro/sort_order - validate-number - 1 - - - - payment/payflowpro/payment_action - Magento\Paypal\Model\System\Config\Source\PaymentActions - 1 - - - - Magento\Config\Block\System\Config\Form\Field\Heading - 1 - - - - - http://www.paypal.com/amexupdate.]]> - - payment/payflowpro/cctypes - Magento\Paypal\Model\Config::getPayflowproCcTypesAsOptionArray - 1 - - - - config-advanced - - - payment/payflowpro/allowspecific - Magento\Payment\Model\Config\Source\Allspecificcountries - 1 - - - - payment/payflowpro/specificcountry - Magento\Paypal\Model\System\Config\Source\BuyerCountry - - 1 - - 1 - - - - payment/payflowpro/debug - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflowpro/verify_peer - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflowpro/useccv - Magento\Config\Model\Config\Source\Yesno - 1 - - - - - - Magento\Config\Block\System\Config\Form\Field\Heading - 1 - - - - payment/payflowpro/avs_street - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflowpro/avs_zip - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflowpro/avs_international - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflowpro/avs_security_code - Magento\Config\Model\Config\Source\Yesno - 0 - - - - - - - - - - - - - - - - - - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - paypal-other-section - Includes Express Checkout)]]> - payment/payflow_link/active - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - not-required - - 1 - - - - payment/payflow_link/partner - 1 - - - - payment/payflow_link/vendor - 1 - - - - If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here. - payment/payflow_link/user - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - payment/payflow_link/pwd - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - payment/payflow_link/sandbox_flag - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_link/use_proxy - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_link/proxy_host - - 1 - - 1 - - - - payment/payflow_link/proxy_port - - 1 - - 1 - - - Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info - 1 - - - - - - - - payment/payflow_link/active - Magento\Config\Model\Config\Source\Yesno - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment - - - - - - - payment/payflow_express/active - Magento\Config\Model\Config\Source\Yesno - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Express - - - - - - - - Learn More]]> - - payment/payflow_express_bml/active - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml - - - - - - payment/payflow_express_bml/sort_order - Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder - - 1 - - - - - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from PayPal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise PayPal Credit® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> -
- - - - - - - - - payment/paypal_express_bml/homepage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS - - 1 - - - - - - - - - - payment/paypal_express_bml/categorypage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS - - 1 - - - - - - - - - - payment/paypal_express_bml/productpage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN - - 1 - - - - - - - - - - payment/paypal_express_bml/checkout_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN - 1 - - 1 - - - -
-
- - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - It is recommended to set this value to "Debit or Credit Card" per store views. - payment/payflow_link/title - 1 - - - - payment/payflow_link/sort_order - validate-number - 1 - - - - payment/payflow_link/payment_action - Magento\Paypal\Model\System\Config\Source\PaymentActions - 1 - - - - config-advanced - - - payment/payflow_link/allowspecific - Magento\Payment\Model\Config\Source\Allspecificcountries - 1 - - - - payment/payflow_link/specificcountry - Magento\Paypal\Model\System\Config\Source\BuyerCountry - - 1 - - 1 - - - - payment/payflow_link/debug - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_link/verify_peer - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_link/csc_editable - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_link/csc_required - Magento\Config\Model\Config\Source\Yesno - - 1 - - 1 - - - - payment/payflow_link/email_confirmation - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_link/url_method - Magento\Paypal\Model\System\Config\Source\UrlMethod - 1 - - - - - - - - - - - - - - - - - - - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - - - - - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - paypal-other-section - Add PayPal as an additional payment method to your checkout page. - payment/paypal_express/active - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - not-required - - Start accepting payments via PayPal!]]> - - Don't have a PayPal account? Simply enter your email address. - paypal/general/business_account - validate-email - 1 - - - - paypal/wpp/api_authentication - Magento\Paypal\Model\Config::getApiAuthenticationMethods - 1 - - - - paypal/wpp/api_username - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - paypal/wpp/api_password - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - paypal/wpp/api_signature - Magento\Config\Model\Config\Backend\Encrypted - 1 - - 0 - - - - - paypal/wpp/api_cert - Magento\Paypal\Model\System\Config\Backend\Cert - 1 - - 1 - - - - - Get Credentials from PayPal - - - - - Sandbox Credentials - - - - - - NB9WWHYEMVUMS - - Magento_Backend/web/images/logo-magento.png - - FALSE - - FALSE - - embedded - - pp_express - - Magento\Paypal\Block\Adminhtml\System\Config\ApiWizard - 1 - - - - paypal/wpp/sandbox_flag - Magento\Config\Model\Config\Source\Yesno - 1 - - - - paypal/wpp/use_proxy - Magento\Config\Model\Config\Source\Yesno - 1 - - - - paypal/wpp/proxy_host - 1 - - 1 - - - - - paypal/wpp/proxy_port - 1 - - 1 - - - - - - payment/paypal_express/active - Magento\Config\Model\Config\Source\Yesno - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment - - - - - - - - here.]]> - - payment/paypal_express/in_context - Magento\Config\Model\Config\Source\Yesno - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\InContextApi - - - - - - - You can look up your merchant ID by logging into https://www.paypal.com/. Click the profile icon on the top right side of the page and then select Profile and settings in the Business Profile menu. (If you do not see the profile icon at the top of the page, click Profile, which appears in the top menu when the My Account tab is selected.) Click My business info on the left, and the Merchant account ID is displayed in the list of profile items on the right. - payment/paypal_express/merchant_id - Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\MerchantId - - 1 - - required-entry - - - - Learn More]]> - - payment/paypal_express_bml/active - Magento\Config\Model\Config\Source\Yesno - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\BmlApi - - - - - - - payment/paypal_express_bml/sort_order - validate-number - 1 - Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlApiSortOrder - - 1 - - - - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - It is recommended to set this value to "PayPal" per store views. - payment/paypal_express/title - 1 - - - - payment/paypal_express/sort_order - validate-number - 1 - - - - payment/paypal_express/payment_action - Magento\Paypal\Model\System\Config\Source\PaymentActions\Express - 1 - - - - payment/paypal_express/visible_on_product - Magento\Config\Model\Config\Source\Yesno - 1 - - - - Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal. - payment/paypal_express/authorization_honor_period - 1 - - Order - - - - - Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal. - payment/paypal_express/order_valid_period - 1 - - Order - - - - - The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase. - payment/paypal_express/child_authorization_number - 1 - - Order - - - - - config-advanced - - - payment/paypal_express/visible_on_cart - Also affects mini-shopping cart. - Magento\Paypal\Model\System\Config\Source\Yesnoshortcut - 1 - - - - payment/paypal_express/allowspecific - Magento\Payment\Model\Config\Source\Allspecificcountries - 1 - - - - payment/paypal_express/specificcountry - Magento\Paypal\Model\System\Config\Source\BuyerCountry - 1 - - 1 - - - - - payment/paypal_express/debug - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/paypal_express/verify_peer - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/paypal_express/line_items_enabled - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/paypal_express/transfer_shipping_options - If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only. - Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available. - Magento\Config\Model\Config\Source\Yesno - 1 - - 1 - - - - - paypal/wpp/button_flavor - Magento\Paypal\Model\Config::getExpressCheckoutButtonFlavors - 1 - - - - Ability for buyer to purchase without PayPal account. - payment/paypal_express/solution_type - Magento\Paypal\Model\Config::getExpressCheckoutSolutionTypes - 1 - - - - This feature needs be enabled first for the merchant account through PayPal technical support. - payment/paypal_express/require_billing_address - Magento\Paypal\Model\System\Config\Source\RequireBillingAddress - 1 - - - - Whether to create a billing agreement, if there are no active billing agreements available. - - - - payment/paypal_express/allow_ba_signup - Magento\Paypal\Model\Config::getExpressCheckoutBASignupOptions - 1 - - - - payment/paypal_express/skip_order_review_step - Magento\Config\Model\Config\Source\Yesno - 1 - - - - - - - - - payment/paypal_billing_agreement/active - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/paypal_billing_agreement/title - 1 - - - - payment/paypal_billing_agreement/sort_order - validate-number - 1 - - - - payment/paypal_billing_agreement/payment_action - Magento\Paypal\Model\System\Config\Source\PaymentActions - 1 - - - - payment/paypal_billing_agreement/allowspecific - Magento\Payment\Model\Config\Source\Allspecificcountries - 1 - - - - payment/paypal_billing_agreement/specificcountry - Magento\Paypal\Model\System\Config\Source\BuyerCountry - 1 - - 1 - - - - - payment/paypal_billing_agreement/debug - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/paypal_billing_agreement/verify_peer - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/paypal_billing_agreement/line_items_enabled - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/paypal_billing_agreement/allow_billing_agreement_wizard - Magento\Config\Model\Config\Source\Yesno - 1 - - - - - - - Magento\Config\Block\System\Config\Form\Field\Heading - 1 - - - - paypal/fetch_reports/ftp_login - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - paypal/fetch_reports/ftp_password - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - paypal/fetch_reports/ftp_sandbox - Magento\Config\Model\Config\Source\Yesno - 1 - - - - By default it is "reports.paypal.com". - Use colon to specify port. For example: "test.example.com:5224". - paypal/fetch_reports/ftp_ip - 1 - - 0 - - - - - By default it is "/ppreports/outgoing". - paypal/fetch_reports/ftp_path - 1 - - 0 - - - - - Magento\Config\Block\System\Config\Form\Field\Heading - 1 - - - - paypal/fetch_reports/active - Magento\Config\Model\Config\Source\Yesno - 1 - - - - PayPal retains reports for 45 days. - paypal/fetch_reports/schedule - Magento\Paypal\Model\System\Config\Source\FetchingSchedule - 1 - - - - paypal/fetch_reports/time - 1 - - - - - - - - Magento\Config\Block\System\Config\Form\Field\Heading - 1 - - - - paypal/style/page_style - - - - 1 - - - - paypal/style/paypal_hdrimg - - https is highly encouraged.]]> - - 1 - - - - paypal/style/paypal_hdrbackcolor - - - - 1 - - - - paypal/style/paypal_hdrbordercolor - 2-pixel perimeter around the header space. - 1 - - - - paypal/style/paypal_payflowcolor - - - - 1 - - - - Magento\Config\Block\System\Config\Form\Field\Heading - 1 - - - - - - paypal/style/checkout_page_button_customize - Magento\Config\Model\Config\Source\Yesno - 1 - - - - - paypal/style/checkout_page_button_label - Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\ButtonStylesLabel - Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel - - 1 - - 1 - - - - paypal/style/checkout_page_button_mx_installment_period - Magento\Paypal\Model\System\Config\Source\ButtonStyles::getMxInstallmentPeriod - - 1 - installment - - 1 - - - - paypal/style/checkout_page_button_br_installment_period - Magento\Paypal\Model\System\Config\Source\ButtonStyles::getBrInstallmentPeriod - - 1 - installment - - 1 - - - - paypal/style/checkout_page_button_layout - Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLayout - - 1 - credit - - 1 - - - - paypal/style/checkout_page_button_size - Magento\Paypal\Model\System\Config\Source\ButtonStyles::getSize - Select Responsive to ensure the PayPal button renders correctly on mobile devices. - - 1 - - 1 - - - - paypal/style/checkout_page_button_shape - Magento\Paypal\Model\System\Config\Source\ButtonStyles::getShape - - 1 - - 1 - - - - paypal/style/checkout_page_button_color - Magento\Paypal\Model\System\Config\Source\ButtonStyles::getColor - - 1 - credit - - 1 - - - - - - paypal/style/product_page_button_customize - - - paypal/style/product_page_button_label - - 1 - - - - paypal/style/product_page_button_mx_installment_period - - 1 - installment - - - - paypal/style/product_page_button_br_installment_period - - 1 - installment - - - - paypal/style/product_page_button_layout - - 1 - credit - - - - paypal/style/product_page_button_size - - 1 - - - - paypal/style/product_page_button_shape - - 1 - - - - paypal/style/product_page_button_color - - 1 - credit - - - - - - - paypal/style/cart_page_button_customize - - - paypal/style/cart_page_button_label - - 1 - - - - paypal/style/cart_page_button_mx_installment_period - - 1 - installment - - - - paypal/style/cart_page_button_br_installment_period - - 1 - installment - - - - paypal/style/cart_page_button_layout - - 1 - credit - - - - paypal/style/cart_page_button_size - - 1 - - - - paypal/style/cart_page_button_shape - - 1 - - - - paypal/style/cart_page_button_color - - 1 - credit - - - - - - - paypal/style/mini_cart_page_button_customize - - - paypal/style/mini_cart_page_button_label - - 1 - - - - paypal/style/mini_cart_page_button_mx_installment_period - - 1 - installment - - - - paypal/style/mini_cart_page_button_br_installment_period - - 1 - installment - - - - paypal/style/mini_cart_page_button_layout - - 1 - credit - - - - paypal/style/mini_cart_page_button_size - - 1 - - - - paypal/style/mini_cart_page_button_shape - - 1 - - - - paypal/style/mini_cart_page_button_color - - 1 - credit - - - - - - - - - - - paypal/style/disable_funding_options - Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions - Magento\Paypal\Model\System\Config\Source\DisableFundingOptions - 1 - 1 - - - - - - - - - paypal-other-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - payment/hosted_pro/active - Includes Express Checkout)]]> - 1 - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - - - - - - - - - - - - - payment/hosted_pro/active - Magento\Config\Model\Config\Source\Yesno - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment - - - - paypal-enabler paypal-ec-separate - - - - Learn More]]> - - - - - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from PayPal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise PayPal Credit® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> -
- - - - - - - - - payment/paypal_express_bml/homepage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS - - 1 - - - - - - - - - - payment/paypal_express_bml/categorypage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS - - 1 - - - - - - - - - - payment/paypal_express_bml/productpage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN - - 1 - - - - - - - - - - payment/paypal_express_bml/checkout_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN - 1 - - 1 - - - -
-
- - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - It is recommended to set this value to "PayPal" per store views. - payment/hosted_pro/title - - - - payment/hosted_pro/sort_order - validate-number - - - - payment/hosted_pro/payment_action - Magento\Paypal\Model\System\Config\Source\PaymentActions - - - - payment/hosted_pro/display_ec - Magento\Config\Model\Config\Source\Yesno - - - - config-advanced - - - payment/hosted_pro/allowspecific - Magento\Payment\Model\Config\Source\Allspecificcountries - - - - payment/hosted_pro/specificcountry - Magento\Paypal\Model\System\Config\Source\BuyerCountry - - 1 - - - - - payment/hosted_pro/debug - Magento\Config\Model\Config\Source\Yesno - - - - payment/hosted_pro/verify_peer - Magento\Config\Model\Config\Source\Yesno - - - - - - - - - - - - - - - - -
- - - - - - - -
-
- - - complex paypal-other-section paypal-all-in-one-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - Choose a secure bundled payment solution for your business. - other_paypal_payment_solutions - - - paypal-other-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - Includes Express Checkout)]]> - payment/payflow_advanced/active - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - - - - payment/payflow_advanced/partner - 1 - - - - payment/payflow_advanced/vendor - 1 - - - - PayPal recommends that you set up an additional User on your account at manager.paypal.com - PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here. - payment/payflow_advanced/user - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - payment/payflow_advanced/pwd - Magento\Config\Model\Config\Backend\Encrypted - 1 - - - - payment/payflow_advanced/sandbox_flag - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_advanced/use_proxy - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_advanced/proxy_host - - 1 - - 1 - - - - payment/payflow_advanced/proxy_port - - 1 - - 1 - - - Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced - 1 - - - - - payment/payflow_advanced/active - Magento\Config\Model\Config\Source\Yesno - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment - - - - - - Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden - - - - - - Learn More]]> - - payment/payflow_express_bml/active - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml - - - - - - payment/payflow_express_bml/sort_order - Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder - - 1 - - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from PayPal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise PayPal Credit® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> -
- - - - - - - - - payment/paypal_express_bml/homepage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS - - 1 - - - - - - - - - - payment/paypal_express_bml/categorypage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS - - 1 - - - - - - - - - - payment/paypal_express_bml/productpage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN - - 1 - - - - - - - - - - - payment/paypal_express_bml/checkout_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN - 1 - - 1 - - - -
-
- - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - It is recommended to set this value to "Debit or Credit Card" per store views. - payment/payflow_advanced/title - 1 - - - - payment/payflow_advanced/sort_order - validate-number - 1 - - - - payment/payflow_advanced/payment_action - Magento\Paypal\Model\System\Config\Source\PaymentActions - 1 - - - - config-advanced - - - payment/payflow_advanced/allowspecific - Magento\Payment\Model\Config\Source\Allspecificcountries - 1 - - - - payment/payflow_advanced/specificcountry - Magento\Paypal\Model\System\Config\Source\BuyerCountry - - 1 - - 1 - - - - payment/payflow_advanced/debug - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_advanced/verify_peer - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_advanced/csc_editable - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_advanced/csc_required - Magento\Config\Model\Config\Source\Yesno - - 1 - - 1 - - - - payment/payflow_advanced/email_confirmation - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_advanced/url_method - Magento\Paypal\Model\System\Config\Source\UrlMethod - 1 - - - - - - - - - - - - - - - - - - - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - - - - - - - - payment/paypal_payment_pro/active - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html - - - - 0 - payment/paypal_payment_pro/active - - - - - - - - - - - - Accept credit card and PayPal payments securely. - payment/wps_express/active - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html - - - - - - - - - payment/wps_express/active - - - payment/wps_express_bml/active - - - - - - -
- - - complex paypal-other-section paypal-gateways-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - other_paypal_payment_solutions - - - 0 - - - - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment - - - - - - - not-required - - 1 - - - - Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden - - - - - - - Learn More]]> - - payment/payflow_express_bml/active - Magento\Config\Model\Config\Source\Yesno - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml - - - - - - payment/payflow_express_bml/sort_order - Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder - - 1 - - - - - - Why Advertise Financing?
- Give your sales a boost when you advertise financing.
PayPal helps turn browsers into buyers with financing - from PayPal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you. - Use PayPal’s free banner ads that let you advertise PayPal Credit® financing as a payment option when your customers check out with PayPal. - The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15% - or more. See Details.]]> -
- - - - - - - - - payment/paypal_express_bml/homepage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS - - 1 - - - - - - - - - - payment/paypal_express_bml/categorypage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS - - 1 - - - - - - - - - - payment/paypal_express_bml/productpage_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN - - 1 - - - - - - - - - - payment/paypal_express_bml/checkout_size - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC - 1 - - 0 - - - - Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN - 1 - - 1 - - - -
-
- - - - - - - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - payment/payflow_express/title - 1 - - - - payment/payflow_express/sort_order - validate-number - 1 - - - - payment/payflow_express/payment_action - Magento\Paypal\Model\System\Config\Source\PaymentActions - 1 - - - - payment/payflow_express/visible_on_product - Magento\Config\Model\Config\Source\Yesno - 1 - - - - config-advanced - - - Also affects mini-shopping cart. - payment/payflow_express/visible_on_cart - Magento\Paypal\Model\System\Config\Source\Yesnoshortcut - 1 - - - - payment/payflow_express/allowspecific - Magento\Payment\Model\Config\Source\Allspecificcountries - 1 - - - - payment/payflow_express/specificcountry - Magento\Paypal\Model\System\Config\Source\BuyerCountry - - 1 - - 1 - - - - payment/payflow_express/debug - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_express/verify_peer - Magento\Config\Model\Config\Source\Yesno - 1 - - - - payment/payflow_express/line_items_enabled - Magento\Config\Model\Config\Source\Yesno - 1 - - - - -
- - - - - - complex paypal-express-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - Add another payment method to your existing solution or as a stand-alone option. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - 0 - payment/paypal_express/active - payment/payflow_express/active - recommended_solutions - - -
-
- - - complex paypal-other-section paypal-all-in-one-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - Choose a secure bundled payment solution for your business. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - other_paypal_payment_solutions - - pp-general-uk - http://www.youtube.com/watch?v=LBe-TW87eGI&list=PLF18B1094ABCD7CE8&index=1&feature=plpp_video - Accept payments with a completely customizable checkout page. - - - - - - - - - 0 - - - - - - - - - paypal-enabler - - - - - - - - - - - - - - - - - - - - - - - - - - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - - - - - - - - config-advanced - - - - - - - - - - - - - - - - - - Accept credit card and PayPal payments securely. - payment/wps_express/active - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html - - - - - - - payment/wps_express/active - - - - - - - - - - - - - - - complex paypal-express-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - Add another payment method to your existing solution or as a stand-alone option. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - recommended_solutions - - - - - - -
-
- - - - complex paypal-express-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - Add another payment method to your existing solution or as a stand-alone option. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - recommended_solutions - - - - - - - - - - - -
-
- - - complex paypal-express-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - Add another payment method to your existing solution or as a stand-alone option. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - recommended_solutions - - - - - - - - complex paypal-other-section paypal-all-in-one-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - Choose a secure bundled payment solution for your business. - https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup - other_paypal_payment_solutions - - - complex - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment - Accept credit card and PayPal payments securely. - payment/wps_express/active - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html - - - - - - - - - payment/wps_express/active - - - - - - - - - - - - complex paypal-other-section paypal-gateways-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - Process payments using your own internet merchant account. - https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content - other_paypal_payment_solutions - -
-
- - payment/paypal_express/active - payment/payflow_express/active - - - - - - complex paypal-other-section paypal-gateways-section - Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded - - - - payment/paypal_payment_pro/active - - http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html - - - - - - - - - paypal-enabler paypal-ec-pe - 0 - payment/paypal_payment_pro/active - Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment - - - - - - - - - - - - - - - -
-
- - - - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
- - - - - -
-
- - - - - - - -
-
-
From 9b324e804c58ed2b05c9646bcd7c781ecf113edc Mon Sep 17 00:00:00 2001 From: Denis Kopylov Date: Wed, 27 Mar 2019 22:29:48 +0300 Subject: [PATCH 05/10] [BUG] Fix gallery event observer --- lib/web/mage/gallery/gallery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js index 15c3d01cf2be3..be78856b21fcd 100644 --- a/lib/web/mage/gallery/gallery.js +++ b/lib/web/mage/gallery/gallery.js @@ -141,7 +141,7 @@ define([ this.setupBreakpoints(); this.initFullscreenSettings(); - this.settings.$element.on('mouseup', '.fotorama__stage__frame', function () { + this.settings.$element.on('click', '.fotorama__stage__frame', function () { if ( !$(this).parents('.fotorama__shadows--left, .fotorama__shadows--right').length && !$(this).hasClass('fotorama-video-container') From 1fe977a11c238b19e6f79342bed637bc7941bea8 Mon Sep 17 00:00:00 2001 From: RomanKis Date: Thu, 28 Mar 2019 11:43:58 +0200 Subject: [PATCH 06/10] #21998 Magento/ImportExport/Model/Import has _coreConfig declared dynamically --- app/code/Magento/ImportExport/Model/Import.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php index d115aea7f2ff9..2a4d6904b11b5 100644 --- a/app/code/Magento/ImportExport/Model/Import.php +++ b/app/code/Magento/ImportExport/Model/Import.php @@ -126,6 +126,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel */ protected $_importExportData = null; + /** + * @var \Magento\Framework\App\Config\ScopeConfigInterface + */ + private $_coreConfig; + /** * @var \Magento\ImportExport\Model\Import\ConfigInterface */ From f826017acfb81d549d5eaada07a0081ddc2498c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20K=C3=B6cke?= Date: Thu, 28 Mar 2019 14:55:05 +0100 Subject: [PATCH 07/10] Correct bug 21993 config:set not storing scoped values --- .../Config/Console/Command/ConfigSet/DefaultProcessor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php index 86ae1f96749df..c622a48b7f2c8 100644 --- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php +++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php @@ -90,10 +90,10 @@ public function process($path, $value, $scope, $scopeCode) } try { - $config = $this->configFactory->create([ + $config = $this->configFactory->create(['data' => [ 'scope' => $scope, 'scope_code' => $scopeCode, - ]); + ]]); $config->setDataByPath($path, $value); $config->save(); } catch (\Exception $exception) { From d53690cbfe4aeac02d05c2078424698ce1fb7d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20K=C3=B6cke?= Date: Mon, 1 Apr 2019 07:21:11 +0200 Subject: [PATCH 08/10] Fix unit tests --- .../Unit/Console/Command/ConfigSet/DefaultProcessorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php index edb76c067bf35..35b2406b328cb 100644 --- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php +++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php @@ -103,7 +103,7 @@ public function testProcess($path, $value, $scope, $scopeCode) $config = $this->createMock(Config::class); $this->configFactory->expects($this->once()) ->method('create') - ->with(['scope' => $scope, 'scope_code' => $scopeCode]) + ->with(['data' => ['scope' => $scope, 'scope_code' => $scopeCode]]) ->willReturn($config); $config->expects($this->once()) ->method('setDataByPath') From 223d8efc62bed0ec5b42e027bb94bacfa38087c4 Mon Sep 17 00:00:00 2001 From: Nazarn96 Date: Mon, 1 Apr 2019 11:51:09 +0300 Subject: [PATCH 09/10] fix-issue-20186 --- .../Magento/Sniffs/Annotation/AnnotationFormatValidator.php | 4 ++-- .../Sniffs/Annotation/ClassAnnotationStructureSniff.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php index 49acd039a0960..3f477f7ce5033 100644 --- a/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php +++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php @@ -301,8 +301,8 @@ public function validateDescriptionFormatStructure( $this->validateShortDescriptionFormat( $phpcsFile, (int) $shortPtr, - $commentStartPtr, - $commentEndPtr, + (int)$commentStartPtr, + (int)$commentEndPtr, $emptyTypeTokens ); } diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php index 01834ff81e81b..c37f0b500fe39 100644 --- a/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php +++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php @@ -97,8 +97,8 @@ public function process(File $phpcsFile, $stackPtr) { $tokens = $phpcsFile->getTokens(); $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr - 1, 0); - $this->validateAnnotationBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr); - $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0); + $this->validateAnnotationBlockExists($phpcsFile, (int)$previousCommentClosePtr, (int)$stackPtr); + $commentStartPtr = (int)$phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0); $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer']; $emptyTypeTokens = [ T_DOC_COMMENT_WHITESPACE, @@ -111,7 +111,7 @@ public function process(File $phpcsFile, $stackPtr) } else { $this->annotationFormatValidator->validateDescriptionFormatStructure( $phpcsFile, - $commentStartPtr, + (int)$commentStartPtr, (int) $shortPtr, $previousCommentClosePtr, $emptyTypeTokens From bd04930788146e542ea2b761e4ccc921095cd5c0 Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Wed, 3 Apr 2019 16:07:15 +0300 Subject: [PATCH 10/10] Fix static tests. --- .../Framework/Crontab/CrontabManager.php | 17 ++++--- .../Crontab/Test/Unit/CrontabManagerTest.php | 44 ++++++++++--------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/lib/internal/Magento/Framework/Crontab/CrontabManager.php b/lib/internal/Magento/Framework/Crontab/CrontabManager.php index 37ced978c5567..da81540faf477 100644 --- a/lib/internal/Magento/Framework/Crontab/CrontabManager.php +++ b/lib/internal/Magento/Framework/Crontab/CrontabManager.php @@ -4,6 +4,7 @@ * See COPYING.txt for license details. */ + namespace Magento\Framework\Crontab; use Magento\Framework\App\Filesystem\DirectoryList; @@ -40,31 +41,35 @@ public function __construct( } /** + * Build tasks block start text. + * * @return string */ private function getTasksBlockStart() { $tasksBlockStart = self::TASKS_BLOCK_START; if (defined('BP')) { - $tasksBlockStart .= ' ' . md5(BP); + $tasksBlockStart .= ' ' . hash("sha256", BP); } return $tasksBlockStart; } /** + * Build tasks block end text. + * * @return string */ private function getTasksBlockEnd() { $tasksBlockEnd = self::TASKS_BLOCK_END; if (defined('BP')) { - $tasksBlockEnd .= ' ' . md5(BP); + $tasksBlockEnd .= ' ' . hash("sha256", BP); } return $tasksBlockEnd; } /** - * {@inheritdoc} + * @inheritdoc */ public function getTasks() { @@ -82,7 +87,7 @@ public function getTasks() } /** - * {@inheritdoc} + * @inheritdoc */ public function saveTasks(array $tasks) { @@ -118,8 +123,7 @@ public function saveTasks(array $tasks) } /** - * {@inheritdoc} - * @throws LocalizedException + * @inheritdoc */ public function removeTasks() { @@ -203,6 +207,7 @@ private function save($content) try { $this->shell->execute('echo "' . $content . '" | crontab -'); + // phpcs:disable Magento2.Exceptions.ThrowCatch } catch (LocalizedException $e) { throw new LocalizedException( new Phrase('Error during saving of crontab: %1', [$e->getPrevious()->getMessage()]), diff --git a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php index b07703d2bd0ba..f6c863d9d9fad 100644 --- a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php +++ b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php @@ -4,6 +4,7 @@ * See COPYING.txt for license details. */ + namespace Magento\Framework\Crontab\Test\Unit; use Magento\Framework\Crontab\CrontabManager; @@ -16,6 +17,9 @@ use Magento\Framework\Filesystem\Directory\ReadInterface; use Magento\Framework\Filesystem\DriverPool; +/** + * Tests crontab manager functionality. + */ class CrontabManagerTest extends \PHPUnit\Framework\TestCase { /** @@ -88,17 +92,17 @@ public function getTasksDataProvider() return [ [ 'content' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL, + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL, 'tasks' => ['* * * * * /bin/php /var/www/magento/bin/magento cron:run'], ], [ 'content' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL . '* * * * * /bin/php /var/www/magento/bin/magento setup:cron:run' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL, + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL, 'tasks' => [ '* * * * * /bin/php /var/www/magento/bin/magento cron:run', '* * * * * /bin/php /var/www/magento/bin/magento setup:cron:run', @@ -166,17 +170,17 @@ public function removeTasksDataProvider() return [ [ 'contentBefore' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL, + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL, 'contentAfter' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL ], [ 'contentBefore' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL . '* * * * * /bin/php /var/www/magento/bin/magento setup:cron:run' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL, + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL, 'contentAfter' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL ], [ @@ -292,9 +296,9 @@ public function testSaveTasks($tasks, $content, $contentToSave) public function saveTasksDataProvider() { $content = '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL; + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL; return [ [ @@ -303,9 +307,9 @@ public function saveTasksDataProvider() ], 'content' => $content, 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '* * * * * ' . PHP_BINARY . ' run.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL, + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL, ], [ 'tasks' => [ @@ -313,9 +317,9 @@ public function saveTasksDataProvider() ], 'content' => $content, 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '1 2 3 4 5 ' . PHP_BINARY . ' run.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL, + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL, ], [ 'tasks' => [ @@ -323,10 +327,10 @@ public function saveTasksDataProvider() ], 'content' => $content, 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php >>' . ' /var/www/magento2/var/log/cron.log' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL, + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL, ], [ 'tasks' => [ @@ -334,10 +338,10 @@ public function saveTasksDataProvider() ], 'content' => $content, 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php' . ' %% cron:run | grep -v \"Ran \'jobs\' by schedule\"' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL, + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL, ], [ 'tasks' => [ @@ -345,10 +349,10 @@ public function saveTasksDataProvider() ], 'content' => '* * * * * /bin/php /var/www/cron.php', 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL + . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php' . ' %% cron:run | grep -v \"Ran \'jobs\' by schedule\"' . PHP_EOL - . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL, + . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL, ], ]; }