Use a trait instead of an abstract class

dunglas · dunglas · commit f1b4de0596f7 · 2016-01-19T22:55:33.000+01:00
diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php b/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php
@@ -21,8 +21,10 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class ClassMetadataFactory extends AbstractMetadataFactory
+class ClassMetadataFactory implements ClassMetadataFactoryInterface
 {
+    use ClassResolverTrait;
+
     /**
      * @var LoaderInterface
      */
diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/ClassResolverTrait.php b/src/Symfony/Component/Serializer/Mapping/Factory/ClassResolverTrait.php
@@ -14,11 +14,11 @@
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 
 /**
- * Abstract metadata factory.
+ * Resolves a class name.
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-abstract class AbstractMetadataFactory implements ClassMetadataFactoryInterface
+trait ClassResolverTrait
 {
     /**
      * Gets a class name for a given class or instance.
@@ -29,7 +29,7 @@ abstract class AbstractMetadataFactory implements ClassMetadataFactoryInterface
      *
      * @throws InvalidArgumentException If the class does not exists
      */
-    protected function getClass($value)
+    private function getClass($value)
     {
         if (is_string($value)) {
             if (!class_exists($value) && !interface_exists($value)) {
diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/Psr6MetadataFactory.php b/src/Symfony/Component/Serializer/Mapping/Factory/Psr6MetadataFactory.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /*
  * This file is part of the Symfony package.
  *
@@ -11,15 +10,18 @@
  */
 
 namespace Symfony\Component\Serializer\Mapping\Factory;
+
 use Psr\Cache\CacheItemPoolInterface;
 
 /**
  * Caches metadata using a PSR-6 implementation.
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class Psr6CacheDecorator extends AbstractMetadataFactory
+class Psr6CacheDecorator implements ClassMetadataFactoryInterface
 {
+    use ClassResolverTrait;
+
     /**
      * @var ClassMetadataFactoryInterface
      */

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,10 @@`
`21`	`21`	`*`
`22`	`22`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`23`	`23`	`*/`
`24`		`-class ClassMetadataFactory extends AbstractMetadataFactory`
	`24`	`+class ClassMetadataFactory implements ClassMetadataFactoryInterface`
`25`	`25`	`{`
	`26`	`+ use ClassResolverTrait;`
	`27`	`+`
`26`	`28`	`/**`
`27`	`29`	`* @var LoaderInterface`
`28`	`30`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@`
`14`	`14`	`use Symfony\Component\Serializer\Exception\InvalidArgumentException;`
`15`	`15`
`16`	`16`	`/**`
`17`		`- * Abstract metadata factory.`
	`17`	`+ * Resolves a class name.`
`18`	`18`	`*`
`19`	`19`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`20`	`20`	`*/`
`21`		`-abstract class AbstractMetadataFactory implements ClassMetadataFactoryInterface`
	`21`	`+trait ClassResolverTrait`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`	`24`	`* Gets a class name for a given class or instance.`
`@@ -29,7 +29,7 @@ abstract class AbstractMetadataFactory implements ClassMetadataFactoryInterface`
`29`	`29`	`*`
`30`	`30`	`* @throws InvalidArgumentException If the class does not exists`
`31`	`31`	`*/`
`32`		`- protected function getClass($value)`
	`32`	`+ private function getClass($value)`
`33`	`33`	`{`
`34`	`34`	`if (is_string($value)) {`
`35`	`35`	`if (!class_exists($value) && !interface_exists($value)) {`