Numeric order works on MySQL databases

config/packages/doctrine.yaml

@@ -33,7 +33,6 @@ doctrine:
             string_functions:
                 JSON_EXTRACT: Bolt\Doctrine\Functions\JsonExtract
                 CAST: DoctrineExtensions\Query\Mysql\Cast
-                INSTR: DoctrineExtensions\Query\Mysql\Instr
             numeric_functions:
                 RAND: Bolt\Doctrine\Functions\Rand
 

src/Doctrine/Version.php

@@ -90,12 +90,12 @@ public function hasJson(): bool
         return false;
     }
 
-    public function hasInstrAndCast(): bool
+    public function hasCast(): bool
     {
         try {
             $query = $this->connection->createQueryBuilder();
             $query
-                ->select('CAST (1.1 AS int), INSTR("Bolt", "o")');
+                ->select('CAST (1.1 AS int)');
             $query->execute();
         } catch (\Throwable $e) {
             return false;

src/Entity/Field/NumberField.php

@@ -14,4 +14,11 @@
 class NumberField extends Field implements FieldInterface, ScalarCastable
 {
     public const TYPE = 'number';
+
+    public function getValue(): ?array
+    {
+        $pv = parent::getValue();
+
+        return empty($pv) ? $pv : [(float) $pv[0]];
+    }
 }

src/Storage/Directive/OrderDirective.php

@@ -172,24 +172,20 @@ private function orderByNumericField(QueryInterface $query, string $translations
     {
         $qb = $query->getQueryBuilder();
 
-        // For older bundled SQLite in PHP 7.2 that do not have `INSTR` and `CAST` built in, we fall
+        // For older bundled SQLite in PHP 7.2 that do not have `CAST` built in, we fall
         // back to the "dumb" sorting instead. C'est la vie.
         $doctrineVersion = new Version($query->getQueryBuilder()->getEntityManager()->getConnection());
 
-        if (! $doctrineVersion->hasInstrAndCast()) {
+        if (! $doctrineVersion->hasCast()) {
             $qb->addOrderBy($translationsAlias . '.value', $direction);
 
             return;
         }
 
-        $qb->addSelect('INSTR(' . $translationsAlias . '.value, \'%[0-9]%\') as HIDDEN instr');
-        $innerSubstring = $qb
+        $substring = $qb
             ->expr()
-            ->substring($translationsAlias . '.value', 'instr', $qb->expr()->length($translationsAlias . '.value'));
-        $outerSubstring = $qb
-            ->expr()
-            ->substring($innerSubstring, 3, $query->getQueryBuilder()->expr()->length($translationsAlias . '.value'));
-        $qb->addOrderBy('CAST(' . $outerSubstring . ' as decimal) ', $direction);
+            ->substring($translationsAlias . '.value', 3, $query->getQueryBuilder()->expr()->length($translationsAlias . '.value'));
+        $qb->addOrderBy('CAST(' . $substring . ' as decimal) ', $direction);
     }
 
     private function isNumericField(QueryInterface $query, $fieldname): bool