naming/coding conventions tidy up

Resources/config/services.xml

@@ -132,7 +132,7 @@
             <call method="setOptions">
                 <argument>%jms_serializer.json_serialization_visitor.options%</argument>
             </call>
-            <call method="setNullable">
+            <call method="setSerializeNull">
                 <argument>%jms_serializer.json_serialization_visitor.serialize_null%</argument>
             </call>
             <tag name="jms_serializer.serialization_visitor" format="json" />
@@ -146,7 +146,7 @@
         <service id="jms_serializer.xml_serialization_visitor" class="%jms_serializer.xml_serialization_visitor.class%" public="false">
             <argument type="service" id="jms_serializer.naming_strategy" />
             <argument type="collection" /><!-- Custom Handlers -->
-            <call method="setNullable">
+            <call method="setSerializeNull">
                 <argument>%jms_serializer.xml_serialization_visitor.serialize_null%</argument>
             </call>
             <tag name="jms_serializer.serialization_visitor" format="xml" />
@@ -160,7 +160,7 @@
         <service id="jms_serializer.yaml_serialization_visitor" class="%jms_serializer.yaml_serialization_visitor.class%" public="false">
             <argument type="service" id="jms_serializer.naming_strategy" />
             <argument type="collection" /><!-- Custom Handlers -->
-            <call method="setNullable">
+            <call method="setSerializeNull">
                 <argument>%jms_serializer.yaml_serialization_visitor.serialize_null%</argument>
             </call>
             <tag name="jms_serializer.serialization_visitor" format="yml" />

Serializer/AbstractSerializationVisitor.php

@@ -25,16 +25,16 @@ namespace JMS\SerializerBundle\Serializer;
  */
 abstract class AbstractSerializationVisitor extends AbstractVisitor
 {
-    private $nullable = false;
+    private $serializeNull = false;
 
-    public function setNullable($serializeNull)
+    public function setSerializeNull($serializeNull)
     {
-        $this->nullable = (bool) $serializeNull;
+        $this->serializeNull = (bool) $serializeNull;
     }
 
-    public function isNullable()
+    public function getSerializeNull()
     {
-        return (bool) $this->nullable;
+        return (bool) $this->serializeNull;
     }
 
     public function visitUsingCustomHandler($data, $type, &$visited)

Serializer/GenericSerializationVisitor.php

@@ -90,7 +90,7 @@ abstract class GenericSerializationVisitor extends AbstractSerializationVisitor
         foreach ($data as $k => $v) {
             $v = $this->navigator->accept($v, null, $this);
 
-            if (null === $v && (!is_string($k) || !$this->isNullable())) {
+            if (null === $v && (!is_string($k) || !$this->getSerializeNull())) {
                 continue;
             }
 
@@ -133,7 +133,7 @@ abstract class GenericSerializationVisitor extends AbstractSerializationVisitor
                 : $data->{$metadata->getter}());
 
         $v = $this->navigator->accept($v, null, $this);
-        if (null === $v && !$this->isNullable()) {
+        if (null === $v && !$this->getSerializeNull()) {
             return;
         }
 

Serializer/Handler/NullHandler.php

@@ -28,12 +28,14 @@ class NullHandler implements SerializationHandlerInterface
             $attr->value = 'true';
             return $attr;
 
-        } else if ($visitor instanceof GenericSerializationVisitor) {
+        }
+        if ($visitor instanceof GenericSerializationVisitor) {
 
             $handled = true;
             return null;
 
-        } else if ($visitor instanceof YamlSerializationVisitor) {
+        }
+        if ($visitor instanceof YamlSerializationVisitor) {
 
             $handled = true;
             return Inline::dump(null);

Serializer/XmlSerializationVisitor.php

@@ -152,7 +152,7 @@ class XmlSerializationVisitor extends AbstractSerializationVisitor
         $v = (null === $metadata->getter ? $metadata->reflection->getValue($object)
             : $object->{$metadata->getter}());
 
-        if (null === $v && !$this->isNullable()) {
+        if (null === $v && !$this->getSerializeNull()) {
             return;
         }
 

Serializer/YamlSerializationVisitor.php

@@ -75,7 +75,7 @@ class YamlSerializationVisitor extends AbstractSerializationVisitor
         $isList = array_keys($data) === range(0, count($data) - 1);
 
         foreach ($data as $k => $v) {
-            if (null === $v && (!is_string($k) || !$this->isNullable())) {
+            if (null === $v && (!is_string($k) || !$this->getSerializeNull())) {
                 continue;
             }
 
@@ -150,7 +150,7 @@ class YamlSerializationVisitor extends AbstractSerializationVisitor
         $v = (null === $metadata->getter ? $metadata->reflection->getValue($data)
             : $data->{$metadata->getter}());
 
-        if (null === $v && !$this->isNullable()) {
+        if (null === $v && !$this->getSerializeNull()) {
             return;
         }
 

Tests/Serializer/BaseSerializationTest.php

@@ -490,7 +490,7 @@ abstract class BaseSerializationTest extends \PHPUnit_Framework_TestCase
         return $this->getSerializer()->deserialize($content, $type, $this->getFormat());
     }
 
-    protected function getSerializer($serialize_null = false)
+    protected function getSerializer($serializeNull = false)
     {
         $factory = new MetadataFactory(new AnnotationDriver(new AnnotationReader()));
         $namingStrategy = new SerializedNameAnnotationStrategy(new CamelCaseNamingStrategy());
@@ -505,10 +505,10 @@ abstract class BaseSerializationTest extends \PHPUnit_Framework_TestCase
             'yml'  => new YamlSerializationVisitor($namingStrategy, $customSerializationHandlers),
         );
 
-        if ($serialize_null) {
-            $serializationVisitors['json']->setNullable(true);
-            $serializationVisitors['xml']->setNullable(true);
-            $serializationVisitors['yml']->setNullable(true);
+        if ($serializeNull) {
+            $serializationVisitors['json']->setSerializeNull(true);
+            $serializationVisitors['xml']->setSerializeNull(true);
+            $serializationVisitors['yml']->setSerializeNull(true);
         }
 
         $deserializationVisitors = array(