Merge ecf775e into MAGETWO-65444-Api-Annotations

Magento CICD · web-flow · commit 0f2becbdd7a7 · 2017-04-20T17:46:19.000+01:00
diff --git a/app/code/Magento/Cookie/Helper/Cookie.php b/app/code/Magento/Cookie/Helper/Cookie.php
@@ -7,6 +7,7 @@
 
 /**
  * Cookie helper
+ * @api
  */
 class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/app/code/Magento/Cookie/view/frontend/web/js/notices.js b/app/code/Magento/Cookie/view/frontend/web/js/notices.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @api
+ */
 define([
     'jquery',
     'jquery/ui',
diff --git a/app/code/Magento/Cookie/view/frontend/web/js/require-cookie.js b/app/code/Magento/Cookie/view/frontend/web/js/require-cookie.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @api
+ */
 define([
     'jquery',
     'jquery/ui'
diff --git a/setup/src/Magento/Setup/Exception.php b/setup/src/Magento/Setup/Exception.php
@@ -6,6 +6,11 @@
 
 namespace Magento\Setup;
 
+/**
+ * Exception thrown if an error occurs on setup process.
+ *
+ * @api
+ */
 class Exception extends \Exception
 {
 }
diff --git a/setup/src/Magento/Setup/Model/ModuleContext.php b/setup/src/Magento/Setup/Model/ModuleContext.php
@@ -9,6 +9,8 @@
 
 /**
  * Context of a module being installed/updated: version, user data, etc.
+ *
+ * @api
  */
 class ModuleContext implements ModuleContextInterface
 {
diff --git a/setup/src/Magento/Setup/Module/DataSetup.php b/setup/src/Magento/Setup/Module/DataSetup.php
@@ -11,6 +11,9 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Setup\Module\Setup\SetupCache;
 
+/**
+ * @api
+ */
 class DataSetup extends \Magento\Framework\Module\Setup implements ModuleDataSetupInterface
 {
     /**
diff --git a/setup/src/Magento/Setup/Module/DataSetupFactory.php b/setup/src/Magento/Setup/Module/DataSetupFactory.php
@@ -9,6 +9,7 @@
 
 /**
  * Factory class to create DataSetup
+ * @api
  */
 class DataSetupFactory
 {
diff --git a/setup/src/Magento/Setup/Module/Setup.php b/setup/src/Magento/Setup/Module/Setup.php
@@ -8,6 +8,9 @@
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\App\ResourceConnection;
 
+/**
+ * @api
+ */
 class Setup extends \Magento\Framework\Module\Setup implements SchemaSetupInterface
 {
     /**
diff --git a/setup/src/Magento/Setup/Module/SetupFactory.php b/setup/src/Magento/Setup/Module/SetupFactory.php
@@ -10,6 +10,8 @@
 
 /**
  * Factory class to create Setup
+ *
+ * @api
  */
 class SetupFactory
 {

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Cookie helper`
	`10`	`+ * @api`
`10`	`11`	`*/`
`11`	`12`	`class Cookie extends \Magento\Framework\App\Helper\AbstractHelper`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,11 @@`
`6`	`6`
`7`	`7`	`namespace Magento\Setup;`
`8`	`8`
	`9`	`+/**`
	`10`	`+ * Exception thrown if an error occurs on setup process.`
	`11`	`+ *`
	`12`	`+ * @api`
	`13`	`+ */`
`9`	`14`	`class Exception extends \Exception`
`10`	`15`	`{`
`11`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Context of a module being installed/updated: version, user data, etc.`
	`12`	`+ *`
	`13`	`+ * @api`
`12`	`14`	`*/`
`13`	`15`	`class ModuleContext implements ModuleContextInterface`
`14`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`	`use Magento\Framework\Setup\ModuleDataSetupInterface;`
`12`	`12`	`use Magento\Setup\Module\Setup\SetupCache;`
`13`	`13`
	`14`	`+/**`
	`15`	`+ * @api`
	`16`	`+ */`
`14`	`17`	`class DataSetup extends \Magento\Framework\Module\Setup implements ModuleDataSetupInterface`
`15`	`18`	`{`
`16`	`19`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Factory class to create DataSetup`
	`12`	`+ * @api`
`12`	`13`	`*/`
`13`	`14`	`class DataSetupFactory`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@`
`8`	`8`	`use Magento\Framework\Setup\SchemaSetupInterface;`
`9`	`9`	`use Magento\Framework\App\ResourceConnection;`
`10`	`10`
	`11`	`+/**`
	`12`	`+ * @api`
	`13`	`+ */`
`11`	`14`	`class Setup extends \Magento\Framework\Module\Setup implements SchemaSetupInterface`
`12`	`15`	`{`
`13`	`16`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* Factory class to create Setup`
	`13`	`+ *`
	`14`	`+ * @api`
`13`	`15`	`*/`
`14`	`16`	`class SetupFactory`
`15`	`17`	`{`