Merge pull request #93 from JinTotonic/jindun

Fix array_filter which filters '0' or 0
theaentmachine · Aug 8, 2018 · a7eaa4a · a7eaa4a
2 parents 0416ce8 + 8cda0e2
commit a7eaa4a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/src/Service/Environment/EnvVariable.php b/src/Service/Environment/EnvVariable.php
@@ -61,6 +61,8 @@ public function jsonSerialize(): array
             'value' => $this->value,
             'type' => $this->type,
             'comment' => $this->comment
-        ]);
+        ], function ($v) {
+            return null !== $v;
+        });
     }
 }
diff --git a/src/Service/Environment/SharedEnvVariable.php b/src/Service/Environment/SharedEnvVariable.php
@@ -37,6 +37,8 @@ public function jsonSerialize(): array
             'type' => $this->getType(),
             'comment' => $this->getComment(),
             'containerId' => $this->containerId
-        ]);
+        ], function ($v) {
+            return null !== $v;
+        });
     }
 }
diff --git a/src/Service/Service.php b/src/Service/Service.php
@@ -168,11 +168,15 @@ public function jsonSerialize(): array
                 'memory' => $this->requestMemory,
                 'cpu' => $this->requestCpu,
                 'storage' => $this->requestStorage,
-            ]),
+            ], function ($v) {
+                return null !== $v;
+            }),
             'limits' => array_filter([
                 'memory' => $this->limitMemory,
                 'cpu' => $this->limitCpu,
-            ]),
+            ], function ($v) {
+                return null !== $v;
+            }),
         ]);
 
         if (!empty($resources)) {
@@ -456,7 +460,7 @@ public function addVirtualHostPrefix(?string $hostPrefix, int $port, ?string $co
         $this->virtualHosts[] = $array;
     }
 
-    /************************ environment adders & contains **********************/
+    /************************ environment adders & getters by type **********************/
 
     /** @throws ServiceException */
     private function addEnvVar(string $key, string $value, string $type, ?string $comment = null, ?string $containerId = null): void
@@ -623,7 +627,6 @@ public function removeVolumesBySource(string $source): void
         $this->volumes = array_values(array_filter($this->volumes, $filterFunction));
     }
 
-
     /************************ destEnvTypes stuffs **********************/
 
     public function addDestEnvType(string $envType, bool $keepTheOtherEnvTypes = true): void

diff --git a/src/Service/Volume/TmpfsVolume.php b/src/Service/Volume/TmpfsVolume.php
@@ -27,6 +27,8 @@ public function jsonSerialize(): array
             'type' => $this->getType(),
             'source' => $this->source,
             'comment' => $this->comment,
-        ]);
+        ], function ($v) {
+            return null !== $v;
+        });
     }
 }