Skip to content

Drop request and response from Application and bootstrap event #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: 4.0.x
Choose a base branch
from
Open

Drop request and response from Application and bootstrap event #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f017f2e
Drop ApplicationInterface
Xerkus Jun 19, 2020
6b7cd1c
Downgrade Application to EventsCapableInterface
Xerkus Jun 19, 2020
1a79dc8
Extract Application default listeners to dedicated listener provider
Xerkus Mar 15, 2023
4321411
Provide bare minimum tests update for extracted default listeners for…
Xerkus Mar 15, 2023
7ab32f8
Update psalm baseline
Xerkus Mar 15, 2023
9b67bcd
Drop getConfig() from Application
Xerkus Mar 16, 2023
ea92e43
Switch Application to use ContainerInterface
Xerkus Mar 16, 2023
0891d01
Remove request and response from bootstrap event
Xerkus Dec 10, 2023
b95dbc9
Reorder event constants to match triggering order
Xerkus Jan 6, 2024
6be5d96
Remove deprecated Application::getResponse() usage and fix cs
Xerkus Jan 6, 2024
f7410d6
Add new MvcEvent::EVENT_PREPARE to perform request aware setup logic
Xerkus Jan 6, 2024
294d87c
Update inline documentation for Application
Xerkus Jan 6, 2024
f2258d4
Create MvcEvent instance in constructor rather than bootstrap() for t…
Xerkus Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 2 additions & 104 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.8.0@9cf4f60a333f779ad3bc704a555920e81d4fdcda">
<files psalm-version="5.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d">
<file src="src/Application.php">
<ImplementedReturnTypeMismatch>
<code>Application</code>
</ImplementedReturnTypeMismatch>
<MissingClosureParamType>
<code>$r</code>
</MissingClosureParamType>
<MixedArgument>
<code><![CDATA[$events ?: $serviceManager->get('EventManager')]]></code>
<code>$listener</code>
<code><![CDATA[$serviceManager->get('Router')]]></code>
</MixedArgument>
<MixedAssignment>
<code>$listener</code>
<code>$response</code>
<code>$response</code>
<code><![CDATA[$this->request]]></code>
Expand All @@ -22,9 +16,6 @@
<MixedInferredReturnType>
<code>array|object</code>
</MixedInferredReturnType>
<MixedMethodCall>
<code>attach</code>
</MixedMethodCall>
<MixedReturnStatement>
<code><![CDATA[$this->serviceManager->get('config')]]></code>
</MixedReturnStatement>
Expand Down Expand Up @@ -176,9 +167,6 @@
<code><![CDATA[$request->getContent()]]></code>
<code><![CDATA[$request->getMethod()]]></code>
</MixedArgument>
<MixedArrayOffset>
<code><![CDATA[$this->customHttpMethodsMap[$method]]]></code>
</MixedArrayOffset>
<MixedAssignment>
<code>$action</code>
<code>$action</code>
Expand Down Expand Up @@ -331,7 +319,6 @@
<code>$request</code>
</MissingConstructor>
<MixedArgument>
<code>$modelAcceptString</code>
<code>$modelName</code>
<code>$modelString</code>
</MixedArgument>
Expand All @@ -343,17 +330,13 @@
<code><![CDATA[$res->getMatchedAgainst()->params[self::INJECT_VIEWMODEL_NAME]]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code>$modelAcceptString</code>
<code>$modelName</code>
<code>$modelString</code>
<code>$modelStrings</code>
</MixedAssignment>
<MixedMethodCall>
<code>new $name()</code>
</MixedMethodCall>
<MixedOperand>
<code>$modelAcceptString</code>
</MixedOperand>
<MoreSpecificReturnType>
<code>ModelInterface|null</code>
</MoreSpecificReturnType>
Expand Down Expand Up @@ -622,11 +605,6 @@
</UndefinedClass>
</file>
<file src="src/DispatchListener.php">
<ArgumentTypeCoercion>
<code>$application</code>
<code>$application</code>
<code>$application</code>
</ArgumentTypeCoercion>
<MissingReturnType>
<code>reportMonitorEvent</code>
</MissingReturnType>
Expand Down Expand Up @@ -660,11 +638,6 @@
<MixedMethodCall>
<code>dispatch</code>
</MixedMethodCall>
<UndefinedConstant>
<code>$application::ERROR_CONTROLLER_INVALID</code>
<code>$application::ERROR_CONTROLLER_NOT_FOUND</code>
<code>$application::ERROR_EXCEPTION</code>
</UndefinedConstant>
<UndefinedFunction>
<code><![CDATA[zend_monitor_custom_event_ex(
$error,
Expand Down Expand Up @@ -871,18 +844,9 @@
<code>$container</code>
</ArgumentTypeCoercion>
<MixedArgument>
<code><![CDATA[$container->get('EventManager')]]></code>
<code><![CDATA[$container->get('Request')]]></code>
<code><![CDATA[$container->get('Response')]]></code>
<code>$listener</code>
</MixedArgument>
<MixedAssignment>
<code>$listener</code>
<code>$listeners</code>
</MixedAssignment>
<MixedMethodCall>
<code>attach</code>
</MixedMethodCall>
</file>
<file src="src/Service/ControllerManagerFactory.php">
<MixedArgument>
Expand Down Expand Up @@ -1296,9 +1260,6 @@
<PossiblyNullReference>
<code>attach</code>
</PossiblyNullReference>
<PropertyTypeCoercion>
<code>$services</code>
</PropertyTypeCoercion>
</file>
<file src="test/Application/AllowsReturningEarlyFromRoutingTest.php">
<MissingClosureParamType>
Expand All @@ -1309,9 +1270,6 @@
</UnusedClosureParam>
</file>
<file src="test/Application/BadControllerTrait.php">
<ArgumentTypeCoercion>
<code>$serviceConfig</code>
</ArgumentTypeCoercion>
<MissingClosureParamType>
<code>$services</code>
<code>$services</code>
Expand Down Expand Up @@ -1429,16 +1387,10 @@
</MixedOperand>
</file>
<file src="test/Application/InvalidControllerTypeTrait.php">
<ArgumentTypeCoercion>
<code>$serviceConfig</code>
</ArgumentTypeCoercion>
<MissingClosureParamType>
<code>$services</code>
<code>$services</code>
</MissingClosureParamType>
<MissingClosureReturnType>
<code><![CDATA[static fn($services) => $services->get('HttpRouter')]]></code>
</MissingClosureReturnType>
<MixedArgument>
<code>$services</code>
</MixedArgument>
Expand All @@ -1451,20 +1403,10 @@
</MixedInferredReturnType>
<MixedMethodCall>
<code>bootstrap</code>
<code>get</code>
<code>setUri</code>
</MixedMethodCall>
</file>
<file src="test/Application/MissingControllerTrait.php">
<ArgumentTypeCoercion>
<code>$serviceConfig</code>
</ArgumentTypeCoercion>
<MissingClosureParamType>
<code>$services</code>
</MissingClosureParamType>
<MissingClosureReturnType>
<code><![CDATA[static fn($services) => $services->get('HttpRouter')]]></code>
</MissingClosureReturnType>
<MixedAssignment>
<code>$application</code>
<code>$request</code>
Expand All @@ -1474,21 +1416,15 @@
</MixedInferredReturnType>
<MixedMethodCall>
<code>bootstrap</code>
<code>get</code>
<code>setUri</code>
</MixedMethodCall>
</file>
<file src="test/Application/PathControllerTrait.php">
<ArgumentTypeCoercion>
<code>$serviceConfig</code>
</ArgumentTypeCoercion>
<MissingClosureParamType>
<code>$services</code>
<code>$services</code>
</MissingClosureParamType>
<MissingClosureReturnType>
<code><![CDATA[static fn($services) => $services->get('HttpRouter')]]></code>
</MissingClosureReturnType>
<MissingClosureReturnType/>
<MixedArgument>
<code>$services</code>
</MixedArgument>
Expand All @@ -1501,33 +1437,20 @@
</MixedInferredReturnType>
<MixedMethodCall>
<code>bootstrap</code>
<code>get</code>
<code>setUri</code>
</MixedMethodCall>
</file>
<file src="test/Application/RoutingSuccessTest.php">
<MissingClosureParamType>
<code>$e</code>
</MissingClosureParamType>
<MixedArgument>
<code>$log</code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$log['route-match']]]></code>
</MixedArrayAccess>
<MixedArrayAssignment>
<code><![CDATA[$log['route-match']]]></code>
</MixedArrayAssignment>
<MixedMethodCall>
<code>getRouteMatch</code>
</MixedMethodCall>
</file>
<file src="test/ApplicationTest.php">
<ArgumentTypeCoercion>
<code>$eventManager</code>
<code>$eventManager</code>
<code>$events</code>
<code>$serviceConfig</code>
</ArgumentTypeCoercion>
<DeprecatedMethod>
<code>setMethods</code>
Expand Down Expand Up @@ -1569,7 +1492,6 @@
<code>static function (MvcEvent $event) {</code>
</MissingClosureReturnType>
<MixedArgument>
<code>$defaultListenerName</code>
<code><![CDATA[$response->getContent()]]></code>
<code><![CDATA[$response->getContent()]]></code>
<code>$router</code>
Expand All @@ -1580,17 +1502,10 @@
<MixedAssignment>
<code>$controllerLoader</code>
<code>$controllerManager</code>
<code>$defaultListener</code>
<code>$defaultListenerName</code>
<code>$defaultListenersNames</code>
<code>$defaultListeners[]</code>
<code>$error</code>
<code>$error</code>
<code>$events</code>
<code>$listener</code>
<code>$listener</code>
<code>$listenerService</code>
<code>$registeredListeners[]</code>
<code>$request</code>
<code>$request</code>
<code>$request</code>
Expand Down Expand Up @@ -2471,16 +2386,6 @@
<code>$e</code>
<code>$e</code>
</MissingClosureParamType>
<MixedArgument>
<code>$log</code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$log['error']]]></code>
</MixedArrayAccess>
<MixedArrayAssignment>
<code><![CDATA[$log['error']]]></code>
<code><![CDATA[$log['error']]]></code>
</MixedArrayAssignment>
<MixedAssignment>
<code><![CDATA[$log['error']]]></code>
<code><![CDATA[$log['error']]]></code>
Expand Down Expand Up @@ -2517,10 +2422,6 @@
<MissingClosureParamType>
<code>$e</code>
</MissingClosureParamType>
<MixedArrayAssignment>
<code><![CDATA[$result['response']]]></code>
<code><![CDATA[$result['target']]]></code>
</MixedArrayAssignment>
<MixedAssignment>
<code><![CDATA[$result['response']]]></code>
<code><![CDATA[$result['target']]]></code>
Expand Down Expand Up @@ -2819,9 +2720,6 @@
<MissingReturnType>
<code>testDetachesListeners</code>
</MissingReturnType>
<MixedAssignment>
<code>$child</code>
</MixedAssignment>
</file>
<file src="test/View/RouteNotFoundStrategyTest.php">
<InternalMethod>
Expand Down
Loading