From ca46d9befc23db02c7dbf95f15544a4ed9d24c65 Mon Sep 17 00:00:00 2001 From: Liam Wiltshire Date: Mon, 28 Dec 2015 17:33:42 +0000 Subject: [PATCH 01/11] Update final_price.phtml Remove unused dec of $productId --- .../Bundle/view/base/templates/product/price/final_price.phtml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml index 406ca0cd37c52..c90253e23d81e 100644 --- a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml +++ b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml @@ -11,7 +11,8 @@ getIdSuffix() ? $block->getIdSuffix() : ''; /** @var \Magento\Bundle\Pricing\Render\FinalPriceBox $block */ -$productId = $block->getSaleableItem()->getId(); + + /** @var \Magento\Bundle\Pricing\Price\FinalPrice $finalPriceModel */ $finalPriceModel = $block->getPrice(); $minimalPrice = $finalPriceModel->getMinimalPrice(); From 6db545847cdb90f46e7c4ea6d9ab8c0e953fd8e1 Mon Sep 17 00:00:00 2001 From: Digimix Date: Tue, 22 Mar 2016 11:40:41 -0400 Subject: [PATCH 02/11] Optional PHP7.0 Socket Path Updating Nginx site(s) to use New socket path. I've left it commented out, but I think this will come in handy as PHP7.0 adoption grows. --- nginx.conf.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx.conf.sample b/nginx.conf.sample index 5de47a5fe6a82..dc127cc187be6 100644 --- a/nginx.conf.sample +++ b/nginx.conf.sample @@ -47,6 +47,7 @@ location /update { location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; +# fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; fastcgi_pass fastcgi_backend; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; From e132c5431e5c71599d9dbb3c69a577f8a607ff35 Mon Sep 17 00:00:00 2001 From: Digimix Date: Tue, 22 Mar 2016 11:56:52 -0400 Subject: [PATCH 03/11] PHP7.0 Unix socket to upstream fastcgi_backend --- nginx.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf.sample b/nginx.conf.sample index dc127cc187be6..85cbc94f034dd 100644 --- a/nginx.conf.sample +++ b/nginx.conf.sample @@ -8,6 +8,7 @@ # # server 127.0.0.1:9000; # # or socket # server unix:/var/run/php5-fpm.sock; +# server unix:/var/run/php/php7.0-fpm.sock; # } # server { # listen 80; @@ -47,7 +48,6 @@ location /update { location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; -# fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; fastcgi_pass fastcgi_backend; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; From f8e7f2b2ade5f4486dd906520dbdf3ad90037b41 Mon Sep 17 00:00:00 2001 From: NikolasSumrak Date: Fri, 3 Jun 2016 14:40:57 +0300 Subject: [PATCH 04/11] Fix admin menu bug Remove empty column from admin menu if menu items > limit; See screenshot http://c2n.me/3yO1R1h.png --- app/code/Magento/Backend/Block/Menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php index 5af117b892bee..96f6281bc616c 100644 --- a/app/code/Magento/Backend/Block/Menu.php +++ b/app/code/Magento/Backend/Block/Menu.php @@ -450,7 +450,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = []) $itemName = substr($menuId, strrpos($menuId, '::') + 2); $itemClass = str_replace('_', '-', strtolower($itemName)); - if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake']) { + if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1) { $output .= '
    • '; } From c158dc887752913c3ffcdaf5007b146420cc55d1 Mon Sep 17 00:00:00 2001 From: Nikolay Sumrak Date: Tue, 30 Aug 2016 17:25:26 +0300 Subject: [PATCH 05/11] Fix for Product Attribute's Conditions Fix for Product Attribute's Conditions if attribute option is deleted. Description bug: 1. Create new cart rule or edit existing. 2. Add condition with multiselect product attribute (ex. attr activity in magento2+sample data) 3. Choose one option of attribute in condition and save rule 4. Delete this option in Stores->Product attributes 5. Reload Cart Rule Page in admin 1 exception(s): Exception #0 (Exception): Warning: iconv_strlen() expects parameter 1 to be string, array given in /var/www/sources/sumrak/dev21/vendor/magento/framework/Stdlib/StringUtils.php on line 151 Exception #0 (Exception): Warning: iconv_strlen() expects parameter 1 to be string, array given in /var/www/sources/sumrak/dev21/vendor/magento/framework/Stdlib/StringUtils.php on line 151 #0 [internal function]: Magento\Framework\App\ErrorHandler->handler(2, 'iconv_strlen() ...', '/var/www/source...', 151, Array) #1 /var/www/sources/sumrak/dev21/vendor/magento/framework/Stdlib/StringUtils.php(151): iconv_strlen(Array, 'UTF-8') #2 /var/www/sources/sumrak/dev21/vendor/magento/framework/Filter/Truncate.php(76): Magento\Framework\Stdlib\StringUtils->strlen(Array) #3 /var/www/sources/sumrak/dev21/vendor/magento/framework/Filter/FilterManager.php(133): Magento\Framework\Filter\Truncate->filter(Array) #4 /var/www/sources/sumrak/dev21/vendor/magento/module-rule/Block/Editable.php(74): Magento\Framework\Filter\FilterManager->__call('truncate', Array) #5 /var/www/sources/sumrak/dev21/vendor/magento/module-rule/Block/Editable.php(74): Magento\Framework\Filter\FilterManager->truncate(Array, Array) #6 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form/Element/AbstractElement.php(453): Magento\Rule\Block\Editable->render(Object(Magento\Framework\Data\Form\Element\Multiselect)) #7 /var/www/sources/sumrak/dev21/vendor/magento/module-rule/Model/Condition/AbstractCondition.php(649): Magento\Framework\Data\Form\Element\AbstractElement->getHtml() #8 /var/www/sources/sumrak/dev21/vendor/magento/module-rule/Model/Condition/AbstractCondition.php(477): Magento\Rule\Model\Condition\AbstractCondition->getValueElementHtml() #9 /var/www/sources/sumrak/dev21/vendor/magento/module-rule/Model/Condition/AbstractCondition.php(488): Magento\Rule\Model\Condition\AbstractCondition->asHtml() #10 /var/www/sources/sumrak/dev21/vendor/magento/module-rule/Model/Condition/Combine.php(292): Magento\Rule\Model\Condition\AbstractCondition->asHtmlRecursive() #11 /var/www/sources/sumrak/dev21/vendor/magento/module-rule/Model/Condition/Combine.php(292): Magento\Rule\Model\Condition\Combine->asHtmlRecursive() #12 /var/www/sources/sumrak/dev21/vendor/magento/module-rule/Block/Conditions.php(19): Magento\Rule\Model\Condition\Combine->asHtmlRecursive() #13 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form/Element/AbstractElement.php(453): Magento\Rule\Block\Conditions->render(Object(Magento\Framework\Data\Form\Element\Text)) #14 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form/Element/Text.php(43): Magento\Framework\Data\Form\Element\AbstractElement->getHtml() #15 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form/Element/AbstractElement.php(467): Magento\Framework\Data\Form\Element\Text->getHtml() #16 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form/Element/Fieldset.php(229): Magento\Framework\Data\Form\Element\AbstractElement->toHtml() #17 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form/Element/Fieldset.php(80): Magento\Framework\Data\Form\Element\Fieldset->_elementsToHtml(Array) #18 /var/www/sources/sumrak/dev21/vendor/magento/module-catalog-rule/view/adminhtml/templates/promo/fieldset.phtml(23): Magento\Framework\Data\Form\Element\Fieldset->getChildrenHtml() #19 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/TemplateEngine/Php.php(59): include('/var/www/source...') #20 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Element/Template.php(255): Magento\Framework\View\TemplateEngine\Php->render(Object(Magento\Backend\Block\Widget\Form\Renderer\Fieldset), '/var/www/source...', Array) #21 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Element/Template.php(279): Magento\Framework\View\Element\Template->fetchView('/var/www/source...') #22 /var/www/sources/sumrak/dev21/vendor/magento/module-backend/Block/Template.php(104): Magento\Framework\View\Element\Template->_toHtml() #23 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Element/AbstractBlock.php(659): Magento\Backend\Block\Template->_toHtml() #24 /var/www/sources/sumrak/dev21/vendor/magento/module-backend/Block/Widget/Form/Renderer/Fieldset.php(45): Magento\Framework\View\Element\AbstractBlock->toHtml() #25 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form/Element/AbstractElement.php(453): Magento\Backend\Block\Widget\Form\Renderer\Fieldset->render(Object(Magento\Framework\Data\Form\Element\Fieldset)) #26 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form/Element/AbstractElement.php(467): Magento\Framework\Data\Form\Element\AbstractElement->getHtml() #27 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form.php(322): Magento\Framework\Data\Form\Element\AbstractElement->toHtml() #28 /var/www/sources/sumrak/dev21/vendor/magento/framework/Data/Form.php(337): Magento\Framework\Data\Form->toHtml() #29 /var/www/sources/sumrak/dev21/vendor/magento/module-backend/Block/Widget/Form.php(98): Magento\Framework\Data\Form->getHtml() #30 /var/www/sources/sumrak/dev21/vendor/magento/module-backend/view/adminhtml/templates/widget/form.phtml(15): Magento\Backend\Block\Widget\Form->getFormHtml() #31 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/TemplateEngine/Php.php(59): include('/var/www/source...') #32 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Element/Template.php(255): Magento\Framework\View\TemplateEngine\Php->render(Object(Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Conditions), '/var/www/source...', Array) #33 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Element/Template.php(279): Magento\Framework\View\Element\Template->fetchView('/var/www/source...') #34 /var/www/sources/sumrak/dev21/vendor/magento/module-backend/Block/Template.php(104): Magento\Framework\View\Element\Template->_toHtml() #35 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Element/AbstractBlock.php(659): Magento\Backend\Block\Template->_toHtml() #36 /var/www/sources/sumrak/dev21/vendor/magento/module-ui/Component/HtmlContent.php(50): Magento\Framework\View\Element\AbstractBlock->toHtml() #37 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout/Generator/UiComponent.php(148): Magento\Ui\Component\HtmlContent->prepare() #38 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout/Generator/UiComponent.php(145): Magento\Framework\View\Layout\Generator\UiComponent->prepareComponent(Object(Magento\Ui\Component\HtmlContent)) #39 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout/Generator/UiComponent.php(145): Magento\Framework\View\Layout\Generator\UiComponent->prepareComponent(Object(Magento\Ui\Component\Container)) #40 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout/Generator/UiComponent.php(145): Magento\Framework\View\Layout\Generator\UiComponent->prepareComponent(Object(Magento\Ui\Component\Form\Fieldset)) #41 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout/Generator/UiComponent.php(126): Magento\Framework\View\Layout\Generator\UiComponent->prepareComponent(Object(Magento\Ui\Component\Form)) #42 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout/Generator/UiComponent.php(93): Magento\Framework\View\Layout\Generator\UiComponent->generateComponent(Object(Magento\Framework\View\Layout\Data\Structure), 'sales_rule_form', Array, Object(Magento\Framework\View\Layout\Interceptor)) #43 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout/GeneratorPool.php(86): Magento\Framework\View\Layout\Generator\UiComponent->process(Object(Magento\Framework\View\Layout\Reader\Context), Object(Magento\Framework\View\Layout\Generator\Context)) #44 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout.php(327): Magento\Framework\View\Layout\GeneratorPool->process(Object(Magento\Framework\View\Layout\Reader\Context), Object(Magento\Framework\View\Layout\Generator\Context)) #45 /var/www/sources/sumrak/dev21/var/generation/Magento/Framework/View/Layout/Interceptor.php(89): Magento\Framework\View\Layout->generateElements() #46 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout/Builder.php(129): Magento\Framework\View\Layout\Interceptor->generateElements() #47 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Page/Builder.php(55): Magento\Framework\View\Layout\Builder->generateLayoutBlocks() #48 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout/Builder.php(65): Magento\Framework\View\Page\Builder->generateLayoutBlocks() #49 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout.php(244): Magento\Framework\View\Layout\Builder->build() #50 /var/www/sources/sumrak/dev21/vendor/magento/framework/View/Layout.php(859): Magento\Framework\View\Layout->build() #51 /var/www/sources/sumrak/dev21/var/generation/Magento/Framework/View/Layout/Interceptor.php(414): Magento\Framework\View\Layout->getBlock('promo_sales_rul...') #52 /var/www/sources/sumrak/dev21/vendor/magento/module-sales-rule/Controller/Adminhtml/Promo/Quote/Edit.php(59): Magento\Framework\View\Layout\Interceptor->getBlock('promo_sales_rul...') #53 /var/www/sources/sumrak/dev21/var/generation/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit/Interceptor.php(24): Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit->execute() #54 /var/www/sources/sumrak/dev21/vendor/magento/framework/App/Action/Action.php(102): Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit\Interceptor->execute() #55 /var/www/sources/sumrak/dev21/vendor/magento/module-backend/App/AbstractAction.php(226): Magento\Framework\App\Action\Action->dispatch(Object(Magento\Framework\App\Request\Http)) #56 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Interceptor.php(74): Magento\Backend\App\AbstractAction->dispatch(Object(Magento\Framework\App\Request\Http)) #57 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Chain/Chain.php(70): Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit\Interceptor->___callParent('dispatch', Array) #58 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Chain/Chain.php(63): Magento\Framework\Interception\Chain\Chain->invokeNext('Magento\\SalesRu...', 'dispatch', Object(Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit\Interceptor), Array, 'adminAuthentica...') #59 /var/www/sources/sumrak/dev21/vendor/magento/module-backend/App/Action/Plugin/Authentication.php(143): Magento\Framework\Interception\Chain\Chain->Magento\Framework\Interception\Chain\{closure}(Object(Magento\Framework\App\Request\Http)) #60 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Chain/Chain.php(67): Magento\Backend\App\Action\Plugin\Authentication->aroundDispatch(Object(Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit\Interceptor), Object(Closure), Object(Magento\Framework\App\Request\Http)) #61 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Interceptor.php(138): Magento\Framework\Interception\Chain\Chain->invokeNext('Magento\\SalesRu...', 'dispatch', Object(Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit\Interceptor), Array, 'adminMassaction...') #62 /var/www/sources/sumrak/dev21/vendor/magento/module-backend/App/Action/Plugin/MassactionKey.php(33): Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit\Interceptor->Magento\Framework\Interception\{closure}(Object(Magento\Framework\App\Request\Http)) #63 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Interceptor.php(142): Magento\Backend\App\Action\Plugin\MassactionKey->aroundDispatch(Object(Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit\Interceptor), Object(Closure), Object(Magento\Framework\App\Request\Http)) #64 /var/www/sources/sumrak/dev21/var/generation/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit/Interceptor.php(39): Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit\Interceptor->___callPlugins('dispatch', Array, Array) #65 /var/www/sources/sumrak/dev21/vendor/magento/framework/App/FrontController.php(55): Magento\SalesRule\Controller\Adminhtml\Promo\Quote\Edit\Interceptor->dispatch(Object(Magento\Framework\App\Request\Http)) #66 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Interceptor.php(74): Magento\Framework\App\FrontController->dispatch(Object(Magento\Framework\App\Request\Http)) #67 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Chain/Chain.php(70): Magento\Framework\App\FrontController\Interceptor->___callParent('dispatch', Array) #68 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Interceptor.php(138): Magento\Framework\Interception\Chain\Chain->invokeNext('Magento\\Framewo...', 'dispatch', Object(Magento\Framework\App\FrontController\Interceptor), Array, 'install') #69 /var/www/sources/sumrak/dev21/vendor/magento/framework/Module/Plugin/DbStatusValidator.php(69): Magento\Framework\App\FrontController\Interceptor->Magento\Framework\Interception\{closure}(Object(Magento\Framework\App\Request\Http)) #70 /var/www/sources/sumrak/dev21/vendor/magento/framework/Interception/Interceptor.php(142): Magento\Framework\Module\Plugin\DbStatusValidator->aroundDispatch(Object(Magento\Framework\App\FrontController\Interceptor), Object(Closure), Object(Magento\Framework\App\Request\Http)) #71 /var/www/sources/sumrak/dev21/var/generation/Magento/Framework/App/FrontController/Interceptor.php(26): Magento\Framework\App\FrontController\Interceptor->___callPlugins('dispatch', Array, Array) #72 /var/www/sources/sumrak/dev21/vendor/magento/framework/App/Http.php(135): Magento\Framework\App\FrontController\Interceptor->dispatch(Object(Magento\Framework\App\Request\Http)) #73 /var/www/sources/sumrak/dev21/vendor/magento/framework/App/Bootstrap.php(258): Magento\Framework\App\Http->launch() #74 /var/www/sources/sumrak/dev21/index.php(39): Magento\Framework\App\Bootstrap->run(Object(Magento\Framework\App\Http)) --- app/code/Magento/Rule/Model/Condition/AbstractCondition.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php index cbab59a95a3e0..8224694794cab 100644 --- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php +++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php @@ -441,6 +441,8 @@ public function getValueName() } if (!empty($valueArr)) { $value = implode(', ', $valueArr); + } elseif(is_array($value)) { + $value = implode(', ', $value); } return $value; } From 23f2d5ce94a412f6a913640f38779a2a7025a435 Mon Sep 17 00:00:00 2001 From: maciekpaprocki Date: Tue, 20 Sep 2016 11:33:55 +0100 Subject: [PATCH 06/11] Update addCategoriesFilter to return $this To keep consistency addCategoriesFilter should return $this. All Other methods seems to use fluent API. --- .../Magento/Catalog/Model/ResourceModel/Product/Collection.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php index b2b20b9d223e2..b1d48f41c1a0b 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php @@ -852,6 +852,7 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category) * Filter Product by Categories * * @param array $categoriesFilter + * @return $this */ public function addCategoriesFilter(array $categoriesFilter) { @@ -865,6 +866,7 @@ public function addCategoriesFilter(array $categoriesFilter) ]; $this->getSelect()->where($this->getConnection()->prepareSqlCondition('e.entity_id' , $selectCondition)); } + return $this; } /** From 5e9fe6025d73564eaa544e3e85d1eeaa4dc2b5d6 Mon Sep 17 00:00:00 2001 From: Federico Rivollier Date: Thu, 6 Oct 2016 03:14:38 -0300 Subject: [PATCH 07/11] Fixed phpseclib\Net\SFTP constants used in write() method --- lib/internal/Magento/Framework/Filesystem/Io/Sftp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php b/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php index 30bed420be66c..5ce7547df0bcc 100644 --- a/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php +++ b/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php @@ -20,7 +20,7 @@ class Sftp extends AbstractIo const SSH2_PORT = 22; /** - * @var \Net_SFTP $_connection + * @var \phpseclib\Net\SFTP $_connection */ protected $_connection = null; @@ -184,7 +184,7 @@ public function read($filename, $destination = null) */ public function write($filename, $source, $mode = null) { - $mode = is_readable($source) ? NET_SFTP_LOCAL_FILE : NET_SFTP_STRING; + $mode = is_readable($source) ? \phpseclib\Net\SFTP::SOURCE_LOCAL_FILE : \phpseclib\Net\SFTP::SOURCE_STRING; return $this->_connection->put($filename, $source, $mode); } From 11627611c87fd3a5000ba4a46a6d0550c180062b Mon Sep 17 00:00:00 2001 From: Anton Evers Date: Fri, 21 Oct 2016 10:04:37 +0200 Subject: [PATCH 08/11] Add de_LU and fr_LU languages for Luxembourg For our Luxembourgian customers it would be very nice if their languages were also supported. Although de_LU and fr_LU can be easily added with a plugin - which is my current solution - it's a small change to add it to the Magento code. I think the Luxembourgians would be thankful. --- lib/internal/Magento/Framework/Locale/Config.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/internal/Magento/Framework/Locale/Config.php b/lib/internal/Magento/Framework/Locale/Config.php index 2a3fb35f6b3cf..bf894725b58bd 100644 --- a/lib/internal/Magento/Framework/Locale/Config.php +++ b/lib/internal/Magento/Framework/Locale/Config.php @@ -31,6 +31,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface 'de_AT', /*German (Austria)*/ 'de_CH', /*German (Switzerland)*/ 'de_DE', /*German (Germany)*/ + 'de_LU', /*German (Luxembourg)*/ 'el_GR', /*Greek (Greece)*/ 'en_AU', /*English (Australian)*/ 'en_CA', /*English (Canadian)*/ @@ -53,6 +54,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface 'fr_BE', /*French (Belgium)*/ 'fr_CA', /*French (Canada)*/ 'fr_FR', /*French (France)*/ + 'fr_LU', /*French (Luxembourg)*/ 'gu_IN', /*Gujarati (India)*/ 'he_IL', /*Hebrew (Israel)*/ 'hi_IN', /*Hindi (India)*/ From daeaeb4afa30252e8553a49c82221d58f7811e43 Mon Sep 17 00:00:00 2001 From: Danijel Potocki Date: Thu, 16 Mar 2017 17:36:19 +0100 Subject: [PATCH 09/11] magento/magetno2#8676: I can not translate title attribute in xml files translation not working - add translation of resource title --- app/code/Magento/Integration/Helper/Data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Integration/Helper/Data.php b/app/code/Magento/Integration/Helper/Data.php index 4a24cf12706fd..7f60bb1d44335 100644 --- a/app/code/Magento/Integration/Helper/Data.php +++ b/app/code/Magento/Integration/Helper/Data.php @@ -21,7 +21,7 @@ public function mapResources(array $resources) foreach ($resources as $resource) { $item = []; $item['attr']['data-id'] = $resource['id']; - $item['data'] = $resource['title']; + $item['data'] = __($resource['title']); $item['children'] = []; if (isset($resource['children'])) { $item['state'] = 'open'; From 54df914087c464d4999efd4b3ae94c5fb4cb3359 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 20 Mar 2017 13:41:51 -0500 Subject: [PATCH 10/11] MAGETWO-66357: Fix for Product Attribute's Conditions #6400 --- app/code/Magento/Rule/Model/Condition/AbstractCondition.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php index 286ac1b4a4b35..8798ca627a354 100644 --- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php +++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php @@ -441,7 +441,7 @@ public function getValueName() } if (!empty($valueArr)) { $value = implode(', ', $valueArr); - } elseif(is_array($value)) { + } elseif (is_array($value)) { $value = implode(', ', $value); } return $value; From f92c5fe73433f73813d12a77b867ee33fcde321d Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 20 Mar 2017 16:49:58 -0500 Subject: [PATCH 11/11] MAGETWO-66350 Fix admin menu bug #4854 - suppress warning on coupling between objects --- app/code/Magento/Backend/Block/Menu.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php index e56283fedef36..afe4d0fed2db6 100644 --- a/app/code/Magento/Backend/Block/Menu.php +++ b/app/code/Magento/Backend/Block/Menu.php @@ -13,6 +13,7 @@ * * @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo) * @method array getAdditionalCacheKeyInfo() + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Menu extends \Magento\Backend\Block\Template {