From 8d6f7c5b7b35c216d24c49f78813215cfde66b75 Mon Sep 17 00:00:00 2001 From: flashwave Date: Sun, 4 Aug 2024 22:49:20 +0000 Subject: [PATCH] Updated Index in Hanyuu and configured PHPStan. --- composer.json | 13 +- composer.lock | 633 +++++++++++++++++++++++-- hanyuu.php | 7 +- phpstan.neon | 9 + src/HanyuuContext.php | 6 +- src/Jose/JwtHandler.php | 2 +- src/MisuzuInterop.php | 2 +- src/OAuth2/OAuth2AuthorisationInfo.php | 2 +- src/OAuth2/OAuth2DeviceInfo.php | 7 - src/OAuth2/OAuth2Routes.php | 5 +- 10 files changed, 609 insertions(+), 77 deletions(-) create mode 100644 phpstan.neon diff --git a/composer.json b/composer.json index da9bdd2..2331f77 100644 --- a/composer.json +++ b/composer.json @@ -1,15 +1,14 @@ { - "minimum-stability": "dev", - "prefer-stable": true, "require": { - "flashwave/index": "dev-master", - "flashwave/sasae": "dev-master", + "flashwave/index": "^0.2408.40014", + "flashwave/sasae": "^1.1", + "flashwave/syokuhou": "^1.2", "chillerlan/php-qrcode": "^4.3", "symfony/mailer": "^6.0", "matomo/device-detector": "^6.1", "sentry/sdk": "^4.0", - "flashwave/syokuhou": "dev-master", - "phpseclib/phpseclib": "~3.0" + "phpseclib/phpseclib": "~3.0", + "nesbot/carbon": "^3.7" }, "autoload": { "classmap": [ @@ -32,6 +31,6 @@ } }, "require-dev": { - "phpstan/phpstan": "^1.10" + "phpstan/phpstan": "^1.11" } } diff --git a/composer.lock b/composer.lock index b58a3bc..f9d97aa 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,77 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ce2957bfc51cf8af01d85ba4676d1655", + "content-hash": "16b27dc9d1837e8435dc95cecc4eeea2", "packages": [ + { + "name": "carbonphp/carbon-doctrine-types", + "version": "3.2.0", + "source": { + "type": "git", + "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git", + "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d", + "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "conflict": { + "doctrine/dbal": "<4.0.0 || >=5.0.0" + }, + "require-dev": { + "doctrine/dbal": "^4.0.0", + "nesbot/carbon": "^2.71.0 || ^3.0.0", + "phpunit/phpunit": "^10.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Carbon\\Doctrine\\": "src/Carbon/Doctrine/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KyleKatarn", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "Types to use Carbon in Doctrine", + "keywords": [ + "carbon", + "date", + "datetime", + "doctrine", + "time" + ], + "support": { + "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues", + "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0" + }, + "funding": [ + { + "url": "https://github.com/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], + "time": "2024-02-09T16:56:22+00:00" + }, { "name": "chillerlan/php-qrcode", "version": "4.4.1", @@ -299,30 +368,26 @@ }, { "name": "flashwave/index", - "version": "dev-master", + "version": "v0.2408.40014", "source": { "type": "git", "url": "https://patchii.net/flash/index.git", - "reference": "e4c8ed711e045cffe840ba10a239ede14b0b171f" + "reference": "fbca708fbd75e8ecc6b36b39c1307a67bf250808" }, "require": { "ext-mbstring": "*", - "php": ">=8.1" + "php": ">=8.3" }, "require-dev": { - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.2" + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^11.2" }, "suggest": { "ext-mysqli": "Support for the Index\\Data\\MariaDB namespace (both mysqlnd and libmysql are supported).", "ext-sqlite3": "Support for the Index\\Data\\SQLite namespace." }, - "default-branch": true, "type": "library", "autoload": { - "files": [ - "index.php" - ], "psr-4": { "Index\\": "src" } @@ -341,27 +406,26 @@ ], "description": "Composer package for the common library for my projects.", "homepage": "https://railgun.sh/index", - "time": "2024-04-10T23:40:14+00:00" + "time": "2024-08-04T00:14:17+00:00" }, { "name": "flashwave/sasae", - "version": "dev-master", + "version": "v1.1.0", "source": { "type": "git", "url": "https://patchii.net/flash/sasae.git", - "reference": "c8a9f2974e6591215b3f898dd5525de1e8367f66" + "reference": "ad63107a4387aa35c45bce71c2d6262a15b96f9d" }, "require": { - "flashwave/index": "dev-master", - "php": ">=8.2", - "twig/html-extra": "^3.7", - "twig/twig": "^3.7" + "flashwave/index": "^0.2408.40014", + "php": ">=8.3", + "twig/html-extra": "^3.10", + "twig/twig": "^3.10" }, "require-dev": { - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.2" + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^11.2" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -382,25 +446,24 @@ ], "description": "A wrapper for Twig with added common functionality.", "homepage": "https://railgun.sh/sasae", - "time": "2024-01-04T02:13:42+00:00" + "time": "2024-08-04T00:48:17+00:00" }, { "name": "flashwave/syokuhou", - "version": "dev-master", + "version": "v1.2.0", "source": { "type": "git", "url": "https://patchii.net/flash/syokuhou.git", - "reference": "954a07b95110a43e64dd6e20b2a25f4676c71a08" + "reference": "129a46c0d917382f9bc195cce278be51984eb87d" }, "require": { - "flashwave/index": "dev-master", - "php": ">=8.2" + "flashwave/index": "^0.2408.40014", + "php": ">=8.3" }, "require-dev": { - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.4" + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^11.2" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -421,20 +484,20 @@ ], "description": "Configuration library for PHP.", "homepage": "https://railgun.sh/syokuhou", - "time": "2024-06-03T22:59:30+00:00" + "time": "2024-08-04T01:07:23+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.6.2", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", - "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", "shasum": "" }, "require": { @@ -449,8 +512,8 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.36 || ^9.6.15" + "http-interop/http-factory-tests": "0.9.0", + "phpunit/phpunit": "^8.5.39 || ^9.6.20" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -521,7 +584,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.6.2" + "source": "https://github.com/guzzle/psr7/tree/2.7.0" }, "funding": [ { @@ -537,7 +600,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:05:35+00:00" + "time": "2024-07-18T11:15:46+00:00" }, { "name": "jean85/pretty-package-versions", @@ -721,6 +784,112 @@ }, "time": "2019-09-10T13:16:29+00:00" }, + { + "name": "nesbot/carbon", + "version": "3.7.0", + "source": { + "type": "git", + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "cb4374784c87d0a0294e8513a52eb63c0aff3139" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cb4374784c87d0a0294e8513a52eb63c0aff3139", + "reference": "cb4374784c87d0a0294e8513a52eb63c0aff3139", + "shasum": "" + }, + "require": { + "carbonphp/carbon-doctrine-types": "*", + "ext-json": "*", + "php": "^8.1", + "psr/clock": "^1.0", + "symfony/clock": "^6.3 || ^7.0", + "symfony/polyfill-mbstring": "^1.0", + "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0" + }, + "provide": { + "psr/clock-implementation": "1.0" + }, + "require-dev": { + "doctrine/dbal": "^3.6.3 || ^4.0", + "doctrine/orm": "^2.15.2 || ^3.0", + "friendsofphp/php-cs-fixer": "^3.57.2", + "kylekatarnls/multi-tester": "^2.5.3", + "ondrejmirtes/better-reflection": "^6.25.0.4", + "phpmd/phpmd": "^2.15.0", + "phpstan/extension-installer": "^1.3.1", + "phpstan/phpstan": "^1.11.2", + "phpunit/phpunit": "^10.5.20", + "squizlabs/php_codesniffer": "^3.9.0" + }, + "bin": [ + "bin/carbon" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev", + "dev-2.x": "2.x-dev" + }, + "laravel": { + "providers": [ + "Carbon\\Laravel\\ServiceProvider" + ] + }, + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Carbon\\": "src/Carbon/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Brian Nesbitt", + "email": "brian@nesbot.com", + "homepage": "https://markido.com" + }, + { + "name": "kylekatarnls", + "homepage": "https://github.com/kylekatarnls" + } + ], + "description": "An API extension for DateTime that supports 281 different languages.", + "homepage": "https://carbon.nesbot.com", + "keywords": [ + "date", + "datetime", + "time" + ], + "support": { + "docs": "https://carbon.nesbot.com/docs", + "issues": "https://github.com/briannesbitt/Carbon/issues", + "source": "https://github.com/briannesbitt/Carbon" + }, + "funding": [ + { + "url": "https://github.com/sponsors/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon#sponsor", + "type": "opencollective" + }, + { + "url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme", + "type": "tidelift" + } + ], + "time": "2024-07-16T22:29:20+00:00" + }, { "name": "paragonie/constant_time_encoding", "version": "v3.0.0", @@ -948,6 +1117,54 @@ ], "time": "2024-06-24T06:27:33+00:00" }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, { "name": "psr/container", "version": "2.0.2", @@ -1397,6 +1614,80 @@ ], "time": "2024-07-16T13:45:27+00:00" }, + { + "name": "symfony/clock", + "version": "v7.1.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/clock.git", + "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/clock/zipball/3dfc8b084853586de51dd1441c6242c76a28cbe7", + "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "psr/clock": "^1.0", + "symfony/polyfill-php83": "^1.28" + }, + "provide": { + "psr/clock-implementation": "1.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/now.php" + ], + "psr-4": { + "Symfony\\Component\\Clock\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Decouples applications from the system clock", + "homepage": "https://symfony.com", + "keywords": [ + "clock", + "psr20", + "time" + ], + "support": { + "source": "https://github.com/symfony/clock/tree/v7.1.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:57:53+00:00" + }, { "name": "symfony/deprecation-contracts", "version": "v3.5.0", @@ -2328,6 +2619,82 @@ ], "time": "2024-05-31T15:07:36+00:00" }, + { + "name": "symfony/polyfill-php83", + "version": "v1.30.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php83.git", + "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", + "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php83\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-06-19T12:35:24+00:00" + }, { "name": "symfony/service-contracts", "version": "v3.5.0", @@ -2411,6 +2778,178 @@ ], "time": "2024-04-18T09:32:20+00:00" }, + { + "name": "symfony/translation", + "version": "v7.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/8d5e50c813ba2859a6dfc99a0765c550507934a1", + "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation-contracts": "^2.5|^3.0" + }, + "conflict": { + "symfony/config": "<6.4", + "symfony/console": "<6.4", + "symfony/dependency-injection": "<6.4", + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<6.4", + "symfony/service-contracts": "<2.5", + "symfony/twig-bundle": "<6.4", + "symfony/yaml": "<6.4" + }, + "provide": { + "symfony/translation-implementation": "2.3|3.0" + }, + "require-dev": { + "nikic/php-parser": "^4.18|^5.0", + "psr/log": "^1|^2|^3", + "symfony/config": "^6.4|^7.0", + "symfony/console": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/finder": "^6.4|^7.0", + "symfony/http-client-contracts": "^2.5|^3.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", + "symfony/polyfill-intl-icu": "^1.21", + "symfony/routing": "^6.4|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to internationalize your application", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/translation/tree/v7.1.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-07-26T12:41:01+00:00" + }, + { + "name": "symfony/translation-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation-contracts.git", + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to translation", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, { "name": "twig/html-extra", "version": "v3.10.0", @@ -2562,16 +3101,16 @@ "packages-dev": [ { "name": "phpstan/phpstan", - "version": "1.11.7", + "version": "1.11.9", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d" + "reference": "e370bcddadaede0c1716338b262346f40d296f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/52d2bbfdcae7f895915629e4694e9497d0f8e28d", - "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e370bcddadaede0c1716338b262346f40d296f82", + "reference": "e370bcddadaede0c1716338b262346f40d296f82", "shasum": "" }, "require": { @@ -2616,17 +3155,13 @@ "type": "github" } ], - "time": "2024-07-06T11:17:41+00:00" + "time": "2024-08-01T16:25:18+00:00" } ], "aliases": [], - "minimum-stability": "dev", - "stability-flags": { - "flashwave/index": 20, - "flashwave/sasae": 20, - "flashwave/syokuhou": 20 - }, - "prefer-stable": true, + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, "prefer-lowest": false, "platform": [], "platform-dev": [], diff --git a/hanyuu.php b/hanyuu.php index 324da86..657f32f 100644 --- a/hanyuu.php +++ b/hanyuu.php @@ -1,7 +1,6 @@ appsCtx = new Apps\AppsContext($dbConn); $this->oauth2Ctx = new OAuth2\OAuth2Context($dbConn); - $isDebug = Environment::isDebug(); - $this->templating = new SasaeEnvironment( HAU_DIR_TEMPLATES, - cache: null,//$isDebug ? null : ['Hanyuu', GitInfo::hash(true)], - debug: $isDebug, + cache: null,//HAU_DEBUG ? null : ['Hanyuu', GitInfo::hash(true)], + debug: HAU_DEBUG, ); $this->templating->addExtension(new HanyuuSasaeExtension($this)); diff --git a/src/Jose/JwtHandler.php b/src/Jose/JwtHandler.php index 1595bf9..2ead619 100644 --- a/src/Jose/JwtHandler.php +++ b/src/Jose/JwtHandler.php @@ -4,7 +4,7 @@ namespace Hanyuu\Jose; use stdClass; use InvalidArgumentException; use RuntimeException; -use Index\Serialisation\UriBase64; +use Index\UriBase64; class JwtHandler { private JwsHandlers $jwsHandlers; diff --git a/src/MisuzuInterop.php b/src/MisuzuInterop.php index cf9719c..4b8c73b 100644 --- a/src/MisuzuInterop.php +++ b/src/MisuzuInterop.php @@ -3,8 +3,8 @@ namespace Hanyuu; use stdClass; use RuntimeException; +use Index\UriBase64; use Syokuhou\IConfig; -use Index\Serialisation\UriBase64; class MisuzuInterop { public function __construct( diff --git a/src/OAuth2/OAuth2AuthorisationInfo.php b/src/OAuth2/OAuth2AuthorisationInfo.php index 5906e70..850165c 100644 --- a/src/OAuth2/OAuth2AuthorisationInfo.php +++ b/src/OAuth2/OAuth2AuthorisationInfo.php @@ -1,8 +1,8 @@ userCode, $interval, '-'), '-'); } - public function getRemainingAttempts(): int { - return $this->attempts; - } - public function hasRemainingAttempts(): bool { - return $this->attempts > 0; - } - public function getPollInterval(): int { return $this->interval; } diff --git a/src/OAuth2/OAuth2Routes.php b/src/OAuth2/OAuth2Routes.php index 5b6553b..43a4edd 100644 --- a/src/OAuth2/OAuth2Routes.php +++ b/src/OAuth2/OAuth2Routes.php @@ -3,9 +3,8 @@ namespace Hanyuu\OAuth2; use InvalidArgumentException; use RuntimeException; -use Index\XString; +use Index\{CSRFP,XString}; use Index\Http\Routing\{HttpGet,HttpOptions,HttpPost,RouteHandler}; -use Index\Security\CSRFP; use Sasae\SasaeEnvironment; use Syokuhou\IConfig; use Hanyuu\Apps\AppsContext; @@ -41,7 +40,7 @@ final class OAuth2Routes extends RouteHandler { foreach($info as $name => $value) $wwwAuth .= sprintf(', %s="%s"', $name, rawurlencode($value)); - $response->setStatusCode($authzHeader ? 401 : 400); + $response->setStatusCode(401); $response->setHeader('WWW-Authenticate', $wwwAuth); } else $response->setStatusCode(400);