halfpastfouram / phpchartjs

src/Delegate/ArraySerializable.php

Spacing +4 added lines, -10 removed lines

@@ -11,7 +11,7 @@ 
  */
 trait ArraySerializable
 {
-<<<<<<< HEAD
+<< << <<< HEAD
     /**
      * Will loop through class properties and try and assign their values to an array of data that will be returned.
      *
@@ -51,7 +51,7 @@ 
                 }
 
                 // Assign the contents of the property to the data array
-                $data[$property] = $object ? $this->$getter()->getArrayCopy() : $this->$getter();
+                $data[ $property ] = $object ? $this->$getter()->getArrayCopy() : $this->$getter();
             }
         }
 
@@ -93,14 +93,8 @@ 
 				if( !method_exists( $this, $getter ) ) continue;
 
 				// Assign the contents of the property to the data array
-				$data[ $property ] = $object ? $this->$getter()->getArrayCopy() : $this->$getter();
+				$data[  $property ] = $object ? $this->$getter()->getArrayCopy() : $this->$getter();
 			}
 		}
 
-		return $data;
-	}
-}
->>>>>>> 6d743af... Simplified getArrayCopy method
-=======
-}
->>>>>>> e69d8b3... Add unit test making sure the ArraySerializable trait is working well.
+		return $data
\ No newline at end of file

src/ChartOwned.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function setOwner(ChartInterface $chart)
     {
-        $this->owner        = $chart;
+        $this->owner = $chart;
 
         return $this;
     }