Selaa lähdekoodia

Adheres to Symfony coding standards, appropriate extension naming

Jonathan Bowers 13 vuotta sitten
vanhempi
commit
e34a156f5c
3 muutettua tiedostoa jossa 13 lisäystä ja 12 poistoa
  1. 2 2
      Resources/config/services.xml
  2. 10 9
      Tests/Twig/SerializerTest.php
  3. 1 1
      Twig/Serializer.php

+ 2 - 2
Resources/config/services.xml

@@ -26,7 +26,7 @@
 
         <parameter key="jms_serializer.serializer.class">JMS\SerializerBundle\Serializer\LazyLoadingSerializer</parameter>
 
-        <parameter key="jms_serializer.twig.class">JMS\SerializerBundle\Twig\Serializer</parameter>
+        <parameter key="jms_serializer.twig_extension.class">JMS\SerializerBundle\Twig\SerializerExtension</parameter>
         
         <parameter key="jms_serializer.json_serialization_visitor.class">JMS\SerializerBundle\Serializer\JsonSerializationVisitor</parameter>
         <parameter key="jms_serializer.json_deserialization_visitor.class">JMS\SerializerBundle\Serializer\JsonDeserializationVisitor</parameter>
@@ -118,7 +118,7 @@
         <service id="serializer" alias="jms_serializer.serializer" />
 
         <!-- Twig Extension -->
-        <service id="jms_serializer.twig.serializer" class="%jms_serializer.twig.class%" public="false">
+        <service id="jms_serializer.twig_extension.serializer" class="%jms_serializer.twig_extension.class%" public="false">
             <argument type="service" id="serializer" />
             <tag name="twig.extension" />
         </service>

+ 10 - 9
Tests/Twig/SerializerTest.php

@@ -19,22 +19,23 @@
 namespace JMS\SerializerBundle\Tests\Twig;
 
 use JMS\SerializerBundle\Serializer\SerializerInterface;
-use JMS\SerializerBundle\Twig\Serializer as TwigSerializer;
+use JMS\SerializerBundle\Twig\SerializerExtension;
 
-class SerializerTest extends \PHPUnit_Framework_TestCase
+class SerializerExtensionTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
         $this->mockSerializer = $this->getMock('JMS\SerializerBundle\Serializer\SerializerInterface');
     }
+
     public function testSerialize()
     {
-      $obj = new \stdClass();
-      $this->mockSerializer
-        ->expects($this->once())
-        ->method('serialize')
-        ->with($this->equalTo($obj), $this->equalTo('json'));
-      $twigSerializer = new TwigSerializer($this->mockSerializer);
-      $twigSerializer->serialize($obj);
+        $obj = new \stdClass();
+        $this->mockSerializer
+            ->expects($this->once())
+            ->method('serialize')
+            ->with($this->equalTo($obj), $this->equalTo('json'));
+        $serializerExtension = new SerializerExtension($this->mockSerializer);
+        $serializerExtension->serialize($obj);
     }
 }

+ 1 - 1
Twig/Serializer.php

@@ -25,7 +25,7 @@ use JMS\SerializerBundle\Serializer\SerializerInterface;
  * 
  * Basically provides access to JMSSerializer from Twig
  */
-class Serializer extends \Twig_Extension {
+class SerializerExtension extends \Twig_Extension {
   protected $serializer;
 
   public function getName() {