Merge pull request #79 from ADmad/cake-5.3

Update for CakePHP 5.3

Author: ADmad

composer.json

@@ -23,10 +23,10 @@
         "issues":"https://github.com/ADmad/cakephp-i18n/issues"
     },
     "require": {
-        "cakephp/cakephp": "^5.0"
+        "cakephp/cakephp": "^5.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.5.58 || ^11.5.3 || ^12.4"
+        "phpunit/phpunit": "^11.5.3 || ^12.4 || ^13.0"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-	level: 7
+	level: 8
 	treatPhpDocTypesAsCertain: false
 	bootstrapFiles:
 		- tests/bootstrap.php

psalm.xml

@@ -20,5 +20,10 @@
         <PropertyNotSetInConstructor errorLevel="info" />
         <MissingConstructor errorLevel="info" />
         <RiskyTruthyFalsyComparison errorLevel="info" />
+        <MissingOverrideAttribute errorLevel="info" />
+        <ClassMustBeFinal errorLevel="info" />
+        <PossiblyNullArrayAccess errorLevel="info" />
+        <PossiblyNullArrayAssignment errorLevel="info" />
+        <PossiblyNullArrayOffset errorLevel="info" />
     </issueHandlers>
 </psalm>

src/Command/I18nExtractCommand.php

@@ -22,6 +22,8 @@ class I18nExtractCommand extends CakeI18nExtractCommand
 
     /**
      * Default model for storing translation messages.
+     *
+     * @var string
      */
     public const DEFAULT_MODEL = 'I18nMessages';
 
@@ -207,7 +209,7 @@ protected function _getLanguages(Arguments $args): array
     protected function _saveMessages(Arguments $args, ConsoleIo $io): void
     {
         $paths = $this->_paths;
-        /** @psalm-suppress UndefinedConstant */
+        /** @psalm-suppress UndefinedConstant, PossiblyFalseOperand */
         $paths[] = realpath(APP) . DIRECTORY_SEPARATOR;
 
         usort($paths, function (string $a, string $b): int {

src/Validation/Validator.php

@@ -40,16 +40,21 @@ public function validationDomain(?string $domain = null): ?string
      * @param \Cake\Validation\ValidationSet $rules the list of rules for a field
      * @param array $data the full data passed to the validator
      * @param bool $newRecord whether is it a new record or an existing one
+     * @param array $context Additional validation context.
      * @return array<string, mixed>
      */
-    protected function _processRules(string $field, ValidationSet $rules, array $data, bool $newRecord): array
-    {
+    protected function _processRules(
+        string $field,
+        ValidationSet $rules,
+        array $data,
+        bool $newRecord,
+        array $context = [],
+    ): array {
         $errors = [];
-        // Loading default provider in case there is none
-        $this->getProvider('default');
+        $context = compact('newRecord', 'data', 'field') + $context;
 
         foreach ($rules as $name => $rule) {
-            $result = $rule->process($data[$field], $this->_providers, compact('newRecord', 'data', 'field'));
+            $result = $rule->process($data[$field], $this->_providers, $context);
             if ($result === true) {
                 continue;
             }
@@ -61,6 +66,10 @@ protected function _processRules(string $field, ValidationSet $rules, array $dat
             } else {
                 $args = $rule->get('pass');
                 $errors[$name] = __d($this->_validationDomain, $name, $this->_translateArgs($args));
+
+                if ($errors[$name] === $name) {
+                    $errors[$name] = __d('cake', 'The provided value is invalid');
+                }
             }
 
             if ($rule->isLast()) {

tests/TestCase/View/Widget/TimezoneWidgetTest.php

@@ -5,6 +5,7 @@
 
 use ADmad\I18n\View\Widget\TimezoneWidget;
 use Cake\TestSuite\TestCase;
+use Cake\View\Form\ContextInterface;
 use Cake\View\StringTemplate;
 use DateTimeZone;
 use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
@@ -14,7 +15,7 @@
  */
 class TimezoneWidgetTest extends TestCase
 {
-    protected $context;
+    protected ContextInterface $context;
 
     protected StringTemplate $templates;
 
@@ -32,7 +33,7 @@ public function setUp(): void
             'option' => '<option value="{{value}}"{{attrs}}>{{text}}</option>',
             'optgroup' => '<optgroup label="{{label}}"{{attrs}}>{{content}}</optgroup>',
         ];
-        $this->context = $this->getMockBuilder('Cake\View\Form\ContextInterface')->getMock();
+        $this->context = $this->createStub(ContextInterface::class);
         $this->templates = new StringTemplate($templates);
     }