Move description trait

digiaonline · Feb 8, 2018 · 4fa1272 · 4fa1272
1 parent 4c1d168
commit 4fa1272
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 15 deletions.
diff --git a/src/Type/Definition/Argument.php b/src/Type/Definition/Argument.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\DefaultValueTrait;

diff --git a/src/Behavior/DescriptionTrait.php → .../Definition/Behavior/DescriptionTrait.php b/src/Behavior/DescriptionTrait.php → .../Definition/Behavior/DescriptionTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Digia\GraphQL\Behavior;
+namespace Digia\GraphQL\Type\Definition\Behavior;
 
 trait DescriptionTrait
 {

diff --git a/src/Type/Definition/EnumType.php b/src/Type/Definition/EnumType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeInterface;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\KindEnum;

diff --git a/src/Type/Definition/EnumValue.php b/src/Type/Definition/EnumValue.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Behavior\ValueTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\EnumValueDefinitionNode;

diff --git a/src/Type/Definition/Field.php b/src/Type/Definition/Field.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Type\Definition\Behavior\ArgumentsTrait;
 use Digia\GraphQL\Type\Definition\Behavior\DeprecationTrait;

diff --git a/src/Type/Definition/InputField.php b/src/Type/Definition/InputField.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\DefaultValueTrait;

diff --git a/src/Type/Definition/InputObjectType.php b/src/Type/Definition/InputObjectType.php
@@ -19,7 +19,7 @@
  */
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\InputObjectTypeDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;

diff --git a/src/Type/Definition/InterfaceType.php b/src/Type/Definition/InterfaceType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\InterfaceTypeDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\ExtensionASTNodesTrait;

diff --git a/src/Type/Definition/ListType.php b/src/Type/Definition/ListType.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;
 use Digia\GraphQL\Type\Definition\Behavior\OfTypeTrait;
 use Digia\GraphQL\Type\Definition\Contract\TypeInterface;

diff --git a/src/Type/Definition/NonNullType.php b/src/Type/Definition/NonNullType.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;
 use Digia\GraphQL\Type\Definition\Behavior\OfTypeTrait;
 use Digia\GraphQL\Type\Definition\Contract\TypeInterface;

diff --git a/src/Type/Definition/ObjectType.php b/src/Type/Definition/ObjectType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\ObjectTypeDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\ExtensionASTNodesTrait;

diff --git a/src/Type/Definition/Scalar/AbstractScalarType.php b/src/Type/Definition/Scalar/AbstractScalarType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition\Scalar;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeInterface;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\ScalarTypeDefinitionNode;

diff --git a/src/Type/Definition/UnionType.php b/src/Type/Definition/UnionType.php
@@ -3,7 +3,7 @@
 namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\UnionTypeDefinitionNode;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;

diff --git a/src/Type/Directive/AbstractDirective.php b/src/Type/Directive/AbstractDirective.php
@@ -5,7 +5,7 @@
 use Digia\GraphQL\Type\Definition\Behavior\ArgumentsTrait;
 use Digia\GraphQL\Type\Definition\Behavior\NameTrait;
 use Digia\GraphQL\Behavior\ConfigTrait;
-use Digia\GraphQL\Behavior\DescriptionTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
 
 abstract class AbstractDirective implements DirectiveInterface
 {

diff --git a/tests/Unit/Type/Definition/Behavior/DescriptionTraitTest.php b/tests/Unit/Type/Definition/Behavior/DescriptionTraitTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Digia\GraphQL\Test\Unit\Type\Definition\Behavior;
+
+use Digia\GraphQL\Test\Unit\TestCase;
+use Digia\GraphQL\Behavior\ConfigTrait;
+use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;
+
+class DescriptionTraitTest extends TestCase
+{
+
+    /**
+     * @var DescribedClass
+     */
+    protected $instance;
+
+    public function setUp()
+    {
+        $this->instance = new DescribedClass([
+            'description' => 'Some description',
+        ]);
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function testGetDescription()
+    {
+        $this->assertEquals('Some description', $this->instance->getDescription());
+    }
+}
+
+class DescribedClass {
+    use DescriptionTrait;
+    use ConfigTrait;
+}
diff --git a/tests/Unit/Type/Definition/Behavior/NameTraitTest.php b/tests/Unit/Type/Definition/Behavior/NameTraitTest.php
@@ -24,7 +24,7 @@ public function setUp()
     /**
      * @throws \Exception
      */
-    public function testSetName()
+    public function testGetName()
     {
         $this->assertEquals('Dummy', $this->instance->getName());
     }