Merge pull request #371 from magento-folks/temporary_updates

[Folks] Sprint 81

Author: Akimov, Alexander(aakimov)

app/code/Magento/CatalogRule/Model/CatalogRuleRepository.php

@@ -9,6 +9,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use \Magento\Framework\Exception\ValidatorException;
 
 class CatalogRuleRepository implements \Magento\CatalogRule\Api\CatalogRuleRepositoryInterface
 {
@@ -51,7 +52,10 @@ public function save(Data\RuleInterface $rule)
         try {
             $this->ruleResource->save($rule);
             unset($this->rules[$rule->getId()]);
-        } catch (\Exception $e) {
+        } catch (ValidatorException $e) {
+            throw new CouldNotSaveException(__($e->getMessage()));
+        }
+        catch (\Exception $e) {
             throw new CouldNotSaveException(__('Unable to save rule %1', $rule->getRuleId()));
         }
         return $rule;
@@ -63,7 +67,7 @@ public function save(Data\RuleInterface $rule)
     public function get($ruleId)
     {
         if (!isset($this->rules[$ruleId])) {
-            /** @var \Magento\CatalogRule\Model\RuleFactory $rule */
+            /** @var \Magento\CatalogRule\Model\Rule $rule */
             $rule = $this->ruleFactory->create();
 
             /* TODO: change to resource model after entity manager will be fixed */
@@ -84,6 +88,8 @@ public function delete(Data\RuleInterface $rule)
         try {
             $this->ruleResource->delete($rule);
             unset($this->rules[$rule->getId()]);
+        } catch (ValidatorException $e) {
+            throw new CouldNotSaveException(__($e->getMessage()));
         } catch (\Exception $e) {
             throw new CouldNotDeleteException(__('Unable to remove rule %1', $rule->getRuleId()));
         }

app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php

@@ -287,28 +287,31 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
-     * Delete the object
-     *
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param AbstractModel $object
      * @return $this
      * @throws \Exception
      */
-    public function delete(AbstractModel $object)
+    public function delete(\Magento\Framework\Model\AbstractModel $object)
     {
+        //TODO: add object relation processor support (MAGETWO-49297)
         $this->transactionManager->start($this->getConnection());
         try {
             $object->beforeDelete();
             $this->_beforeDelete($object);
-            $this->entityManager->delete('Magento\CatalogRule\Api\Data\RuleInterface', $object);
+            $this->entityManager->delete(
+                'Magento\CatalogRule\Api\Data\RuleInterface',
+                $object
+            );
             $this->_afterDelete($object);
             $object->isDeleted(true);
             $object->afterDelete();
             $this->transactionManager->commit();
             $object->afterDeleteCommit();
-        } catch (\Exception $exception) {
+        } catch (\Exception $e) {
             $this->transactionManager->rollBack();
-            throw $exception;
+            throw $e;
         }
+
         return $this;
     }
 }

lib/internal/Magento/Framework/App/etc/routes.xsd

@@ -136,7 +136,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z0-9_\-]{3,}" />
+            <xs:pattern value="[A-Za-z0-9_\-]{1,}" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>

lib/internal/Magento/Framework/App/etc/routes_merged.xsd

@@ -136,7 +136,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z0-9_\-]{3,}" />
+            <xs:pattern value="[A-Za-z0-9_\-]{1,}" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>