Skip to content

Commit 8674c29

Browse files
committed
Merge branch 'master' into develop
2 parents 41df224 + a3f8bb0 commit 8674c29

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ Versions and branches
1515

1616
| CakePHP | CakeDC Api Plugin | Tag | Notes |
1717
| :-------------: | :------------------------: | :--: | :---- |
18-
| ^3.6 | [master](https://github.com/cakedc/cakephp-api/tree/master) | 6.0.1 | stable |
19-
| ^3.6 | [develop](https://github.com/cakedc/cakephp-api/tree/develop) | - | unstable |
18+
| ^3.7 | [master](https://github.com/cakedc/cakephp-api/tree/master) | 7.0.0 | stable |
19+
| ^3.7 | [develop](https://github.com/cakedc/cakephp-api/tree/develop) | - | unstable |
20+
| 3.6 | [master](https://github.com/cakedc/cakephp-api/tree/6.0.1) | 6.0.1 | stable |
2021
| 3.5 | [5.x](https://github.com/cakedc/cakephp-api/tree/5.0.0) | 5.0.0 | stable |
2122
| 3.4 | [4.x](https://github.com/cakedc/cakephp-api/tree/4.0.0) | 4.0.0 | stable |
2223
| 3.3 | [3.x](https://github.com/cakedc/cakephp-api/tree/3.3) | 3.3 | stable |

src/Service/Action/Action.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public function process()
287287
$event = new Event('Action.onAuth', $this, ['action' => $this]);
288288
$this->Auth->authCheck($event);
289289

290-
$event = $this->dispatchEvent('Action.beforeValidate', compact('data'));
290+
$event = $this->dispatchEvent('Action.beforeValidate', []);
291291

292292
if ($event->isStopped()) {
293293
$this->dispatchEvent('Action.beforeValidateStopped', []);
@@ -300,7 +300,7 @@ public function process()
300300
throw new ValidationException(__('Validation failed'), 0, null, []);
301301
}
302302

303-
$event = $this->dispatchEvent('Action.beforeExecute', compact('data'));
303+
$event = $this->dispatchEvent('Action.beforeExecute', []);
304304

305305
if ($event->isStopped()) {
306306
$this->dispatchEvent('Action.beforeExecuteStopped', []);

0 commit comments

Comments
 (0)