Merge branch '3.x' into 3.next

cakephp · May 22, 2020 · 5e651e1 · 5e651e1
2 parents 03ced73 + 9c6026f
commit 5e651e1
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 37 deletions.
diff --git a/Connection.php b/Connection.php
@@ -737,12 +737,12 @@ public function supportsDynamicConstraints()
      * });
      * ```
      */
-    public function transactional(callable $callback)
+    public function transactional(callable $transaction)
     {
         $this->begin();
 
         try {
-            $result = $callback($this);
+            $result = $transaction($this);
         } catch (Exception $e) {
             $this->rollback(false);
             throw $e;
@@ -785,13 +785,13 @@ protected function wasNestedTransactionRolledback()
      * });
      * ```
      */
-    public function disableConstraints(callable $callback)
+    public function disableConstraints(callable $operation)
     {
-        return $this->getDisconnectRetry()->run(function () use ($callback) {
+        return $this->getDisconnectRetry()->run(function () use ($operation) {
             $this->disableForeignKeys();
 
             try {
-                $result = $callback($this);
+                $result = $operation($this);
             } catch (Exception $e) {
                 $this->enableForeignKeys();
                 throw $e;

diff --git a/Expression/BetweenExpression.php b/Expression/BetweenExpression.php
@@ -101,11 +101,11 @@ public function sql(ValueBinder $generator)
      * {@inheritDoc}
      *
      */
-    public function traverse(callable $callable)
+    public function traverse(callable $visitor)
     {
         foreach ([$this->_field, $this->_from, $this->_to] as $part) {
             if ($part instanceof ExpressionInterface) {
-                $callable($part);
+                $visitor($part);
             }
         }
     }

diff --git a/Expression/Comparison.php b/Expression/Comparison.php
@@ -166,21 +166,21 @@ public function sql(ValueBinder $generator)
      * {@inheritDoc}
      *
      */
-    public function traverse(callable $callable)
+    public function traverse(callable $visitor)
     {
         if ($this->_field instanceof ExpressionInterface) {
-            $callable($this->_field);
-            $this->_field->traverse($callable);
+            $visitor($this->_field);
+            $this->_field->traverse($visitor);
         }
 
         if ($this->_value instanceof ExpressionInterface) {
-            $callable($this->_value);
-            $this->_value->traverse($callable);
+            $visitor($this->_value);
+            $this->_value->traverse($visitor);
         }
 
         foreach ($this->_valueExpressions as $v) {
-            $callable($v);
-            $v->traverse($callable);
+            $visitor($v);
+            $v->traverse($visitor);
         }
     }
 

diff --git a/Expression/IdentifierExpression.php b/Expression/IdentifierExpression.php
@@ -77,13 +77,9 @@ public function sql(ValueBinder $generator)
     }
 
     /**
-     * This method is a no-op, this is a leaf type of expression,
-     * hence there is nothing to traverse
-     *
-     * @param callable $callable The callable to traverse with.
-     * @return void
+     * @inheritDoc
      */
-    public function traverse(callable $callable)
+    public function traverse(callable $visitor)
     {
     }
 }
diff --git a/Expression/QueryExpression.php b/Expression/QueryExpression.php
@@ -572,15 +572,15 @@ public function sql(ValueBinder $generator)
      *
      * Callback function receives as only argument an instance of ExpressionInterface
      *
-     * @param callable $callable The callable to apply to all sub-expressions.
+     * @param callable $visitor The callable to apply to all sub-expressions.
      * @return void
      */
-    public function traverse(callable $callable)
+    public function traverse(callable $visitor)
     {
         foreach ($this->_conditions as $c) {
             if ($c instanceof ExpressionInterface) {
-                $callable($c);
-                $c->traverse($callable);
+                $visitor($c);
+                $c->traverse($visitor);
             }
         }
     }

diff --git a/Expression/TupleComparison.php b/Expression/TupleComparison.php
@@ -134,30 +134,30 @@ protected function _bindValue($generator, $value, $type)
      *
      * Callback function receives as its only argument an instance of an ExpressionInterface
      *
-     * @param callable $callable The callable to apply to sub-expressions
+     * @param callable $visitor The callable to apply to sub-expressions
      * @return void
      */
-    public function traverse(callable $callable)
+    public function traverse(callable $visitor)
     {
         foreach ($this->getField() as $field) {
-            $this->_traverseValue($field, $callable);
+            $this->_traverseValue($field, $visitor);
         }
 
         $value = $this->getValue();
         if ($value instanceof ExpressionInterface) {
-            $callable($value);
-            $value->traverse($callable);
+            $visitor($value);
+            $value->traverse($visitor);
 
             return;
         }
 
         foreach ($value as $i => $val) {
             if ($this->isMulti()) {
                 foreach ($val as $v) {
-                    $this->_traverseValue($v, $callable);
+                    $this->_traverseValue($v, $visitor);
                 }
             } else {
-                $this->_traverseValue($val, $callable);
+                $this->_traverseValue($val, $visitor);
             }
         }
     }

diff --git a/Expression/UnaryExpression.php b/Expression/UnaryExpression.php
@@ -25,12 +25,14 @@ class UnaryExpression implements ExpressionInterface
     /**
      * Indicates that the operation is in pre-order
      *
+     * @var int
      */
     const PREFIX = 0;
 
     /**
      * Indicates that the operation is in post-order
      *
+     * @var int
      */
     const POSTFIX = 1;
 
@@ -93,11 +95,11 @@ public function sql(ValueBinder $generator)
      * {@inheritDoc}
      *
      */
-    public function traverse(callable $callable)
+    public function traverse(callable $visitor)
     {
         if ($this->_value instanceof ExpressionInterface) {
-            $callable($this->_value);
-            $this->_value->traverse($callable);
+            $visitor($this->_value);
+            $this->_value->traverse($visitor);
         }
     }
 

diff --git a/Schema/SqlserverSchema.php b/Schema/SqlserverSchema.php
@@ -19,6 +19,9 @@
  */
 class SqlserverSchema extends BaseSchema
 {
+    /**
+     * @var string
+     */
     const DEFAULT_SCHEMA_NAME = 'dbo';
 
     /**

diff --git a/Statement/BufferedStatement.php b/Statement/BufferedStatement.php
@@ -147,7 +147,10 @@ public function execute($params = null)
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the value of the result at position.
+     *
+     * @param int $position The numeric position of the column to retrieve in the result
+     * @return mixed Returns the specific value of the column designated at $position
      */
     public function fetchColumn($position)
     {

diff --git a/Statement/SqlserverStatement.php b/Statement/SqlserverStatement.php
@@ -24,10 +24,10 @@
 class SqlserverStatement extends PDOStatement
 {
     /**
+     * {@inheritDoc}
+     *
      * The SQL Server PDO driver requires that binary parameters be bound with the SQLSRV_ENCODING_BINARY attribute.
      * This overrides the PDOStatement::bindValue method in order to bind binary columns using the required attribute.
-     *
-     * {@inheritDoc}
      */
     public function bindValue($column, $value, $type = 'string')
     {