Merge pull request #368 from magento-ogre/PR_Branch

[Ogre's] Sprint 31 - Uninstall, backup and rollback functionality
magento · Jun 18, 2015 · 6b5e713 · 6b5e713
2 parents ba55724 + a7f7b64
commit 6b5e713
Show file tree

Hide file tree

Showing 114 changed files with 23,045 additions and 731 deletions.
diff --git a/app/code/Magento/Backend/App/ConfigInterface.php b/app/code/Magento/Backend/App/ConfigInterface.php
@@ -17,6 +17,7 @@ interface ConfigInterface
      *
      * @param string $path
      * @return mixed
+     * @api
      */
     public function getValue($path);
 
@@ -26,6 +27,7 @@ public function getValue($path);
      * @param string $path
      * @param mixed $value
      * @return void
+     * @api
      */
     public function setValue($path, $value);
 
@@ -34,6 +36,7 @@ public function setValue($path, $value);
      *
      * @param string $path
      * @return bool
+     * @api
      */
     public function isSetFlag($path);
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Button/ContextInterface.php b/app/code/Magento/Backend/Block/Widget/Button/ContextInterface.php
@@ -13,6 +13,7 @@ interface ContextInterface
      *
      * @param \Magento\Backend\Block\Widget\Button\Item $item
      * @return bool
+     * @api
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item);
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Button/ToolbarInterface.php b/app/code/Magento/Backend/Block/Widget/Button/ToolbarInterface.php
@@ -14,6 +14,7 @@ interface ToolbarInterface
      * @param \Magento\Framework\View\Element\AbstractBlock $context
      * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
      * @return void
+     * @api
      */
     public function pushButtons(
         \Magento\Framework\View\Element\AbstractBlock $context,

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/FilterInterface.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/FilterInterface.php
@@ -16,17 +16,20 @@ interface FilterInterface
 {
     /**
      * @return Column
+     * @api
      */
     public function getColumn();
 
     /**
      * @param Column $column
      * @return AbstractFilter
+     * @api
      */
     public function setColumn($column);
 
     /**
      * @return string
+     * @api
      */
     public function getHtml();
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/RendererInterface.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/RendererInterface.php
@@ -20,6 +20,7 @@ interface RendererInterface
      * @param Column $column
      * @return void
      * @abstract
+     * @api
      */
     public function setColumn($column);
 
@@ -28,6 +29,7 @@ public function setColumn($column);
      *
      * @abstract
      * @return void
+     * @api
      */
     public function getColumn();
 
@@ -36,6 +38,7 @@ public function getColumn();
      *
      * @param \Magento\Framework\Object $row
      * @return string
+     * @api
      */
     public function render(\Magento\Framework\Object $row);
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ExportInterface.php b/app/code/Magento/Backend/Block/Widget/Grid/ExportInterface.php
@@ -11,13 +11,15 @@ interface ExportInterface
      * Retrieve grid export types
      *
      * @return array|bool
+     * @api
      */
     public function getExportTypes();
 
     /**
      * Retrieve grid id
      *
      * @return string
+     * @api
      */
     public function getId();
 
@@ -43,20 +45,23 @@ public function addExportType($url, $label);
      * Return array with keys type and value
      *
      * @return array
+     * @api
      */
     public function getCsvFile();
 
     /**
      * Retrieve Grid data as CSV
      *
      * @return string
+     * @api
      */
     public function getCsv();
 
     /**
      * Retrieve data in xml
      *
      * @return string
+     * @api
      */
     public function getXml();
 
@@ -67,13 +72,15 @@ public function getXml();
      *
      * @param string $sheetName
      * @return array
+     * @api
      */
     public function getExcelFile($sheetName = '');
 
     /**
      * Retrieve grid data as MS Excel 2003 XML Document
      *
      * @return string
+     * @api
      */
     public function getExcel();
 }
diff --git a/...code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/AdditionalInterface.php b/...code/Magento/Backend/Block/Widget/Grid/Massaction/Item/Additional/AdditionalInterface.php
@@ -15,6 +15,7 @@ interface AdditionalInterface
     /**
      * @param array $configuration
      * @return $this
+     * @api
      */
     public function createFromConfiguration(array $configuration);
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Tab/TabInterface.php b/app/code/Magento/Backend/Block/Widget/Tab/TabInterface.php
@@ -17,27 +17,31 @@ interface TabInterface
      * Return Tab label
      *
      * @return string
+     * @api
      */
     public function getTabLabel();
 
     /**
      * Return Tab title
      *
      * @return string
+     * @api
      */
     public function getTabTitle();
 
     /**
      * Can show tab in tabs
      *
      * @return boolean
+     * @api
      */
     public function canShowTab();
 
     /**
      * Tab is hidden
      *
      * @return boolean
+     * @api
      */
     public function isHidden();
 }
diff --git a/app/code/Magento/Backend/Model/Auth/Credential/StorageInterface.php b/app/code/Magento/Backend/Model/Auth/Credential/StorageInterface.php
@@ -9,6 +9,7 @@
  * Backend Auth Credential Storage interface
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 interface StorageInterface
 {

diff --git a/app/code/Magento/Backend/Model/Auth/StorageInterface.php b/app/code/Magento/Backend/Model/Auth/StorageInterface.php
@@ -15,6 +15,7 @@ interface StorageInterface
      *
      * @return $this
      * @abstract
+     * @api
      */
     public function processLogin();
 
@@ -23,6 +24,7 @@ public function processLogin();
      *
      * @return $this
      * @abstract
+     * @api
      */
     public function processLogout();
 
@@ -31,6 +33,7 @@ public function processLogout();
      *
      * @return bool
      * @abstract
+     * @api
      */
     public function isLoggedIn();
 
@@ -39,6 +42,7 @@ public function isLoggedIn();
      *
      * @return void
      * @abstract
+     * @api
      */
     public function prolong();
 }
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/Row/GeneratorInterface.php b/app/code/Magento/Backend/Model/Widget/Grid/Row/GeneratorInterface.php
@@ -12,6 +12,7 @@ interface GeneratorInterface
     /**
      * @param \Magento\Framework\Object $item
      * @return string
+     * @api
      */
     public function getUrl($item);
 }
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/TotalsInterface.php b/app/code/Magento/Backend/Model/Widget/Grid/TotalsInterface.php
@@ -13,6 +13,7 @@ interface TotalsInterface
      * @abstract
      * @param \Magento\Framework\Data\Collection $collection
      * @return \Magento\Framework\Object
+     * @api
      */
     public function countTotals($collection);
 }
diff --git a/app/code/Magento/Log/Model/Log.php b/app/code/Magento/Log/Model/Log.php
@@ -81,6 +81,7 @@ public function getLogCleanTime()
      * Clean Logs
      *
      * @return $this
+     * @api
      */
     public function clean()
     {

diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Collection.php
@@ -111,6 +111,7 @@ protected function _construct()
      * Filter for customers only
      *
      * @return $this
+     * @api
      */
     public function showCustomersOnly()
     {
@@ -174,6 +175,7 @@ public function load($printQuery = false, $logQuery = false)
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
+     * @api
      */
     public function getIsOnlineFilterUsed()
     {
@@ -185,6 +187,7 @@ public function getIsOnlineFilterUsed()
      *
      * @param int[]|int $storeIds
      * @return void
+     * @api
      */
     public function addVisitorStoreFilter($storeIds)
     {

diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
@@ -87,6 +87,7 @@ public function addCustomerData()
      *
      * @param int|int[] $websiteIds
      * @return $this
+     * @api
      */
     public function addWebsiteFilter($websiteIds)
     {

diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
@@ -87,6 +87,7 @@ public function __construct(
      * Return currently selected cache type: built in or varnish
      *
      * @return int
+     * @api
      */
     public function getType()
     {
@@ -97,6 +98,7 @@ public function getType()
      * Return page lifetime
      *
      * @return int
+     * @api
      */
     public function getTtl()
     {
@@ -108,6 +110,7 @@ public function getTtl()
      *
      * @param string $vclTemplatePath
      * @return string
+     * @api
      */
     public function getVclFile($vclTemplatePath)
     {
@@ -202,6 +205,7 @@ protected function _getDesignExceptions()
      * Whether a cache type is enabled in Cache Management Grid
      *
      * @return bool
+     * @api
      */
     public function isEnabled()
     {

diff --git a/app/code/Magento/PageCache/Model/DepersonalizeChecker.php b/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
@@ -51,6 +51,7 @@ public function __construct(
      *
      * @param \Magento\Framework\View\LayoutInterface $subject
      * @return bool
+     * @api
      */
     public function checkIfDepersonalize(\Magento\Framework\View\LayoutInterface $subject)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
      * Backend Auth Credential Storage interface
      *
      * @author      Magento Core Team <core@magentocommerce.com>
+     * @api
      */
     interface StorageInterface
     {
@@ Expand Down @@