supernova-ws / SuperNova

classes/Vector/Vector.php

Spacing +10 added lines, -10 removed lines

@@ -133,12 +133,12 @@ 
    * @return static
    */
   public function convertToVectorDynamic($coordinates, $prefix = '') {
-    $this->galaxy = isset($coordinates[$prefix . 'galaxy']) ? intval($coordinates[$prefix . 'galaxy']) : 0;
-    $this->system = isset($coordinates[$prefix . 'system']) ? intval($coordinates[$prefix . 'system']) : 0;
-    $this->planet = isset($coordinates[$prefix . 'planet']) ? intval($coordinates[$prefix . 'planet']) : 0;
-    $this->type = isset($coordinates[$prefix . 'type'])
-      ? isset($coordinates[$prefix . 'type'])
-      : (isset($coordinates[$prefix . 'planet_type']) ? intval($coordinates[$prefix . 'planet_type']) : 0);
+    $this->galaxy = isset($coordinates[$prefix.'galaxy']) ? intval($coordinates[$prefix.'galaxy']) : 0;
+    $this->system = isset($coordinates[$prefix.'system']) ? intval($coordinates[$prefix.'system']) : 0;
+    $this->planet = isset($coordinates[$prefix.'planet']) ? intval($coordinates[$prefix.'planet']) : 0;
+    $this->type = isset($coordinates[$prefix.'type'])
+      ? isset($coordinates[$prefix.'type'])
+      : (isset($coordinates[$prefix.'planet_type']) ? intval($coordinates[$prefix.'planet_type']) : 0);
 
     return $this;
   }
@@ -150,10 +150,10 @@ 
    */
   public function toArray($prefix = '') {
     $array = array(
-      $prefix . 'galaxy' => $this->galaxy,
-      $prefix . 'system' => $this->system,
-      $prefix . 'planet' => $this->planet,
-      $prefix . 'type'   => $this->type,
+      $prefix.'galaxy' => $this->galaxy,
+      $prefix.'system' => $this->system,
+      $prefix.'planet' => $this->planet,
+      $prefix.'type'   => $this->type,
     );
 
     return $array;

classes/V2Fleet/V2FleetModel.php

Spacing +13 added lines, -13 removed lines

@@ -93,28 +93,28 @@ 
   public function __construct(\Common\GlobalContainer $gc) {
     parent::__construct($gc);
 
-    $this->accessors->set(P_CONTAINER_SET, 'dbId', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'dbId', function(V2FleetContainer $that, $value) {
       $that->setDirect('dbId', $value);
       $that->location->setLocationId($value);
     });
 
-    $this->accessors->set(P_CONTAINER_SET, 'ownerId', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'ownerId', function(V2FleetContainer $that, $value) {
       $that->setDirect('ownerId', $value);
       $that->location->setLocationPlayerId($value);
     });
 
-    $this->accessors->set(P_CONTAINER_SET, 'owner', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'owner', function(V2FleetContainer $that, $value) {
       $that->owner = $value;
-      if(isset($value['id'])) {
+      if (isset($value['id'])) {
         $that->ownerId = $value['id'];
       } else {
         $that->ownerId = 0;
       }
     });
 
-    $this->accessors->set(P_CONTAINER_SET, 'departure', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'departure', function(V2FleetContainer $that, $value) {
       $that->departure = $value;
-      if(isset($value['id'])) {
+      if (isset($value['id'])) {
         $that->departurePlanetId = $value['id'];
         $that->vectorDeparture = $value;
       } else {
@@ -122,20 +122,20 @@ 
       }
     });
 
-    $this->accessors->set(P_CONTAINER_GET, 'vectorDeparture', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'vectorDeparture', function(V2FleetContainer $that) {
       $vector = new Vector();
       $that->setDirect('vectorDeparture', $vector);
 
       return $vector;
     }, ACCESSOR_SHARED);
-    $this->accessors->set(P_CONTAINER_SET, 'vectorDeparture', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'vectorDeparture', function(V2FleetContainer $that, $value) {
       $vector = $that->vectorDeparture;
 
-      if(is_array($value)) {
+      if (is_array($value)) {
         $value = Vector::convertToVector($value);
       }
 
-      if($value instanceof Vector) {
+      if ($value instanceof Vector) {
         $vector->readFromVector($value);
       } else {
         throw new \Exception('V2Fleet::vectorDeparture setter - value is not a Vector or array!', ERR_ERROR);
@@ -148,7 +148,7 @@ 
     $this->accessors->set(P_CONTAINER_EXPORT, 'vectorArrive', array($this, 'exportVector'));
 
 
-    $this->accessors->set(P_CONTAINER_GET, 'location', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'location', function(V2FleetContainer $that) {
 //      if (is_null($location = $that->getDirect('location'))) {}
       $location = new V2Location(LOC_FLEET);
       $that->setDirect('location', $location);
@@ -156,7 +156,7 @@ 
       return $location;
     }, ACCESSOR_SHARED);
 
-    $this->accessors->set(P_CONTAINER_GET, 'units', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'units', function(V2FleetContainer $that) {
 //      if (is_null($units = $that->getDirect('units'))) {}
       $units = \classSupernova::$gc->unitList;
       $that->setDirect('units', $units);
@@ -164,7 +164,7 @@ 
       return $units;
     }, ACCESSOR_SHARED);
 
-    $this->accessors->set(P_CONTAINER_GET, 'isReturning', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'isReturning', function(V2FleetContainer $that) {
       return $that->status == FLEET_FLAG_RETURNING;
     });