renamed bundle to SerializerBundle

Annotation/Exclude.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Annotation;
+namespace JMS\SerializerBundle\Annotation;
 
 class Exclude
 {

Annotation/ExclusionPolicy.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Annotation;
+namespace JMS\SerializerBundle\Annotation;
 
 class ExclusionPolicy
 {

Annotation/Expose.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Annotation;
+namespace JMS\SerializerBundle\Annotation;
 
 class Expose
 {

Annotation/SerializedName.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Annotation;
+namespace JMS\SerializerBundle\Annotation;
 
 class SerializedName
 {

Annotation/Since.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Annotation;
+namespace JMS\SerializerBundle\Annotation;
 
 class Since extends Version
 {

Annotation/Until.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Annotation;
+namespace JMS\SerializerBundle\Annotation;
 
 class Until extends Version
 {

Annotation/Version.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Annotation;
+namespace JMS\SerializerBundle\Annotation;
 
 abstract class Version
 {

DependencyInjection/JMSSerializerExtraExtension.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\DependencyInjection;
+namespace JMS\SerializerBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -26,7 +26,7 @@ use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-class JMSSerializerExtraExtension extends Extension
+class JMSSerializerExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container)
     {

JMSSerializerExtraBundle.php

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle;
+namespace JMS\SerializerBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class JMSSerializerExtraBundle extends Bundle
+class JMSSerializerBundle extends Bundle
 {
 }

Resources/config/services.xml

@@ -5,10 +5,10 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="jms_serializer_extra.camel_case_naming_strategy.class">JMS\SerializerExtraBundle\Serializer\Naming\CamelCaseNamingStrategy</parameter>
-        <parameter key="jms_serializer_extra.annotated_naming_strategy.class">JMS\SerializerExtraBundle\Serializer\Naming\AnnotatedNamingStrategy</parameter>
+        <parameter key="jms_serializer_extra.camel_case_naming_strategy.class">JMS\SerializerBundle\Serializer\Naming\CamelCaseNamingStrategy</parameter>
+        <parameter key="jms_serializer_extra.annotated_naming_strategy.class">JMS\SerializerBundle\Serializer\Naming\AnnotatedNamingStrategy</parameter>
         
-        <parameter key="jms_serializer_extra.serializer_factory.class">JMS\SerializerExtraBundle\Serializer\SerializerFactory</parameter>
+        <parameter key="jms_serializer_extra.serializer_factory.class">JMS\SerializerBundle\Serializer\SerializerFactory</parameter>
         
         <parameter key="jms_serializer_extra.annotation_reader.class">Doctrine\Common\Annotations\AnnotationReader</parameter>
         
@@ -34,7 +34,7 @@
         
         <service id="jms_serializer_extra.annotation_reader" class="%jms_serializer_extra.annotation_reader.class%" public="false">
             <call method="setDefaultAnnotationNamespace">
-                <argument>JMS\SerializerExtraBundle\Annotation\</argument>
+                <argument>JMS\SerializerBundle\Annotation\</argument>
             </call>
             <call method="setAutoloadAnnotations">
                 <argument>true</argument>

Resources/doc/index.rst

@@ -40,7 +40,7 @@ Configuration
 Below is the default configuration, you don't need to change it unless it doesn't
 suit your needs::
 
-    jms_serializer_extra:
+    jms_serializer:
         naming_strategy:
             separator:  _
             lower_case: true

Serializer/AnnotatedNormalizer.php

@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer;
+namespace JMS\SerializerBundle\Serializer;
 
-use JMS\SerializerExtraBundle\Serializer\Exclusion\ExclusionStrategyFactoryInterface;
-use JMS\SerializerExtraBundle\Serializer\Naming\PropertyNamingStrategyInterface;
+use JMS\SerializerBundle\Serializer\Exclusion\ExclusionStrategyFactoryInterface;
+use JMS\SerializerBundle\Serializer\Naming\PropertyNamingStrategyInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use JMS\SerializerExtraBundle\Annotation\ExclusionPolicy;
+use JMS\SerializerBundle\Annotation\ExclusionPolicy;
 use Doctrine\Common\Annotations\AnnotationReader;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 

Serializer/Exclusion/AllExclusionStrategy.php

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Exclusion;
+namespace JMS\SerializerBundle\Serializer\Exclusion;
 
-use JMS\SerializerExtraBundle\Annotation\Expose;
+use JMS\SerializerBundle\Annotation\Expose;
 use Doctrine\Common\Annotations\AnnotationReader;
 
 class AllExclusionStrategy implements ExclusionStrategyInterface

Serializer/Exclusion/DisjunctExclusionStrategy.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Exclusion;
+namespace JMS\SerializerBundle\Serializer\Exclusion;
 
 class DisjunctExclusionStrategy implements ExclusionStrategyInterface
 {

Serializer/Exclusion/ExclusionStrategyFactory.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Exclusion;
+namespace JMS\SerializerBundle\Serializer\Exclusion;
 
 class ExclusionStrategyFactory implements ExclusionStrategyFactoryInterface
 {

Serializer/Exclusion/ExclusionStrategyFactoryInterface.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Exclusion;
+namespace JMS\SerializerBundle\Serializer\Exclusion;
 
 interface ExclusionStrategyFactoryInterface
 {

Serializer/Exclusion/ExclusionStrategyInterface.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Exclusion;
+namespace JMS\SerializerBundle\Serializer\Exclusion;
 
 /**
  * Interface for exclusion strategies.

Serializer/Exclusion/NoneExclusionStrategy.php

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Exclusion;
+namespace JMS\SerializerBundle\Serializer\Exclusion;
 
-use JMS\SerializerExtraBundle\Annotation\Exclude;
+use JMS\SerializerBundle\Annotation\Exclude;
 use Doctrine\Common\Annotations\AnnotationReader;
 
 class NoneExclusionStrategy implements ExclusionStrategyInterface

Serializer/Exclusion/VersionExclusionStrategy.php

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Exclusion;
+namespace JMS\SerializerBundle\Serializer\Exclusion;
 
-use JMS\SerializerExtraBundle\Annotation\Until;
-use JMS\SerializerExtraBundle\Annotation\Since;
+use JMS\SerializerBundle\Annotation\Until;
+use JMS\SerializerBundle\Annotation\Since;
 use Doctrine\Common\Annotations\AnnotationReader;
 
 class VersionExclusionStrategy

Serializer/Naming/AnnotatedNamingStrategy.php

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Naming;
+namespace JMS\SerializerBundle\Serializer\Naming;
 
-use JMS\SerializerExtraBundle\Annotation\SerializedName;
+use JMS\SerializerBundle\Annotation\SerializedName;
 
 use Doctrine\Common\Annotations\AnnotationReader;
 

Serializer/Naming/CamelCaseNamingStrategy.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Naming;
+namespace JMS\SerializerBundle\Serializer\Naming;
 
 class CamelCaseNamingStrategy implements PropertyNamingStrategyInterface
 {

Serializer/Naming/PropertyNamingStrategyInterface.php

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer\Naming;
+namespace JMS\SerializerBundle\Serializer\Naming;
 
 /**
  * Interface for property naming strategies.

Serializer/SerializerFactory.php

@@ -16,14 +16,16 @@
  * limitations under the License.
  */
 
-namespace JMS\SerializerExtraBundle\Serializer;
+namespace JMS\SerializerBundle\Serializer;
 
-use JMS\SerializerExtraBundle\Serializer\Exclusion\ExclusionStrategyFactory;
-use JMS\SerializerExtraBundle\Serializer\Naming\PropertyNamingStrategyInterface;
-use JMS\SerializerExtraBundle\Serializer\Exclusion\DisjunctExclusionStrategy;
-use JMS\SerializerExtraBundle\Serializer\Exclusion\VersionExclusionStrategy;
-use JMS\SerializerExtraBundle\Serializer\Exclusion\NoneExclusionStrategy;
-use JMS\SerializerExtraBundle\Serializer\Exclusion\AllExclusionStrategy;
+use Symfony\Component\Serializer\SerializerInterface;
+
+use JMS\SerializerBundle\Serializer\Exclusion\ExclusionStrategyFactory;
+use JMS\SerializerBundle\Serializer\Naming\PropertyNamingStrategyInterface;
+use JMS\SerializerBundle\Serializer\Exclusion\DisjunctExclusionStrategy;
+use JMS\SerializerBundle\Serializer\Exclusion\VersionExclusionStrategy;
+use JMS\SerializerBundle\Serializer\Exclusion\NoneExclusionStrategy;
+use JMS\SerializerBundle\Serializer\Exclusion\AllExclusionStrategy;
 use Doctrine\Common\Annotations\AnnotationReader;
 use Symfony\Component\Serializer\Serializer;
 
@@ -40,7 +42,7 @@ class SerializerFactory
         $this->encoders = $encoders;
     }
 
-    public function getSerializer($version = null)
+    public function configureSerializer(SerializerInterface $serializer, $version = null)
     {
         if (null === $version) {
             $strategies = array(
@@ -59,11 +61,16 @@ class SerializerFactory
             );
         }
 
-        $serializer = new Serializer();
         $serializer->addNormalizer(new AnnotatedNormalizer($this->reader, $this->propertyNamingStrategy, new ExclusionStrategyFactory($strategies)));
         foreach ($this->encoders as $format => $encoder) {
             $serializer->setEncoder($format, $encoder);
         }
+    }
+
+    public function getSerializer($version = null)
+    {
+        $serializer = new Serializer();
+        $this->configureSerializer($serializer, $version);
 
         return $serializer;
     }

Tests/DependencyInjection/JMSSerializerExtraExtensionTest.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace JMS\SerializerExtraBundle\Tests\DependencyInjection;
+namespace JMS\SerializerBundle\Tests\DependencyInjection;
 
-use JMS\SerializerExtraBundle\Tests\Fixtures\VersionedObject;
+use JMS\SerializerBundle\Tests\Fixtures\VersionedObject;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use JMS\SerializerExtraBundle\DependencyInjection\JMSSerializerExtraExtension;
+use JMS\SerializerBundle\DependencyInjection\JMSSerializerExtension;
 
-class JMSSerializerExtraExtensionTest extends \PHPUnit_Framework_TestCase
+class JMSSerializerExtensionTest extends \PHPUnit_Framework_TestCase
 {
     public function testLoad()
     {
-        $extension = new JMSSerializerExtraExtension();
+        $extension = new JMSSerializerExtension();
         $container = new ContainerBuilder();
         $extension->load(array(array()), $container);
 

Tests/Fixtures/AllExcludedObject.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace JMS\SerializerExtraBundle\Tests\Fixtures;
+namespace JMS\SerializerBundle\Tests\Fixtures;
 
 /**
  * @ExclusionPolicy("all")

Tests/Fixtures/CircularReferenceChild.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace JMS\SerializerExtraBundle\Tests\Fixtures;
+namespace JMS\SerializerBundle\Tests\Fixtures;
 
 class CircularReferenceChild
 {

Tests/Fixtures/CircularReferenceParent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace JMS\SerializerExtraBundle\Tests\Fixtures;
+namespace JMS\SerializerBundle\Tests\Fixtures;
 
 use Doctrine\Common\Collections\ArrayCollection;
 

Tests/Fixtures/SimpleObject.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace JMS\SerializerExtraBundle\Tests\Fixtures;
+namespace JMS\SerializerBundle\Tests\Fixtures;
 
 class SimpleObject
 {

Tests/Fixtures/VersionedObject.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace JMS\SerializerExtraBundle\Tests\Fixtures;
+namespace JMS\SerializerBundle\Tests\Fixtures;
 
 class VersionedObject
 {

Tests/Serializer/AnnotatedNormalizerTest.php

@@ -1,22 +1,22 @@
 <?php
 
-namespace JMS\SerializerExtraBundle\Tests\Serializer;
+namespace JMS\SerializerBundle\Tests\Serializer;
 
-use JMS\SerializerExtraBundle\Tests\Fixtures\AllExcludedObject;
+use JMS\SerializerBundle\Tests\Fixtures\AllExcludedObject;
 
-use JMS\SerializerExtraBundle\Tests\Fixtures\VersionedObject;
-use JMS\SerializerExtraBundle\Serializer\Exclusion\DisjunctExclusionStrategy;
-use JMS\SerializerExtraBundle\Serializer\Exclusion\VersionExclusionStrategy;
-use JMS\SerializerExtraBundle\Serializer\Exclusion\NoneExclusionStrategy;
-use JMS\SerializerExtraBundle\Serializer\Exclusion\AllExclusionStrategy;
+use JMS\SerializerBundle\Tests\Fixtures\VersionedObject;
+use JMS\SerializerBundle\Serializer\Exclusion\DisjunctExclusionStrategy;
+use JMS\SerializerBundle\Serializer\Exclusion\VersionExclusionStrategy;
+use JMS\SerializerBundle\Serializer\Exclusion\NoneExclusionStrategy;
+use JMS\SerializerBundle\Serializer\Exclusion\AllExclusionStrategy;
 use Symfony\Component\Serializer\Serializer;
-use JMS\SerializerExtraBundle\Tests\Fixtures\CircularReferenceParent;
-use JMS\SerializerExtraBundle\Tests\Fixtures\SimpleObject;
-use JMS\SerializerExtraBundle\Serializer\Exclusion\ExclusionStrategyFactory;
-use JMS\SerializerExtraBundle\Serializer\Naming\CamelCaseNamingStrategy;
-use JMS\SerializerExtraBundle\Serializer\Naming\AnnotatedNamingStrategy;
+use JMS\SerializerBundle\Tests\Fixtures\CircularReferenceParent;
+use JMS\SerializerBundle\Tests\Fixtures\SimpleObject;
+use JMS\SerializerBundle\Serializer\Exclusion\ExclusionStrategyFactory;
+use JMS\SerializerBundle\Serializer\Naming\CamelCaseNamingStrategy;
+use JMS\SerializerBundle\Serializer\Naming\AnnotatedNamingStrategy;
 use Doctrine\Common\Annotations\AnnotationReader;
-use JMS\SerializerExtraBundle\Serializer\AnnotatedNormalizer;
+use JMS\SerializerBundle\Serializer\AnnotatedNormalizer;
 
 class AnnotatedNormalizerTest extends \PHPUnit_Framework_TestCase
 {
@@ -70,7 +70,7 @@ class AnnotatedNormalizerTest extends \PHPUnit_Framework_TestCase
     protected function getNormalizer($version = null)
     {
         $reader = new AnnotationReader();
-        $reader->setDefaultAnnotationNamespace('JMS\SerializerExtraBundle\Annotation\\');
+        $reader->setDefaultAnnotationNamespace('JMS\SerializerBundle\Annotation\\');
         $reader->setAutoloadAnnotations(true);
 
         $propertyNamingStrategy = new AnnotatedNamingStrategy($reader, new CamelCaseNamingStrategy('_'));