Skip to content

Commit

Permalink
Fix static tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
nmalevanec committed Feb 22, 2019
1 parent 40d9c7e commit b62691d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<?php
/**
*
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Catalog\Controller\Adminhtml\Product;

class GridOnly extends \Magento\Catalog\Controller\Adminhtml\Product
use Magento\Framework\App\Action\HttpGetActionInterface;

/**
* Get specified tab grid controller.
*/
class GridOnly extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
{
/**
* @var \Magento\Framework\Controller\Result\RawFactory
Expand Down
13 changes: 7 additions & 6 deletions lib/internal/Magento/Framework/DataObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ public function addData(array $arr)
*
* If $key is an array, it will overwrite all the data in the object.
*
* @param string|array $key
* @param mixed $value
* @param string|array $key
* @param mixed $value
* @return $this
*/
public function setData($key, $value = null)
Expand Down Expand Up @@ -111,7 +111,7 @@ public function unsetData($key = null)
* and retrieve corresponding member. If data is the string - it will be explode
* by new line character and converted to array.
*
* @param string $key
* @param string $key
* @param string|int $index
* @return mixed
*/
Expand Down Expand Up @@ -222,6 +222,7 @@ public function getDataUsingMethod($key, $args = null)

/**
* If $key is empty, checks whether there's any data in the object
*
* Otherwise checks if the specified attribute is set.
*
* @param string $key
Expand Down Expand Up @@ -272,8 +273,8 @@ public function convertToArray(array $keys = [])
/**
* Convert object data into XML string
*
* @param array $keys array of keys that must be represented
* @param string $rootName root node name
* @param array $keys array of keys that must be represented
* @param string $rootName root node name
* @param bool $addOpenTag flag that allow to add initial xml node
* @param bool $addCdata flag that require wrap all values in CDATA
* @return string
Expand Down Expand Up @@ -436,7 +437,7 @@ protected function _underscore($name)
*
* Example: key1="value1" key2="value2" ...
*
* @param array $keys array of accepted keys
* @param array $keys array of accepted keys
* @param string $valueSeparator separator between key and value
* @param string $fieldSeparator separator between key/value pairs
* @param string $quote quoting sign
Expand Down
5 changes: 3 additions & 2 deletions lib/internal/Magento/Framework/Module/PackageInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
use Magento\Framework\Component\ComponentRegistrar;

/**
* Provide information of dependencies and conflicts in composer.json files, mapping of package name to module name,
* and mapping of module name to package version
* Provide information of dependencies and conflicts in composer.json files.
*
* Mapping of package name to module name, and mapping of module name to package version.
*/
class PackageInfo
{
Expand Down

0 comments on commit b62691d

Please sign in to comment.