Merge branch 'MAGETWO-54341-add-deprecated-annotation' of https://github.com/magento-extensibility/magento2ce into develop

Robert He · Robert He · commit 88012bcef9d4 · 2016-06-13T16:09:28.000-05:00
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -523,6 +523,7 @@ public function getCollection()
      * @param integer $modelId
      * @param null|string $field
      * @return $this
+     * @deprecated
      */
     public function load($modelId, $field = null)
     {
@@ -623,6 +624,7 @@ public function setHasDataChanges($flag)
      *
      * @return $this
      * @throws \Exception
+     * @deprecated
      */
     public function save()
     {
@@ -807,6 +809,7 @@ public function afterSave()
      *
      * @return $this
      * @throws \Exception
+     * @deprecated
      */
     public function delete()
     {

Original file line number	Diff line number	Diff line change
`@@ -523,6 +523,7 @@ public function getCollection()`
`523`	`523`	`* @param integer $modelId`
`524`	`524`	`* @param null\|string $field`
`525`	`525`	`* @return $this`
	`526`	`+ * @deprecated`
`526`	`527`	`*/`
`527`	`528`	`public function load($modelId, $field = null)`
`528`	`529`	`{`
`@@ -623,6 +624,7 @@ public function setHasDataChanges($flag)`
`623`	`624`	`*`
`624`	`625`	`* @return $this`
`625`	`626`	`* @throws \Exception`
	`627`	`+ * @deprecated`
`626`	`628`	`*/`
`627`	`629`	`public function save()`
`628`	`630`	`{`
`@@ -807,6 +809,7 @@ public function afterSave()`
`807`	`809`	`*`
`808`	`810`	`* @return $this`
`809`	`811`	`* @throws \Exception`
	`812`	`+ * @deprecated`
`810`	`813`	`*/`
`811`	`814`	`public function delete()`
`812`	`815`	`{`