renamed ElementNewInterface to StructureElementInterface

maximgubar · maximgubar · commit 42baff63ad69 · 2017-08-28T09:31:10.000+02:00
diff --git a/app/code/Magento/Backend/Model/Search/Config.php b/app/code/Magento/Backend/Model/Search/Config.php
@@ -12,13 +12,7 @@
 
 /**
  * Search Config Model
- *
- * @method Config setQuery(string $query)
- * @method string|null getQuery()
- * @method bool hasQuery()
- * @method Config setResults(array $results)
- * @method array getResults()
- */
+  */
 class Config extends \Magento\Framework\DataObject
 {
     /**
@@ -41,6 +35,50 @@ public function __construct(Structure $configStructure, Builder $resultBuilder)
         $this->resultBuilder = $resultBuilder;
     }
 
+    /**
+     * @param string $query
+     * @return $this
+     */
+    public function setQuery($query)
+    {
+        $this->setData('query', $query);
+        return $this;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getQuery()
+    {
+        return $this->getData('query');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasQuery()
+    {
+        return $this->hasData('query');
+    }
+
+    /**
+     * @param array $results
+     * @return $this
+     */
+    public function setResults(array $results)
+    {
+        $this->setData('results', $results);
+        return $this;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getResults()
+    {
+        return $this->getData('results');
+    }
+
     /**
      * Load search results
      *
diff --git a/app/code/Magento/Backend/Model/Search/Config/Result/Builder.php b/app/code/Magento/Backend/Model/Search/Config/Result/Builder.php
@@ -7,7 +7,7 @@
 
 use Magento\Backend\Model\Search\Config\Structure\ElementBuilderInterface;
 use Magento\Backend\Model\UrlInterface;
-use Magento\Config\Model\Config\Structure\ElementNewInterface;
+use Magento\Config\Model\Config\StructureElementInterface;
 
 /**
  * Config SearchResult Builder
@@ -48,11 +48,11 @@ public function getAll()
     }
 
     /**
-     * @param ElementNewInterface $structureElement
+     * @param StructureElementInterface $structureElement
      * @param string $elementPathLabel
      * @return void
      */
-    public function add(ElementNewInterface $structureElement, $elementPathLabel)
+    public function add(StructureElementInterface $structureElement, $elementPathLabel)
     {
         $urlParams = [];
         $elementData = $structureElement->getData();
diff --git a/app/code/Magento/Backend/Model/Search/Config/Structure/Element/Builder/Field.php b/app/code/Magento/Backend/Model/Search/Config/Structure/Element/Builder/Field.php
@@ -6,14 +6,14 @@
 namespace Magento\Backend\Model\Search\Config\Structure\Element\Builder;
 
 use Magento\Backend\Model\Search\Config\Structure\ElementBuilderInterface;
-use Magento\Config\Model\Config\Structure\ElementNewInterface;
+use Magento\Config\Model\Config\StructureElementInterface;
 
 class Field implements ElementBuilderInterface
 {
     /**
      * @inheritdoc
      */
-    public function build(ElementNewInterface $structureElement)
+    public function build(StructureElementInterface $structureElement)
     {
         $elementPathParts = explode('/', $structureElement->getPath());
         return [
diff --git a/app/code/Magento/Backend/Model/Search/Config/Structure/Element/Builder/Group.php b/app/code/Magento/Backend/Model/Search/Config/Structure/Element/Builder/Group.php
@@ -6,14 +6,14 @@
 namespace Magento\Backend\Model\Search\Config\Structure\Element\Builder;
 
 use Magento\Backend\Model\Search\Config\Structure\ElementBuilderInterface;
-use Magento\Config\Model\Config\Structure\ElementNewInterface;
+use Magento\Config\Model\Config\StructureElementInterface;
 
 class Group implements ElementBuilderInterface
 {
     /**
      * @inheritdoc
      */
-    public function build(ElementNewInterface $structureElement)
+    public function build(StructureElementInterface $structureElement)
     {
         $elementPathParts = explode('/', $structureElement->getPath());
         return [
diff --git a/app/code/Magento/Backend/Model/Search/Config/Structure/Element/Builder/Section.php b/app/code/Magento/Backend/Model/Search/Config/Structure/Element/Builder/Section.php
@@ -6,14 +6,14 @@
 namespace Magento\Backend\Model\Search\Config\Structure\Element\Builder;
 
 use Magento\Backend\Model\Search\Config\Structure\ElementBuilderInterface;
-use Magento\Config\Model\Config\Structure\ElementNewInterface;
+use Magento\Config\Model\Config\StructureElementInterface;
 
 class Section implements ElementBuilderInterface
 {
     /**
      * @inheritdoc
      */
-    public function build(ElementNewInterface $structureElement)
+    public function build(StructureElementInterface $structureElement)
     {
         $elementPathParts = explode('/', $structureElement->getPath());
         return ['section' => $elementPathParts[1]];
diff --git a/app/code/Magento/Backend/Model/Search/Config/Structure/ElementBuilderInterface.php b/app/code/Magento/Backend/Model/Search/Config/Structure/ElementBuilderInterface.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Backend\Model\Search\Config\Structure;
 
-use Magento\Config\Model\Config\Structure\ElementNewInterface;
+use Magento\Config\Model\Config\StructureElementInterface;
 
 interface ElementBuilderInterface
 {
     /**
-     * @param ElementNewInterface $structureElement
+     * @param StructureElementInterface $structureElement
      * @return array
      */
-    public function build(ElementNewInterface $structureElement);
+    public function build(StructureElementInterface $structureElement);
 }
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Search/Config/Result/BuilderTest.php b/app/code/Magento/Backend/Test/Unit/Model/Search/Config/Result/BuilderTest.php
@@ -8,7 +8,7 @@
 use Magento\Backend\Model\Search\Config\Structure\ElementBuilderInterface;
 use Magento\Backend\Model\UrlInterface;
 use Magento\Backend\Model\Search\Config\Result\Builder;
-use Magento\Config\Model\Config\Structure\ElementNewInterface;
+use Magento\Config\Model\Config\StructureElementInterface;
 use PHPUnit\Framework\TestCase;
 
 class BuilderTest extends TestCase
@@ -19,7 +19,7 @@ class BuilderTest extends TestCase
     protected $model;
 
     /**
-     * @var ElementNewInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StructureElementInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $structureElementMock;
 
@@ -36,7 +36,7 @@ class BuilderTest extends TestCase
     protected function setUp()
     {
         $this->urlBuilderMock = $this->getMockForAbstractClass(UrlInterface::class);
-        $this->structureElementMock = $this->getMockForAbstractClass(ElementNewInterface::class);
+        $this->structureElementMock = $this->getMockForAbstractClass(StructureElementInterface::class);
         $this->structureElementUrlParamsBuilderMock = $this->getMockForAbstractClass(ElementBuilderInterface::class);
         $this->model = new Builder($this->urlBuilderMock, ['section' => $this->structureElementUrlParamsBuilderMock]);
     }
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Search/Config/Structure/Element/Builder/FieldTest.php b/app/code/Magento/Backend/Test/Unit/Model/Search/Config/Structure/Element/Builder/FieldTest.php
@@ -7,13 +7,13 @@
 namespace Magento\Backend\Test\Unit\Model\Search\Config\Structure\Element\Builder;
 
 use Magento\Backend\Model\Search\Config\Structure\Element\Builder\Field;
-use Magento\Config\Model\Config\Structure\ElementNewInterface;
+use Magento\Config\Model\Config\StructureElementInterface;
 use PHPUnit\Framework\TestCase;
 
 class FieldTest extends TestCase
 {
     /**
-     * @var ElementNewInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StructureElementInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $structureElementMock;
 
@@ -24,7 +24,7 @@ class FieldTest extends TestCase
 
     protected function setUp()
     {
-        $this->structureElementMock = $this->getMockForAbstractClass(ElementNewInterface::class);
+        $this->structureElementMock = $this->getMockForAbstractClass(StructureElementInterface::class);
         $this->model = new Field();
     }
 
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Search/Config/Structure/Element/Builder/GroupTest.php b/app/code/Magento/Backend/Test/Unit/Model/Search/Config/Structure/Element/Builder/GroupTest.php
@@ -7,13 +7,13 @@
 namespace Magento\Backend\Test\Unit\Model\Search\Config\Structure\Element\Builder;
 
 use Magento\Backend\Model\Search\Config\Structure\Element\Builder\Group;
-use Magento\Config\Model\Config\Structure\ElementNewInterface;
+use Magento\Config\Model\Config\StructureElementInterface;
 use PHPUnit\Framework\TestCase;
 
 class GroupTest extends TestCase
 {
     /**
-     * @var ElementNewInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StructureElementInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $structureElementMock;
 
@@ -24,7 +24,7 @@ class GroupTest extends TestCase
 
     protected function setUp()
     {
-        $this->structureElementMock = $this->getMockForAbstractClass(ElementNewInterface::class);
+        $this->structureElementMock = $this->getMockForAbstractClass(StructureElementInterface::class);
         $this->model = new Group();
     }
 
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Search/Config/Structure/Element/Builder/SectionTest.php b/app/code/Magento/Backend/Test/Unit/Model/Search/Config/Structure/Element/Builder/SectionTest.php
@@ -7,13 +7,13 @@
 namespace Magento\Backend\Test\Unit\Model\Search\Config\Structure\Element\Builder;
 
 use Magento\Backend\Model\Search\Config\Structure\Element\Builder\Section;
-use Magento\Config\Model\Config\Structure\ElementNewInterface;
+use Magento\Config\Model\Config\StructureElementInterface;
 use PHPUnit\Framework\TestCase;
 
 class SectionTest extends TestCase
 {
     /**
-     * @var ElementNewInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StructureElementInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $structureElementMock;
 
@@ -24,7 +24,7 @@ class SectionTest extends TestCase
 
     protected function setUp()
     {
-        $this->structureElementMock = $this->getMockForAbstractClass(ElementNewInterface::class);
+        $this->structureElementMock = $this->getMockForAbstractClass(StructureElementInterface::class);
         $this->model = new Section();
     }
 
diff --git a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
@@ -5,14 +5,15 @@
  */
 namespace Magento\Config\Model\Config\Structure;
 
+use Magento\Config\Model\Config\StructureElementInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\ObjectManager;
 
 /**
  * @api
  */
-abstract class AbstractElement implements ElementNewInterface
+abstract class AbstractElement implements StructureElementInterface
 {
     /**
      * Element data
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Iterator.php b/app/code/Magento/Config/Model/Config/Structure/Element/Iterator.php
@@ -13,7 +13,7 @@ class Iterator implements \Iterator
     /**
      * List of element data
      *
-     * @var \Magento\Config\Model\Config\Structure\ElementNewInterface[]
+     * @var \Magento\Config\Model\Config\StructureElementInterface[]
      */
     protected $_elements;
 
@@ -66,7 +66,7 @@ public function setElements(array $elements, $scope)
     /**
      * Return the current element
      *
-     * @return \Magento\Config\Model\Config\Structure\ElementNewInterface
+     * @return \Magento\Config\Model\Config\StructureElementInterface
      */
     public function current()
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php b/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\Config\Model\Config\Structure;
 
+use Magento\Config\Model\Config\StructureElementInterface;
+
 /**
  * @api
  * @deprecated
- * @see ElementNewInterface
+ * @see StructureElementInterface
  */
 interface ElementInterface
 {
diff --git a/app/code/Magento/Config/Model/Config/StructureElementInterface.php b/app/code/Magento/Config/Model/Config/StructureElementInterface.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Config\Model\Config\Structure;
+namespace Magento\Config\Model\Config;
 
 /**
  * @api
  */
-interface ElementNewInterface extends ElementInterface
+interface StructureElementInterface extends Structure\ElementInterface
 {
     /**
      * Retrieve element config path

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`	`namespace Magento\Backend\Test\Unit\Model\Search\Config\Structure\Element\Builder;`
`8`	`8`
`9`	`9`	`use Magento\Backend\Model\Search\Config\Structure\Element\Builder\Field;`
`10`		`-use Magento\Config\Model\Config\Structure\ElementNewInterface;`
	`10`	`+use Magento\Config\Model\Config\StructureElementInterface;`
`11`	`11`	`use PHPUnit\Framework\TestCase;`
`12`	`12`
`13`	`13`	`class FieldTest extends TestCase`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`		`- * @var ElementNewInterface\|\PHPUnit_Framework_MockObject_MockObject`
	`16`	`+ * @var StructureElementInterface\|\PHPUnit_Framework_MockObject_MockObject`
`17`	`17`	`*/`
`18`	`18`	`private $structureElementMock;`
`19`	`19`
`@@ -24,7 +24,7 @@ class FieldTest extends TestCase`
`24`	`24`
`25`	`25`	`protected function setUp()`
`26`	`26`	`{`
`27`		`- $this->structureElementMock = $this->getMockForAbstractClass(ElementNewInterface::class);`
	`27`	`+ $this->structureElementMock = $this->getMockForAbstractClass(StructureElementInterface::class);`
`28`	`28`	`$this->model = new Field();`
`29`	`29`	`}`
`30`	`30`