From a9566a9f5c42c1a1187c81ffce0d1e812cee4138 Mon Sep 17 00:00:00 2001 From: George Steel Date: Tue, 13 Sep 2022 12:10:19 +0100 Subject: [PATCH] Switches to Psr\Container now that Interop is supplied by service manager Signed-off-by: George Steel --- composer.json | 22 +-- composer.lock | 180 +++++++++--------- src/Service/AbstractNavigationFactory.php | 2 +- src/Service/ConstructedNavigationFactory.php | 2 +- .../NavigationAbstractServiceFactory.php | 2 +- src/View/NavigationHelperFactory.php | 2 +- .../ViewHelperManagerDelegatorFactory.php | 2 +- 7 files changed, 108 insertions(+), 104 deletions(-) diff --git a/composer.json b/composer.json index ec403075..10b07fe3 100644 --- a/composer.json +++ b/composer.json @@ -35,26 +35,26 @@ "laminas/laminas-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "laminas/laminas-coding-standard": "^2.3.0", + "laminas/laminas-coding-standard": "~2.4.0", "laminas/laminas-config": "^3.7.0", - "laminas/laminas-http": "^2.15.1", - "laminas/laminas-i18n": "^2.13.0", - "laminas/laminas-mvc": "^3.3.0", - "laminas/laminas-permissions-acl": "^2.9.0", - "laminas/laminas-router": "^3.5.0", - "laminas/laminas-servicemanager": "^3.10.0", + "laminas/laminas-http": "^2.16.0", + "laminas/laminas-i18n": "^2.17.0", + "laminas/laminas-mvc": "^3.3.4", + "laminas/laminas-permissions-acl": "^2.10.0", + "laminas/laminas-router": "^3.9.0", + "laminas/laminas-servicemanager": "^3.16.0", "laminas/laminas-uri": "^2.9.1", - "laminas/laminas-view": "^2.14.2", + "laminas/laminas-view": "^2.22.1", "phpspec/prophecy-phpunit": "^2.0.1", - "phpunit/phpunit": "^9.5.10", + "phpunit/phpunit": "^9.5.24", "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.24" + "vimeo/psalm": "^4.27" }, "suggest": { "laminas/laminas-config": "^3.7, to provide page configuration (optional, as arrays and Traversables are also allowed)", "laminas/laminas-permissions-acl": "^2.9, to provide ACL-based access restrictions to pages", "laminas/laminas-router": "^3.5, to use router-based URI generation with Mvc pages", - "laminas/laminas-servicemanager": "^3.10, to use the navigation factories", + "laminas/laminas-servicemanager": "^3.16, to use the navigation factories", "laminas/laminas-view": "^2.14, to use the navigation view helpers" }, "autoload": { diff --git a/composer.lock b/composer.lock index 9da50bc8..dd048c3b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ee670b0173cbac6c5eb472c52edf2d59", + "content-hash": "30bc113e56b8feacdb3526216d04c217", "packages": [ { "name": "laminas/laminas-stdlib", - "version": "3.12.0", + "version": "3.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "c5aed3c798018e31fbb7b1e421b8d96bf2cda453" + "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/c5aed3c798018e31fbb7b1e421b8d96bf2cda453", - "reference": "c5aed3c798018e31fbb7b1e421b8d96bf2cda453", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/66a6d03c381f6c9f1dd988bf8244f9afb9380d76", + "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76", "shasum": "" }, "require": { @@ -64,7 +64,7 @@ "type": "community_bridge" } ], - "time": "2022-08-22T22:55:58+00:00" + "time": "2022-08-24T13:56:50+00:00" } ], "packages-dev": [ @@ -859,25 +859,28 @@ }, { "name": "laminas/laminas-coding-standard", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-coding-standard.git", - "reference": "bcf6e07fe4690240be7beb6d884d0b0fafa6a251" + "reference": "eb076dd86aa93dd424856b150c9b6f76c1fdfabc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/bcf6e07fe4690240be7beb6d884d0b0fafa6a251", - "reference": "bcf6e07fe4690240be7beb6d884d0b0fafa6a251", + "url": "https://api.github.com/repos/laminas/laminas-coding-standard/zipball/eb076dd86aa93dd424856b150c9b6f76c1fdfabc", + "reference": "eb076dd86aa93dd424856b150c9b6f76c1fdfabc", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7", - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.6", "webimpress/coding-standard": "^1.2" }, + "conflict": { + "phpstan/phpdoc-parser": ">=1.6.0" + }, "type": "phpcodesniffer-standard", "autoload": { "psr-4": { @@ -908,7 +911,7 @@ "type": "community_bridge" } ], - "time": "2021-05-29T15:53:59+00:00" + "time": "2022-08-24T17:45:47+00:00" }, { "name": "laminas/laminas-config", @@ -1378,16 +1381,16 @@ }, { "name": "laminas/laminas-modulemanager", - "version": "2.11.0", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-modulemanager.git", - "reference": "6acf5991d10b0b38a2edb08729ed48981b2a5dad" + "reference": "cd2dd3b3dc59e75a9f2117374222c0d84b25bf19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/6acf5991d10b0b38a2edb08729ed48981b2a5dad", - "reference": "6acf5991d10b0b38a2edb08729ed48981b2a5dad", + "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/cd2dd3b3dc59e75a9f2117374222c0d84b25bf19", + "reference": "cd2dd3b3dc59e75a9f2117374222c0d84b25bf19", "shasum": "" }, "require": { @@ -1406,7 +1409,9 @@ "laminas/laminas-loader": "^2.8", "laminas/laminas-mvc": "^3.1.1", "laminas/laminas-servicemanager": "^3.7", - "phpunit/phpunit": "^9.5.5" + "phpunit/phpunit": "^9.5.5", + "psalm/plugin-phpunit": "^0.16.1", + "vimeo/psalm": "^4.10" }, "suggest": { "laminas/laminas-console": "Laminas\\Console component", @@ -1444,7 +1449,7 @@ "type": "community_bridge" } ], - "time": "2021-10-13T17:05:17+00:00" + "time": "2022-09-07T11:22:27+00:00" }, { "name": "laminas/laminas-mvc", @@ -1593,16 +1598,16 @@ }, { "name": "laminas/laminas-router", - "version": "3.7.0", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-router.git", - "reference": "0227cc29f62583dd1ca50d17d117b832edaa8cd8" + "reference": "ebd084f7fda7520394b9ddc1e9ec2cbdf2094daa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-router/zipball/0227cc29f62583dd1ca50d17d117b832edaa8cd8", - "reference": "0227cc29f62583dd1ca50d17d117b832edaa8cd8", + "url": "https://api.github.com/repos/laminas/laminas-router/zipball/ebd084f7fda7520394b9ddc1e9ec2cbdf2094daa", + "reference": "ebd084f7fda7520394b9ddc1e9ec2cbdf2094daa", "shasum": "" }, "require": { @@ -1615,7 +1620,7 @@ "zendframework/zend-router": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.2.1", + "laminas/laminas-coding-standard": "~2.4.0", "laminas/laminas-i18n": "^2.15.0", "phpunit/phpunit": "^9.5.5", "psalm/plugin-phpunit": "^0.17.0", @@ -1660,7 +1665,7 @@ "type": "community_bridge" } ], - "time": "2022-07-18T01:39:51+00:00" + "time": "2022-08-30T22:41:24+00:00" }, { "name": "laminas/laminas-servicemanager", @@ -1813,16 +1818,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.23.0", + "version": "2.24.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "6d61b6cc3b222f13807a18d9247cdfb084958b03" + "reference": "f2ad7de3f92b443f31447a37e061116f701d150a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/6d61b6cc3b222f13807a18d9247cdfb084958b03", - "reference": "6d61b6cc3b222f13807a18d9247cdfb084958b03", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/f2ad7de3f92b443f31447a37e061116f701d150a", + "reference": "f2ad7de3f92b443f31447a37e061116f701d150a", "shasum": "" }, "require": { @@ -1834,20 +1839,20 @@ "zendframework/zend-validator": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.3.0", - "laminas/laminas-db": "^2.7", - "laminas/laminas-filter": "^2.14.0", - "laminas/laminas-http": "^2.14.2", - "laminas/laminas-i18n": "^2.15.0", - "laminas/laminas-session": "^2.12.1", + "laminas/laminas-coding-standard": "^2.4.0", + "laminas/laminas-db": "^2.15.0", + "laminas/laminas-filter": "^2.18.0", + "laminas/laminas-http": "^2.16.0", + "laminas/laminas-i18n": "^2.17.0", + "laminas/laminas-session": "^2.13.0", "laminas/laminas-uri": "^2.9.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5.21", + "phpunit/phpunit": "^9.5.24", "psalm/plugin-phpunit": "^0.17.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0", - "vimeo/psalm": "^4.24.0" + "vimeo/psalm": "^4.27.0" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", @@ -1895,7 +1900,7 @@ "type": "community_bridge" } ], - "time": "2022-07-27T19:17:59+00:00" + "time": "2022-09-13T07:40:10+00:00" }, { "name": "laminas/laminas-view", @@ -2116,16 +2121,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.14.0", + "version": "v4.15.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1" + "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", "shasum": "" }, "require": { @@ -2166,9 +2171,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" }, - "time": "2022-05-31T20:59:12+00:00" + "time": "2022-09-04T07:30:47+00:00" }, { "name": "openlss/lib-array2xml", @@ -2615,16 +2620,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.7.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "367a8d9d5f7da2a0136422d27ce8840583926955" + "reference": "981cc368a216c988e862a75e526b6076987d1b50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/367a8d9d5f7da2a0136422d27ce8840583926955", - "reference": "367a8d9d5f7da2a0136422d27ce8840583926955", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/981cc368a216c988e862a75e526b6076987d1b50", + "reference": "981cc368a216c988e862a75e526b6076987d1b50", "shasum": "" }, "require": { @@ -2634,7 +2639,6 @@ "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5", "symfony/process": "^5.2" @@ -2654,22 +2658,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.7.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.5.1" }, - "time": "2022-08-09T12:23:23+00:00" + "time": "2022-05-05T11:32:40+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.16", + "version": "9.2.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073" + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073", - "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", "shasum": "" }, "require": { @@ -2725,7 +2729,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" }, "funding": [ { @@ -2733,7 +2737,7 @@ "type": "github" } ], - "time": "2022-08-20T05:26:47+00:00" + "time": "2022-08-30T12:24:04+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2978,16 +2982,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.23", + "version": "9.5.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "888556852e7e9bbeeedb9656afe46118765ade34" + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/888556852e7e9bbeeedb9656afe46118765ade34", - "reference": "888556852e7e9bbeeedb9656afe46118765ade34", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", "shasum": "" }, "require": { @@ -3016,7 +3020,7 @@ "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.0", + "sebastian/type": "^3.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -3060,7 +3064,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.23" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" }, "funding": [ { @@ -3072,7 +3076,7 @@ "type": "github" } ], - "time": "2022-08-22T14:01:36+00:00" + "time": "2022-08-30T07:42:16+00:00" }, { "name": "psalm/plugin-phpunit", @@ -4089,16 +4093,16 @@ }, { "name": "sebastian/type", - "version": "3.0.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", "shasum": "" }, "require": { @@ -4110,7 +4114,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -4133,7 +4137,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" }, "funding": [ { @@ -4141,7 +4145,7 @@ "type": "github" } ], - "time": "2022-03-15T09:54:48+00:00" + "time": "2022-09-12T14:47:03+00:00" }, { "name": "sebastian/version", @@ -4315,16 +4319,16 @@ }, { "name": "symfony/console", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "535846c7ee6bc4dd027ca0d93220601456734b10" + "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10", - "reference": "535846c7ee6bc4dd027ca0d93220601456734b10", + "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1", + "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1", "shasum": "" }, "require": { @@ -4394,7 +4398,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.11" + "source": "https://github.com/symfony/console/tree/v5.4.12" }, "funding": [ { @@ -4410,7 +4414,7 @@ "type": "tidelift" } ], - "time": "2022-07-22T10:42:43+00:00" + "time": "2022-08-17T13:18:05+00:00" }, { "name": "symfony/deprecation-contracts", @@ -5056,16 +5060,16 @@ }, { "name": "symfony/string", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322" + "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322", - "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322", + "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058", + "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058", "shasum": "" }, "require": { @@ -5122,7 +5126,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.11" + "source": "https://github.com/symfony/string/tree/v5.4.12" }, "funding": [ { @@ -5138,7 +5142,7 @@ "type": "tidelift" } ], - "time": "2022-07-24T16:15:25+00:00" + "time": "2022-08-12T17:03:11+00:00" }, { "name": "theseer/tokenizer", @@ -5192,16 +5196,16 @@ }, { "name": "vimeo/psalm", - "version": "4.26.0", + "version": "4.27.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "6998fabb2bf528b65777bf9941920888d23c03ac" + "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/6998fabb2bf528b65777bf9941920888d23c03ac", - "reference": "6998fabb2bf528b65777bf9941920888d23c03ac", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/faf106e717c37b8c81721845dba9de3d8deed8ff", + "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff", "shasum": "" }, "require": { @@ -5293,9 +5297,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.26.0" + "source": "https://github.com/vimeo/psalm/tree/4.27.0" }, - "time": "2022-07-31T13:10:26+00:00" + "time": "2022-08-31T13:47:09+00:00" }, { "name": "webimpress/coding-standard", diff --git a/src/Service/AbstractNavigationFactory.php b/src/Service/AbstractNavigationFactory.php index aa33f0d3..78e93889 100644 --- a/src/Service/AbstractNavigationFactory.php +++ b/src/Service/AbstractNavigationFactory.php @@ -4,7 +4,6 @@ namespace Laminas\Navigation\Service; -use Interop\Container\ContainerInterface; use Laminas\Config; use Laminas\Http\Request; use Laminas\Navigation\Exception; @@ -15,6 +14,7 @@ use Laminas\ServiceManager\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use Laminas\Stdlib\ArrayUtils; +use Psr\Container\ContainerInterface; use Traversable; use function file_exists; diff --git a/src/Service/ConstructedNavigationFactory.php b/src/Service/ConstructedNavigationFactory.php index f71066ed..e7fea9b4 100644 --- a/src/Service/ConstructedNavigationFactory.php +++ b/src/Service/ConstructedNavigationFactory.php @@ -4,8 +4,8 @@ namespace Laminas\Navigation\Service; -use Interop\Container\ContainerInterface; use Laminas\Config\Config; +use Psr\Container\ContainerInterface; /** * Constructed factory to set pages during construction. diff --git a/src/Service/NavigationAbstractServiceFactory.php b/src/Service/NavigationAbstractServiceFactory.php index 47153316..16bc36a0 100644 --- a/src/Service/NavigationAbstractServiceFactory.php +++ b/src/Service/NavigationAbstractServiceFactory.php @@ -5,10 +5,10 @@ namespace Laminas\Navigation\Service; use ArrayAccess; -use Interop\Container\ContainerInterface; use Laminas\Navigation\Navigation; use Laminas\ServiceManager\AbstractFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; +use Psr\Container\ContainerInterface; use function is_array; use function strlen; diff --git a/src/View/NavigationHelperFactory.php b/src/View/NavigationHelperFactory.php index 2267e6de..01030919 100644 --- a/src/View/NavigationHelperFactory.php +++ b/src/View/NavigationHelperFactory.php @@ -4,10 +4,10 @@ namespace Laminas\Navigation\View; -use Interop\Container\ContainerInterface; use Laminas\ServiceManager\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use Laminas\View\Helper\Navigation as NavigationHelper; +use Psr\Container\ContainerInterface; use ReflectionProperty; use function method_exists; diff --git a/src/View/ViewHelperManagerDelegatorFactory.php b/src/View/ViewHelperManagerDelegatorFactory.php index 9140bccf..89dda480 100644 --- a/src/View/ViewHelperManagerDelegatorFactory.php +++ b/src/View/ViewHelperManagerDelegatorFactory.php @@ -4,10 +4,10 @@ namespace Laminas\Navigation\View; -use Interop\Container\ContainerInterface; use Laminas\ServiceManager\DelegatorFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use Laminas\View\HelperPluginManager; +use Psr\Container\ContainerInterface; /** * Inject the laminas-view HelperManager with laminas-navigation view helper configuration.