Merge remote-tracking branch 'tango-ce/MAGETWO-33812' into MAGETWO-33812

Author: Yuri Kovsher

app/code/Magento/Catalog/Helper/Product/View.php

@@ -15,9 +15,6 @@
  */
 class View extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    // List of exceptions throwable during prepareAndRender() method
-    public $ERR_BAD_CONTROLLER_INTERFACE = 2;
-
     /**
      * List of catalog product session message groups
      *
@@ -183,6 +180,7 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
      * @param \Magento\Framework\App\Action\Action $controller
      * @param null|\Magento\Framework\Object $params
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return \Magento\Catalog\Helper\Product\View
      */
     public function prepareAndRender(ResultPage $resultPage, $productId, $controller, $params = null)
@@ -218,8 +216,7 @@ public function prepareAndRender(ResultPage $resultPage, $productId, $controller
             $resultPage->getLayout()->initMessages($this->messageGroups);
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Bad controller interface for showing product'),
-                $this->ERR_BAD_CONTROLLER_INTERFACE
+                __('Bad controller interface for showing product')
             );
         }
         return $this;

lib/internal/Magento/Framework/Exception/InvalidDataException.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Exception;
+
+class InvalidDataException extends LocalizedException
+{
+}

lib/internal/Magento/Framework/Exception/Product/HasRequiredOptionsException.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Exception\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+
+class HasRequiredOptionsException extends LocalizedException
+{
+}

lib/internal/Magento/Framework/Exception/State/AdminUserLockedException.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Exception\State;
+
+class AdminUserLockedException extends \Magento\Framework\Exception\StateException
+{
+}