Merge pull request #240 from mirko-pagliai/develop

fixed deprecation
mirko-pagliai · Dec 23, 2020 · 158d00e · 158d00e
2 parents 47006bb + 7bbaad4
commit 158d00e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 123 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,10 @@
 .directory
+.idea
 .phpunit.result.cache
 *_old
 *.lock
 *.old.*
+bin/
 composer.lock
 coverage/
 plugins/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@
     to use with other plugins;
 * fixed old bug on loading theme plugins;
 * fixed little bug for the `description` field for `Banner` and `Photo` entities;
-* added `cake` binaries and fixed composer script to extract POT files;
+* fixed composer script to extract POT files;
 * updated for `php-tools` 1.4.5;
 * removed redundant code in routes;
 * added `phpstan`, so fixed some code and descriptions.

diff --git a/bin/cake b/bin/cake
diff --git a/bin/cake.bat b/bin/cake.bat
diff --git a/bin/cake.php b/bin/cake.php
diff --git a/phpstan.neon b/phpstan.neon
@@ -95,5 +95,5 @@ parameters:
             path: tests/TestCase/Mailer
 
         -
-            message: '#^Property [\w\\]+::\$Posts \(MeCms\\Model\\Table\\PostsTable\|PHPUnit\\Framework\\MockObject\\MockObject\) does not accept Cake\\ORM\\Table\.#'
-            path: tests/TestCase/Model/Table/Traits
+            message: '#^Property [\w\\]+::\$\w+ \([\w\\\|]*PHPUnit\\Framework\\MockObject\\MockObject\) does not accept Cake\\ORM\\Table\.#'
+            path: tests/TestCase/Model
diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php
@@ -87,7 +87,7 @@ protected function sendActivationMail(User $user): bool
         $token = $this->Token->create($user->get('email'), ['type' => 'signup', 'user_id' => $user->get('id')]);
 
         return (bool)$this->getMailer('MeCms.User')
-            ->set('url', Router::url(['_name' => 'activation', (string)$user->get('id'), $token], true))
+            ->setViewVars('url', Router::url(['_name' => 'activation', (string)$user->get('id'), $token], true))
             ->send('activation', [$user]);
     }
 
@@ -286,7 +286,7 @@ public function passwordForgot()
                 if ($user) {
                     $token = $this->Token->create($email, ['type' => 'password_forgot', 'user_id' => $user->get('id')]);
                     $this->getMailer('MeCms.User')
-                        ->set('url', Router::url(['_name' => 'passwordReset', (string)$user->get('id'), $token], true))
+                        ->setViewVars('url', Router::url(['_name' => 'passwordReset', (string)$user->get('id'), $token], true))
                         ->send('passwordForgot', [$user]);
                     $this->Flash->success(__d('me_cms', 'We have sent you an email to reset your password'));