Merge branch 'holiday-branch' into 'development'

Release 1.2.0-RC4

See merge request fuzeworks/MVCR!2
This commit is contained in:
Abel Hoogeveen 2019-08-21 17:02:16 +00:00
commit ea0cf92d74
2 changed files with 2 additions and 2 deletions

View File

@ -14,7 +14,7 @@
], ],
"require": { "require": {
"php": ">=7.1.0", "php": ">=7.1.0",
"fuzeworks/core": "1.2.0-RC3" "fuzeworks/core": "1.2.0-RC4"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^7", "phpunit/phpunit": "^7",

View File

@ -83,7 +83,7 @@ class Views
else else
$arguments = []; $arguments = [];
// Fire a view load event // Fire a viewGetEvent
/** @var ViewGetEvent $event */ /** @var ViewGetEvent $event */
try { try {
$event = Events::fireEvent('viewGetEvent', $viewName, $viewType, $viewPaths, $namespace, $controller, $arguments); $event = Events::fireEvent('viewGetEvent', $viewName, $viewType, $viewPaths, $namespace, $controller, $arguments);