Adapt to last changes in Yii DataView and Yii Form (#605)

yiisoft · Dec 2, 2023 · 0331470 · 0331470
1 parent b93c078
commit 0331470
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 55 deletions.
diff --git a/blog/composer.json b/blog/composer.json
@@ -44,13 +44,14 @@
         "yiisoft/config": "^1.3.1",
         "yiisoft/cookies": "^1.2",
         "yiisoft/csrf": "^2.0",
-        "yiisoft/data": "^1.0",
+        "yiisoft/data": "dev-master as 1.0",
         "yiisoft/data-response": "^2.0",
         "yiisoft/definitions": "^3.0",
         "yiisoft/di": "^1.2",
         "yiisoft/error-handler": "^3.0",
         "yiisoft/factory": "^1.0",
         "yiisoft/form": "dev-master",
+        "yiisoft/form-model": "dev-master",
         "yiisoft/html": "^3.0",
         "yiisoft/http": "^1.2",
         "yiisoft/injector": "^1.0",

diff --git a/blog/resources/views/auth/login.php b/blog/resources/views/auth/login.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use App\Auth\Form\LoginForm;
-use Yiisoft\Form\Field;
+use Yiisoft\FormModel\Field;
 use Yiisoft\Html\Html;
 use Yiisoft\Html\Tag\Form;
 use Yiisoft\Router\UrlGeneratorInterface;

diff --git a/blog/resources/views/signup/signup.php b/blog/resources/views/signup/signup.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use App\Auth\Form\SignupForm;
-use Yiisoft\Form\Field;
+use Yiisoft\FormModel\Field;
 use Yiisoft\Html\Html;
 use Yiisoft\Html\Tag\Form;
 use Yiisoft\Router\UrlGeneratorInterface;

diff --git a/blog/resources/views/user/index.php b/blog/resources/views/user/index.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use App\User\User;
 use Yiisoft\Data\Paginator\OffsetPaginator;
 use Yiisoft\Html\Html;
 use Yiisoft\Html\Tag\A;
@@ -86,48 +87,49 @@
 
 <?= GridView::widget()
     ->columns(
-        DataColumn::create()
-            ->attribute('id')
-            ->value(static fn (object $data) => $data->getId()),
-        DataColumn::create()
-            ->attribute('login')
-            ->label($translator->translate('gridview.login'))
-            ->value(static fn (object $data) => $data->getLogin()),
-        DataColumn::create()
-            ->attribute('create_at')
-            ->label($translator->translate('gridview.create.at'))
-            ->value(static fn (object $data) => $data->getCreatedAt()->format('r')),
-        DataColumn::create()
-            ->attribute('api')
-            ->label($translator->translate('gridview.api'))
-            ->value(
-                static function (object $data) use ($urlGenerator): string {
-                    return Html::a(
-                        'API User Data',
-                        $urlGenerator->generate('api/user/profile', ['login' => $data->getLogin()]),
-                        ['target' => '_blank'],
-                    )->render();
-                },
-            ),
-        DataColumn::create()
-            ->attribute('profile')
-            ->label($translator->translate('gridview.profile'))
-            ->value(
-                static function (object $data) use ($urlGenerator): string {
-                    return Html::a(
-                        Html::tag('i', '', [
-                            'class' => 'bi bi-person-fill ms-1',
-                            'style' => 'font-size: 1.5em;',
-                        ]),
-                        $urlGenerator->generate('user/profile', ['login' => $data->getLogin()]),
-                        ['class' => 'btn btn-link'],
-                    )->render();
-                },
-            ),
+        new DataColumn(
+            'id',
+            content: static fn (User $user) => $user->getId(),
+        ),
+        new DataColumn(
+            'login',
+            content: static fn (User $user) => $user->getLogin(),
+            header: $translator->translate('gridview.login'),
+        ),
+        new DataColumn(
+            'login',
+            content: static fn (User $user) => $user->getCreatedAt()->format('r'),
+            header: $translator->translate('gridview.create.at'),
+        ),
+        new DataColumn(
+            'api',
+            content: static function (User $user) use ($urlGenerator): string {
+                return Html::a(
+                    'API User Data',
+                    $urlGenerator->generate('api/user/profile', ['login' => $user->getLogin()]),
+                    ['target' => '_blank'],
+                )->render();
+            },
+            header: $translator->translate('gridview.api'),
+        ),
+        new DataColumn(
+            'profile',
+            content:  static function (User $user) use ($urlGenerator): string {
+                return Html::a(
+                    Html::tag('i', '', [
+                        'class' => 'bi bi-person-fill ms-1',
+                        'style' => 'font-size: 1.5em;',
+                    ]),
+                    $urlGenerator->generate('user/profile', ['login' => $user->getLogin()]),
+                    ['class' => 'btn btn-link'],
+                )->render();
+            },
+            header: $translator->translate('gridview.profile'),
+        ),
     )
     ->header($header)
     ->id('w1-grid')
-    ->paginator($paginator)
+    ->dataReader($paginator)
     ->pagination(
         OffsetPagination::widget()
             ->menuClass('pagination justify-content-center')

diff --git a/blog/src/Auth/Controller/AuthController.php b/blog/src/Auth/Controller/AuthController.php
@@ -9,7 +9,7 @@
 use App\Service\WebControllerService;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Yiisoft\Form\FormHydrator;
+use Yiisoft\FormModel\FormHydrator;
 use Yiisoft\Http\Method;
 use Yiisoft\Translator\TranslatorInterface;
 use Yiisoft\User\Login\Cookie\CookieLogin;

diff --git a/blog/src/Auth/Controller/SignupController.php b/blog/src/Auth/Controller/SignupController.php
@@ -9,7 +9,7 @@
 use App\Service\WebControllerService;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Yiisoft\Form\FormHydrator;
+use Yiisoft\FormModel\FormHydrator;
 use Yiisoft\Http\Method;
 use Yiisoft\Yii\View\ViewRenderer;
 

diff --git a/blog/src/Auth/Form/LoginForm.php b/blog/src/Auth/Form/LoginForm.php
@@ -5,7 +5,7 @@
 namespace App\Auth\Form;
 
 use App\Auth\AuthService;
-use Yiisoft\Form\FormModel;
+use Yiisoft\FormModel\FormModel;
 use Yiisoft\Translator\TranslatorInterface;
 use Yiisoft\Validator\Result;
 use Yiisoft\Validator\Rule\Callback;

diff --git a/blog/src/Auth/Form/SignupForm.php b/blog/src/Auth/Form/SignupForm.php
@@ -6,7 +6,7 @@
 
 use App\User\User;
 use App\User\UserRepository;
-use Yiisoft\Form\FormModel;
+use Yiisoft\FormModel\FormModel;
 use Yiisoft\Translator\TranslatorInterface;
 use Yiisoft\Validator\Result;
 use Yiisoft\Validator\Rule\Equal;

diff --git a/blog/src/Blog/Post/PostController.php b/blog/src/Blog/Post/PostController.php
@@ -9,7 +9,7 @@
 use App\User\UserService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Yiisoft\Form\FormHydrator;
+use Yiisoft\FormModel\FormHydrator;
 use Yiisoft\Http\Method;
 use Yiisoft\Router\CurrentRoute;
 use Yiisoft\Validator\ValidatorInterface;

diff --git a/blog/src/Blog/Post/PostForm.php b/blog/src/Blog/Post/PostForm.php
@@ -4,7 +4,7 @@
 
 namespace App\Blog\Post;
 
-use Yiisoft\Form\FormModel;
+use Yiisoft\FormModel\FormModel;
 use Yiisoft\Validator\Rule\Required;
 
 final class PostForm extends FormModel

diff --git a/blog/src/Contact/ContactController.php b/blog/src/Contact/ContactController.php
@@ -7,7 +7,7 @@
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Yiisoft\Form\FormHydrator;
+use Yiisoft\FormModel\FormHydrator;
 use Yiisoft\Http\Header;
 use Yiisoft\Http\Method;
 use Yiisoft\Http\Status;

diff --git a/blog/src/Contact/ContactForm.php b/blog/src/Contact/ContactForm.php
@@ -4,7 +4,7 @@
 
 namespace App\Contact;
 
-use Yiisoft\Form\FormModel;
+use Yiisoft\FormModel\FormModel;
 use Yiisoft\Input\Http\Attribute\Parameter\UploadedFiles;
 use Yiisoft\Validator\Rule\Email;
 use Yiisoft\Validator\Rule\Required;

diff --git a/blog/src/Contact/ContactMailer.php b/blog/src/Contact/ContactMailer.php
@@ -32,15 +32,15 @@ public function send(ContactForm $form): void
             ->compose(
                 'contact-email',
                 [
-                    'content' => $form->getAttributeValue('body'),
+                    'content' => $form->getPropertyValue('body'),
                 ]
             )
-            ->withSubject($form->getAttributeValue('subject'))
-            ->withFrom([$form->getAttributeValue('email') => $form->getAttributeValue('name')])
+            ->withSubject($form->getPropertyValue('subject'))
+            ->withFrom([$form->getPropertyValue('email') => $form->getPropertyValue('name')])
             ->withSender($this->sender)
             ->withTo($this->to);
 
-        foreach ($form->getAttributeValue('attachFiles') as $attachFile) {
+        foreach ($form->getPropertyValue('attachFiles') as $attachFile) {
             foreach ($attachFile as $file) {
                 if ($file[0]?->getError() === UPLOAD_ERR_OK) {
                     $message = $message->withAttached(

diff --git a/blog/src/Contact/views/contact/form.php b/blog/src/Contact/views/contact/form.php
@@ -4,7 +4,7 @@
 
 use App\Contact\ContactForm;
 use App\Widget\FlashMessage;
-use Yiisoft\Form\Field;
+use Yiisoft\FormModel\Field;
 use Yiisoft\Html\Html;
 use Yiisoft\Html\Tag\Form;
 use Yiisoft\Router\UrlGeneratorInterface;