From 5189e5bdd189599b8847d362de46ddc3bfb2df0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D?= Date: Thu, 7 Dec 2023 07:38:52 +0100 Subject: [PATCH] fix: Wrong type. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rubén D --- composer.lock | 129 +++++++++++++++++-------------- tests/SP/Core/Crypt/CsrfTest.php | 17 ++-- 2 files changed, 77 insertions(+), 69 deletions(-) diff --git a/composer.lock b/composer.lock index 5d1ac125..0d5cefbd 100644 --- a/composer.lock +++ b/composer.lock @@ -1388,34 +1388,34 @@ }, { "name": "laminas/laminas-ldap", - "version": "2.17.0", + "version": "2.18.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-ldap.git", - "reference": "cb66c477ec2fd2a7f38527c59d0635a9166b6597" + "reference": "c337026c6c3555d06bcae37e95ffe92cafcea08a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-ldap/zipball/cb66c477ec2fd2a7f38527c59d0635a9166b6597", - "reference": "cb66c477ec2fd2a7f38527c59d0635a9166b6597", + "url": "https://api.github.com/repos/laminas/laminas-ldap/zipball/c337026c6c3555d06bcae37e95ffe92cafcea08a", + "reference": "c337026c6c3555d06bcae37e95ffe92cafcea08a", "shasum": "" }, "require": { "ext-ldap": "*", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-ldap": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.4.0", + "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-config": "^3.8.0", "laminas/laminas-eventmanager": "^3.6.0", "laminas/laminas-stdlib": "^3.15.0", "php-mock/php-mock-phpunit": "^2.6.1", "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "^0.18.0", - "vimeo/psalm": "^5.0.0" + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.16" }, "suggest": { "laminas/laminas-eventmanager": "Laminas\\EventManager component" @@ -1450,7 +1450,7 @@ "type": "community_bridge" } ], - "time": "2022-12-19T19:50:51+00:00" + "time": "2023-12-06T11:19:05+00:00" }, { "name": "laravel/serializable-closure", @@ -2363,16 +2363,16 @@ }, { "name": "symfony/console", - "version": "v5.4.31", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a" + "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/11ac5f154e0e5c4c77af83ad11ead9165280b92a", - "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a", + "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", + "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7", "shasum": "" }, "require": { @@ -2442,7 +2442,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.31" + "source": "https://github.com/symfony/console/tree/v5.4.32" }, "funding": [ { @@ -2458,7 +2458,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T07:58:33+00:00" + "time": "2023-11-18T18:23:04+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2529,16 +2529,16 @@ }, { "name": "symfony/lock", - "version": "v5.4.31", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "23146b4eeeff63121066590e95a22ce223d19cf9" + "reference": "a6d7d829f4907134775a0e1b162780e61f80ed87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/23146b4eeeff63121066590e95a22ce223d19cf9", - "reference": "23146b4eeeff63121066590e95a22ce223d19cf9", + "url": "https://api.github.com/repos/symfony/lock/zipball/a6d7d829f4907134775a0e1b162780e61f80ed87", + "reference": "a6d7d829f4907134775a0e1b162780e61f80ed87", "shasum": "" }, "require": { @@ -2588,7 +2588,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v5.4.31" + "source": "https://github.com/symfony/lock/tree/v5.4.32" }, "funding": [ { @@ -2604,7 +2604,7 @@ "type": "tidelift" } ], - "time": "2023-11-06T17:37:45+00:00" + "time": "2023-11-20T15:40:25+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3345,16 +3345,16 @@ }, { "name": "symfony/string", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13880a87790c76ef994c91e87efb96134522577a" + "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", - "reference": "13880a87790c76ef994c91e87efb96134522577a", + "url": "https://api.github.com/repos/symfony/string/zipball/b45fcf399ea9c3af543a92edf7172ba21174d809", + "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809", "shasum": "" }, "require": { @@ -3368,11 +3368,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -3411,7 +3411,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.8" + "source": "https://github.com/symfony/string/tree/v6.4.0" }, "funding": [ { @@ -3427,7 +3427,7 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:28:21+00:00" + "time": "2023-11-28T20:41:49+00:00" }, { "name": "vlucas/phpdotenv", @@ -3869,16 +3869,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.44", + "version": "1.10.47", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "bf84367c53a23f759513985c54ffe0d0c249825b" + "reference": "84dbb33b520ea28b6cf5676a3941f4bae1c1ff39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bf84367c53a23f759513985c54ffe0d0c249825b", - "reference": "bf84367c53a23f759513985c54ffe0d0c249825b", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/84dbb33b520ea28b6cf5676a3941f4bae1c1ff39", + "reference": "84dbb33b520ea28b6cf5676a3941f4bae1c1ff39", "shasum": "" }, "require": { @@ -3927,7 +3927,7 @@ "type": "tidelift" } ], - "time": "2023-11-21T16:30:46+00:00" + "time": "2023-12-01T15:19:17+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4252,16 +4252,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.4.2", + "version": "10.5.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "cacd8b9dd224efa8eb28beb69004126c7ca1a1a1" + "reference": "5aedff46afba98dddecaa12349ec044d9103d4fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/cacd8b9dd224efa8eb28beb69004126c7ca1a1a1", - "reference": "cacd8b9dd224efa8eb28beb69004126c7ca1a1a1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5aedff46afba98dddecaa12349ec044d9103d4fe", + "reference": "5aedff46afba98dddecaa12349ec044d9103d4fe", "shasum": "" }, "require": { @@ -4301,7 +4301,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.4-dev" + "dev-main": "10.5-dev" } }, "autoload": { @@ -4333,7 +4333,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.4.2" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.2" }, "funding": [ { @@ -4349,7 +4349,7 @@ "type": "tidelift" } ], - "time": "2023-10-26T07:21:45+00:00" + "time": "2023-12-05T14:54:33+00:00" }, { "name": "roave/security-advisories", @@ -4357,12 +4357,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "2b23329e299c9a6cd98a82f5137ab4909c8e506d" + "reference": "498a07ca22004364fc54bc909b77de792a10c127" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2b23329e299c9a6cd98a82f5137ab4909c8e506d", - "reference": "2b23329e299c9a6cd98a82f5137ab4909c8e506d", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/498a07ca22004364fc54bc909b77de792a10c127", + "reference": "498a07ca22004364fc54bc909b77de792a10c127", "shasum": "" }, "conflict": { @@ -4410,7 +4410,7 @@ "baserproject/basercms": "<4.8", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", - "billz/raspap-webgui": "<=2.9.2", + "billz/raspap-webgui": "<2.9.5", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "bmarshall511/wordpress_zero_spam": "<5.2.13", "bolt/bolt": "<3.7.2", @@ -4486,6 +4486,7 @@ "ectouch/ectouch": "<=2.7.2", "elefant/cms": "<2.0.7", "elgg/elgg": "<3.3.24|>=4,<4.0.5", + "elijaa/phpmemcacheadmin": "<=1.3", "encore/laravel-admin": "<=1.8.19", "endroid/qr-code-bundle": "<3.4.2", "enshrined/svg-sanitize": "<0.15", @@ -4660,7 +4661,10 @@ "melisplatform/melis-front": "<5.0.1", "mezzio/mezzio-swoole": "<3.7|>=4,<4.3", "mgallegos/laravel-jqgrid": "<=1.3", - "microweber/microweber": "<2.0.3", + "microsoft/microsoft-graph": ">=1.16,<1.109.1|>=2.0.0.0-RC1-dev,<2.0.1", + "microsoft/microsoft-graph-beta": "<2.0.1", + "microsoft/microsoft-graph-core": "<2.0.2", + "microweber/microweber": "<=2.0.4", "miniorange/miniorange-saml": "<1.4.3", "mittwald/typo3_forum": "<1.2.1", "mobiledetect/mobiledetectlib": "<2.8.32", @@ -4699,7 +4703,7 @@ "october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1", "october/october": "<=3.4.4", "october/rain": "<1.0.472|>=1.1,<1.1.2", - "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.0.66", + "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.2", "omeka/omeka-s": "<4.0.3", "onelogin/php-saml": "<2.10.4", "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", @@ -4709,9 +4713,12 @@ "openmage/magento-lts": "<=19.5|>=20,<=20.1", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", + "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", - "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8", + "oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1", + "oro/customer-portal": ">=4.2,<=4.2.8|>=5,<5.0.11|>=5.1,<5.1.1", + "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<5.0.8", "oxid-esales/oxideshop-ce": "<4.5", "packbackbooks/lti-1-3-php-library": "<5", "padraic/humbug_get_contents": "<1.1.2", @@ -4735,7 +4742,7 @@ "phpmyfaq/phpmyfaq": "<=3.1.7", "phpoffice/phpexcel": "<1.8", "phpoffice/phpspreadsheet": "<1.16", - "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.19", + "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.34", "phpservermon/phpservermon": "<3.6", "phpsysinfo/phpsysinfo": "<3.2.5", "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5,<5.6.3", @@ -4743,7 +4750,7 @@ "phpxmlrpc/extras": "<0.6.1", "phpxmlrpc/phpxmlrpc": "<4.9.2", "pi/pi": "<=2.5", - "pimcore/admin-ui-classic-bundle": "<1.2.1", + "pimcore/admin-ui-classic-bundle": "<1.2.2", "pimcore/customer-management-framework-bundle": "<3.4.2", "pimcore/data-hub": "<1.2.4", "pimcore/demo": "<10.3", @@ -4771,6 +4778,7 @@ "pterodactyl/panel": "<1.7", "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2", "ptrofimov/beanstalk_console": "<1.7.14", + "pubnub/pubnub": "<6.1", "pusher/pusher-php-server": "<2.2.1", "pwweb/laravel-core": "<=0.3.6.0-beta", "pyrocms/pyrocms": "<=3.9.1", @@ -4822,11 +4830,12 @@ "silverstripe/userforms": "<3", "silverstripe/versioned-admin": ">=1,<1.11.1", "simple-updates/phpwhois": "<=1", - "simplesamlphp/saml2": "<1.15.4|>=2,<2.3.8|>=3,<3.1.4", + "simplesamlphp/saml2": "<1.15.4|>=2,<2.3.8|>=3,<3.1.4|==5.0.0.0-alpha12", "simplesamlphp/simplesamlphp": "<1.18.6", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "simplesamlphp/simplesamlphp-module-openid": "<1", "simplesamlphp/simplesamlphp-module-openidprovider": "<0.9", + "simplesamlphp/xml-security": "==1.6.11", "simplito/elliptic-php": "<1.0.6", "sitegeist/fluid-components": "<3.5", "sjbr/sr-freecap": "<2.4.6|>=2.5,<2.5.3", @@ -5053,7 +5062,7 @@ "type": "tidelift" } ], - "time": "2023-11-23T04:04:32+00:00" + "time": "2023-12-06T18:04:43+00:00" }, { "name": "sebastian/cli-parser", @@ -6236,16 +6245,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.4.25", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "d2aefa5a7acc5511422792931d14d1be96fe9fea" + "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d2aefa5a7acc5511422792931d14d1be96fe9fea", - "reference": "d2aefa5a7acc5511422792931d14d1be96fe9fea", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/728f1fc136252a626ba5a69c02bd66a3697ff201", + "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201", "shasum": "" }, "require": { @@ -6291,7 +6300,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.25" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.32" }, "funding": [ { @@ -6307,7 +6316,7 @@ "type": "tidelift" } ], - "time": "2023-06-05T08:05:41+00:00" + "time": "2023-11-17T20:43:48+00:00" }, { "name": "theseer/tokenizer", diff --git a/tests/SP/Core/Crypt/CsrfTest.php b/tests/SP/Core/Crypt/CsrfTest.php index e7d59203..32d2d788 100644 --- a/tests/SP/Core/Crypt/CsrfTest.php +++ b/tests/SP/Core/Crypt/CsrfTest.php @@ -29,6 +29,7 @@ use SP\Core\Crypt\Csrf; use SP\Core\Crypt\Hash; use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Core\Context\SessionContextInterface; +use SP\Domain\Http\Method; use SP\Domain\Http\RequestInterface; use SP\Tests\UnitaryTestCase; @@ -48,8 +49,8 @@ class CsrfTest extends UnitaryTestCase public static function httpMethodDataProvider(): array { return [ - ['post', 'test'], - ['get', 'XMLHttpRequest'] + [Method::POST, 'test'], + [Method::GET, 'XMLHttpRequest'] ]; } @@ -106,7 +107,7 @@ class CsrfTest extends UnitaryTestCase * * @return void */ - public function testCheckWithValidToken(string $method, string $header) + public function testCheckWithValidToken(Method $method, string $header) { $salt = self::$faker->sha1; $userAgent = self::$faker->userAgent; @@ -153,7 +154,7 @@ class CsrfTest extends UnitaryTestCase * * @return void */ - public function testCheckWithInvalidToken(string $method, string $header) + public function testCheckWithInvalidToken(Method $method, string $header) { $this->requestInterface ->expects(self::once()) @@ -194,7 +195,7 @@ class CsrfTest extends UnitaryTestCase * * @return void */ - public function testCheckWithNoToken(string $method, string $header) + public function testCheckWithNoToken(Method $method, string $header) { $this->requestInterface ->expects(self::once()) @@ -228,7 +229,7 @@ class CsrfTest extends UnitaryTestCase $this->requestInterface ->expects(self::once()) ->method('getMethod') - ->willReturn('test'); + ->willReturn(Method::GET); $this->requestInterface ->expects(self::once()) @@ -252,7 +253,7 @@ class CsrfTest extends UnitaryTestCase $this->requestInterface ->expects(self::once()) ->method('getMethod') - ->willReturn('test'); + ->willReturn(Method::GET); $this->requestInterface ->expects(self::once()) @@ -283,6 +284,4 @@ class CsrfTest extends UnitaryTestCase $this->csrf = new Csrf($this->sessionContext, $this->requestInterface, $this->configData); } - - }