Skip to content

Commit

Permalink
Merge branch 'sw-26435/improve-routing' into '5.7.7'
Browse files Browse the repository at this point in the history 
SW-26435 - Improve routing

See merge request shopware/5/product/shopware!715
  • Loading branch information
@philipreinken
philipreinken committed Dec 29, 2021
2 parents 8b75cbd + 938d712 commit 7125ed7
Show file tree
Hide file tree
Showing 6 changed files with 217 additions and 354 deletions.
205 changes: 0 additions & 205 deletions .phpstan-baseline.neon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47870,56 +47870,6 @@ parameters:
count: 1
path: engine/Shopware/Plugins/Default/Core/RestApi/Components/Router.php

-
message: "#^Access to an undefined property Shopware_Components_Config\\:\\:\\$offlineIp\\.$#"
count: 1
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Cannot call method jsonSerialize\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Country\\|null\\.$#"
count: 1
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Method Shopware_Plugins_Core_Router_Bootstrap\\:\\:initServiceMode\\(\\) has no return typehint specified\\.$#"
count: 1
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Method Shopware_Plugins_Core_Router_Bootstrap\\:\\:onRouteShutdown\\(\\) has no return typehint specified\\.$#"
count: 1
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Method Shopware_Plugins_Core_Router_Bootstrap\\:\\:onRouteStartup\\(\\) has no return typehint specified\\.$#"
count: 1
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Method Shopware_Plugins_Core_Router_Bootstrap\\:\\:upgradeShop\\(\\) has no return typehint specified\\.$#"
count: 1
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Negated boolean expression is always false\\.$#"
count: 3
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Parameter \\#1 \\$str of function trim expects string, string\\|null given\\.$#"
count: 2
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Parameter \\#2 \\$shop of method Shopware_Plugins_Core_Router_Bootstrap\\:\\:removeShopBaseUrl\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Shop, Shopware\\\\Models\\\\Shop\\\\Shop\\|null given\\.$#"
count: 1
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
count: 1
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

-
message: "#^Method Shopware_Plugins_Core_System_Bootstrap\\:\\:onDispatchLoopShutdown\\(\\) has no return typehint specified\\.$#"
count: 1
Expand Down Expand Up @@ -56114,161 +56064,6 @@ parameters:
count: 1
path: tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:routeDeleteProvider\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:routeGetProvider\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:routePostProvider\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:routePutProvider\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testCanGetInstance\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedAction with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedCode with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedController with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedId with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedVersion with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$uri with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$expectedAction with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$expectedController with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$expectedId with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$expectedVersion with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$uri with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$expectedAction with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$expectedController with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$expectedId with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$expectedVersion with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$uri with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has no return typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedAction with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedCode with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedController with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedId with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedVersion with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$uri with no typehint specified\\.$#"
count: 1
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php

-
message: "#^Call to an undefined method Enlight_Controller_Request_Request\\:\\:setClientIp\\(\\)\\.$#"
count: 1
Expand Down
1 change: 1 addition & 0 deletions engine/Shopware/Components/Plugin/Namespace.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
* @method Shopware_Plugins_Core_HttpCache_Bootstrap HttpCache()
* @method Shopware_Plugins_Core_MarketingAggregate_Bootstrap MarketingAggregate()
* @method Shopware_Plugins_Core_PostFilter_Bootstrap PostFilter()
* @method Shopware_Plugins_Core_Router_Bootstrap Router()
* @method Shopware_Plugins_Frontend_Statistics_Bootstrap Statistics()
* @method Shopware_Plugins_Backend_SwagUpdate_Bootstrap SwagUpdate()
* @method Shopware_Plugins_Frontend_TagCloud_Bootstrap TagCloud()
Expand Down
Loading

0 comments on commit 7125ed7

Please sign in to comment.