CS fixes

Annotation/AccessorOrder.php

@@ -11,14 +11,14 @@ namespace JMS\SerializerBundle\Annotation;
  */
 final class AccessorOrder
 {
-	/**
-	 * @Required
-	 * @var string
-	 */
-	public $order;
+    /**
+     * @Required
+     * @var string
+     */
+    public $order;
 
-	/**
-	 * @var array<string>
-	 */
-	public $custom = array();
+    /**
+     * @var array<string>
+     */
+    public $custom = array();
 }

Metadata/ClassMetadata.php

@@ -30,9 +30,9 @@ use Metadata\MergeableClassMetadata;
  */
 class ClassMetadata extends MergeableClassMetadata
 {
-	const ACCESSOR_ORDER_UNDEFINED = 'undefined';
-	const ACCESSOR_ORDER_ALPHABETICAL = 'alphabetical';
-	const ACCESSOR_ORDER_CUSTOM = 'custom';
+    const ACCESSOR_ORDER_UNDEFINED = 'undefined';
+    const ACCESSOR_ORDER_ALPHABETICAL = 'alphabetical';
+    const ACCESSOR_ORDER_CUSTOM = 'custom';
 
     public $preSerializeMethods = array();
     public $postSerializeMethods = array();
@@ -49,25 +49,25 @@ class ClassMetadata extends MergeableClassMetadata
      */
     public function setAccessorOrder($order, array $customOrder = array())
     {
-    	if (!in_array($order, array(self::ACCESSOR_ORDER_UNDEFINED, self::ACCESSOR_ORDER_ALPHABETICAL, self::ACCESSOR_ORDER_CUSTOM), true)) {
-    		throw new \InvalidArgumentException(sprintf('The accessor order "%s" is invalid.', $order));
-    	}
-
-    	foreach ($customOrder as $name) {
-    		if (!is_string($name)) {
-    			throw new \InvalidArgumentException(sprintf('$customOrder is expected to be a list of strings, but got element of value %s.', json_encode($name)));
-    		}
-    	}
-
-    	$this->accessorOrder = $order;
-    	$this->customOrder = array_flip($customOrder);
-    	$this->sortProperties();
+        if (!in_array($order, array(self::ACCESSOR_ORDER_UNDEFINED, self::ACCESSOR_ORDER_ALPHABETICAL, self::ACCESSOR_ORDER_CUSTOM), true)) {
+            throw new \InvalidArgumentException(sprintf('The accessor order "%s" is invalid.', $order));
+        }
+
+        foreach ($customOrder as $name) {
+            if (!is_string($name)) {
+                throw new \InvalidArgumentException(sprintf('$customOrder is expected to be a list of strings, but got element of value %s.', json_encode($name)));
+            }
+        }
+
+        $this->accessorOrder = $order;
+        $this->customOrder = array_flip($customOrder);
+        $this->sortProperties();
     }
 
     public function addPropertyMetadata(PropertyMetadata $metadata)
     {
-    	parent::addPropertyMetadata($metadata);
-    	$this->sortProperties();
+        parent::addPropertyMetadata($metadata);
+        $this->sortProperties();
     }
 
     public function addPreSerializeMethod(MethodMetadata $method)
@@ -98,8 +98,8 @@ class ClassMetadata extends MergeableClassMetadata
         $this->xmlRootName = $object->xmlRootName;
 
         if ($object->accessorOrder) {
-        	$this->accessorOrder = $object->accessorOrder;
-        	$this->customOrder = $object->customOrder;
+            $this->accessorOrder = $object->accessorOrder;
+            $this->customOrder = $object->customOrder;
         }
 
         $this->sortProperties();
@@ -107,15 +107,15 @@ class ClassMetadata extends MergeableClassMetadata
 
     public function serialize()
     {
-    	$this->sortProperties();
+        $this->sortProperties();
 
         return serialize(array(
             $this->preSerializeMethods,
             $this->postSerializeMethods,
             $this->postDeserializeMethods,
             $this->xmlRootName,
-        	$this->accessorOrder,
-        	$this->customOrder,
+            $this->accessorOrder,
+            $this->customOrder,
             parent::serialize(),
         ));
     }
@@ -127,8 +127,8 @@ class ClassMetadata extends MergeableClassMetadata
             $this->postSerializeMethods,
             $this->postDeserializeMethods,
             $this->xmlRootName,
-        	$this->accessorOrder,
-        	$this->customOrder,
+            $this->accessorOrder,
+            $this->customOrder,
             $parentStr
         ) = unserialize($str);
 
@@ -137,32 +137,32 @@ class ClassMetadata extends MergeableClassMetadata
 
     private function sortProperties()
     {
-    	switch ($this->accessorOrder) {
-    		case self::ACCESSOR_ORDER_ALPHABETICAL:
-    			ksort($this->propertyMetadata);
-    			break;
+        switch ($this->accessorOrder) {
+            case self::ACCESSOR_ORDER_ALPHABETICAL:
+                ksort($this->propertyMetadata);
+                break;
 
-    		case self::ACCESSOR_ORDER_CUSTOM:
-    			$order = $this->customOrder;
-    			uksort($this->propertyMetadata, function($a, $b) use ($order) {
-    				$existsA = isset($order[$a]);
-    				$existsB = isset($order[$b]);
+            case self::ACCESSOR_ORDER_CUSTOM:
+                $order = $this->customOrder;
+                uksort($this->propertyMetadata, function($a, $b) use ($order) {
+                    $existsA = isset($order[$a]);
+                    $existsB = isset($order[$b]);
 
-    				if (!$existsA && !$existsB) {
-    					return 0;
-    				}
+                    if (!$existsA && !$existsB) {
+                        return 0;
+                    }
 
-    				if (!$existsA) {
-    					return 1;
-    				}
+                    if (!$existsA) {
+                        return 1;
+                    }
 
-    				if (!$existsB) {
-    					return -1;
-    				}
-
-    				return $order[$a] < $order[$b] ? -1 : 1;
-    			});
-    			break;
-    	}
+                    if (!$existsB) {
+                        return -1;
+                    }
+
+                    return $order[$a] < $order[$b] ? -1 : 1;
+                });
+                break;
+        }
     }
 }

Metadata/Driver/AnnotationDriver.php

@@ -74,7 +74,7 @@ class AnnotationDriver implements DriverInterface
             } else if ($annot instanceof AccessType) {
                 $classAccessType = $annot->type;
             } else if ($annot instanceof AccessorOrder) {
-            	$classMetadata->setAccessorOrder($annot->order, $annot->custom);
+                $classMetadata->setAccessorOrder($annot->order, $annot->custom);
             }
         }
 
@@ -119,7 +119,7 @@ class AnnotationDriver implements DriverInterface
                     } else if ($annot instanceof Accessor) {
                         $accessor = array($annot->getter, $annot->setter);
                     } else if ($annot instanceof Groups) {
-                    	$propertyMetadata->setGroups($annot->names);
+                        $propertyMetadata->setGroups($annot->names);
                     }
                 }
 

Metadata/Driver/XmlDriver.php

@@ -51,7 +51,7 @@ class XmlDriver extends AbstractFileDriver
         $classAccessType = (string) ($elem->attributes()->{'access-type'} ?: PropertyMetadata::ACCESS_TYPE_PROPERTY);
 
         if (null !== $accessorOrder = $elem->attributes()->{'accessor-order'}) {
-        	$metadata->setAccessorOrder((string) $accessorOrder, preg_split('/\s*,\s*/', (string) $elem->attributes()->{'custom-accessor-order'}));
+            $metadata->setAccessorOrder((string) $accessorOrder, preg_split('/\s*,\s*/', (string) $elem->attributes()->{'custom-accessor-order'}));
         }
 
         if (null !== $xmlRootName = $elem->attributes()->{'xml-root-name'}) {

Metadata/Driver/YamlDriver.php

@@ -45,7 +45,7 @@ class YamlDriver extends AbstractFileDriver
         $classAccessType = isset($config['access_type']) ? $config['access_type'] : PropertyMetadata::ACCESS_TYPE_PROPERTY;
 
         if (isset($config['accessor_order'])) {
-        	$metadata->setAccessorOrder($config['accessor_order'], isset($config['custom_accessor_order']) ? $config['custom_accessor_order'] : array());
+            $metadata->setAccessorOrder($config['accessor_order'], isset($config['custom_accessor_order']) ? $config['custom_accessor_order'] : array());
         }
 
         if (isset($config['xml_root_name'])) {

Tests/Fixtures/AccessorOrderChild.php

@@ -7,5 +7,5 @@ use JMS\SerializerBundle\Annotation as Serializer;
 /** @Serializer\AccessorOrder("custom", custom = {"c", "d", "a", "b"}) */
 class AccessorOrderChild extends AccessorOrderParent
 {
-	private $c = 'c', $d = 'd';
+    private $c = 'c', $d = 'd';
 }

Tests/Fixtures/AccessorOrderParent.php

@@ -7,5 +7,5 @@ use JMS\SerializerBundle\Annotation as Serializer;
 /** @Serializer\AccessorOrder("alphabetical") */
 class AccessorOrderParent
 {
-	private $b = 'b', $a = 'a';
+    private $b = 'b', $a = 'a';
 }

Tests/Metadata/ClassMetadataTest.php

@@ -7,34 +7,34 @@ use JMS\SerializerBundle\Metadata\ClassMetadata;
 
 class ClassMetadataTest extends \PHPUnit_Framework_TestCase
 {
-	public function testSetAccessorOrder()
-	{
-		$metadata = new ClassMetadata('JMS\SerializerBundle\Tests\Metadata\PropertyMetadataOrder');
-		$metadata->addPropertyMetadata(new PropertyMetadata('JMS\SerializerBundle\Tests\Metadata\PropertyMetadataOrder', 'b'));
-		$metadata->addPropertyMetadata(new PropertyMetadata('JMS\SerializerBundle\Tests\Metadata\PropertyMetadataOrder', 'a'));
-		$this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
+    public function testSetAccessorOrder()
+    {
+        $metadata = new ClassMetadata('JMS\SerializerBundle\Tests\Metadata\PropertyMetadataOrder');
+        $metadata->addPropertyMetadata(new PropertyMetadata('JMS\SerializerBundle\Tests\Metadata\PropertyMetadataOrder', 'b'));
+        $metadata->addPropertyMetadata(new PropertyMetadata('JMS\SerializerBundle\Tests\Metadata\PropertyMetadataOrder', 'a'));
+        $this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
 
-		$metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_ALPHABETICAL);
-		$this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata));
+        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_ALPHABETICAL);
+        $this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata));
 
-		$metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('b', 'a'));
-		$this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
+        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('b', 'a'));
+        $this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
 
-		$metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('a', 'b'));
-		$this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata));
+        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('a', 'b'));
+        $this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata));
 
-		$metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('b'));
-		$this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
+        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('b'));
+        $this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
 
-		$metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('a'));
-		$this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata));
+        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('a'));
+        $this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata));
 
-		$metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('foo', 'bar'));
-		$this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
-	}
+        $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('foo', 'bar'));
+        $this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata));
+    }
 }
 
 class PropertyMetadataOrder
 {
-	private $b, $a;
+    private $b, $a;
 }

Tests/Serializer/BaseSerializationTest.php

@@ -386,8 +386,8 @@ abstract class BaseSerializationTest extends \PHPUnit_Framework_TestCase
 
     public function testAccessorOrder()
     {
-    	$this->assertEquals($this->getContent('accessor_order_child'), $this->serialize(new AccessorOrderChild()));
-    	$this->assertEquals($this->getContent('accessor_order_parent'), $this->serialize(new AccessorOrderParent()));
+        $this->assertEquals($this->getContent('accessor_order_child'), $this->serialize(new AccessorOrderChild()));
+        $this->assertEquals($this->getContent('accessor_order_parent'), $this->serialize(new AccessorOrderParent()));
     }
 
     abstract protected function getContent($key);