Replaced EMPTY_STRING with EMPTY. (#312)

CHANGELOG.md

@@ -7,6 +7,7 @@ Support for PHP 8.0 is dropped. Minimal PHP version required is 8.2.
 
 Enhancements:
 * [ORM] Added support for count query with `DISTINCT` in PostgreSQL dialect.
+* [Utilities] `Strings::EMPTY_STRING` is deprecated in favour of `Strings::EMPTY`. 
 
 Release 2.0.0
 --------

src/Ouzo/Core/Db/Dialect/Dialect.php

@@ -26,7 +26,7 @@ public function select(int $queryType = null): string
     {
         $type = $queryType ?: $this->query->type;
         if ($type == QueryType::$SELECT) {
-            $distinct = $this->query->distinct ? 'DISTINCT ' : (empty($this->query->distinctOnColumns) ? Strings::EMPTY_STRING : $this->getDistinctOnQuery());
+            $distinct = $this->query->distinct ? 'DISTINCT ' : (empty($this->query->distinctOnColumns) ? Strings::EMPTY : $this->getDistinctOnQuery());
             $columns = empty($this->query->selectColumns) ? '*' : Joiner::on(', ')->map(DialectUtil::addAliases())->join($this->query->selectColumns);
             return "SELECT {$distinct}{$columns}";
         }
@@ -36,7 +36,7 @@ public function select(int $queryType = null): string
             }
             return 'SELECT count(*)';
         }
-        return Strings::EMPTY_STRING;
+        return Strings::EMPTY;
     }
 
     public function update(): string

src/Ouzo/Core/Helper/FormHelper.php

@@ -15,7 +15,7 @@ class FormHelper
     {
         public static function escapeText(?string $text): ?string
         {
-            return htmlspecialchars($text ?: Strings::EMPTY_STRING, ENT_COMPAT);
+            return htmlspecialchars($text ?: Strings::EMPTY, ENT_COMPAT);
         }
 
         public static function escapeNewLine(?string $text): ?string

src/Ouzo/Core/Helper/HtmlElementRenderer.php

@@ -67,7 +67,7 @@ public static function formStart(): HtmlElementRenderer
 
     public function setText(?string $text): HtmlElementRenderer
     {
-        $this->text = htmlspecialchars($text ?? Strings::EMPTY_STRING, ENT_COMPAT);
+        $this->text = htmlspecialchars($text ?? Strings::EMPTY, ENT_COMPAT);
         return $this;
     }
 
@@ -167,7 +167,7 @@ private function attributesToHtml(array $attributes): string
         $attributes = $this->sort($attributes);
 
         $attrs = Arrays::mapEntries($attributes, function ($key, $value) {
-            $escaped = htmlspecialchars($value ?? Strings::EMPTY_STRING, ENT_COMPAT);
+            $escaped = htmlspecialchars($value ?? Strings::EMPTY, ENT_COMPAT);
             return "$key=\"$escaped\"";
         });
         return implode(' ', $attrs);
@@ -190,4 +190,4 @@ private function sort(array $attributes): array
         ksort($alphabeticOrderAttrs);
         return $fixedOrderAttrs + $alphabeticOrderAttrs;
     }
-}
+}

src/Ouzo/Core/Uri/UriGeneratorTemplates.php

@@ -21,7 +21,7 @@ public static function replaceTemplate(string $namesList, string $methodsList, s
 
     private static function replace(string $template, string $pattern, ?string $replacement): string
     {
-        $replacement ??= Strings::EMPTY_STRING;
+        $replacement ??= Strings::EMPTY;
         return str_replace(["/*{{$pattern}}*/", "%{{$pattern}}"], $replacement, $template);
     }
 

src/Ouzo/Goodies/Utilities/DynamicProxy.php

@@ -106,7 +106,7 @@ private static function generateParameters(ReflectionMethod $reflectionMethod):
             $parameter = '';
             if ($reflectionParameter->hasType() && $reflectionParameter->getType() instanceof ReflectionNamedType) {
                 $typeName = $reflectionParameter->getType()->getName();
-                $nullable = $typeName != 'mixed' && $reflectionParameter->allowsNull() ? '?' : Strings::EMPTY_STRING;
+                $nullable = $typeName != 'mixed' && $reflectionParameter->allowsNull() ? '?' : Strings::EMPTY;
                 $parameter .= "{$nullable}{$typeName} ";
             }
             if ($reflectionParameter->isVariadic()) {
@@ -160,6 +160,6 @@ private static function generateRelation(string $relation, array $classes): stri
         if ($classes) {
             return $relation . ' ' . implode(', ', $classes);
         }
-        return Strings::EMPTY_STRING;
+        return Strings::EMPTY;
     }
 }

src/Ouzo/Goodies/Utilities/Strings.php

@@ -8,7 +8,12 @@
 
 class Strings
 {
-    const EMPTY_STRING = '';
+    const EMPTY = '';
+
+    /**
+     * @deprecated Use `Strings::EMPTY` instead.
+     */
+    const EMPTY_STRING = self::EMPTY;
 
     /**
      * Example:
@@ -26,7 +31,7 @@ public static function underscoreToCamelCase(?string $string): ?string
         if (is_null($string)) {
             return null;
         }
-        return str_replace('_', self::EMPTY_STRING, ucwords($string, '_'));
+        return str_replace('_', self::EMPTY, ucwords($string, '_'));
     }
 
     /**
@@ -192,7 +197,7 @@ public static function remove(?string $string, ?string $toRemove): ?string
         if (is_null($toRemove)) {
             return $string;
         }
-        return str_replace($toRemove, self::EMPTY_STRING, $string);
+        return str_replace($toRemove, self::EMPTY, $string);
     }
 
     /**

src/Ouzo/Goodies/Utilities/ToString/SimpleToStringStyle.php

@@ -14,7 +14,7 @@ public function __construct()
     {
         $this->setUseClassName(false);
         $this->setUseFieldNames(false);
-        $this->setContentStart(Strings::EMPTY_STRING);
-        $this->setContentEnd(Strings::EMPTY_STRING);
+        $this->setContentStart(Strings::EMPTY);
+        $this->setContentEnd(Strings::EMPTY);
     }
 }