diff --git a/awaki.php b/awaki.php index c783689..45d8059 100644 --- a/awaki.php +++ b/awaki.php @@ -1,8 +1,6 @@ =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" } @@ -50,25 +46,24 @@ ], "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/syokuhou", - "version": "dev-master", + "version": "v1.2.0", "source": { "type": "git", "url": "https://patchii.net/flash/syokuhou.git", - "reference": "c1fe9371ada20fcea51c225cc53b9ceae4642bc4" + "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": { @@ -89,20 +84,20 @@ ], "description": "Configuration library for PHP.", "homepage": "https://railgun.sh/syokuhou", - "time": "2024-01-04T02:12:49+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": { @@ -117,8 +112,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" @@ -189,7 +184,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": [ { @@ -205,7 +200,7 @@ "type": "tidelift" } ], - "time": "2023-12-03T20:05:35+00:00" + "time": "2024-07-18T11:15:46+00:00" }, { "name": "jean85/pretty-package-versions", @@ -525,16 +520,16 @@ }, { "name": "sentry/sentry", - "version": "4.7.0", + "version": "4.8.1", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f" + "reference": "61770efd8b7888e0bdd7d234f0ba67b066e47d04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f", - "reference": "d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/61770efd8b7888e0bdd7d234f0ba67b066e47d04", + "reference": "61770efd8b7888e0bdd7d234f0ba67b066e47d04", "shasum": "" }, "require": { @@ -598,7 +593,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.7.0" + "source": "https://github.com/getsentry/sentry-php/tree/4.8.1" }, "funding": [ { @@ -610,7 +605,7 @@ "type": "custom" } ], - "time": "2024-04-10T13:22:13+00:00" + "time": "2024-07-16T13:45:27+00:00" }, { "name": "symfony/deprecation-contracts", @@ -681,16 +676,16 @@ }, { "name": "symfony/options-resolver", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "23cc173858776ad451e31f053b1c9f47840b2cfa" + "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/23cc173858776ad451e31f053b1c9f47840b2cfa", - "reference": "23cc173858776ad451e31f053b1c9f47840b2cfa", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55", + "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55", "shasum": "" }, "require": { @@ -728,7 +723,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.0.7" + "source": "https://github.com/symfony/options-resolver/tree/v7.1.1" }, "funding": [ { @@ -744,17 +739,14 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" } ], "packages-dev": [], "aliases": [], - "minimum-stability": "dev", - "stability-flags": { - "flashwave/index": 20, - "flashwave/syokuhou": 20 - }, - "prefer-stable": true, + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, "prefer-lowest": false, "platform": [], "platform-dev": [], diff --git a/src/RedirectorRoutes.php b/src/RedirectorRoutes.php index d006391..44a66a2 100644 --- a/src/RedirectorRoutes.php +++ b/src/RedirectorRoutes.php @@ -3,7 +3,6 @@ namespace Awaki; use Index\Data\IDbConnection; use Index\Http\Routing\{HandlerAttribute,HttpGet,IRouter,IRouteHandler}; -use Index\Serialisation\Base62; use Syokuhou\IConfig; final class RedirectorRoutes implements IRouteHandler { diff --git a/src/SatoriRoutes.php b/src/SatoriRoutes.php index be03e90..e38928d 100644 --- a/src/SatoriRoutes.php +++ b/src/SatoriRoutes.php @@ -1,9 +1,9 @@ dbConn->prepare('SELECT redir_url FROM awk_satori_redirects WHERE redir_id = ?'); $getInfo->addParameter(1, $linkId); @@ -62,7 +62,7 @@ final class SatoriRoutes extends RouteHandler { } return [ - 'url' => sprintf($this->config->getString('format'), Base62::encode($linkId)), + 'url' => sprintf($this->config->getString('format'), XNumber::toBase62($linkId)), ]; } }