diff --git a/composer.json b/composer.json index 85158bc..694a602 100644 --- a/composer.json +++ b/composer.json @@ -1,14 +1,12 @@ { - "minimum-stability": "dev", - "prefer-stable": true, "autoload": { "psr-4": { "Satori\\": "src" } }, "require": { - "flashwave/index": "dev-master", - "flashwave/syokuhou": "dev-master", + "flashwave/index": "^0.2408.40014", + "flashwave/syokuhou": "^1.2", "sentry/sdk": "^4.0" } } diff --git a/composer.lock b/composer.lock index 84694c4..efe869f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,34 +4,30 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d5abb8ca3c597026b2d53f67c12b2681", + "content-hash": "25cd4c9695654bac1ffda2ab6d6033de", "packages": [ { "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" } @@ -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", @@ -268,20 +263,20 @@ }, { "name": "psr/http-factory", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "e616d01114759c4c489f93b099585439f795fe35" + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", - "reference": "e616d01114759c4c489f93b099585439f795fe35", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", "shasum": "" }, "require": { - "php": ">=7.0.0", + "php": ">=7.1", "psr/http-message": "^1.0 || ^2.0" }, "type": "library", @@ -305,7 +300,7 @@ "homepage": "https://www.php-fig.org/" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "factory", "http", @@ -317,9 +312,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/1.0.2" + "source": "https://github.com/php-fig/http-factory" }, - "time": "2023-04-10T20:10:41+00:00" + "time": "2024-04-15T12:06:14+00:00" }, { "name": "psr/http-message", @@ -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,20 +605,20 @@ "type": "custom" } ], - "time": "2024-04-10T13:22:13+00:00" + "time": "2024-07-16T13:45:27+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -632,7 +627,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -661,7 +656,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -677,20 +672,20 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/options-resolver", - "version": "v7.0.0", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "700ff4096e346f54cb628ea650767c8130f1001f" + "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/700ff4096e346f54cb628ea650767c8130f1001f", - "reference": "700ff4096e346f54cb628ea650767c8130f1001f", + "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.0" + "source": "https://github.com/symfony/options-resolver/tree/v7.1.1" }, "funding": [ { @@ -744,17 +739,14 @@ "type": "tidelift" } ], - "time": "2023-08-08T10:20:21+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/satori.php b/satori.php index dcff745..e91c85f 100644 --- a/satori.php +++ b/satori.php @@ -1,7 +1,6 @@ id = $festInfo->getId(); $fest->title = $festInfo->getTitle(); - $fest->start = str_replace('+00:00', 'Z', date(\DateTime::ATOM, $festInfo->getStartTime())); - $fest->midterm = str_replace('+00:00', 'Z', date(\DateTime::ATOM, $festInfo->getMidTermTime())); - $fest->end = str_replace('+00:00', 'Z', date(\DateTime::ATOM, $festInfo->getEndTime())); + $fest->start = str_replace('+00:00', 'Z', date(DateTimeInterface::ATOM, $festInfo->getStartTime())); + $fest->midterm = str_replace('+00:00', 'Z', date(DateTimeInterface::ATOM, $festInfo->getMidTermTime())); + $fest->end = str_replace('+00:00', 'Z', date(DateTimeInterface::ATOM, $festInfo->getEndTime())); $fest->state = $festInfo->getState(); $fest->teams = XArray::select($festInfo->getTeams(), function($teamInfo) { $team = new stdClass; @@ -112,8 +113,8 @@ class SplatoonRoutes extends RouteHandler { $schedules[$gameMode]->schedule[] = $schedule = new stdClass; $schedule->periods = XArray::select($scheduleInfo->getTimePeriods(), function($periodInfo) { $period = new stdClass; - $period->start = str_replace('+00:00', 'Z', date(\DateTime::ATOM, $periodInfo->getStartTime())); - $period->end = str_replace('+00:00', 'Z', date(\DateTime::ATOM, $periodInfo->getEndTime())); + $period->start = str_replace('+00:00', 'Z', date(DateTimeInterface::ATOM, $periodInfo->getStartTime())); + $period->end = str_replace('+00:00', 'Z', date(DateTimeInterface::ATOM, $periodInfo->getEndTime())); return $period; }); @@ -199,8 +200,8 @@ class SplatoonRoutes extends RouteHandler { $fest->id = $festInfo->getLocalId(); $fest->region = $festInfo->getRegion(); $fest->state = $festInfo->getState(); - $fest->start = str_replace('+00:00', 'Z', date(\DateTime::ATOM, $festInfo->getStartTime())); - $fest->end = str_replace('+00:00', 'Z', date(\DateTime::ATOM, $festInfo->getEndTime())); + $fest->start = str_replace('+00:00', 'Z', date(DateTimeInterface::ATOM, $festInfo->getStartTime())); + $fest->end = str_replace('+00:00', 'Z', date(DateTimeInterface::ATOM, $festInfo->getEndTime())); $fest->title = $festInfo->getTitle(); $fest->image = $festInfo->getImage(); $fest->can_vote = $festInfo->canVote();