fix(BazarFields): return "" instead of null when renderring

J9rem · mrflos · commit 3d9aea2ee0e6 · 2022-11-17T18:31:24.000+03:00
diff --git a/tools/bazar/fields/AclField.php b/tools/bazar/fields/AclField.php
@@ -31,7 +31,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
@@ -51,7 +51,7 @@ public function formatValuesBeforeSave($entry)
 
     protected function renderStatic($entry)
     {
-        return null;
+        return "";
     }
 
     private function replaceWithCreator($right, $entry)
diff --git a/tools/bazar/fields/CalcField.php b/tools/bazar/fields/CalcField.php
@@ -32,15 +32,15 @@ public function __construct(array $values, ContainerInterface $services)
     protected function renderInput($entry)
     {
         // display nothing
-        return null;
+        return "";
     }
 
     protected function renderStatic($entry)
     {
         $value = $this->getValue($entry);
         if (!in_array($value, [0,"0"], true) && empty($value)) {
             // 0 should be displayed but not false or null or ""
-            return null;
+            return "";
         }
         return $this->render("@bazar/fields/text.twig", [
             'value' => str_replace('{value}', strval($value), $this->displayText)
diff --git a/tools/bazar/fields/DateField.php b/tools/bazar/fields/DateField.php
@@ -59,7 +59,7 @@ protected function renderStatic($entry)
     {
         $value = $this->getValue($entry);
         if (!$value) {
-            return null;
+            return "";
         }
 
         if (strlen($value) > 10) {
diff --git a/tools/bazar/fields/EmailField.php b/tools/bazar/fields/EmailField.php
@@ -47,7 +47,7 @@ protected function renderStatic($entry)
     {
         $value = $this->getValue($entry);
         if (!$value) {
-            return null;
+            return "";
         }
 
         // TODO add JS libraries with Twig
diff --git a/tools/bazar/fields/ExternalCheckboxEntryField.php b/tools/bazar/fields/ExternalCheckboxEntryField.php
@@ -24,12 +24,12 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
     {
-        return null;
+        return "";
     }
     
     protected function renderStatic($entry)
diff --git a/tools/bazar/fields/ExternalCheckboxListField.php b/tools/bazar/fields/ExternalCheckboxListField.php
@@ -24,7 +24,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
diff --git a/tools/bazar/fields/ExternalFileField.php b/tools/bazar/fields/ExternalFileField.php
@@ -24,7 +24,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
@@ -44,6 +44,6 @@ protected function renderStatic($entry)
             ]);
         }
 
-        return null;
+        return "";
     }
 }
diff --git a/tools/bazar/fields/ExternalImageField.php b/tools/bazar/fields/ExternalImageField.php
@@ -24,7 +24,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
@@ -51,6 +51,6 @@ protected function renderStatic($entry)
             ]);
         }
 
-        return null;
+        return "";
     }
 }
diff --git a/tools/bazar/fields/ExternalRadioEntryField.php b/tools/bazar/fields/ExternalRadioEntryField.php
@@ -24,7 +24,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
diff --git a/tools/bazar/fields/ExternalRadioListField.php b/tools/bazar/fields/ExternalRadioListField.php
@@ -24,7 +24,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
diff --git a/tools/bazar/fields/ExternalSelectEntryField.php b/tools/bazar/fields/ExternalSelectEntryField.php
@@ -24,7 +24,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
diff --git a/tools/bazar/fields/ExternalSelectListField.php b/tools/bazar/fields/ExternalSelectListField.php
@@ -24,7 +24,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
diff --git a/tools/bazar/fields/ExternalTagsField.php b/tools/bazar/fields/ExternalTagsField.php
@@ -24,7 +24,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
@@ -66,7 +66,7 @@ protected function renderStatic($entry)
                 'value' => join(' ', $tags) ?? ''
             ]);
         } else {
-            return null ;
+            return "" ;
         }
     }
 }
diff --git a/tools/bazar/fields/FileField.php b/tools/bazar/fields/FileField.php
@@ -116,7 +116,7 @@ protected function renderStatic($entry)
             ]);
         }
 
-        return null;
+        return "";
     }
 
     /**
diff --git a/tools/bazar/fields/HiddenField.php b/tools/bazar/fields/HiddenField.php
@@ -18,7 +18,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderStatic($entry)
     {
-        return null;
+        return "";
     }
 
     // Format input values before save
diff --git a/tools/bazar/fields/ImageField.php b/tools/bazar/fields/ImageField.php
@@ -178,7 +178,7 @@ protected function renderStatic($entry)
                ]);
         }
 
-        return null;
+        return "";
     }
 
     protected function isImage($fileName)
diff --git a/tools/bazar/fields/LinkedEntryField.php b/tools/bazar/fields/LinkedEntryField.php
@@ -52,7 +52,7 @@ protected function renderStatic($entry)
         if (!empty($entry['id_fiche']) && !empty($entry['id_typeannonce'])) {
             return $this->getService(Performer::class)->run('wakka', 'formatter', ['text' => $this->getBazarListAction($entry)]);
         } else {
-            return null ;
+            return "" ;
         }
     }
 
diff --git a/tools/bazar/fields/MapField.php b/tools/bazar/fields/MapField.php
@@ -319,7 +319,7 @@ public function formatValuesBeforeSaveIfEditable($entry, bool $isCreation = fals
 
     protected function renderStatic($entry)
     {
-        return null;
+        return "";
     }
 
     // GETTERS. Needed to use them in the Twig syntax
diff --git a/tools/bazar/fields/MetadataField.php b/tools/bazar/fields/MetadataField.php
@@ -41,7 +41,7 @@ public function __construct(array $values, ContainerInterface $services)
 
     protected function renderInput($entry)
     {
-        return null;
+        return "";
     }
 
     public function formatValuesBeforeSave($entry)
@@ -62,7 +62,7 @@ public function formatValuesBeforeSave($entry)
 
     protected function renderStatic($entry)
     {
-        return null;
+        return "";
     }
 
     public function getTheme()
diff --git a/tools/bazar/fields/PasswordField.php b/tools/bazar/fields/PasswordField.php
@@ -47,6 +47,6 @@ public function formatValuesBeforeSaveIfEditable($entry, bool $isCreation = fals
     protected function renderStatic($entry)
     {
         // We never want to display passwords
-        return null;
+        return "";
     }
 }
diff --git a/tools/bazar/fields/RadioEntryField.php b/tools/bazar/fields/RadioEntryField.php
@@ -31,7 +31,7 @@ protected function renderStatic($entry)
     {
         $value = $this->getValue($entry) ;
         if (!$value) {
-            return null;
+            return "";
         }
 
         if ($this->isDistantJson) {
diff --git a/tools/bazar/fields/RadioListField.php b/tools/bazar/fields/RadioListField.php
@@ -20,7 +20,7 @@ protected function renderStatic($entry)
     {
         $value = $this->getValue($entry) ;
         if (!$value) {
-            return null;
+            return "";
         }
         return $this->render('@bazar/fields/radio.twig', [
             'value' => $this->options[$value]
diff --git a/tools/bazar/fields/SelectEntryField.php b/tools/bazar/fields/SelectEntryField.php
@@ -44,13 +44,13 @@ protected function renderStatic($entry)
     {
         $value = $this->getValue($entry);
         if (!$value) {
-            return null;
+            return "";
         }
 
         if ($this->displayMethod === 'fiche') {
             if ($this->isDistantJson) {
                 // TODO display the entry in an iframe ?
-                return null;
+                return "";
             } else {
                 // TODO add documentation
                 return $this->getService(EntryController::class)->view($value);
diff --git a/tools/bazar/fields/SelectListField.php b/tools/bazar/fields/SelectListField.php
@@ -27,7 +27,7 @@ protected function renderInput($entry)
     protected function renderStatic($entry)
     {
         $value = $this->getValue($entry) ;
-        if( !$value ) return null;
+        if( !$value ) return "";
         return $this->render('@bazar/fields/select.twig', [
             'value' => $this->options[$value]
         ]);
diff --git a/tools/bazar/fields/SubscribeField.php b/tools/bazar/fields/SubscribeField.php
@@ -77,7 +77,7 @@ public function formatValuesBeforeSave($entry)
 
     protected function renderStatic($entry)
     {
-        return null;
+        return "";
     }
 
     protected function getSubscribeEmail($entry) {
diff --git a/tools/bazar/fields/TabChangeField.php b/tools/bazar/fields/TabChangeField.php
@@ -34,25 +34,25 @@ public function __construct(array $values, ContainerInterface $services)
     protected function renderInput($entry)
     {
         if (!$this->formChange) {
-            return null;
+            return "";
         }
         $tabsFieldService = $this->getService(TabsFieldService::class);
         $params = $tabsFieldService->getFormData();
         if ($params['counter'] === false) {
-            return null;
+            return "";
         }
         return $this->render('@bazar/fields/tab-change.twig', $params);
     }
 
     protected function renderStatic($entry)
     {
         if (!$this->viewChange) {
-            return null;
+            return "";
         }
         $tabsFieldService = $this->getService(TabsFieldService::class);
         $params = $tabsFieldService->getViewData();
         if ($params['counter'] === false) {
-            return null;
+            return "";
         }
         return $this->render('@bazar/fields/tab-change.twig', $params);
     }
diff --git a/tools/bazar/fields/TagsField.php b/tools/bazar/fields/TagsField.php
@@ -111,7 +111,7 @@ protected function renderStatic($entry)
                 'value' => join(' ', $tags) ?? ''
             ]);
         } else {
-            return null ;
+            return "" ;
         }
     }
 
diff --git a/tools/bazar/fields/TextField.php b/tools/bazar/fields/TextField.php
@@ -51,7 +51,7 @@ protected function renderStatic($entry)
     {
         $value = $this->getValue($entry);
         if ($value !== "0" && !$value) {
-            return null;
+            return "";
         }
 
         if ($this->name === 'bf_titre') {
diff --git a/tools/bazar/fields/TextareaField.php b/tools/bazar/fields/TextareaField.php
@@ -161,7 +161,7 @@ protected function renderStatic($entry)
     {
         $value = $this->getValue($entry);
         if (!$value) {
-            return null;
+            return "";
         }
         
         switch ($this->syntax) {
diff --git a/tools/bazar/fields/UserField.php b/tools/bazar/fields/UserField.php
@@ -218,7 +218,7 @@ protected function renderStatic($entry)
             ]);
         }
 
-        return null;
+        return "";
     }
 
     // GETTERS. Needed to use them in the Twig syntax

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __construct(array $values, ContainerInterface $services)`
`31`	`31`
`32`	`32`	`protected function renderInput($entry)`
`33`	`33`	`{`
`34`		`- return null;`
	`34`	`+ return "";`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function formatValuesBeforeSave($entry)`
`@@ -51,7 +51,7 @@ public function formatValuesBeforeSave($entry)`
`51`	`51`
`52`	`52`	`protected function renderStatic($entry)`
`53`	`53`	`{`
`54`		`- return null;`
	`54`	`+ return "";`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`private function replaceWithCreator($right, $entry)`
Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,15 @@ public function __construct(array $values, ContainerInterface $services)`
`32`	`32`	`protected function renderInput($entry)`
`33`	`33`	`{`
`34`	`34`	`// display nothing`
`35`		`- return null;`
	`35`	`+ return "";`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`protected function renderStatic($entry)`
`39`	`39`	`{`
`40`	`40`	`$value = $this->getValue($entry);`
`41`	`41`	`if (!in_array($value, [0,"0"], true) && empty($value)) {`
`42`	`42`	`// 0 should be displayed but not false or null or ""`
`43`		`- return null;`
	`43`	`+ return "";`
`44`	`44`	`}`
`45`	`45`	`return $this->render("@bazar/fields/text.twig", [`
`46`	`46`	`'value' => str_replace('{value}', strval($value), $this->displayText)`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected function renderStatic($entry)`
`59`	`59`	`{`
`60`	`60`	`$value = $this->getValue($entry);`
`61`	`61`	`if (!$value) {`
`62`		`- return null;`
	`62`	`+ return "";`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if (strlen($value) > 10) {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected function renderStatic($entry)`
`47`	`47`	`{`
`48`	`48`	`$value = $this->getValue($entry);`
`49`	`49`	`if (!$value) {`
`50`		`- return null;`
	`50`	`+ return "";`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// TODO add JS libraries with Twig`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ public function __construct(array $values, ContainerInterface $services)`
`24`	`24`
`25`	`25`	`protected function renderInput($entry)`
`26`	`26`	`{`
`27`		`- return null;`
	`27`	`+ return "";`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function formatValuesBeforeSave($entry)`
`31`	`31`	`{`
`32`		`- return null;`
	`32`	`+ return "";`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`protected function renderStatic($entry)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function __construct(array $values, ContainerInterface $services)`
`24`	`24`
`25`	`25`	`protected function renderInput($entry)`
`26`	`26`	`{`
`27`		`- return null;`
	`27`	`+ return "";`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function formatValuesBeforeSave($entry)`