Merge remote-tracking branch 'upstream/develop' into MAGETWO-31968-Logger-Fatal-Error

Author: Joan He

CONTRIBUTING.md

@@ -1,28 +1,31 @@
-# Contribution Guide
+# Contributing to Magento 2 code
 
-The Magento 2 development team will review all issues and contributions submitted by the community of developers. Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions. To assist in the expediency of the review process, we strongly encourage you to follow all the proper requirements stated below in Definition of Done, before submitting any code for consideration.
+Contributions to the Magento 2 codebase are done using the fork & pull model.
+This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes (hence the phrase “pull request”).
 
-## Contribution Process
+Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions.
 
-If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
-
-1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
-2. Review the [Contributor License Agreement](https://github.com/magento/magento2/blob/master/CONTRIBUTOR_LICENSE_AGREEMENT.html) if this is your first time contributing.
-3. Create and test your work.
-4. Fork the Magento 2 repository according to [github's Fork A Repo instructions](https://help.github.com/articles/fork-a-repo) and when you are ready to send us a Pull Request – follow [github's Using Pull Requests instructions](https://help.github.com/articles/using-pull-requests).
-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.
+The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor for two weeks, the issue is closed.
 
-### Contribution Acceptance Criteria
 
-1. Code changes must be covered with automated tests and supplied along with the patch (or fork). Author chooses the best approach for testing as deemed necessary. See [Magento Automated Testing Standard](https://github.com/magento/magento2/wiki/Magento-Automated-Testing-Standard) for additional guidance.
-2. New features or proposals must be supplied with documentation -- functional (how a feature works) or technical (how it is implemented/designed), or both.
+## Contribution requirements
 
-## Frequently Asked Questions
+1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v1.0/coding-standards/bk-coding-standards.html).
+2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
+3. Commits must be accompanied by meaningful commit messages.
+4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
+3. PRs which include new logic or new features must be submitted along with:
+* Unit/integration test coverage (we will be releasing more information on writing test coverage in the near future).
+* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
+4. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
+5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
 
-**Do I need to follow all requirements of the contribution process?**
+## Contribution process
 
-Yes. We strongly encourage that you follow the requirements as stated, before submitting your code or patch for Magento 2 development team's review. Properly submitted contributions will help the Magento 2 development team to quickly assess your contribution and incorporate it into the Magento 2 project if deemed beneficial.
-
-**Do you accept all contributions?**
+If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
 
-Not all contributions will be used or incorporated into the code for the project. The decision to incorporate the code or not is at the discretion of the Magento 2 development team.
+1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
+2. Review the [Contributor License Agreement](https://github.com/magento/magento2/blob/master/CONTRIBUTOR_LICENSE_AGREEMENT.html) if this is your first time contributing.
+3. Create and test your work.
+4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v1.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/v1.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.

app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php

@@ -93,7 +93,7 @@ protected function _prepareLayout()
                     'onclick' => "categoryDelete('" . $this->getUrl(
                         'catalog/*/delete',
                         ['_current' => true]
-                    ) . "', true, {$categoryId})",
+                    ) . "')",
                     'class' => 'delete'
                 ]
             );

app/code/Magento/Catalog/Block/Navigation.php

@@ -173,16 +173,6 @@ public function getCurrenCategoryKey()
         return $this->_currentCategoryKey;
     }
 
-    /**
-     * Get catagories of current store
-     *
-     * @return \Magento\Framework\Data\Tree\Node\Collection
-     */
-    public function getStoreCategories()
-    {
-        return $this->_catalogCategory->getStoreCategories();
-    }
-
     /**
      * Retrieve child categories of current category
      *
@@ -229,161 +219,6 @@ public function getCategoryUrl($category)
         return $url;
     }
 
-    /**
-     * Return item position representation in menu tree
-     *
-     * @param int $level
-     * @return string
-     */
-    protected function _getItemPosition($level)
-    {
-        if ($level == 0) {
-            $zeroLevelPosition = isset(
-                $this->_itemLevelPositions[$level]
-            ) ? $this->_itemLevelPositions[$level] + 1 : 1;
-            $this->_itemLevelPositions = [];
-            $this->_itemLevelPositions[$level] = $zeroLevelPosition;
-        } elseif (isset($this->_itemLevelPositions[$level])) {
-            $this->_itemLevelPositions[$level]++;
-        } else {
-            $this->_itemLevelPositions[$level] = 1;
-        }
-
-        $position = [];
-        for ($i = 0; $i <= $level; $i++) {
-            if (isset($this->_itemLevelPositions[$i])) {
-                $position[] = $this->_itemLevelPositions[$i];
-            }
-        }
-        return implode('-', $position);
-    }
-
-    /**
-     * Render category to html
-     *
-     * @param Category $category
-     * @param int $level Nesting level number
-     * @param boolean $isLast Whether ot not this item is last, affects list item class
-     * @param boolean $isFirst Whether ot not this item is first, affects list item class
-     * @param boolean $isOutermost Whether ot not this item is outermost, affects list item class
-     * @param string $outermostItemClass Extra class of outermost list items
-     * @param string $childrenWrapClass If specified wraps children list in div with this class
-     * @param boolean $noEventAttributes Whether ot not to add on* attributes to list item
-     * @return string
-     */
-    protected function _renderCategoryMenuItemHtml(
-        $category,
-        $level = 0,
-        $isLast = false,
-        $isFirst = false,
-        $isOutermost = false,
-        $outermostItemClass = '',
-        $childrenWrapClass = '',
-        $noEventAttributes = false
-    ) {
-        if (!$category->getIsActive()) {
-            return '';
-        }
-
-        // get all children
-        if ($this->flatState->isAvailable()) {
-            $children = (array)$category->getChildrenNodes();
-        } else {
-            $children = $category->getChildren();
-        }
-
-        // select active children
-        $activeChildren = [];
-        foreach ($children as $child) {
-            if ($child->getIsActive()) {
-                $activeChildren[] = $child;
-            }
-        }
-
-        $activeChildrenCount = count($activeChildren);
-        $hasActiveChildren = $activeChildrenCount > 0;
-
-        // prepare list item html classes
-        $classes = [];
-        $classes[] = 'level' . $level;
-        $classes[] = 'nav-' . $this->_getItemPosition($level);
-        if ($this->isCategoryActive($category)) {
-            $classes[] = 'active';
-        }
-
-        $linkClass = '';
-        if ($isOutermost && $outermostItemClass) {
-            $classes[] = $outermostItemClass;
-            $linkClass = ' class="' . $outermostItemClass . '"';
-        }
-        if ($isFirst) {
-            $classes[] = 'first';
-        }
-        if ($isLast) {
-            $classes[] = 'last';
-        }
-        if ($hasActiveChildren) {
-            $classes[] = 'parent';
-        }
-
-        // prepare list item attributes
-        $attributes = [];
-        if (count($classes) > 0) {
-            $attributes['class'] = implode(' ', $classes);
-        }
-        if ($hasActiveChildren && !$noEventAttributes) {
-            $attributes['onmouseover'] = 'toggleMenu(this,1)';
-            $attributes['onmouseout'] = 'toggleMenu(this,0)';
-        }
-
-        // assemble list item with attributes
-        $htmlLi = '<li';
-        foreach ($attributes as $attrName => $attrValue) {
-            $htmlLi .= ' ' . $attrName . '="' . str_replace('"', '\"', $attrValue) . '"';
-        }
-        $htmlLi .= '>';
-
-        $html = [];
-        $html[] = $htmlLi;
-
-        $html[] = '<a href="' . $this->getCategoryUrl($category) . '"' . $linkClass . '>';
-        $html[] = '<span>' . $this->escapeHtml($category->getName()) . '</span>';
-        $html[] = '</a>';
-
-        // render children
-        $htmlChildren = '';
-        $j = 0;
-        foreach ($activeChildren as $child) {
-            $htmlChildren .= $this->_renderCategoryMenuItemHtml(
-                $child,
-                $level + 1,
-                $j == $activeChildrenCount - 1,
-                $j == 0,
-                false,
-                $outermostItemClass,
-                $childrenWrapClass,
-                $noEventAttributes
-            );
-            $j++;
-        }
-        if (!empty($htmlChildren)) {
-            if ($childrenWrapClass) {
-                $html[] = '<div class="' . $childrenWrapClass . '">';
-            }
-            $html[] = '<ul class="level' . $level . '">';
-            $html[] = $htmlChildren;
-            $html[] = '</ul>';
-            if ($childrenWrapClass) {
-                $html[] = '</div>';
-            }
-        }
-
-        $html[] = '</li>';
-
-        $html = implode("\n", $html);
-        return $html;
-    }
-
     /**
      * Enter description here...
      *
@@ -394,107 +229,6 @@ public function getCurrentCategory()
         return $this->_catalogLayer->getCurrentCategory();
     }
 
-    /**
-     * Enter description here...
-     *
-     * @return string
-     */
-    public function getCurrentCategoryPath()
-    {
-        if ($this->getCurrentCategory()) {
-            return explode(',', $this->getCurrentCategory()->getPathInStore());
-        }
-        return [];
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param Category $category
-     * @return string
-     */
-    public function drawOpenCategoryItem($category)
-    {
-        $html = '';
-        if (!$category->getIsActive()) {
-            return $html;
-        }
-
-        $html .= '<li';
-
-        if ($this->isCategoryActive($category)) {
-            $html .= ' class="active"';
-        }
-
-        $html .= '>' . "\n";
-        $html .= '<a href="' . $this->getCategoryUrl(
-            $category
-        ) . '">' . '<span>' . $this->escapeHtml(
-            $category->getName()
-        ) . '</span></a>' . "\n";
-
-        if (in_array($category->getId(), $this->getCurrentCategoryPath())) {
-            $children = $category->getChildren();
-            $hasChildren = $children && $children->count();
-
-            if ($hasChildren) {
-                $htmlChildren = '';
-                foreach ($children as $child) {
-                    $htmlChildren .= $this->drawOpenCategoryItem($child);
-                }
-
-                if (!empty($htmlChildren)) {
-                    $html .= '<ul>' . "\n" . $htmlChildren . '</ul>';
-                }
-            }
-        }
-        $html .= '</li>' . "\n";
-
-        return $html;
-    }
-
-    /**
-     * Render categories menu in HTML
-     *
-     * @param int $level Level number for list item class to start from
-     * @param string $outermostItemClass Extra class of outermost list items
-     * @param string $childrenWrapClass If specified wraps children list in div with this class
-     * @return string
-     */
-    public function renderCategoriesMenuHtml($level = 0, $outermostItemClass = '', $childrenWrapClass = '')
-    {
-        $activeCategories = [];
-        foreach ($this->getStoreCategories() as $child) {
-            if ($child->getIsActive()) {
-                $activeCategories[] = $child;
-            }
-        }
-        $activeCategoriesCount = count($activeCategories);
-        $hasActiveCategoriesCount = $activeCategoriesCount > 0;
-
-        if (!$hasActiveCategoriesCount) {
-            return '';
-        }
-
-        $html = '';
-        $j = 0;
-        foreach ($activeCategories as $category) {
-            $html .= $this->_renderCategoryMenuItemHtml(
-                $category,
-                $level,
-                $j == $activeCategoriesCount - 1,
-                $j == 0,
-                true,
-                $outermostItemClass,
-                $childrenWrapClass,
-                true
-            );
-            $j++;
-        }
-
-        return $html;
-    }
-
     /**
      * Return identifiers for produced content
      *

app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php

@@ -7,6 +7,23 @@
 
 class Delete extends \Magento\Catalog\Controller\Adminhtml\Category
 {
+    /** @var \Magento\Catalog\Api\CategoryRepositoryInterface */
+    protected $categoryRepository;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+        \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
+    ) {
+        parent::__construct($context, $resultRedirectFactory);
+        $this->categoryRepository = $categoryRepository;
+    }
+
     /**
      * Delete category action
      *
@@ -18,14 +35,14 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
 
         $categoryId = (int)$this->getRequest()->getParam('id');
+        $parentId = null;
         if ($categoryId) {
             try {
-                $category = $this->_objectManager->create('Magento\Catalog\Model\Category')->load($categoryId);
+                $category = $this->categoryRepository->get($categoryId);
+                $parentId = $category->getParentId();
                 $this->_eventManager->dispatch('catalog_controller_category_delete', ['category' => $category]);
-
-                $this->_objectManager->get('Magento\Backend\Model\Auth\Session')->setDeletedPath($category->getPath());
-
-                $category->delete();
+                $this->_auth->getAuthStorage()->setDeletedPath($category->getPath());
+                $this->categoryRepository->delete($category);
                 $this->messageManager->addSuccess(__('You deleted the category.'));
             } catch (\Magento\Framework\Model\Exception $e) {
                 $this->messageManager->addError($e->getMessage());
@@ -35,6 +52,6 @@ public function execute()
                 return $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
             }
         }
-        return $resultRedirect->setPath('catalog/*/', ['_current' => true, 'id' => null]);
+        return $resultRedirect->setPath('catalog/*/', ['_current' => true, 'id' => $parentId]);
     }
 }