Make Connection constructor protected (#1138)

docs/.readthedocs.yaml

@@ -0,0 +1,16 @@
+version: 2
+
+build:
+  # https://github.com/readthedocs/readthedocs.org/issues/8861
+  os: ubuntu-22.04
+  tools:
+    # https://github.com/readthedocs/readthedocs.org/issues/9719
+    python: '3'
+
+python:
+  install:
+    # https://github.com/readthedocs/readthedocs.org/issues/10806
+    - requirements: docs/requirements.txt
+
+formats:
+  - pdf

phpstan.neon.dist

@@ -40,7 +40,7 @@ parameters:
         -
             message: '~^Class Doctrine\\DBAL\\Platforms\\SqlitePlatform referenced with incorrect case: Doctrine\\DBAL\\Platforms\\SQLitePlatform\.$~'
             path: '*'
-            count: 31
+            count: 28
 
         # TODO these rules are generated, this ignores should be fixed in the code
         # for src/Schema/TestCase.php

src/Field.php

@@ -153,6 +153,7 @@ public function normalize($value)
 
                         break;
                     case 'float':
+                    case 'decimal':
                     case 'atk4_money':
                         $value = preg_replace('~\s+|[`\']|,(?=.*\.)~', '', $value);
 
@@ -163,6 +164,7 @@ public function normalize($value)
                     case 'boolean':
                     case 'integer':
                     case 'float':
+                    case 'decimal':
                     case 'atk4_money':
                         if ($value === '') {
                             $value = null;
@@ -178,6 +180,7 @@ public function normalize($value)
                     case 'text':
                     case 'integer':
                     case 'float':
+                    case 'decimal':
                     case 'atk4_money':
                         if (is_bool($value)) {
                             throw new Exception('Must not be boolean type');
@@ -223,6 +226,7 @@ public function normalize($value)
                     break;
                 case 'integer':
                 case 'float':
+                case 'decimal':
                 case 'atk4_money':
                     if ($this->required && !$value) {
                         throw new Exception('Must not be a zero');

src/Persistence.php

@@ -359,7 +359,7 @@ public function typecastSaveField(Field $field, $value)
         try {
             $v = $this->_typecastSaveField($field, $value);
             if ($v !== null && !is_scalar($v)) { // @phpstan-ignore-line
-                throw new Exception('Unexpected non-scalar value');
+                throw new \TypeError('Unexpected non-scalar value');
             }
 
             return $v;
@@ -382,7 +382,7 @@ public function typecastLoadField(Field $field, $value)
         if ($value === null) {
             return null;
         } elseif (!is_scalar($value)) { // @phpstan-ignore-line
-            throw new Exception('Unexpected non-scalar value');
+            throw new \TypeError('Unexpected non-scalar value');
         }
 
         try {
@@ -446,7 +446,7 @@ protected function _typecastSaveField(Field $field, $value)
     protected function _typecastLoadField(Field $field, $value)
     {
         // TODO casting optionally to null should be handled by type itself solely
-        if ($value === '' && in_array($field->type, ['boolean', 'integer', 'float', 'datetime', 'date', 'time', 'json', 'object'], true)) {
+        if ($value === '' && in_array($field->type, ['boolean', 'integer', 'float', 'decimal', 'datetime', 'date', 'time', 'json', 'object'], true)) {
             return null;
         }
 

src/Persistence/Sql/Connection.php

@@ -45,7 +45,7 @@ abstract class Connection
     /**
      * @param array<string, mixed> $defaults
      */
-    public function __construct(array $defaults = [])
+    protected function __construct(array $defaults = [])
     {
         $this->setDefaults($defaults);
     }
@@ -177,7 +177,7 @@ public static function resolveConnectionClass(string $driverName): string
     }
 
     /**
-     * Connect to database and return connection class.
+     * Connect to database and return connection instance.
      *
      * @param string|array<string, string>|DbalConnection|DbalDriverConnection $dsn
      * @param string|null                                                      $user

src/Persistence/Sql/Expression.php

@@ -445,7 +445,15 @@ public function getDebugQuery(): string
     {
         [$sql, $params] = $this->render();
 
-        if (class_exists('SqlFormatter')) { // requires optional "jdorn/sql-formatter" package
+        if (class_exists(\SqlFormatter::class)) { // requires optional "jdorn/sql-formatter" package
+            \Closure::bind(static function () {
+                // fix latest/1.2.16 release from 2013-11-28
+                if (end(\SqlFormatter::$reserved_toplevel) === 'INTERSECT') {
+                    \SqlFormatter::$reserved_toplevel[] = 'OFFSET';
+                    \SqlFormatter::$reserved_toplevel[] = 'FETCH';
+                }
+            }, null, \SqlFormatter::class)();
+
             $sql = preg_replace('~ +(?=\n|$)|(?<=:) (?=\w)~', '', \SqlFormatter::format($sql, false));
         }
 

src/Persistence/Sql/Oracle/PlatformTrait.php

@@ -71,9 +71,8 @@ public function getCreateAutoincrementSql($name, $table, $start = 1)
         $aiSequenceName = $this->getIdentitySequenceName($tableIdentifier->getQuotedName($this), $nameIdentifier->getQuotedName($this));
         assert(str_starts_with($sqls[count($sqls) - 1], 'CREATE TRIGGER ' . $aiTriggerName . "\n"));
 
-        $conn = new Connection();
         $pkSeq = \Closure::bind(fn () => $this->normalizeIdentifier($aiSequenceName), $this, OraclePlatform::class)()->getName();
-        $sqls[count($sqls) - 1] = $conn->expr(
+        $sqls[count($sqls) - 1] = (new Expression(
             // else branch should be maybe (because of concurrency) put into after update trigger
             str_replace('[pk_seq]', '\'' . str_replace('\'', '\'\'', $pkSeq) . '\'', <<<'EOF'
                 CREATE TRIGGER {{trigger}}
@@ -100,7 +99,7 @@ public function getCreateAutoincrementSql($name, $table, $start = 1)
                 'pk' => $nameIdentifier->getName(),
                 'pk_seq' => $pkSeq,
             ]
-        )->render()[0];
+        ))->render()[0];
 
         return $sqls;
     }

src/Persistence/Sql/Postgresql/PlatformTrait.php

@@ -82,9 +82,7 @@ protected function getCreateAutoincrementSql(Table $table, Column $pkColumn): ar
 
         $pkSeqName = $this->getIdentitySequenceName($table->getName(), $pkColumn->getName());
 
-        $conn = new Connection();
-
-        $sqls[] = $conn->expr(
+        $sqls[] = (new Expression(
             // else branch should be maybe (because of concurrency) put into after update trigger
             // with pure nextval instead of setval with a loop like in Oracle trigger
             str_replace('[pk_seq]', '\'' . $pkSeqName . '\'', <<<'EOF'
@@ -111,9 +109,9 @@ protected function getCreateAutoincrementSql(Table $table, Column $pkColumn): ar
                 'pk_seq' => $pkSeqName,
                 'trigger_func' => $table->getName() . '_AI_FUNC',
             ]
-        )->render()[0];
+        ))->render()[0];
 
-        $sqls[] = $conn->expr(
+        $sqls[] = (new Expression(
             <<<'EOF'
                 CREATE TRIGGER {trigger}
                     BEFORE INSERT OR UPDATE
@@ -126,7 +124,7 @@ protected function getCreateAutoincrementSql(Table $table, Column $pkColumn): ar
                 'trigger' => $table->getShortestName($table->getNamespaceName()) . '_AI_PK',
                 'trigger_func' => $table->getName() . '_AI_FUNC',
             ]
-        )->render()[0];
+        ))->render()[0];
 
         return $sqls;
     }