Remove deprecated calls in Cake\Database

src/Database/Dialect/PostgresDialectTrait.php

@@ -102,15 +102,15 @@ trait PostgresDialectTrait
      */
     protected function _transformFunctionExpression(FunctionExpression $expression)
     {
-        switch ($expression->name()) {
+        switch ($expression->getName()) {
             case 'CONCAT':
                 // CONCAT function is expressed as exp1 || exp2
-                $expression->name('')->tieWith(' ||');
+                $expression->setName('')->setConjunction(' ||');
                 break;
             case 'DATEDIFF':
                 $expression
-                    ->name('')
-                    ->tieWith('-')
+                    ->setName('')
+                    ->setConjunction('-')
                     ->iterateParts(function ($p) {
                         if (is_string($p)) {
                             $p = ['value' => [$p => 'literal'], 'type' => null];
@@ -123,19 +123,19 @@ trait PostgresDialectTrait
                 break;
             case 'CURRENT_DATE':
                 $time = new FunctionExpression('LOCALTIMESTAMP', [' 0 ' => 'literal']);
-                $expression->name('CAST')->tieWith(' AS ')->add([$time, 'date' => 'literal']);
+                $expression->setName('CAST')->setConjunction(' AS ')->add([$time, 'date' => 'literal']);
                 break;
             case 'CURRENT_TIME':
                 $time = new FunctionExpression('LOCALTIMESTAMP', [' 0 ' => 'literal']);
-                $expression->name('CAST')->tieWith(' AS ')->add([$time, 'time' => 'literal']);
+                $expression->setName('CAST')->setConjunction(' AS ')->add([$time, 'time' => 'literal']);
                 break;
             case 'NOW':
-                $expression->name('LOCALTIMESTAMP')->add([' 0 ' => 'literal']);
+                $expression->setName('LOCALTIMESTAMP')->add([' 0 ' => 'literal']);
                 break;
             case 'DATE_ADD':
                 $expression
-                    ->name('')
-                    ->tieWith(' + INTERVAL')
+                    ->setName('')
+                    ->setConjunction(' + INTERVAL')
                     ->iterateParts(function ($p, $key) {
                         if ($key === 1) {
                             $p = sprintf("'%s'", $p);
@@ -146,8 +146,8 @@ trait PostgresDialectTrait
                 break;
             case 'DAYOFWEEK':
                 $expression
-                    ->name('EXTRACT')
-                    ->tieWith(' ')
+                    ->setName('EXTRACT')
+                    ->setConjunction(' ')
                     ->add(['DOW FROM' => 'literal'], [], true)
                     ->add([') + (1' => 'literal']); // Postgres starts on index 0 but Sunday should be 1
                 break;

src/Database/Dialect/SqliteDialectTrait.php

@@ -92,32 +92,32 @@ trait SqliteDialectTrait
      */
     protected function _transformFunctionExpression(FunctionExpression $expression)
     {
-        switch ($expression->name()) {
+        switch ($expression->getName()) {
             case 'CONCAT':
                 // CONCAT function is expressed as exp1 || exp2
-                $expression->name('')->tieWith(' ||');
+                $expression->setName('')->setConjunction(' ||');
                 break;
             case 'DATEDIFF':
                 $expression
-                    ->name('ROUND')
-                    ->tieWith('-')
+                    ->setName('ROUND')
+                    ->setConjunction('-')
                     ->iterateParts(function ($p) {
                         return new FunctionExpression('JULIANDAY', [$p['value']], [$p['type']]);
                     });
                 break;
             case 'NOW':
-                $expression->name('DATETIME')->add(["'now'" => 'literal']);
+                $expression->setName('DATETIME')->add(["'now'" => 'literal']);
                 break;
             case 'CURRENT_DATE':
-                $expression->name('DATE')->add(["'now'" => 'literal']);
+                $expression->setName('DATE')->add(["'now'" => 'literal']);
                 break;
             case 'CURRENT_TIME':
-                $expression->name('TIME')->add(["'now'" => 'literal']);
+                $expression->setName('TIME')->add(["'now'" => 'literal']);
                 break;
             case 'EXTRACT':
                 $expression
-                    ->name('STRFTIME')
-                    ->tieWith(' ,')
+                    ->setName('STRFTIME')
+                    ->setConjunction(' ,')
                     ->iterateParts(function ($p, $key) {
                         if ($key === 0) {
                             $value = rtrim(strtolower($p), 's');
@@ -131,8 +131,8 @@ trait SqliteDialectTrait
                 break;
             case 'DATE_ADD':
                 $expression
-                    ->name('DATE')
-                    ->tieWith(',')
+                    ->setName('DATE')
+                    ->setConjunction(',')
                     ->iterateParts(function ($p, $key) {
                         if ($key === 1) {
                             $p = ['value' => $p, 'type' => null];
@@ -143,8 +143,8 @@ trait SqliteDialectTrait
                 break;
             case 'DAYOFWEEK':
                 $expression
-                    ->name('STRFTIME')
-                    ->tieWith(' ')
+                    ->setName('STRFTIME')
+                    ->setConjunction(' ')
                     ->add(["'%w', " => 'literal'], [], true)
                     ->add([') + (1' => 'literal']); // Sqlite starts on index 0 but Sunday should be 1
                 break;

src/Database/Dialect/SqlserverDialectTrait.php

@@ -111,7 +111,7 @@ trait SqlserverDialectTrait
             ->offset(null)
             ->order([], true);
 
-        $outer = new Query($query->connection());
+        $outer = new Query($query->getConnection());
         $outer->select('*')
             ->from(['_cake_paging_' => $query]);
 
@@ -158,10 +158,10 @@ trait SqlserverDialectTrait
             ->select(function ($q) use ($distinct, $order) {
                 $over = $q->newExpr('ROW_NUMBER() OVER')
                     ->add('(PARTITION BY')
-                    ->add($q->newExpr()->add($distinct)->tieWith(','))
+                    ->add($q->newExpr()->add($distinct)->setConjunction(','))
                     ->add($order)
                     ->add(')')
-                    ->tieWith(' ');
+                    ->setConjunction(' ');
 
                 return [
                     '_cake_distinct_pivot_' => $over
@@ -171,7 +171,7 @@ trait SqlserverDialectTrait
             ->offset(null)
             ->order([], true);
 
-        $outer = new Query($query->connection());
+        $outer = new Query($query->getConnection());
         $outer->select('*')
             ->from(['_cake_distinct_' => $query])
             ->where(['_cake_distinct_pivot_' => 1]);
@@ -214,10 +214,10 @@ trait SqlserverDialectTrait
      */
     protected function _transformFunctionExpression(FunctionExpression $expression)
     {
-        switch ($expression->name()) {
+        switch ($expression->getName()) {
             case 'CONCAT':
                 // CONCAT function is expressed as exp1 + exp2
-                $expression->name('')->tieWith(' +');
+                $expression->setName('')->setConjunction(' +');
                 break;
             case 'DATEDIFF':
                 $hasDay = false;
@@ -236,17 +236,17 @@ trait SqlserverDialectTrait
                 break;
             case 'CURRENT_DATE':
                 $time = new FunctionExpression('GETUTCDATE');
-                $expression->name('CONVERT')->add(['date' => 'literal', $time]);
+                $expression->setName('CONVERT')->add(['date' => 'literal', $time]);
                 break;
             case 'CURRENT_TIME':
                 $time = new FunctionExpression('GETUTCDATE');
-                $expression->name('CONVERT')->add(['time' => 'literal', $time]);
+                $expression->setName('CONVERT')->add(['time' => 'literal', $time]);
                 break;
             case 'NOW':
-                $expression->name('GETUTCDATE');
+                $expression->setName('GETUTCDATE');
                 break;
             case 'EXTRACT':
-                $expression->name('DATEPART')->tieWith(' ,');
+                $expression->setName('DATEPART')->setConjunction(' ,');
                 break;
             case 'DATE_ADD':
                 $params = [];
@@ -266,20 +266,20 @@ trait SqlserverDialectTrait
                 };
 
                 $expression
-                    ->name('DATEADD')
-                    ->tieWith(',')
+                    ->setName('DATEADD')
+                    ->setConjunction(',')
                     ->iterateParts($visitor)
                     ->iterateParts($manipulator)
                     ->add([$params[2] => 'literal']);
                 break;
             case 'DAYOFWEEK':
                 $expression
-                    ->name('DATEPART')
-                    ->tieWith(' ')
+                    ->setName('DATEPART')
+                    ->setConjunction(' ')
                     ->add(['weekday, ' => 'literal'], [], true);
                 break;
             case 'SUBSTR':
-                $expression->name('SUBSTRING');
+                $expression->setName('SUBSTRING');
                 if (count($expression) < 4) {
                     $params = [];
                     $expression

src/Database/Dialect/TupleComparisonTranslatorTrait.php

@@ -70,7 +70,7 @@ trait TupleComparisonTranslatorTrait
             return;
         }
 
-        $surrogate = $query->connection()
+        $surrogate = $query->getConnection()
             ->newQuery()
             ->select($true);
 

src/Database/Driver.php

@@ -63,7 +63,7 @@ abstract class Driver
         $config += $this->_baseConfig;
         $this->_config = $config;
         if (!empty($config['quoteIdentifiers'])) {
-            $this->autoQuoting(true);
+            $this->enableAutoQuoting(true);
         }
     }