Rename all methods to camelCase (#1049)

atk4 · Aug 14, 2022 · 86ee209 · 86ee209
1 parent 5b3a93e
commit 86ee209
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 108 deletions.
diff --git a/docs/persistence/sql/queries.rst b/docs/persistence/sql/queries.rst
@@ -779,7 +779,7 @@ Other Methods
     $q->executeQuery(); // select calc_found_rows `name` from `test`
     $q->mode('insert')->executeStatement(); // insert ignore into `test` (`name`) values (`name` = 'John')
 
-.. php:method:: _set_args($what, $alias, $value)
+.. php:method:: _setArgs($what, $alias, $value)
 
     Internal method which sets value in :php:attr:`Expression::args` array.
     It doesn't allow duplicate aliases and throws Exception in such case.

diff --git a/src/Persistence/Sql/Expression.php b/src/Persistence/Sql/Expression.php
@@ -397,15 +397,20 @@ function ($matches) use (&$namelessCount) {
 
                     // use rendering only with named tags
                 }
-                $fx = '_render_' . $identifier;
 
                 if (array_key_exists($identifier, $this->args['custom'])) {
                     $value = $this->consume($this->args['custom'][$identifier], $escapeMode);
-                } elseif (method_exists($this, $fx)) {
-                    $value = $this->{$fx}();
                 } else {
-                    throw (new Exception('Expression could not render tag'))
-                        ->addMoreInfo('tag', $identifier);
+                    $renderMethodName = !is_int($identifier) ? '_render' . ucfirst($identifier) : null;
+                    if ($renderMethodName !== null
+                        && method_exists($this, $renderMethodName)
+                        && (new \ReflectionMethod($this, $renderMethodName))->getName() === $renderMethodName
+                    ) {
+                        $value = $this->{$renderMethodName}();
+                    } else {
+                        throw (new Exception('Expression could not render tag'))
+                            ->addMoreInfo('tag', $identifier);
+                    }
                 }
 
                 return $value;

diff --git a/src/Persistence/Sql/Mssql/ExpressionTrait.php b/src/Persistence/Sql/Mssql/ExpressionTrait.php
@@ -49,15 +49,15 @@ public function execute(object $connection = null, bool $fromExecuteStatement =
 
             $expectedInsertTemplate = <<<'EOF'
                 begin try
-                  insert[option] into [table_noalias] ([set_fields]) values ([set_values]);
+                  insert[option] into [tableNoalias] ([setFields]) values ([setValues]);
                 end try begin catch
                   if ERROR_NUMBER() = 544 begin
-                    set IDENTITY_INSERT [table_noalias] on;
+                    set IDENTITY_INSERT [tableNoalias] on;
                     begin try
-                      insert[option] into [table_noalias] ([set_fields]) values ([set_values]);
-                      set IDENTITY_INSERT [table_noalias] off;
+                      insert[option] into [tableNoalias] ([setFields]) values ([setValues]);
+                      set IDENTITY_INSERT [tableNoalias] off;
                     end try begin catch
-                      set IDENTITY_INSERT [table_noalias] off;
+                      set IDENTITY_INSERT [tableNoalias] off;
                       throw;
                     end catch
                   end else begin
@@ -71,10 +71,10 @@ public function execute(object $connection = null, bool $fromExecuteStatement =
                     $eDriver = $e->getPrevious();
                     if ($eDriver !== null && $eDriver instanceof DriverException && $eDriver->getCode() === 544) {
                         try {
-                            return $executeFx('set IDENTITY_INSERT [table_noalias] on;' . "\n"
-                                . 'insert[option] into [table_noalias] ([set_fields]) values ([set_values]);');
+                            return $executeFx('set IDENTITY_INSERT [tableNoalias] on;' . "\n"
+                                . 'insert[option] into [tableNoalias] ([setFields]) values ([setValues]);');
                         } finally {
-                            $executeFx('set IDENTITY_INSERT [table_noalias] off;');
+                            $executeFx('set IDENTITY_INSERT [tableNoalias] off;');
                         }
                     }
 

diff --git a/src/Persistence/Sql/Mssql/Query.php b/src/Persistence/Sql/Mssql/Query.php
@@ -15,15 +15,15 @@ class Query extends BaseQuery
 
     protected string $templateInsert = <<<'EOF'
         begin try
-          insert[option] into [table_noalias] ([set_fields]) values ([set_values]);
+          insert[option] into [tableNoalias] ([setFields]) values ([setValues]);
         end try begin catch
           if ERROR_NUMBER() = 544 begin
-            set IDENTITY_INSERT [table_noalias] on;
+            set IDENTITY_INSERT [tableNoalias] on;
             begin try
-              insert[option] into [table_noalias] ([set_fields]) values ([set_values]);
-              set IDENTITY_INSERT [table_noalias] off;
+              insert[option] into [tableNoalias] ([setFields]) values ([setValues]);
+              set IDENTITY_INSERT [tableNoalias] off;
             end try begin catch
-              set IDENTITY_INSERT [table_noalias] off;
+              set IDENTITY_INSERT [tableNoalias] off;
               throw;
             end catch
           end else begin
@@ -32,7 +32,7 @@ class Query extends BaseQuery
         end catch
         EOF;
 
-    public function _render_limit(): ?string
+    protected function _renderLimit(): ?string
     {
         if (!isset($this->args['limit'])) {
             return null;

diff --git a/src/Persistence/Sql/Oracle/Query.php b/src/Persistence/Sql/Oracle/Query.php
@@ -32,7 +32,7 @@ public function render(): array
         return parent::render();
     }
 
-    protected function _sub_render_condition(array $row): string
+    protected function _subrenderCondition(array $row): string
     {
         if (count($row) === 2) {
             [$field, $value] = $row;
@@ -63,10 +63,10 @@ protected function _sub_render_condition(array $row): string
             }
         }
 
-        return parent::_sub_render_condition($row);
+        return parent::_subrenderCondition($row);
     }
 
-    public function _render_limit(): ?string
+    protected function _renderLimit(): ?string
     {
         if (!isset($this->args['limit'])) {
             return null;

diff --git a/src/Persistence/Sql/Postgresql/Query.php b/src/Persistence/Sql/Postgresql/Query.php
@@ -15,7 +15,7 @@ class Query extends BaseQuery
     protected string $templateUpdate = 'update [table][join] set [set] [where]';
     protected string $templateReplace;
 
-    protected function _sub_render_condition(array $row): string
+    protected function _subrenderCondition(array $row): string
     {
         if (count($row) >= 3) {
             [$field, $cond, $value] = $row;
@@ -25,10 +25,10 @@ protected function _sub_render_condition(array $row): string
             }
         }
 
-        return parent::_sub_render_condition($row);
+        return parent::_subrenderCondition($row);
     }
 
-    public function _render_limit(): ?string
+    protected function _renderLimit(): ?string
     {
         if (!isset($this->args['limit'])) {
             return null;