Skip to content

Commit 7125ed7

Browse files
philipreinkenphilipreinken
committed
Merge branch 'sw-26435/improve-routing' into '5.7.7'
SW-26435 - Improve routing See merge request shopware/5/product/shopware!715
2 parents 8b75cbd + 938d712 commit 7125ed7

File tree

6 files changed

+217
-354
lines changed

6 files changed

+217
-354
lines changed

‎.phpstan-baseline.neon‎

Lines changed: 0 additions & 205 deletions
Original file line numberDiff line numberDiff line change
@@ -47870,56 +47870,6 @@ parameters:
4787047870
count: 1
4787147871
path: engine/Shopware/Plugins/Default/Core/RestApi/Components/Router.php
4787247872

47873-
-
47874-
message: "#^Access to an undefined property Shopware_Components_Config\\:\\:\\$offlineIp\\.$#"
47875-
count: 1
47876-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47877-
47878-
-
47879-
message: "#^Cannot call method jsonSerialize\\(\\) on Shopware\\\\Bundle\\\\StoreFrontBundle\\\\Struct\\\\Country\\|null\\.$#"
47880-
count: 1
47881-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47882-
47883-
-
47884-
message: "#^Method Shopware_Plugins_Core_Router_Bootstrap\\:\\:initServiceMode\\(\\) has no return typehint specified\\.$#"
47885-
count: 1
47886-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47887-
47888-
-
47889-
message: "#^Method Shopware_Plugins_Core_Router_Bootstrap\\:\\:onRouteShutdown\\(\\) has no return typehint specified\\.$#"
47890-
count: 1
47891-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47892-
47893-
-
47894-
message: "#^Method Shopware_Plugins_Core_Router_Bootstrap\\:\\:onRouteStartup\\(\\) has no return typehint specified\\.$#"
47895-
count: 1
47896-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47897-
47898-
-
47899-
message: "#^Method Shopware_Plugins_Core_Router_Bootstrap\\:\\:upgradeShop\\(\\) has no return typehint specified\\.$#"
47900-
count: 1
47901-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47902-
47903-
-
47904-
message: "#^Negated boolean expression is always false\\.$#"
47905-
count: 3
47906-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47907-
47908-
-
47909-
message: "#^Parameter \\#1 \\$str of function trim expects string, string\\|null given\\.$#"
47910-
count: 2
47911-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47912-
47913-
-
47914-
message: "#^Parameter \\#2 \\$shop of method Shopware_Plugins_Core_Router_Bootstrap\\:\\:removeShopBaseUrl\\(\\) expects Shopware\\\\Models\\\\Shop\\\\Shop, Shopware\\\\Models\\\\Shop\\\\Shop\\|null given\\.$#"
47915-
count: 1
47916-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47917-
47918-
-
47919-
message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
47920-
count: 1
47921-
path: engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php
47922-
4792347873
-
4792447874
message: "#^Method Shopware_Plugins_Core_System_Bootstrap\\:\\:onDispatchLoopShutdown\\(\\) has no return typehint specified\\.$#"
4792547875
count: 1
@@ -56114,161 +56064,6 @@ parameters:
5611456064
count: 1
5611556065
path: tests/Functional/Plugins/Core/PaymentMethods/Components/SepaPaymentMethodTest.php
5611656066

56117-
-
56118-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:routeDeleteProvider\\(\\) has no return typehint specified\\.$#"
56119-
count: 1
56120-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56121-
56122-
-
56123-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:routeGetProvider\\(\\) has no return typehint specified\\.$#"
56124-
count: 1
56125-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56126-
56127-
-
56128-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:routePostProvider\\(\\) has no return typehint specified\\.$#"
56129-
count: 1
56130-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56131-
56132-
-
56133-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:routePutProvider\\(\\) has no return typehint specified\\.$#"
56134-
count: 1
56135-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56136-
56137-
-
56138-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testCanGetInstance\\(\\) has no return typehint specified\\.$#"
56139-
count: 1
56140-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56141-
56142-
-
56143-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has no return typehint specified\\.$#"
56144-
count: 1
56145-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56146-
56147-
-
56148-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedAction with no typehint specified\\.$#"
56149-
count: 1
56150-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56151-
56152-
-
56153-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedCode with no typehint specified\\.$#"
56154-
count: 1
56155-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56156-
56157-
-
56158-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedController with no typehint specified\\.$#"
56159-
count: 1
56160-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56161-
56162-
-
56163-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedId with no typehint specified\\.$#"
56164-
count: 1
56165-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56166-
56167-
-
56168-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$expectedVersion with no typehint specified\\.$#"
56169-
count: 1
56170-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56171-
56172-
-
56173-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testDeleteRoutes\\(\\) has parameter \\$uri with no typehint specified\\.$#"
56174-
count: 1
56175-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56176-
56177-
-
56178-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has no return typehint specified\\.$#"
56179-
count: 1
56180-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56181-
56182-
-
56183-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$expectedAction with no typehint specified\\.$#"
56184-
count: 1
56185-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56186-
56187-
-
56188-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$expectedController with no typehint specified\\.$#"
56189-
count: 1
56190-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56191-
56192-
-
56193-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$expectedId with no typehint specified\\.$#"
56194-
count: 1
56195-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56196-
56197-
-
56198-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$expectedVersion with no typehint specified\\.$#"
56199-
count: 1
56200-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56201-
56202-
-
56203-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testGetRoutes\\(\\) has parameter \\$uri with no typehint specified\\.$#"
56204-
count: 1
56205-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56206-
56207-
-
56208-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has no return typehint specified\\.$#"
56209-
count: 1
56210-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56211-
56212-
-
56213-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$expectedAction with no typehint specified\\.$#"
56214-
count: 1
56215-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56216-
56217-
-
56218-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$expectedController with no typehint specified\\.$#"
56219-
count: 1
56220-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56221-
56222-
-
56223-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$expectedId with no typehint specified\\.$#"
56224-
count: 1
56225-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56226-
56227-
-
56228-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$expectedVersion with no typehint specified\\.$#"
56229-
count: 1
56230-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56231-
56232-
-
56233-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPostRoutes\\(\\) has parameter \\$uri with no typehint specified\\.$#"
56234-
count: 1
56235-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56236-
56237-
-
56238-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has no return typehint specified\\.$#"
56239-
count: 1
56240-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56241-
56242-
-
56243-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedAction with no typehint specified\\.$#"
56244-
count: 1
56245-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56246-
56247-
-
56248-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedCode with no typehint specified\\.$#"
56249-
count: 1
56250-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56251-
56252-
-
56253-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedController with no typehint specified\\.$#"
56254-
count: 1
56255-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56256-
56257-
-
56258-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedId with no typehint specified\\.$#"
56259-
count: 1
56260-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56261-
56262-
-
56263-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$expectedVersion with no typehint specified\\.$#"
56264-
count: 1
56265-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56266-
56267-
-
56268-
message: "#^Method Shopware\\\\Tests\\\\Functional\\\\Plugins\\\\Core\\\\RestApi\\\\Components\\\\RouterTest\\:\\:testPutRoutes\\(\\) has parameter \\$uri with no typehint specified\\.$#"
56269-
count: 1
56270-
path: tests/Functional/Plugins/Core/RestApi/Components/RouterTest.php
56271-
5627256067
-
5627356068
message: "#^Call to an undefined method Enlight_Controller_Request_Request\\:\\:setClientIp\\(\\)\\.$#"
5627456069
count: 1

‎engine/Shopware/Components/Plugin/Namespace.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
* @method Shopware_Plugins_Core_HttpCache_Bootstrap HttpCache()
4040
* @method Shopware_Plugins_Core_MarketingAggregate_Bootstrap MarketingAggregate()
4141
* @method Shopware_Plugins_Core_PostFilter_Bootstrap PostFilter()
42+
* @method Shopware_Plugins_Core_Router_Bootstrap Router()
4243
* @method Shopware_Plugins_Frontend_Statistics_Bootstrap Statistics()
4344
* @method Shopware_Plugins_Backend_SwagUpdate_Bootstrap SwagUpdate()
4445
* @method Shopware_Plugins_Frontend_TagCloud_Bootstrap TagCloud()

0 commit comments

Comments
 (0)