diff --git a/.gitignore b/.gitignore index 3d6c8d2..3e44ebf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ !**/.gitkeep # Test File -src/Controllers/TestController.php +application/Controllers/TestController.php # Backup Folder /backup/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 428b5a3..21f64c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,19 +9,20 @@ - **template:** Add git commit hash in `CHANGELOG.md` (76bc527) ### Feat -- **Auth:** Sep Auth part from Site to new components (f36884e) - **Auth:** Use JWT to set cookies content (bf897c6) +- **Auth:** Sep Auth part from Site to new components (f36884e) - **Auth:** Add Auth By passkey support for special route (aff1f87) - **Auth/Login:** Add full Advanced Options support (6009dc8) - **Bonus:** Pre-Add Bonus system (59ddd39) -- **Secret:** Protect jwt key for env('APP_SECRET_KEY') (dfa67da) - **Secret:** Check session and user_id match or not in jwt payload (358ba5d) +- **Secret:** Protect jwt key for env('APP_SECRET_KEY') (dfa67da) - **Sessions:** record user access information at Auth->onRequestAfter() (e2a22a7) - **Sessions/List:** Use SessionsListForm to show user sessions (9ecfb97) - **Site:** Add page Site/{Logs,Rules} (65cea9e) - **Torrent:** Show team, quality information in torrent/details page (44314e3) - **Torrent/Download:** Add user download pos check (db6d5ff) - **Torrent/Search:** Use MySQL fulltext search. (354c07b) +- **ban:** Sync site ban list of username and email in Crontab Jobs (33cc1e6) - **ban_ips:** Store banned ip in components/Site (01084c9) - **torrents/tags:** Store torrent tags in TABLE `torrents` (4d573e2) diff --git a/src/Commands/ServiceCommand.php b/application/Commands/ServiceCommand.php similarity index 100% rename from src/Commands/ServiceCommand.php rename to application/Commands/ServiceCommand.php diff --git a/src/Components/.gitkeep b/application/Components/.gitkeep similarity index 100% rename from src/Components/.gitkeep rename to application/Components/.gitkeep diff --git a/src/Components/Auth.php b/application/Components/Auth.php similarity index 100% rename from src/Components/Auth.php rename to application/Components/Auth.php diff --git a/src/Components/Site.php b/application/Components/Site.php similarity index 100% rename from src/Components/Site.php rename to application/Components/Site.php diff --git a/src/Controllers/AdminController.php b/application/Controllers/AdminController.php similarity index 100% rename from src/Controllers/AdminController.php rename to application/Controllers/AdminController.php diff --git a/src/Controllers/Api/v1/ApiController.php b/application/Controllers/Api/v1/ApiController.php similarity index 100% rename from src/Controllers/Api/v1/ApiController.php rename to application/Controllers/Api/v1/ApiController.php diff --git a/src/Controllers/Api/v1/TorrentController.php b/application/Controllers/Api/v1/TorrentController.php similarity index 100% rename from src/Controllers/Api/v1/TorrentController.php rename to application/Controllers/Api/v1/TorrentController.php diff --git a/src/Controllers/AuthController.php b/application/Controllers/AuthController.php similarity index 100% rename from src/Controllers/AuthController.php rename to application/Controllers/AuthController.php diff --git a/src/Controllers/CaptchaController.php b/application/Controllers/CaptchaController.php similarity index 100% rename from src/Controllers/CaptchaController.php rename to application/Controllers/CaptchaController.php diff --git a/src/Controllers/IndexController.php b/application/Controllers/IndexController.php similarity index 100% rename from src/Controllers/IndexController.php rename to application/Controllers/IndexController.php diff --git a/src/Controllers/LinksController.php b/application/Controllers/LinksController.php similarity index 100% rename from src/Controllers/LinksController.php rename to application/Controllers/LinksController.php diff --git a/src/Controllers/MaintenanceController.php b/application/Controllers/MaintenanceController.php similarity index 100% rename from src/Controllers/MaintenanceController.php rename to application/Controllers/MaintenanceController.php diff --git a/src/Controllers/ManageController.php b/application/Controllers/ManageController.php similarity index 100% rename from src/Controllers/ManageController.php rename to application/Controllers/ManageController.php diff --git a/src/Controllers/NewsController.php b/application/Controllers/NewsController.php similarity index 100% rename from src/Controllers/NewsController.php rename to application/Controllers/NewsController.php diff --git a/src/Controllers/RssController.php b/application/Controllers/RssController.php similarity index 100% rename from src/Controllers/RssController.php rename to application/Controllers/RssController.php diff --git a/src/Controllers/SiteController.php b/application/Controllers/SiteController.php similarity index 100% rename from src/Controllers/SiteController.php rename to application/Controllers/SiteController.php diff --git a/src/Controllers/SubtitlesController.php b/application/Controllers/SubtitlesController.php similarity index 100% rename from src/Controllers/SubtitlesController.php rename to application/Controllers/SubtitlesController.php diff --git a/src/Controllers/TorrentController.php b/application/Controllers/TorrentController.php similarity index 100% rename from src/Controllers/TorrentController.php rename to application/Controllers/TorrentController.php diff --git a/src/Controllers/TorrentsController.php b/application/Controllers/TorrentsController.php similarity index 100% rename from src/Controllers/TorrentsController.php rename to application/Controllers/TorrentsController.php diff --git a/src/Controllers/TrackerController.php b/application/Controllers/TrackerController.php similarity index 100% rename from src/Controllers/TrackerController.php rename to application/Controllers/TrackerController.php diff --git a/src/Controllers/UserController.php b/application/Controllers/UserController.php similarity index 100% rename from src/Controllers/UserController.php rename to application/Controllers/UserController.php diff --git a/src/Exceptions/TrackerException.php b/application/Exceptions/TrackerException.php similarity index 100% rename from src/Exceptions/TrackerException.php rename to application/Exceptions/TrackerException.php diff --git a/src/Lang/en.php b/application/Lang/en.php similarity index 100% rename from src/Lang/en.php rename to application/Lang/en.php diff --git a/src/Lang/zh_CN.php b/application/Lang/zh_CN.php similarity index 100% rename from src/Lang/zh_CN.php rename to application/Lang/zh_CN.php diff --git a/src/Libraries/.gitkeep b/application/Libraries/.gitkeep similarity index 100% rename from src/Libraries/.gitkeep rename to application/Libraries/.gitkeep diff --git a/src/Libraries/Bencode/Bencode.php b/application/Libraries/Bencode/Bencode.php similarity index 100% rename from src/Libraries/Bencode/Bencode.php rename to application/Libraries/Bencode/Bencode.php diff --git a/src/Libraries/Bencode/ParseErrorException.php b/application/Libraries/Bencode/ParseErrorException.php similarity index 100% rename from src/Libraries/Bencode/ParseErrorException.php rename to application/Libraries/Bencode/ParseErrorException.php diff --git a/src/Libraries/Bonus.php b/application/Libraries/Bonus.php similarity index 100% rename from src/Libraries/Bonus.php rename to application/Libraries/Bonus.php diff --git a/src/Libraries/Constant.php b/application/Libraries/Constant.php similarity index 100% rename from src/Libraries/Constant.php rename to application/Libraries/Constant.php diff --git a/src/Libraries/GeoIP/GeoIPInterface.php b/application/Libraries/GeoIP/GeoIPInterface.php similarity index 100% rename from src/Libraries/GeoIP/GeoIPInterface.php rename to application/Libraries/GeoIP/GeoIPInterface.php diff --git a/src/Libraries/Mailer.php b/application/Libraries/Mailer.php similarity index 100% rename from src/Libraries/Mailer.php rename to application/Libraries/Mailer.php diff --git a/src/Middleware/ApiMiddleware.php b/application/Middleware/ApiMiddleware.php similarity index 100% rename from src/Middleware/ApiMiddleware.php rename to application/Middleware/ApiMiddleware.php diff --git a/src/Middleware/AuthMiddleware.php b/application/Middleware/AuthMiddleware.php similarity index 100% rename from src/Middleware/AuthMiddleware.php rename to application/Middleware/AuthMiddleware.php diff --git a/src/Middleware/IpBanMiddleware.php b/application/Middleware/IpBanMiddleware.php similarity index 100% rename from src/Middleware/IpBanMiddleware.php rename to application/Middleware/IpBanMiddleware.php diff --git a/src/Models/Api/v1/Form/TorrentsForm.php b/application/Models/Api/v1/Form/TorrentsForm.php similarity index 100% rename from src/Models/Api/v1/Form/TorrentsForm.php rename to application/Models/Api/v1/Form/TorrentsForm.php diff --git a/src/Models/Form/Auth/UserConfirmForm.php b/application/Models/Form/Auth/UserConfirmForm.php similarity index 100% rename from src/Models/Form/Auth/UserConfirmForm.php rename to application/Models/Form/Auth/UserConfirmForm.php diff --git a/src/Models/Form/Auth/UserLoginForm.php b/application/Models/Form/Auth/UserLoginForm.php similarity index 99% rename from src/Models/Form/Auth/UserLoginForm.php rename to application/Models/Form/Auth/UserLoginForm.php index 947aa87..6de6ac6 100644 --- a/src/Models/Form/Auth/UserLoginForm.php +++ b/application/Models/Form/Auth/UserLoginForm.php @@ -88,6 +88,7 @@ protected function loadUserFromPdo() } // User enable 2FA but it's code is wrong + /* if (!is_null($this->self['opt'])) { try { $tfa = new TwoFactorAuth(config('base.site_name')); @@ -100,6 +101,7 @@ protected function loadUserFromPdo() return; } } + */ // User 's status is banned or pending~ if (in_array($this->self['status'], [User::STATUS_DISABLED, User::STATUS_PENDING])) { diff --git a/src/Models/Form/Auth/UserLogoutForm.php b/application/Models/Form/Auth/UserLogoutForm.php similarity index 100% rename from src/Models/Form/Auth/UserLogoutForm.php rename to application/Models/Form/Auth/UserLogoutForm.php diff --git a/src/Models/Form/Auth/UserRecoverForm.php b/application/Models/Form/Auth/UserRecoverForm.php similarity index 100% rename from src/Models/Form/Auth/UserRecoverForm.php rename to application/Models/Form/Auth/UserRecoverForm.php diff --git a/src/Models/Form/Auth/UserRegisterForm.php b/application/Models/Form/Auth/UserRegisterForm.php similarity index 100% rename from src/Models/Form/Auth/UserRegisterForm.php rename to application/Models/Form/Auth/UserRegisterForm.php diff --git a/src/Models/Form/Links/ApplyForm.php b/application/Models/Form/Links/ApplyForm.php similarity index 100% rename from src/Models/Form/Links/ApplyForm.php rename to application/Models/Form/Links/ApplyForm.php diff --git a/src/Models/Form/Links/EditForm.php b/application/Models/Form/Links/EditForm.php similarity index 100% rename from src/Models/Form/Links/EditForm.php rename to application/Models/Form/Links/EditForm.php diff --git a/src/Models/Form/Links/RemoveForm.php b/application/Models/Form/Links/RemoveForm.php similarity index 100% rename from src/Models/Form/Links/RemoveForm.php rename to application/Models/Form/Links/RemoveForm.php diff --git a/src/Models/Form/Manage/Categories/EditForm.php b/application/Models/Form/Manage/Categories/EditForm.php similarity index 100% rename from src/Models/Form/Manage/Categories/EditForm.php rename to application/Models/Form/Manage/Categories/EditForm.php diff --git a/src/Models/Form/Manage/Categories/RemoveForm.php b/application/Models/Form/Manage/Categories/RemoveForm.php similarity index 100% rename from src/Models/Form/Manage/Categories/RemoveForm.php rename to application/Models/Form/Manage/Categories/RemoveForm.php diff --git a/src/Models/Form/News/EditForm.php b/application/Models/Form/News/EditForm.php similarity index 100% rename from src/Models/Form/News/EditForm.php rename to application/Models/Form/News/EditForm.php diff --git a/src/Models/Form/News/SearchForm.php b/application/Models/Form/News/SearchForm.php similarity index 100% rename from src/Models/Form/News/SearchForm.php rename to application/Models/Form/News/SearchForm.php diff --git a/src/Models/Form/Rss/FeedForm.php b/application/Models/Form/Rss/FeedForm.php similarity index 100% rename from src/Models/Form/Rss/FeedForm.php rename to application/Models/Form/Rss/FeedForm.php diff --git a/src/Models/Form/Site/Logs.php b/application/Models/Form/Site/Logs.php similarity index 100% rename from src/Models/Form/Site/Logs.php rename to application/Models/Form/Site/Logs.php diff --git a/src/Models/Form/Subtitles/DeleteForm.php b/application/Models/Form/Subtitles/DeleteForm.php similarity index 100% rename from src/Models/Form/Subtitles/DeleteForm.php rename to application/Models/Form/Subtitles/DeleteForm.php diff --git a/src/Models/Form/Subtitles/DownloadForm.php b/application/Models/Form/Subtitles/DownloadForm.php similarity index 100% rename from src/Models/Form/Subtitles/DownloadForm.php rename to application/Models/Form/Subtitles/DownloadForm.php diff --git a/src/Models/Form/Subtitles/SearchForm.php b/application/Models/Form/Subtitles/SearchForm.php similarity index 100% rename from src/Models/Form/Subtitles/SearchForm.php rename to application/Models/Form/Subtitles/SearchForm.php diff --git a/src/Models/Form/Subtitles/UploadForm.php b/application/Models/Form/Subtitles/UploadForm.php similarity index 100% rename from src/Models/Form/Subtitles/UploadForm.php rename to application/Models/Form/Subtitles/UploadForm.php diff --git a/src/Models/Form/Torrent/CommentsForm.php b/application/Models/Form/Torrent/CommentsForm.php similarity index 100% rename from src/Models/Form/Torrent/CommentsForm.php rename to application/Models/Form/Torrent/CommentsForm.php diff --git a/src/Models/Form/Torrent/DetailsForm.php b/application/Models/Form/Torrent/DetailsForm.php similarity index 100% rename from src/Models/Form/Torrent/DetailsForm.php rename to application/Models/Form/Torrent/DetailsForm.php diff --git a/src/Models/Form/Torrent/DownloadForm.php b/application/Models/Form/Torrent/DownloadForm.php similarity index 100% rename from src/Models/Form/Torrent/DownloadForm.php rename to application/Models/Form/Torrent/DownloadForm.php diff --git a/src/Models/Form/Torrent/SnatchForm.php b/application/Models/Form/Torrent/SnatchForm.php similarity index 100% rename from src/Models/Form/Torrent/SnatchForm.php rename to application/Models/Form/Torrent/SnatchForm.php diff --git a/src/Models/Form/Torrent/StructureForm.php b/application/Models/Form/Torrent/StructureForm.php similarity index 100% rename from src/Models/Form/Torrent/StructureForm.php rename to application/Models/Form/Torrent/StructureForm.php diff --git a/src/Models/Form/Torrents/SearchForm.php b/application/Models/Form/Torrents/SearchForm.php similarity index 100% rename from src/Models/Form/Torrents/SearchForm.php rename to application/Models/Form/Torrents/SearchForm.php diff --git a/src/Models/Form/Torrents/TagsForm.php b/application/Models/Form/Torrents/TagsForm.php similarity index 100% rename from src/Models/Form/Torrents/TagsForm.php rename to application/Models/Form/Torrents/TagsForm.php diff --git a/src/Models/Form/Torrents/UploadForm.php b/application/Models/Form/Torrents/UploadForm.php similarity index 100% rename from src/Models/Form/Torrents/UploadForm.php rename to application/Models/Form/Torrents/UploadForm.php diff --git a/src/Models/Form/Traits/FileSentTrait.php b/application/Models/Form/Traits/FileSentTrait.php similarity index 100% rename from src/Models/Form/Traits/FileSentTrait.php rename to application/Models/Form/Traits/FileSentTrait.php diff --git a/src/Models/Form/Traits/actionRateLimitCheckTrait.php b/application/Models/Form/Traits/actionRateLimitCheckTrait.php similarity index 100% rename from src/Models/Form/Traits/actionRateLimitCheckTrait.php rename to application/Models/Form/Traits/actionRateLimitCheckTrait.php diff --git a/src/Models/Form/Traits/isValidSubtitleTrait.php b/application/Models/Form/Traits/isValidSubtitleTrait.php similarity index 100% rename from src/Models/Form/Traits/isValidSubtitleTrait.php rename to application/Models/Form/Traits/isValidSubtitleTrait.php diff --git a/src/Models/Form/Traits/isValidTorrentTrait.php b/application/Models/Form/Traits/isValidTorrentTrait.php similarity index 100% rename from src/Models/Form/Traits/isValidTorrentTrait.php rename to application/Models/Form/Traits/isValidTorrentTrait.php diff --git a/src/Models/Form/Traits/isValidUserTrait.php b/application/Models/Form/Traits/isValidUserTrait.php similarity index 100% rename from src/Models/Form/Traits/isValidUserTrait.php rename to application/Models/Form/Traits/isValidUserTrait.php diff --git a/src/Models/Form/User/InviteActionForm.php b/application/Models/Form/User/InviteActionForm.php similarity index 100% rename from src/Models/Form/User/InviteActionForm.php rename to application/Models/Form/User/InviteActionForm.php diff --git a/src/Models/Form/User/InviteForm.php b/application/Models/Form/User/InviteForm.php similarity index 100% rename from src/Models/Form/User/InviteForm.php rename to application/Models/Form/User/InviteForm.php diff --git a/src/Models/Form/User/SessionsListForm.php b/application/Models/Form/User/SessionsListForm.php similarity index 100% rename from src/Models/Form/User/SessionsListForm.php rename to application/Models/Form/User/SessionsListForm.php diff --git a/src/Models/Form/User/UserDetailsForm.php b/application/Models/Form/User/UserDetailsForm.php similarity index 100% rename from src/Models/Form/User/UserDetailsForm.php rename to application/Models/Form/User/UserDetailsForm.php diff --git a/src/Models/Torrent.php b/application/Models/Torrent.php similarity index 100% rename from src/Models/Torrent.php rename to application/Models/Torrent.php diff --git a/src/Models/User.php b/application/Models/User.php similarity index 100% rename from src/Models/User.php rename to application/Models/User.php diff --git a/src/Process/CronTabProcess.php b/application/Process/CronTabProcess.php similarity index 100% rename from src/Process/CronTabProcess.php rename to application/Process/CronTabProcess.php diff --git a/src/Process/TrackerAnnounceProcess.php b/application/Process/TrackerAnnounceProcess.php similarity index 100% rename from src/Process/TrackerAnnounceProcess.php rename to application/Process/TrackerAnnounceProcess.php diff --git a/src/Timer/.gitkeep b/application/Timer/.gitkeep similarity index 100% rename from src/Timer/.gitkeep rename to application/Timer/.gitkeep diff --git a/composer.json b/composer.json index daaf9f2..5b923fa 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "rhilip/rid-pt", + "name": "rhilip/ridpt", "description": "基于 swoole 的Private Torrent源码", "type": "project", "keywords": [ @@ -31,31 +31,25 @@ "ext-mbstring": "*", "psr/log": "^1.1", "vlucas/phpdotenv": "^3.5", + "adhocore/cli": "^0.4.0", "league/plates": "^3.3", - "mjohnson/decoda": "^6.12", + "firebase/php-jwt": "^5.0", "phpmailer/phpmailer": "^6.0", - "siriusphp/validation": "^2.3", "soundasleep/html2text": "^1.1", - "robthree/twofactorauth": "^1.6", - "firebase/php-jwt": "^5.0" + "siriusphp/validation": "^2.3", + "mjohnson/decoda": "^6.12" + }, + "require-dev": { + "eaglewu/swoole-ide-helper": "dev-master" }, "autoload": { "psr-4": { "Rid\\": "framework/", - "App\\": "src/" + "App\\": "application/" }, "files": [ "framework/Rid.php", "framework/functions.php" ] - }, - "repositories": { - "packagist": { - "type": "composer", - "url": "https://mirrors.aliyun.com/composer/" - } - }, - "require-dev": { - "eaglewu/swoole-ide-helper": "dev-master" } } diff --git a/composer.lock b/composer.lock index edccaff..bf81c5c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,64 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cb2a923c199a40555f65a4b0f6e33447", + "content-hash": "8fa107aa85090cff379e62500dfe28d3", "packages": [ + { + "name": "adhocore/cli", + "version": "0.4.0", + "source": { + "type": "git", + "url": "https://github.com/adhocore/php-cli.git", + "reference": "0db193bdf671f592a0a026c0772286a31597992b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/adhocore/php-cli/zipball/0db193bdf671f592a0a026c0772286a31597992b", + "reference": "0db193bdf671f592a0a026c0772286a31597992b", + "shasum": "" + }, + "require": { + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Ahc\\Cli\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jitendra Adhikari", + "email": "jiten.adhikary@gmail.com" + } + ], + "description": "Command line interface library for PHP", + "keywords": [ + "PHP7", + "argument-parser", + "argv-parser", + "cli", + "cli-action", + "cli-app", + "cli-color", + "cli-option", + "cli-writer", + "command", + "console", + "console-app", + "php-cli", + "stream-input", + "stream-output" + ], + "time": "2019-09-07T04:41:19+00:00" + }, { "name": "firebase/php-jwt", "version": "v5.0.0", @@ -18,13 +74,7 @@ "type": "zip", "url": "https://api.github.com/repos/firebase/php-jwt/zipball/9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", "reference": "9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3.0" @@ -45,13 +95,13 @@ "authors": [ { "name": "Neuman Vong", - "role": "Developer", - "email": "neuman+pear@twilio.com" + "email": "neuman+pear@twilio.com", + "role": "Developer" }, { "name": "Anant Narayanan", - "role": "Developer", - "email": "anant@php.net" + "email": "anant@php.net", + "role": "Developer" } ], "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", @@ -70,13 +120,7 @@ "type": "zip", "url": "https://api.github.com/repos/thephpleague/plates/zipball/b1684b6f127714497a0ef927ce42c0b44b45a8af", "reference": "b1684b6f127714497a0ef927ce42c0b44b45a8af", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": "^5.3 | ^7.0" @@ -131,13 +175,7 @@ "type": "zip", "url": "https://api.github.com/repos/milesj/decoda/zipball/9817fd5abbd742384f59831d8a5953b01803b45d", "reference": "9817fd5abbd742384f59831d8a5953b01803b45d", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "ext-mbstring": "*", @@ -191,13 +229,7 @@ "type": "zip", "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/0c41a36d4508d470e376498c1c0c527aa36a2d59", "reference": "0c41a36d4508d470e376498c1c0c527aa36a2d59", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "ext-ctype": "*", @@ -263,13 +295,7 @@ "type": "zip", "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed", "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3.0" @@ -307,61 +333,6 @@ ], "time": "2015-07-25T16:39:46+00:00" }, - { - "name": "psr/container", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "time": "2017-02-14T16:28:37+00:00" - }, { "name": "psr/log", "version": "1.1.0", @@ -374,13 +345,7 @@ "type": "zip", "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3.0" @@ -415,63 +380,6 @@ ], "time": "2018-11-20T15:27:04+00:00" }, - { - "name": "robthree/twofactorauth", - "version": "1.6.7", - "source": { - "type": "git", - "url": "https://github.com/RobThree/TwoFactorAuth.git", - "reference": "3407c33775391fa8c36f7d766f26c5e59a736374" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/RobThree/TwoFactorAuth/zipball/3407c33775391fa8c36f7d766f26c5e59a736374", - "reference": "3407c33775391fa8c36f7d766f26c5e59a736374", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "@stable" - }, - "type": "library", - "autoload": { - "psr-4": { - "RobThree\\Auth\\": "lib" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Rob Janssen", - "role": "Developer", - "homepage": "http://robiii.me" - } - ], - "description": "Two Factor Authentication", - "homepage": "https://github.com/RobThree/TwoFactorAuth", - "keywords": [ - "Authentication", - "MFA", - "Multi Factor Authentication", - "Two Factor Authentication", - "authenticator", - "authy", - "php", - "tfa" - ], - "time": "2019-06-21T08:51:04+00:00" - }, { "name": "siriusphp/validation", "version": "2.3.0", @@ -484,13 +392,7 @@ "type": "zip", "url": "https://api.github.com/repos/siriusphp/validation/zipball/fa93b302802616b1dcf7e38244a70e324c121fb4", "reference": "fa93b302802616b1dcf7e38244a70e324c121fb4", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3" @@ -536,13 +438,7 @@ "type": "zip", "url": "https://api.github.com/repos/soundasleep/html2text/zipball/3243a7107878a61685d2eccf99918d6479e039fc", "reference": "3243a7107878a61685d2eccf99918d6479e039fc", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "ext-dom": "*", @@ -580,87 +476,6 @@ ], "time": "2019-02-15T01:44:54+00:00" }, - { - "name": "symfony/console", - "version": "v4.3.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/de63799239b3881b8a08f8481b22348f77ed7b36", - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": "^7.1.3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", - "symfony/service-contracts": "^1.1" - }, - "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3", - "symfony/process": "<3.3" - }, - "provide": { - "psr/log-implementation": "1.0" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "^4.3", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.4|~4.0", - "symfony/var-dumper": "^4.3" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "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": "Symfony Console Component", - "homepage": "https://symfony.com", - "time": "2019-08-26T08:26:39+00:00" - }, { "name": "symfony/polyfill-ctype", "version": "v1.12.0", @@ -673,13 +488,7 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", "reference": "550ebaac289296ce228a706d0867afc34687e3f4", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3.3" @@ -725,218 +534,19 @@ ], "time": "2019-08-06T08:03:45+00:00" }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.12-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "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 for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "time": "2019-08-06T08:03:45+00:00" - }, - { - "name": "symfony/polyfill-php73", - "version": "v1.12.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188", - "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.12-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, - "files": [ - "bootstrap.php" - ], - "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 7.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2019-08-06T08:03:45+00:00" - }, - { - "name": "symfony/service-contracts", - "version": "v1.1.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ea7263d6b6d5f798b56a45a5b8d686725f2719a3", - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": "^7.1.3", - "psr/container": "^1.0" - }, - "suggest": { - "symfony/service-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Service\\": "" - } - }, - "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 writing services", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "time": "2019-08-20T14:44:19+00:00" - }, { "name": "vlucas/phpdotenv", - "version": "v3.5.0", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222" + "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222", - "reference": "95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156", + "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156", + "shasum": "" }, "require": { "php": "^5.4 || ^7.0", @@ -944,12 +554,12 @@ "symfony/polyfill-ctype": "^1.9" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0" + "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.5-dev" + "dev-master": "3.6-dev" } }, "autoload": { @@ -979,7 +589,7 @@ "env", "environment" ], - "time": "2019-08-27T17:00:38+00:00" + "time": "2019-09-10T21:37:39+00:00" } ], "packages-dev": [ @@ -995,13 +605,7 @@ "type": "zip", "url": "https://api.github.com/repos/wudi/swoole-ide-helper/zipball/fceabb51fca645166fdc3d885bb582eb3352335e", "reference": "fceabb51fca645166fdc3d885bb582eb3352335e", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "type": "library", "notification-url": "https://packagist.org/downloads/", @@ -1011,8 +615,8 @@ "authors": [ { "name": "eagle", - "email": "eaglewudi@gmail.com", - "role": "lead" + "role": "lead", + "email": "eaglewudi@gmail.com" } ], "description": "Swoole IDE Helper, to improve auto-completion",