Browse Source

Fix phpcs/phpstan errors.

Update composer.json to have a <9 value as we'll totally need to make
a new release at some point.
Mark Story 3 years ago
parent
commit
dafc106bdf

+ 1 - 1
composer.json

@@ -22,7 +22,7 @@
         }
     ],
     "require": {
-        "php": ">=7.4.0",
+        "php": ">=7.4.0,<9",
         "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",

+ 2 - 2
src/Database/Expression/CaseExpressionTrait.php

@@ -16,7 +16,7 @@ declare(strict_types=1);
  */
 namespace Cake\Database\Expression;
 
-use Cake\Chronos\Date;
+use Cake\Chronos\ChronosDate;
 use Cake\Chronos\MutableDate;
 use Cake\Database\ExpressionInterface;
 use Cake\Database\Query;
@@ -52,7 +52,7 @@ trait CaseExpressionTrait
         } elseif (is_bool($value)) {
             $type = 'boolean';
         } elseif (
-            $value instanceof Date ||
+            $value instanceof ChronosDate ||
             $value instanceof MutableDate
         ) {
             $type = 'date';

+ 1 - 1
src/Database/Log/QueryLogger.php

@@ -52,6 +52,6 @@ class QueryLogger extends BaseLog
             $context = $context['query']->getContext() + $context;
             $message = 'connection={connection} role={role} duration={took} rows={numRows} ' . $message;
         }
-        Log::write('debug', $message, $context);
+        Log::write('debug', (string)$message, $context);
     }
 }

+ 1 - 1
src/Database/Type/DateType.php

@@ -104,7 +104,7 @@ class DateType extends DateTimeType
     public function marshal($value): ?DateTimeInterface
     {
         if ($value instanceof DateTimeInterface) {
-            return new FrozenDate($value);
+            return new FrozenDate('@' . $value->getTimestamp());
         }
 
         /** @var class-string<\Cake\Chronos\ChronosDate> $class */

+ 1 - 1
src/I18n/FrozenDate.php

@@ -16,7 +16,7 @@ declare(strict_types=1);
  */
 namespace Cake\I18n;
 
-use Cake\Chronos\Date as ChronosDate;
+use Cake\Chronos\ChronosDate;
 use IntlDateFormatter;
 
 /**

+ 1 - 1
src/View/Helper/TimeHelper.php

@@ -267,7 +267,7 @@ class TimeHelper extends Helper
             'timezone' => null,
         ];
         $options['timezone'] = $this->_getTimezone($options['timezone']);
-        if ($options['timezone'] && method_exists($dateTime, 'setTimezone')) {
+        if ($options['timezone'] && is_object($dateTime) && method_exists($dateTime, 'setTimezone')) {
             $dateTime = $dateTime->setTimezone($options['timezone']);
             unset($options['timezone']);
         }