From 13d459d0fc87c645407add63f70c2a3616709684 Mon Sep 17 00:00:00 2001 From: j0Shi82 Date: Fri, 7 Jun 2024 23:14:40 +0200 Subject: [PATCH] some small bug and code fixes, package updates --- composer.json | 92 +- composer.lock | 1028 +++++++++-------- src/Application/Routes.php | 1 - src/Controller/V1/Auctions/Assignment.php | 6 +- src/Controller/V1/Auctions/Data.php | 10 +- src/Controller/V1/Auctions/Engine.php | 3 +- src/Controller/V1/Auctions/ItemCountLog.php | 1 - src/Controller/V1/Auctions/ItemDetails.php | 3 +- src/Controller/V1/Auctions/Items.php | 2 - src/Controller/V1/Auctions/Patreon.php | 4 - src/Controller/V1/Auth/Login.php | 7 +- src/Controller/V1/Devtracker/Devinfo.php | 7 +- src/Controller/V1/Devtracker/Devlist.php | 3 - src/Controller/V1/Devtracker/Topiclist.php | 1 - src/Controller/V1/Infohub/Articles.php | 1 - src/Controller/V1/Infohub/Infohub.php | 16 +- src/Middleware/Auth.php | 5 +- src/Middleware/Cache.php | 14 +- src/Middleware/RateLimiter.php | 6 +- .../App/Schema/Crawl/Article/Base/Article.php | 12 +- .../Crawl/Article/Base/ArticleQuery.php | 157 ++- .../Crawl/Article/Map/ArticleTableMap.php | 7 +- .../Base/ArticleContentTags.php | 4 +- .../Base/ArticleContentTagsQuery.php | 117 +- .../Map/ArticleContentTagsTableMap.php | 7 +- .../Base/ArticleTitleTags.php | 4 +- .../Base/ArticleTitleTagsQuery.php | 117 +- .../Map/ArticleTitleTagsTableMap.php | 7 +- .../Base/AuctionAggregates.php | 9 +- .../Base/AuctionAggregatesQuery.php | 88 +- .../Map/AuctionAggregatesTableMap.php | 7 +- .../AuctionCrawlLog/Base/AuctionCrawlLog.php | 6 +- .../Base/AuctionCrawlLogQuery.php | 27 +- .../Map/AuctionCrawlLogTableMap.php | 7 +- .../AuctionDetails/Base/AuctionDetails.php | 10 +- .../Base/AuctionDetailsQuery.php | 92 +- .../Map/AuctionDetailsTableMap.php | 7 +- .../Crawl/AuctionItems/Base/AuctionItems.php | 12 +- .../AuctionItems/Base/AuctionItemsQuery.php | 151 ++- .../AuctionItems/Map/AuctionItemsTableMap.php | 7 +- .../Crawl/Devtracker/Base/Devtracker.php | 14 +- .../Crawl/Devtracker/Base/DevtrackerQuery.php | 65 +- .../Devtracker/Map/DevtrackerTableMap.php | 7 +- .../Schema/Crawl/Settings/Base/Settings.php | 4 +- .../Crawl/Settings/Base/SettingsQuery.php | 19 +- .../Crawl/Settings/Map/SettingsTableMap.php | 7 +- .../App/Schema/Crawl/Tag/Base/Tag.php | 4 +- .../App/Schema/Crawl/Tag/Base/TagQuery.php | 125 +- .../App/Schema/Crawl/Tag/Map/TagTableMap.php | 7 +- .../App/Schema/Crawl/User/Base/User.php | 5 +- .../App/Schema/Crawl/User/Base/UserQuery.php | 23 +- .../Schema/Crawl/User/Map/UserTableMap.php | 7 +- src/Schema/generated-conf/loadDatabase.php | 41 +- src/Services/DB.php | 12 +- 54 files changed, 1510 insertions(+), 895 deletions(-) diff --git a/composer.json b/composer.json index 878a830..7c14a3e 100644 --- a/composer.json +++ b/composer.json @@ -1,45 +1,51 @@ { - "name": "nwoun/api", - "description": "API for the corresponding nwo-uncensored.com project", - "type": "project", - "authors": [ - { - "name": "j0Shi82", - "email": "j0shi.webdev@gmail.com" - } - ], - "version": "1.0.0", - "license": "GPL-3.0-or-later", - "require": { - "slim/slim": "4.*", - "slim/psr7": "^1.5", - "jbbcode/jbbcode": "^1.4", - "vlucas/phpdotenv": "^5.1", - "php-di/slim-bridge": "^3.0", - "simplepie/simplepie": "^1.5", - "phpmailer/phpmailer": "^6.1", - "vlucas/valitron": "^1.4", - "propel/propel": "^2.0@beta", - "patreon/patreon": "^1.0", - "symfony/cache": "^6.0", - "firebase/php-jwt": "^6.3", - "palepurple/rate-limit": "^2.0", - "middlewares/client-ip": "^2.0" - }, - "autoload": { - "psr-4": { - "App\\": "src/" - }, - "classmap": [ - "src/Schema/generated-classes/" - ] - }, - "scripts": { - "start": [ - "Composer\\Config::disableProcessTimeout", - "php -S localhost:8084 -t public -c dev/php.ini" - ] - }, - "minimum-stability": "dev", - "prefer-stable": true + "name": "nwoun/api", + "description": "API for the corresponding nwo-uncensored.com project", + "type": "project", + "authors": [ + { + "name": "j0Shi82", + "email": "j0shi.webdev@gmail.com" + } + ], + "version": "1.0.0", + "license": "GPL-3.0-or-later", + "require": { + "slim/slim": "^4.13", + "slim/psr7": "^1.6", + "jbbcode/jbbcode": "^1.4", + "vlucas/phpdotenv": "^5.6", + "php-di/slim-bridge": "^3.4", + "simplepie/simplepie": "^1.8", + "phpmailer/phpmailer": "^6.9", + "vlucas/valitron": "^1.4", + "propel/propel": "^2.0@beta", + "patreon/patreon": "^1.0", + "symfony/cache": "^7.1", + "firebase/php-jwt": "^6.10", + "palepurple/rate-limit": "^2.0", + "middlewares/client-ip": "^2.0" + }, + "autoload": { + "psr-4": { + "App\\": "src/" + }, + "classmap": [ + "src/Schema/generated-classes/" + ] + }, + "scripts": { + "start": [ + "Composer\\Config::disableProcessTimeout", + "php -S localhost:8084 -t public -c dev/php.ini" + ], + "propel": [ + "cd src/Schema && php ../../vendor/bin/propel sql:build --overwrite", + "rm -rf src/Schema/generated-classes", + "cd src/Schema && php ../../vendor/bin/propel model:build", + "cd src/Schema && php ../../vendor/bin/propel config:convert" + ] + }, + "minimum-stability": "dev", + "prefer-stable": true } diff --git a/composer.lock b/composer.lock index aeb49e8..aca8b95 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e111bc0e3121b2c7d2f83fa2c8b7d278", + "content-hash": "cd5d251e3d91a6ed766593cbd9d21547", "packages": [ { "name": "fig/http-message-util", @@ -64,30 +64,31 @@ }, { "name": "firebase/php-jwt", - "version": "v6.3.1", + "version": "v6.10.1", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "ddfaddcb520488b42bca3a75e17e9dd53c3667da" + "reference": "500501c2ce893c824c801da135d02661199f60c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/ddfaddcb520488b42bca3a75e17e9dd53c3667da", - "reference": "ddfaddcb520488b42bca3a75e17e9dd53c3667da", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5", + "reference": "500501c2ce893c824c801da135d02661199f60c5", "shasum": "" }, "require": { - "php": "^7.1||^8.0" + "php": "^8.0" }, "require-dev": { - "guzzlehttp/guzzle": "^6.5||^7.4", - "phpspec/prophecy-phpunit": "^1.1", - "phpunit/phpunit": "^7.5||^9.5", - "psr/cache": "^1.0||^2.0", + "guzzlehttp/guzzle": "^7.4", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "psr/cache": "^2.0||^3.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0" }, "suggest": { + "ext-sodium": "Support EdDSA (Ed25519) signatures", "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present" }, "type": "library", @@ -120,30 +121,30 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.3.1" + "source": "https://github.com/firebase/php-jwt/tree/v6.10.1" }, - "time": "2022-11-01T21:20:08+00:00" + "time": "2024-05-18T18:05:11+00:00" }, { "name": "graham-campbell/result-type", - "version": "v1.1.0", + "version": "v1.1.2", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8" + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8", - "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862", + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9" + "phpoption/phpoption": "^1.9.2" }, "require-dev": { - "phpunit/phpunit": "^8.5.28 || ^9.5.21" + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" }, "type": "library", "autoload": { @@ -172,7 +173,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2" }, "funding": [ { @@ -184,7 +185,7 @@ "type": "tidelift" } ], - "time": "2022-07-30T15:56:11+00:00" + "time": "2023-11-12T22:16:48+00:00" }, { "name": "jbbcode/jbbcode", @@ -240,16 +241,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v1.2.2", + "version": "v1.3.3", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "47afb7fae28ed29057fdca37e16a84f90cc62fae" + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/47afb7fae28ed29057fdca37e16a84f90cc62fae", - "reference": "47afb7fae28ed29057fdca37e16a84f90cc62fae", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754", + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754", "shasum": "" }, "require": { @@ -296,7 +297,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2022-09-08T13:45:54+00:00" + "time": "2023-11-08T14:08:06+00:00" }, { "name": "middlewares/client-ip", @@ -403,31 +404,30 @@ }, { "name": "palepurple/rate-limit", - "version": "2.0.6", + "version": "2.0.7", "source": { "type": "git", "url": "https://github.com/DavidGoodwin/RateLimit.git", - "reference": "07823e20504d19b3a52db1235e456a5028dbbea6" + "reference": "f1e9d5020adaf69b65a6ab5f2253ee96397ed2a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/DavidGoodwin/RateLimit/zipball/07823e20504d19b3a52db1235e456a5028dbbea6", - "reference": "07823e20504d19b3a52db1235e456a5028dbbea6", + "url": "https://api.github.com/repos/DavidGoodwin/RateLimit/zipball/f1e9d5020adaf69b65a6ab5f2253ee96397ed2a6", + "reference": "f1e9d5020adaf69b65a6ab5f2253ee96397ed2a6", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">= 5.6" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.7", - "php": ">7.0", "php-coveralls/php-coveralls": "^2.2", "php-parallel-lint/php-parallel-lint": "^1.0", "phpstan/phpstan": "*", - "phpunit/phpunit": "^7.0", + "phpunit/phpunit": "^8", "predis/predis": "^1.1", "psr/cache": "^1.0", - "tedivm/stash": "^0.15", + "tedivm/stash": "^0.16", "vimeo/psalm": "*" }, "suggest": { @@ -455,9 +455,10 @@ ], "description": "PHP rate limiting library with Token Bucket Algorithm, originally touhonoob/rate-limit", "support": { - "source": "https://github.com/DavidGoodwin/RateLimit/tree/2.0.6" + "issues": "https://github.com/DavidGoodwin/RateLimit/issues", + "source": "https://github.com/DavidGoodwin/RateLimit/tree/2.0.7" }, - "time": "2020-10-27T13:11:14+00:00" + "time": "2023-03-04T16:02:37+00:00" }, { "name": "patreon/patreon", @@ -501,16 +502,16 @@ }, { "name": "php-di/invoker", - "version": "2.3.3", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/PHP-DI/Invoker.git", - "reference": "cd6d9f267d1a3474bdddf1be1da079f01b942786" + "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/cd6d9f267d1a3474bdddf1be1da079f01b942786", - "reference": "cd6d9f267d1a3474bdddf1be1da079f01b942786", + "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/33234b32dafa8eb69202f950a1fc92055ed76a86", + "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86", "shasum": "" }, "require": { @@ -544,7 +545,7 @@ ], "support": { "issues": "https://github.com/PHP-DI/Invoker/issues", - "source": "https://github.com/PHP-DI/Invoker/tree/2.3.3" + "source": "https://github.com/PHP-DI/Invoker/tree/2.3.4" }, "funding": [ { @@ -552,43 +553,40 @@ "type": "github" } ], - "time": "2021-12-13T09:22:56+00:00" + "time": "2023-09-08T09:24:21+00:00" }, { "name": "php-di/php-di", - "version": "6.4.0", + "version": "7.0.6", "source": { "type": "git", "url": "https://github.com/PHP-DI/PHP-DI.git", - "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4" + "reference": "8097948a89f6ec782839b3e958432f427cac37fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/ae0f1b3b03d8b29dff81747063cbfd6276246cc4", - "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4", + "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/8097948a89f6ec782839b3e958432f427cac37fd", + "reference": "8097948a89f6ec782839b3e958432f427cac37fd", "shasum": "" }, "require": { "laravel/serializable-closure": "^1.0", - "php": ">=7.4.0", + "php": ">=8.0", "php-di/invoker": "^2.0", - "php-di/phpdoc-reader": "^2.0.1", - "psr/container": "^1.0" + "psr/container": "^1.1 || ^2.0" }, "provide": { "psr/container-implementation": "^1.0" }, "require-dev": { - "doctrine/annotations": "~1.10", - "friendsofphp/php-cs-fixer": "^2.4", - "mnapoli/phpunit-easymock": "^1.2", - "ocramius/proxy-manager": "^2.11.2", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^9.5" + "friendsofphp/php-cs-fixer": "^3", + "friendsofphp/proxy-manager-lts": "^1", + "mnapoli/phpunit-easymock": "^1.3", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.6" }, "suggest": { - "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)", - "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)" + "friendsofphp/proxy-manager-lts": "Install it if you want to use lazy injection (version ^1)" }, "type": "library", "autoload": { @@ -616,7 +614,7 @@ ], "support": { "issues": "https://github.com/PHP-DI/PHP-DI/issues", - "source": "https://github.com/PHP-DI/PHP-DI/tree/6.4.0" + "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.6" }, "funding": [ { @@ -628,68 +626,26 @@ "type": "tidelift" } ], - "time": "2022-04-09T16:46:38+00:00" - }, - { - "name": "php-di/phpdoc-reader", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/PHP-DI/PhpDocReader.git", - "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/66daff34cbd2627740ffec9469ffbac9f8c8185c", - "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "require-dev": { - "mnapoli/hard-mode": "~0.3.0", - "phpunit/phpunit": "^8.5|^9.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "PhpDocReader\\": "src/PhpDocReader" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)", - "keywords": [ - "phpdoc", - "reflection" - ], - "support": { - "issues": "https://github.com/PHP-DI/PhpDocReader/issues", - "source": "https://github.com/PHP-DI/PhpDocReader/tree/2.2.1" - }, - "time": "2020-10-12T12:39:22+00:00" + "time": "2023-11-02T10:04:50+00:00" }, { "name": "php-di/slim-bridge", - "version": "3.2.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/PHP-DI/Slim-Bridge.git", - "reference": "1644a2f31079e92a14cebbf90c7f71ebcbe39ee6" + "reference": "d14c95b34b3c5ba2e8c40020dd93fdcc8f3ba875" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/Slim-Bridge/zipball/1644a2f31079e92a14cebbf90c7f71ebcbe39ee6", - "reference": "1644a2f31079e92a14cebbf90c7f71ebcbe39ee6", + "url": "https://api.github.com/repos/PHP-DI/Slim-Bridge/zipball/d14c95b34b3c5ba2e8c40020dd93fdcc8f3ba875", + "reference": "d14c95b34b3c5ba2e8c40020dd93fdcc8f3ba875", "shasum": "" }, "require": { "php": "^7.1 || ^8.0", "php-di/invoker": "^2.0.0", - "php-di/php-di": "^6.0.0", + "php-di/php-di": "^6.0|^7.0", "slim/slim": "^4.2.0" }, "require-dev": { @@ -709,22 +665,22 @@ "description": "PHP-DI integration in Slim", "support": { "issues": "https://github.com/PHP-DI/Slim-Bridge/issues", - "source": "https://github.com/PHP-DI/Slim-Bridge/tree/3.2.0" + "source": "https://github.com/PHP-DI/Slim-Bridge/tree/3.4.0" }, - "time": "2021-11-01T16:14:12+00:00" + "time": "2023-06-29T14:08:47+00:00" }, { "name": "phpmailer/phpmailer", - "version": "v6.6.5", + "version": "v6.9.1", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627" + "reference": "039de174cd9c17a8389754d3b877a2ed22743e18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8b6386d7417526d1ea4da9edb70b8352f7543627", - "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18", + "reference": "039de174cd9c17a8389754d3b877a2ed22743e18", "shasum": "" }, "require": { @@ -734,17 +690,20 @@ "php": ">=5.5.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "doctrine/annotations": "^1.2", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", + "doctrine/annotations": "^1.2.6 || ^1.13.3", "php-parallel-lint/php-console-highlighter": "^1.0.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/php-compatibility": "^9.3.5", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.6.2", - "yoast/phpunit-polyfills": "^1.0.0" + "squizlabs/php_codesniffer": "^3.7.2", + "yoast/phpunit-polyfills": "^1.0.4" }, "suggest": { + "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication", "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses", + "ext-openssl": "Needed for secure SMTP sending and DKIM signing", + "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication", "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", "league/oauth2-google": "Needed for Google XOAUTH2 authentication", "psr/log": "For optional PSR-3 debug logging", @@ -781,7 +740,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.5" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.9.1" }, "funding": [ { @@ -789,28 +748,28 @@ "type": "github" } ], - "time": "2022-10-07T12:23:10+00:00" + "time": "2023-11-25T22:23:28+00:00" }, { "name": "phpoption/phpoption", - "version": "1.9.0", + "version": "1.9.2", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab" + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", - "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820", + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8", - "phpunit/phpunit": "^8.5.28 || ^9.5.21" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" }, "type": "library", "extra": { @@ -852,7 +811,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.0" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.2" }, "funding": [ { @@ -864,38 +823,39 @@ "type": "tidelift" } ], - "time": "2022-07-30T15:51:26+00:00" + "time": "2023-11-12T21:59:55+00:00" }, { "name": "propel/propel", - "version": "2.0.0-beta2", + "version": "2.0.0-beta4", "source": { "type": "git", "url": "https://github.com/propelorm/Propel2.git", - "reference": "8618bbd7c4614e507d1755a0513c66282633787b" + "reference": "f4889ff200d6f5c2c660eac7f0e20bd8b6966fb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/propelorm/Propel2/zipball/8618bbd7c4614e507d1755a0513c66282633787b", - "reference": "8618bbd7c4614e507d1755a0513c66282633787b", + "url": "https://api.github.com/repos/propelorm/Propel2/zipball/f4889ff200d6f5c2c660eac7f0e20bd8b6966fb4", + "reference": "f4889ff200d6f5c2c660eac7f0e20bd8b6966fb4", "shasum": "" }, "require": { - "php": ">=7.4 || >=8.0", + "php": ">=7.4", "psr/log": "^1.0 || ^2.0 || ^3.0", - "symfony/config": "^4.4.0 || ^5.0.0 || ^6.0.0", - "symfony/console": "^4.4.0 || ^5.0.0 || ^6.0.0", - "symfony/filesystem": "^4.4.0 || ^5.0.0 || ^6.0.0", - "symfony/finder": "^4.4.0 || ^5.0.0 || ^6.0.0", - "symfony/translation": "^4.4.0 || ^5.0.0 || ^6.0.0", - "symfony/validator": "^4.4.0 || ^5.0.0 || ^6.0.0", - "symfony/yaml": "^4.4.0 || ^5.0.0 || ^6.0.0" + "symfony/config": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "symfony/console": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "symfony/filesystem": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "symfony/finder": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "symfony/translation": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "symfony/validator": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "symfony/yaml": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" }, "require-dev": { "ext-json": "*", "ext-pdo": "*", + "ext-xml": "*", "mikey179/vfsstream": "^1.6", - "monolog/monolog": "^1.3 || ^2.3", + "monolog/monolog": "^1.3 || ^2.3 || ^3.0", "phpstan/phpstan": "^1.2", "phpunit/phpunit": "^9.5.0", "psalm/phar": "^4.23", @@ -937,9 +897,9 @@ ], "support": { "issues": "https://github.com/propelorm/Propel2/issues", - "source": "https://github.com/propelorm/Propel2/tree/2.0.0-beta2" + "source": "https://github.com/propelorm/Propel2/tree/2.0.0-beta4" }, - "time": "2022-06-29T13:20:03+00:00" + "time": "2024-03-23T13:31:50+00:00" }, { "name": "psr/cache", @@ -992,22 +952,27 @@ }, { "name": "psr/container", - "version": "1.1.2", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { "php": ">=7.4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -1034,27 +999,27 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", "shasum": "" }, "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0" + "php": ">=7.1", + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -1074,10 +1039,10 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "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", @@ -1089,31 +1054,31 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/http-factory" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2024-04-15T12:06:14+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1142,27 +1107,27 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/http-server-handler", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-server-handler.git", - "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7" + "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7", - "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7", + "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4", + "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4", "shasum": "" }, "require": { "php": ">=7.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -1182,7 +1147,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP server-side request handler", @@ -1198,28 +1163,27 @@ "server" ], "support": { - "issues": "https://github.com/php-fig/http-server-handler/issues", - "source": "https://github.com/php-fig/http-server-handler/tree/master" + "source": "https://github.com/php-fig/http-server-handler/tree/1.0.2" }, - "time": "2018-10-30T16:46:14+00:00" + "time": "2023-04-10T20:06:20+00:00" }, { "name": "psr/http-server-middleware", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-server-middleware.git", - "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5" + "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5", - "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5", + "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829", + "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829", "shasum": "" }, "require": { "php": ">=7.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0 || ^2.0", "psr/http-server-handler": "^1.0" }, "type": "library", @@ -1240,7 +1204,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP server-side middleware", @@ -1256,9 +1220,9 @@ ], "support": { "issues": "https://github.com/php-fig/http-server-middleware/issues", - "source": "https://github.com/php-fig/http-server-middleware/tree/master" + "source": "https://github.com/php-fig/http-server-middleware/tree/1.0.2" }, - "time": "2018-10-30T17:12:04+00:00" + "time": "2023-04-11T06:14:47+00:00" }, { "name": "psr/log", @@ -1356,26 +1320,27 @@ }, { "name": "simplepie/simplepie", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/simplepie/simplepie.git", - "reference": "9e9add3428ce86aede874bcf9a59c78e272f8dc1" + "reference": "65b095d87bc00898d8fa7737bdbcda93a3fbcc55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplepie/simplepie/zipball/9e9add3428ce86aede874bcf9a59c78e272f8dc1", - "reference": "9e9add3428ce86aede874bcf9a59c78e272f8dc1", + "url": "https://api.github.com/repos/simplepie/simplepie/zipball/65b095d87bc00898d8fa7737bdbcda93a3fbcc55", + "reference": "65b095d87bc00898d8fa7737bdbcda93a3fbcc55", "shasum": "" }, "require": { "ext-pcre": "*", "ext-xml": "*", "ext-xmlreader": "*", - "php": ">=5.6.0" + "php": ">=7.2.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.19 || ^3.8", + "psr/simple-cache": "^1 || ^2 || ^3", "yoast/phpunit-polyfills": "^1.0.1" }, "suggest": { @@ -1425,22 +1390,22 @@ ], "support": { "issues": "https://github.com/simplepie/simplepie/issues", - "source": "https://github.com/simplepie/simplepie/tree/1.7.0" + "source": "https://github.com/simplepie/simplepie/tree/1.8.0" }, - "time": "2022-09-30T06:49:48+00:00" + "time": "2023-01-20T08:37:35+00:00" }, { "name": "slim/psr7", - "version": "1.6", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/slimphp/Slim-Psr7.git", - "reference": "3471c22c1a0d26c51c78f6aeb06489d38cf46a4d" + "reference": "72d2b2bac94ab4575d369f605dbfafbe168d3163" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/3471c22c1a0d26c51c78f6aeb06489d38cf46a4d", - "reference": "3471c22c1a0d26c51c78f6aeb06489d38cf46a4d", + "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/72d2b2bac94ab4575d369f605dbfafbe168d3163", + "reference": "72d2b2bac94ab4575d369f605dbfafbe168d3163", "shasum": "" }, "require": { @@ -1459,7 +1424,7 @@ "adriansuter/php-autoload-override": "^1.3", "ext-json": "*", "http-interop/http-factory-tests": "^0.9.0", - "php-http/psr7-integration-tests": "dev-master", + "php-http/psr7-integration-tests": "1.1", "phpspec/prophecy": "^1.15", "phpspec/prophecy-phpunit": "^2.0", "phpstan/phpstan": "^1.8", @@ -1507,22 +1472,22 @@ ], "support": { "issues": "https://github.com/slimphp/Slim-Psr7/issues", - "source": "https://github.com/slimphp/Slim-Psr7/tree/1.6" + "source": "https://github.com/slimphp/Slim-Psr7/tree/1.6.1" }, - "time": "2022-11-05T18:50:24+00:00" + "time": "2023-04-17T16:02:20+00:00" }, { "name": "slim/slim", - "version": "4.10.0", + "version": "4.13.0", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "0dfc7d2fdf2553b361d864d51af3fe8a6ad168b0" + "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/0dfc7d2fdf2553b361d864d51af3fe8a6ad168b0", - "reference": "0dfc7d2fdf2553b361d864d51af3fe8a6ad168b0", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17", + "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17", "shasum": "" }, "require": { @@ -1531,27 +1496,27 @@ "php": "^7.4 || ^8.0", "psr/container": "^1.0 || ^2.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "psr/http-server-handler": "^1.0", "psr/http-server-middleware": "^1.0", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "require-dev": { - "adriansuter/php-autoload-override": "^1.2", + "adriansuter/php-autoload-override": "^1.4", "ext-simplexml": "*", - "guzzlehttp/psr7": "^2.1", - "httpsoft/http-message": "^1.0", - "httpsoft/http-server-request": "^1.0", - "laminas/laminas-diactoros": "^2.8", - "nyholm/psr7": "^1.5", - "nyholm/psr7-server": "^1.0", - "phpspec/prophecy": "^1.15", - "phpspec/prophecy-phpunit": "^2.0", - "phpstan/phpstan": "^1.4", - "phpunit/phpunit": "^9.5", - "slim/http": "^1.2", - "slim/psr7": "^1.5", - "squizlabs/php_codesniffer": "^3.6" + "guzzlehttp/psr7": "^2.6", + "httpsoft/http-message": "^1.1", + "httpsoft/http-server-request": "^1.1", + "laminas/laminas-diactoros": "^2.17 || ^3", + "nyholm/psr7": "^1.8", + "nyholm/psr7-server": "^1.1", + "phpspec/prophecy": "^1.19", + "phpspec/prophecy-phpunit": "^2.1", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^9.6", + "slim/http": "^1.3", + "slim/psr7": "^1.6", + "squizlabs/php_codesniffer": "^3.9" }, "suggest": { "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware", @@ -1624,35 +1589,36 @@ "type": "tidelift" } ], - "time": "2022-03-14T14:18:23+00:00" + "time": "2024-03-03T21:25:30+00:00" }, { "name": "symfony/cache", - "version": "v6.1.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "ee5d5b88162684a1377706f9c25125e97685ee61" + "reference": "760294dc7158372699dccd077965c16c328f8719" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/ee5d5b88162684a1377706f9c25125e97685ee61", - "reference": "ee5d5b88162684a1377706f9c25125e97685ee61", + "url": "https://api.github.com/repos/symfony/cache/zipball/760294dc7158372699dccd077965c16c328f8719", + "reference": "760294dc7158372699dccd077965c16c328f8719", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "psr/cache": "^2.0|^3.0", "psr/log": "^1.1|^2|^3", - "symfony/cache-contracts": "^1.1.7|^2|^3", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/cache-contracts": "^2.5|^3", + "symfony/deprecation-contracts": "^2.5|^3.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/var-exporter": "^6.4|^7.0" }, "conflict": { - "doctrine/dbal": "<2.13.1", - "symfony/dependency-injection": "<5.4", - "symfony/http-kernel": "<5.4", - "symfony/var-dumper": "<5.4" + "doctrine/dbal": "<3.6", + "symfony/dependency-injection": "<6.4", + "symfony/http-kernel": "<6.4", + "symfony/var-dumper": "<6.4" }, "provide": { "psr/cache-implementation": "2.0|3.0", @@ -1661,15 +1627,15 @@ }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/dbal": "^2.13.1|^3.0", - "predis/predis": "^1.1", + "doctrine/dbal": "^3.6|^4", + "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/filesystem": "^5.4|^6.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/messenger": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/filesystem": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1704,7 +1670,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.1.7" + "source": "https://github.com/symfony/cache/tree/v7.1.1" }, "funding": [ { @@ -1720,33 +1686,30 @@ "type": "tidelift" } ], - "time": "2022-10-28T16:23:08+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.1.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "2eab7fa459af6d75c6463e63e633b667a9b761d3" + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/2eab7fa459af6d75c6463e63e633b667a9b761d3", - "reference": "2eab7fa459af6d75c6463e63e633b667a9b761d3", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197", + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197", "shasum": "" }, "require": { "php": ">=8.1", "psr/cache": "^3.0" }, - "suggest": { - "symfony/cache-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1783,7 +1746,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.1.1" + "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0" }, "funding": [ { @@ -1799,40 +1762,38 @@ "type": "tidelift" } ], - "time": "2022-02-25T11:15:52+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/config", - "version": "v6.1.3", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "a0645dc585d378b73c01115dd7ab9348f7d40c85" + "reference": "2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/a0645dc585d378b73c01115dd7ab9348f7d40c85", - "reference": "a0645dc585d378b73c01115dd7ab9348f7d40c85", + "url": "https://api.github.com/repos/symfony/config/zipball/2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2", + "reference": "2210fc99fa42a259eb6c89d1f724ce0c4d62d5d2", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/filesystem": "^5.4|^6.0", + "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/filesystem": "^7.1", "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/finder": "<5.4" + "symfony/finder": "<6.4", + "symfony/service-contracts": "<2.5" }, "require-dev": { - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/finder": "^5.4|^6.0", - "symfony/messenger": "^5.4|^6.0", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/yaml": "^5.4|^6.0" - }, - "suggest": { - "symfony/yaml": "To use the yaml reference dumper" + "symfony/event-dispatcher": "^6.4|^7.0", + "symfony/finder": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1860,7 +1821,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.1.3" + "source": "https://github.com/symfony/config/tree/v7.1.1" }, "funding": [ { @@ -1876,53 +1837,50 @@ "type": "tidelift" } ], - "time": "2022-07-20T15:00:40+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/console", - "version": "v6.1.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a1282bd0c096e0bdb8800b104177e2ce404d8815" + "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a1282bd0c096e0bdb8800b104177e2ce404d8815", - "reference": "a1282bd0c096e0bdb8800b104177e2ce404d8815", + "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", + "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.2", "symfony/polyfill-mbstring": "~1.0", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.4|^6.0" + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^6.4|^7.0" }, "conflict": { - "symfony/dependency-injection": "<5.4", - "symfony/dotenv": "<5.4", - "symfony/event-dispatcher": "<5.4", - "symfony/lock": "<5.4", - "symfony/process": "<5.4" + "symfony/dependency-injection": "<6.4", + "symfony/dotenv": "<6.4", + "symfony/event-dispatcher": "<6.4", + "symfony/lock": "<6.4", + "symfony/process": "<6.4" }, "provide": { "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/event-dispatcher": "^6.4|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/stopwatch": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1951,12 +1909,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.1.7" + "source": "https://github.com/symfony/console/tree/v7.1.1" }, "funding": [ { @@ -1972,20 +1930,20 @@ "type": "tidelift" } ], - "time": "2022-10-26T21:42:49+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.1.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918", - "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -1994,7 +1952,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -2023,7 +1981,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.1.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -2039,27 +1997,30 @@ "type": "tidelift" } ], - "time": "2022-02-25T11:15:52+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/filesystem", - "version": "v6.1.5", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "4d216a2beef096edf040a070117c39ca2abce307" + "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d216a2beef096edf040a070117c39ca2abce307", - "reference": "4d216a2beef096edf040a070117c39ca2abce307", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/802e87002f919296c9f606457d9fa327a0b3d6b2", + "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8" }, + "require-dev": { + "symfony/process": "^6.4|^7.0" + }, "type": "library", "autoload": { "psr-4": { @@ -2086,7 +2047,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.1.5" + "source": "https://github.com/symfony/filesystem/tree/v7.1.1" }, "funding": [ { @@ -2102,27 +2063,27 @@ "type": "tidelift" } ], - "time": "2022-09-21T20:29:40+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/finder", - "version": "v6.1.3", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709" + "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/39696bff2c2970b3779a5cac7bf9f0b88fc2b709", - "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709", + "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6", + "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "symfony/filesystem": "^6.0" + "symfony/filesystem": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -2150,7 +2111,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.1.3" + "source": "https://github.com/symfony/finder/tree/v7.1.1" }, "funding": [ { @@ -2166,20 +2127,20 @@ "type": "tidelift" } ], - "time": "2022-07-29T07:42:06+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -2193,9 +2154,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2232,7 +2190,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -2248,20 +2206,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.26.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "433d05519ce6990bf3530fba6957499d327395c2" + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", - "reference": "433d05519ce6990bf3530fba6957499d327395c2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", "shasum": "" }, "require": { @@ -2272,9 +2230,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2313,7 +2268,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" }, "funding": [ { @@ -2329,20 +2284,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.26.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd" + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", "shasum": "" }, "require": { @@ -2353,9 +2308,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2397,7 +2349,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" }, "funding": [ { @@ -2413,20 +2365,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -2440,9 +2392,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2480,7 +2429,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -2496,20 +2445,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -2517,9 +2466,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2563,7 +2509,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -2579,37 +2525,111 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-php83", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php83.git", + "reference": "86fcae159633351e5fd145d1c47de6c528f8caff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff", + "reference": "86fcae159633351e5fd145d1c47de6c528f8caff", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "symfony/polyfill-php80": "^1.14" + }, + "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.29.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-01-29T20:11:03+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.2", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" + "php": ">=8.1", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { "ext-psr": "<1.1|>=2" }, - "suggest": { - "symfony/service-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -2619,7 +2639,10 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Service\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2646,7 +2669,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { @@ -2662,37 +2685,39 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/string", - "version": "v6.1.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "823f143370880efcbdfa2dbca946b3358c4707e5" + "reference": "60bc311c74e0af215101235aa6f471bcbc032df2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/823f143370880efcbdfa2dbca946b3358c4707e5", - "reference": "823f143370880efcbdfa2dbca946b3358c4707e5", + "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2", + "reference": "60bc311c74e0af215101235aa6f471bcbc032df2", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/translation-contracts": "^2.0|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/emoji": "^7.1", + "symfony/error-handler": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -2731,7 +2756,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.1.7" + "source": "https://github.com/symfony/string/tree/v7.1.1" }, "funding": [ { @@ -2747,56 +2772,54 @@ "type": "tidelift" } ], - "time": "2022-10-10T09:34:31+00:00" + "time": "2024-06-04T06:40:14+00:00" }, { "name": "symfony/translation", - "version": "v6.1.6", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "e6cd330e5a072518f88d65148f3f165541807494" + "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/e6cd330e5a072518f88d65148f3f165541807494", - "reference": "e6cd330e5a072518f88d65148f3f165541807494", + "url": "https://api.github.com/repos/symfony/translation/zipball/cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3", + "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^2.3|^3.0" + "symfony/translation-contracts": "^2.5|^3.0" }, "conflict": { - "symfony/config": "<5.4", - "symfony/console": "<5.4", - "symfony/dependency-injection": "<5.4", - "symfony/http-kernel": "<5.4", - "symfony/twig-bundle": "<5.4", - "symfony/yaml": "<5.4" + "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": "^5.4|^6.0", - "symfony/console": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/finder": "^5.4|^6.0", - "symfony/http-client-contracts": "^1.1|^2.0|^3.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/intl": "^5.4|^6.0", + "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": "^5.4|^6.0", - "symfony/service-contracts": "^1.1.2|^2|^3", - "symfony/yaml": "^5.4|^6.0" - }, - "suggest": { - "psr/log-implementation": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" + "symfony/routing": "^6.4|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -2827,7 +2850,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.1.6" + "source": "https://github.com/symfony/translation/tree/v7.1.1" }, "funding": [ { @@ -2843,32 +2866,29 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.1.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "606be0f48e05116baef052f7f3abdb345c8e02cc" + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/606be0f48e05116baef052f7f3abdb345c8e02cc", - "reference": "606be0f48e05116baef052f7f3abdb345c8e02cc", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", "shasum": "" }, "require": { "php": ">=8.1" }, - "suggest": { - "symfony/translation-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -2908,7 +2928,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.1.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" }, "funding": [ { @@ -2924,71 +2944,59 @@ "type": "tidelift" } ], - "time": "2022-06-27T17:24:16+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/validator", - "version": "v6.1.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "0cc147f2e4a0d78221db85545751cd8764bbc156" + "reference": "fcab7598968b21c361becc930fcae8846638c4c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/0cc147f2e4a0d78221db85545751cd8764bbc156", - "reference": "0cc147f2e4a0d78221db85545751cd8764bbc156", + "url": "https://api.github.com/repos/symfony/validator/zipball/fcab7598968b21c361becc930fcae8846638c4c0", + "reference": "fcab7598968b21c361becc930fcae8846638c4c0", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^1.1|^2|^3" + "symfony/polyfill-php83": "^1.27", + "symfony/translation-contracts": "^2.5|^3" }, "conflict": { - "doctrine/annotations": "<1.13", "doctrine/lexer": "<1.1", - "phpunit/phpunit": "<5.4.3", - "symfony/dependency-injection": "<5.4", - "symfony/expression-language": "<5.4", - "symfony/http-kernel": "<5.4", - "symfony/intl": "<5.4", - "symfony/property-info": "<5.4", - "symfony/translation": "<5.4", - "symfony/yaml": "<5.4" + "symfony/dependency-injection": "<6.4", + "symfony/doctrine-bridge": "<7.0", + "symfony/expression-language": "<6.4", + "symfony/http-kernel": "<6.4", + "symfony/intl": "<6.4", + "symfony/property-info": "<6.4", + "symfony/translation": "<6.4.3|>=7.0,<7.0.3", + "symfony/yaml": "<6.4" }, "require-dev": { - "doctrine/annotations": "^1.13", - "egulias/email-validator": "^2.1.10|^3", - "symfony/cache": "^5.4|^6.0", - "symfony/config": "^5.4|^6.0", - "symfony/console": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/expression-language": "^5.4|^6.0", - "symfony/finder": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/http-foundation": "^5.4|^6.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/intl": "^5.4|^6.0", - "symfony/mime": "^5.4|^6.0", - "symfony/property-access": "^5.4|^6.0", - "symfony/property-info": "^5.4|^6.0", - "symfony/translation": "^5.4|^6.0", - "symfony/yaml": "^5.4|^6.0" - }, - "suggest": { - "egulias/email-validator": "Strict (RFC compliant) email validation", - "psr/cache-implementation": "For using the mapping cache.", - "symfony/config": "", - "symfony/expression-language": "For using the Expression validator and the ExpressionLanguageSyntax constraints", - "symfony/http-foundation": "", - "symfony/intl": "", - "symfony/property-access": "For accessing properties within comparison constraints", - "symfony/property-info": "To automatically add NotNull and Type constraints", - "symfony/translation": "For translating validation errors.", - "symfony/yaml": "" + "egulias/email-validator": "^2.1.10|^3|^4", + "symfony/cache": "^6.4|^7.0", + "symfony/config": "^6.4|^7.0", + "symfony/console": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/finder": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", + "symfony/mime": "^6.4|^7.0", + "symfony/property-access": "^6.4|^7.0", + "symfony/property-info": "^6.4|^7.0", + "symfony/translation": "^6.4.3|^7.0.3", + "symfony/type-info": "^7.1", + "symfony/yaml": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -2996,7 +3004,8 @@ "Symfony\\Component\\Validator\\": "" }, "exclude-from-classmap": [ - "/Tests/" + "/Tests/", + "/Resources/bin/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3016,7 +3025,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.1.7" + "source": "https://github.com/symfony/validator/tree/v7.1.1" }, "funding": [ { @@ -3032,27 +3041,29 @@ "type": "tidelift" } ], - "time": "2022-10-28T16:23:08+00:00" + "time": "2024-06-04T05:58:56+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.1.3", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "b49350f45cebbba6e5286485264b912f2bcfc9ef" + "reference": "db82c2b73b88734557cfc30e3270d83fa651b712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b49350f45cebbba6e5286485264b912f2bcfc9ef", - "reference": "b49350f45cebbba6e5286485264b912f2bcfc9ef", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/db82c2b73b88734557cfc30e3270d83fa651b712", + "reference": "db82c2b73b88734557cfc30e3270d83fa651b712", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "symfony/var-dumper": "^5.4|^6.0" + "symfony/property-access": "^6.4|^7.0", + "symfony/serializer": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -3085,10 +3096,12 @@ "export", "hydrate", "instantiate", + "lazy-loading", + "proxy", "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.1.3" + "source": "https://github.com/symfony/var-exporter/tree/v7.1.1" }, "funding": [ { @@ -3104,34 +3117,31 @@ "type": "tidelift" } ], - "time": "2022-07-04T16:01:56+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/yaml", - "version": "v6.1.6", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "66c6b0cf52b00f74614a2cf7ae7db08ea1095931" + "reference": "fa34c77015aa6720469db7003567b9f772492bf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/66c6b0cf52b00f74614a2cf7ae7db08ea1095931", - "reference": "66c6b0cf52b00f74614a2cf7ae7db08ea1095931", + "url": "https://api.github.com/repos/symfony/yaml/zipball/fa34c77015aa6720469db7003567b9f772492bf2", + "reference": "fa34c77015aa6720469db7003567b9f772492bf2", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<5.4" + "symfony/console": "<6.4" }, "require-dev": { - "symfony/console": "^5.4|^6.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" + "symfony/console": "^6.4|^7.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -3162,7 +3172,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.1.6" + "source": "https://github.com/symfony/yaml/tree/v7.1.1" }, "funding": [ { @@ -3178,35 +3188,35 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:04:03+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v5.5.0", + "version": "v5.6.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7" + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", - "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", "shasum": "" }, "require": { "ext-pcre": "*", - "graham-campbell/result-type": "^1.0.2", - "php": "^7.1.3 || ^8.0", - "phpoption/phpoption": "^1.8", - "symfony/polyfill-ctype": "^1.23", - "symfony/polyfill-mbstring": "^1.23.1", - "symfony/polyfill-php80": "^1.23.1" + "graham-campbell/result-type": "^1.1.2", + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.2", + "symfony/polyfill-ctype": "^1.24", + "symfony/polyfill-mbstring": "^1.24", + "symfony/polyfill-php80": "^1.24" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-filter": "*", - "phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25" + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" }, "suggest": { "ext-filter": "Required to use the boolean validator." @@ -3218,7 +3228,7 @@ "forward-command": true }, "branch-alias": { - "dev-master": "5.5-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -3250,7 +3260,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.5.0" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0" }, "funding": [ { @@ -3262,7 +3272,7 @@ "type": "tidelift" } ], - "time": "2022-10-16T01:01:54+00:00" + "time": "2023-11-12T22:43:29+00:00" }, { "name": "vlucas/valitron", @@ -3334,5 +3344,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/src/Application/Routes.php b/src/Application/Routes.php index c00023a..7ccbcad 100644 --- a/src/Application/Routes.php +++ b/src/Application/Routes.php @@ -19,7 +19,6 @@ use App\Controller\V1\Auctions\Engine; use App\Controller\V1\Auctions\Patreon; use App\Controller\V1\Auth\Login; -use App\Services\DB; use App\Middleware\Auth; use App\Middleware\Cache; use App\Middleware\Cors; diff --git a/src/Controller/V1/Auctions/Assignment.php b/src/Controller/V1/Auctions/Assignment.php index 759d785..3b4eda4 100644 --- a/src/Controller/V1/Auctions/Assignment.php +++ b/src/Controller/V1/Auctions/Assignment.php @@ -6,7 +6,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; use App\Schema\Crawl\AuctionItems\AuctionItemsQuery; class Assignment extends BaseController @@ -25,9 +24,10 @@ public function get(Request $request, Response $response) $result = $result->toArray(); $result['ItemName'] = $result['SearchTerm']; - + $response->getBody()->write( - str_replace("\/", "/", json_encode($result))); + str_replace("\/", "/", json_encode($result)) + ); return $response ->withHeader('Content-Type', 'application/json') ->withHeader('charset', 'utf-8'); diff --git a/src/Controller/V1/Auctions/Data.php b/src/Controller/V1/Auctions/Data.php index 595b04d..f5a81d1 100644 --- a/src/Controller/V1/Auctions/Data.php +++ b/src/Controller/V1/Auctions/Data.php @@ -8,13 +8,9 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; use App\Schema\Crawl\AuctionAggregates\AuctionAggregates; use App\Schema\Crawl\AuctionAggregates\AuctionAggregatesQuery; -use App\Schema\Crawl\AuctionItems\AuctionItems; use App\Schema\Crawl\AuctionItems\AuctionItemsQuery; -use App\Schema\Crawl\AuctionDetails\AuctionDetails; -use App\Schema\Crawl\AuctionDetails\AuctionDetailsQuery; class Data extends BaseController { @@ -55,7 +51,8 @@ public function post(Request $request, Response $response) "; $itemNames[] = $item['InternalName']; } - }; + } + ; if (count($itemInserts)) { $stmt = $con->prepare("INSERT IGNORE INTO auction_items (item_def, item_name, quality, categories, crawl_category, allow_auto, server, update_date) VALUES " . implode(",", $itemInserts)); @@ -117,7 +114,8 @@ public function post(Request $request, Response $response) ) "; } - }; + } + ; if (count($auctionInserts)) { $stmt = $con->prepare("INSERT IGNORE INTO auction_details (item_def, server, seller_name, seller_handle, expire_time, price, count, price_per) VALUES " . implode(",", $auctionInserts)); diff --git a/src/Controller/V1/Auctions/Engine.php b/src/Controller/V1/Auctions/Engine.php index d339678..c858390 100644 --- a/src/Controller/V1/Auctions/Engine.php +++ b/src/Controller/V1/Auctions/Engine.php @@ -8,7 +8,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; use App\Schema\Crawl\AuctionItems\AuctionItemsQuery; class Engine extends BaseController @@ -31,7 +30,7 @@ public function get(Request $request, Response $response) ->select(array('Count')) ->findOne(); - $response->getBody()->write(json_encode(array_merge($result, ['totalItems'=> $result2]))); + $response->getBody()->write(json_encode(array_merge($result, ['totalItems' => $result2]))); return $response ->withHeader('Content-Type', 'application/json') ->withHeader('charset', 'utf-8'); diff --git a/src/Controller/V1/Auctions/ItemCountLog.php b/src/Controller/V1/Auctions/ItemCountLog.php index 77a6911..5706e7f 100644 --- a/src/Controller/V1/Auctions/ItemCountLog.php +++ b/src/Controller/V1/Auctions/ItemCountLog.php @@ -8,7 +8,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; use App\Schema\Crawl\AuctionCrawlLog\AuctionCrawlLog; use App\Schema\Crawl\AuctionCrawlLog\AuctionCrawlLogQuery; diff --git a/src/Controller/V1/Auctions/ItemDetails.php b/src/Controller/V1/Auctions/ItemDetails.php index fe1a1e7..7f668ee 100644 --- a/src/Controller/V1/Auctions/ItemDetails.php +++ b/src/Controller/V1/Auctions/ItemDetails.php @@ -8,7 +8,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; use App\Schema\Crawl\AuctionAggregates\AuctionAggregatesQuery; class ItemDetails extends BaseController @@ -49,7 +48,7 @@ public function get(Request $request, Response $response) ->orderBy('insertedDate', 'asc') ->groupBy('insertedDate') ->groupBy('inserted') - ->select('insertedDate', 'insertedTimestamp', 'avgLow', 'avgMean', 'avgMedian', 'avgCount') + ->select(['insertedDate', 'insertedTimestamp', 'avgLow', 'avgMean', 'avgMedian', 'avgCount']) ->find() ->getData(); diff --git a/src/Controller/V1/Auctions/Items.php b/src/Controller/V1/Auctions/Items.php index 0512bed..c563175 100644 --- a/src/Controller/V1/Auctions/Items.php +++ b/src/Controller/V1/Auctions/Items.php @@ -8,8 +8,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; -use App\Schema\Crawl\AuctionItems\AuctionItemsQuery; class Items extends BaseController { diff --git a/src/Controller/V1/Auctions/Patreon.php b/src/Controller/V1/Auctions/Patreon.php index 4415a7d..e659f3b 100644 --- a/src/Controller/V1/Auctions/Patreon.php +++ b/src/Controller/V1/Auctions/Patreon.php @@ -9,15 +9,11 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; use Patreon\API; -use Patreon\OAuth; class Patreon extends BaseController { public function get(Request $request, Response $response) { - $client_id = $_ENV['PATREON_CLIENT_ID']; - $client_secret = $_ENV['PATREON_CLIENT_SECRET']; - $api_client = new API($_ENV['PATREON_ACCESS_TOKEN']); $patron_campaign_response = $api_client->get_data("campaigns/9239090?include=tiers&&fields%5Btier%5D=amount_cents,description,title"); $patron_member_response = $api_client->get_data("campaigns/9239090/members?include=currently_entitled_tiers&fields%5Bmember%5D=full_name,is_follower,last_charge_date,last_charge_status,lifetime_support_cents,currently_entitled_amount_cents,patron_status&fields%5Btier%5D=title"); diff --git a/src/Controller/V1/Auth/Login.php b/src/Controller/V1/Auth/Login.php index 302b145..3882847 100644 --- a/src/Controller/V1/Auth/Login.php +++ b/src/Controller/V1/Auth/Login.php @@ -8,8 +8,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; use App\Schema\Crawl\User\UserQuery; -use Firebase\JWT\JWT; -use Firebase\JWT\Key; use App\Services\Auth as AuthService; class Login extends BaseController @@ -28,7 +26,8 @@ public function post(Request $request, Response $response) ->withHeader('Content-Type', 'application/json') ->withHeader('charset', 'utf-8') ->withStatus(401); - }; + } + ; $jwt = AuthService::encode([ 'username' => $user->getUsername(), @@ -38,7 +37,7 @@ public function post(Request $request, Response $response) $response->getBody()->write($jwt); return $response ->withHeader('Content-Type', 'application/json') - ->withHeader('Set-Cookie', 'jwt=' . $jwt . '; Max-Age=' . $maxAge) + ->withHeader('Set-Cookie', 'jwt=' . $jwt . '; Max-Age=604800') ->withHeader('charset', 'utf-8'); } } diff --git a/src/Controller/V1/Devtracker/Devinfo.php b/src/Controller/V1/Devtracker/Devinfo.php index 7d01211..c792a60 100644 --- a/src/Controller/V1/Devtracker/Devinfo.php +++ b/src/Controller/V1/Devtracker/Devinfo.php @@ -8,7 +8,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; class Devinfo extends BaseController { @@ -44,10 +43,10 @@ public function get(Request $request, Response $response) \curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // Set the url if ($data_ary['id']) { - \curl_setopt($ch, CURLOPT_URL, "https://forum.arcgames.com/neverwinter/api/v1/users/get.json?User.ID=".$data_ary['id']); + \curl_setopt($ch, CURLOPT_URL, "https://forum.arcgames.com/neverwinter/api/v1/users/get.json?User.ID=" . $data_ary['id']); } else { try { - \curl_setopt($ch, CURLOPT_URL, "https://www.reddit.com/user/".$this->devList::getRedditUsername($data_ary['dev'])."/about.json"); + \curl_setopt($ch, CURLOPT_URL, "https://www.reddit.com/user/" . $this->devList::getRedditUsername($data_ary['dev']) . "/about.json"); } catch (\Exception $e) { $response->getBody()->write(json_encode([ 'status' => 400, @@ -62,7 +61,7 @@ public function get(Request $request, Response $response) \curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // Execute - $payload=\curl_exec($ch); + $payload = \curl_exec($ch); // Closing \curl_close($ch); diff --git a/src/Controller/V1/Devtracker/Devlist.php b/src/Controller/V1/Devtracker/Devlist.php index b283fea..a00847b 100644 --- a/src/Controller/V1/Devtracker/Devlist.php +++ b/src/Controller/V1/Devtracker/Devlist.php @@ -4,11 +4,8 @@ namespace App\Controller\V1\Devtracker; -use App\Controller\BaseController; - use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; use App\Schema\Crawl\Devtracker\DevtrackerQuery; class Devlist diff --git a/src/Controller/V1/Devtracker/Topiclist.php b/src/Controller/V1/Devtracker/Topiclist.php index 2b0af67..e0fc591 100644 --- a/src/Controller/V1/Devtracker/Topiclist.php +++ b/src/Controller/V1/Devtracker/Topiclist.php @@ -8,7 +8,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; use App\Schema\Crawl\Devtracker\DevtrackerQuery; class Topiclist extends BaseController diff --git a/src/Controller/V1/Infohub/Articles.php b/src/Controller/V1/Infohub/Articles.php index 8e80d53..ff10b1f 100644 --- a/src/Controller/V1/Infohub/Articles.php +++ b/src/Controller/V1/Infohub/Articles.php @@ -10,7 +10,6 @@ use Psr\Http\Message\ServerRequestInterface as Request; use App\Schema\Crawl\Tag\TagQuery; use App\Schema\Crawl\Article\ArticleQuery; -use JBBCode\DefaultCodeDefinitionSet; class Articles extends BaseController { diff --git a/src/Controller/V1/Infohub/Infohub.php b/src/Controller/V1/Infohub/Infohub.php index 06f6e5f..bc6f972 100644 --- a/src/Controller/V1/Infohub/Infohub.php +++ b/src/Controller/V1/Infohub/Infohub.php @@ -2,14 +2,10 @@ namespace App\Controller\V1\Infohub; -use \App\Controller\BaseController; - use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use JBBCode\DefaultCodeDefinitionSet; use PHPMailer\PHPMailer\PHPMailer; -use PHPMailer\PHPMailer\SMTP; use PHPMailer\PHPMailer\Exception; class Infohub @@ -62,19 +58,19 @@ public function post_source(Request $request, Response $response) $this->mailer->send(); } catch (Exception $e) { - throw($e); + throw ($e); } $response->getBody()->write(json_encode(['success' => $validationSuccess, 'error' => []])); return $response - ->withHeader('Content-Type', 'application/json') - ->withHeader('charset', 'utf-8'); + ->withHeader('Content-Type', 'application/json') + ->withHeader('charset', 'utf-8'); } else { $response->getBody()->write(json_encode(['success' => $validationSuccess, 'error' => $this->validator->errors()])); return $response - ->withStatus(400) - ->withHeader('Content-Type', 'application/json') - ->withHeader('charset', 'utf-8'); + ->withStatus(400) + ->withHeader('Content-Type', 'application/json') + ->withHeader('charset', 'utf-8'); } } } diff --git a/src/Middleware/Auth.php b/src/Middleware/Auth.php index ac76527..bf2c32b 100644 --- a/src/Middleware/Auth.php +++ b/src/Middleware/Auth.php @@ -31,7 +31,8 @@ public function __invoke(Request $request, RequestHandler $handler): Response ->withHeader('Content-Type', 'application/json') ->withHeader('charset', 'utf-8') ->withStatus(401); - }; + } + ; $jwt = AuthService::encode([ 'username' => $decoded->username, @@ -40,7 +41,7 @@ public function __invoke(Request $request, RequestHandler $handler): Response $response = $handler->handle($request); return $response - ->withHeader('Set-Cookie', 'jwt=' . $jwt . '; Max-Age=' . $maxAge); + ->withHeader('Set-Cookie', 'jwt=' . $jwt . '; Max-Age=604800'); } catch (ExpiredException $e) { $response = new SlimResponse(); $response->getBody()->write(json_encode([ diff --git a/src/Middleware/Cache.php b/src/Middleware/Cache.php index 84b3cd6..69d9f19 100644 --- a/src/Middleware/Cache.php +++ b/src/Middleware/Cache.php @@ -13,9 +13,14 @@ class Cache { /** - * @var Symfony\Component\Cache\Adapter\FilesystemAdapter + * @var \Symfony\Component\Cache\Adapter\FilesystemAdapter */ - private $cache; + private $headerCache; + + /** + * @var \Symfony\Component\Cache\Adapter\FilesystemAdapter + */ + private $bodyCache; public function __construct() { @@ -55,9 +60,10 @@ public function __invoke(Request $request, RequestHandler $handler): Response $response->getBody()->write($body); foreach ($headers as $key => $values) { $response = $response->withHeader($key, $values[0]); - }; + } + ; - return $response->withHeader('Cache-Control', 'max-age='.round($this->headerCache->getItem($cacheKey)->getMetadata()['expiry'] - microtime(true)).', must-revalidate'); + return $response->withHeader('Cache-Control', 'max-age=' . round($this->headerCache->getItem($cacheKey)->getMetadata()['expiry'] - microtime(true)) . ', must-revalidate'); } $response = $handler->handle($request); diff --git a/src/Middleware/RateLimiter.php b/src/Middleware/RateLimiter.php index 13d6d25..641e0f3 100644 --- a/src/Middleware/RateLimiter.php +++ b/src/Middleware/RateLimiter.php @@ -13,19 +13,19 @@ class RateLimiter { /** - * @var Symfony\Component\Cache\Adapter\FilesystemAdapter + * @var \Symfony\Component\Cache\Adapter\FilesystemAdapter */ private $cache; /** - * @var App\Helpers\RateLimitPSR6Adapter + * @var \App\Helpers\RateLimitPSR6Adapter */ private $adapter; /** - * @var PalePurple\RateLimit\RateLimit + * @var \PalePurple\RateLimit\RateLimit */ private $rateLimit; diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Article/Base/Article.php b/src/Schema/generated-classes/App/Schema/Crawl/Article/Base/Article.php index aaba6f6..24e5aea 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Article/Base/Article.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Article/Base/Article.php @@ -806,8 +806,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : ArticleTableMap::translateFieldName('Type', TableMap::TYPE_PHPNAME, $indexType)]; $this->type = (null !== $col) ? (string) $col : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -1157,33 +1157,43 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'id': $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; case 'article_id': $stmt->bindValue($identifier, $this->article_id, PDO::PARAM_STR); + break; case 'link': $stmt->bindValue($identifier, $this->link, PDO::PARAM_STR); + break; case 'site': $stmt->bindValue($identifier, $this->site, PDO::PARAM_STR); + break; case 'ts': $stmt->bindValue($identifier, $this->ts, PDO::PARAM_INT); + break; case 'title': $stmt->bindValue($identifier, $this->title, PDO::PARAM_STR); + break; case 'content': $stmt->bindValue($identifier, $this->content, PDO::PARAM_STR); + break; case 'cats': $stmt->bindValue($identifier, $this->cats, PDO::PARAM_STR); + break; case 'last_tagged': $stmt->bindValue($identifier, $this->last_tagged, PDO::PARAM_INT); + break; case 'type': $stmt->bindValue($identifier, $this->type, PDO::PARAM_STR); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Article/Base/ArticleQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/Article/Base/ArticleQuery.php index 87557fd..55fb4c1 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Article/Base/ArticleQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Article/Base/ArticleQuery.php @@ -19,9 +19,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'article' table. - * - * + * Base class that represents a query for the `article` table. * * @method ChildArticleQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildArticleQuery orderByArticleId($order = Criteria::ASC) Order by the article_id column @@ -87,8 +85,8 @@ * @method ChildArticle|null findOneByContent(string $content) Return the first ChildArticle filtered by the content column * @method ChildArticle|null findOneByCats(string $cats) Return the first ChildArticle filtered by the cats column * @method ChildArticle|null findOneByLastTagged(int $last_tagged) Return the first ChildArticle filtered by the last_tagged column - * @method ChildArticle|null findOneByType(string $type) Return the first ChildArticle filtered by the type column * - + * @method ChildArticle|null findOneByType(string $type) Return the first ChildArticle filtered by the type column + * * @method ChildArticle requirePk($key, ?ConnectionInterface $con = null) Return the ChildArticle by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildArticle requireOne(?ConnectionInterface $con = null) Return the first ChildArticle matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -105,29 +103,30 @@ * * @method ChildArticle[]|Collection find(?ConnectionInterface $con = null) Return ChildArticle objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildArticle objects based on current ModelCriteria - * @method ChildArticle[]|Collection findById(int $id) Return ChildArticle objects filtered by the id column - * @psalm-method Collection&\Traversable findById(int $id) Return ChildArticle objects filtered by the id column - * @method ChildArticle[]|Collection findByArticleId(string $article_id) Return ChildArticle objects filtered by the article_id column - * @psalm-method Collection&\Traversable findByArticleId(string $article_id) Return ChildArticle objects filtered by the article_id column - * @method ChildArticle[]|Collection findByLink(string $link) Return ChildArticle objects filtered by the link column - * @psalm-method Collection&\Traversable findByLink(string $link) Return ChildArticle objects filtered by the link column - * @method ChildArticle[]|Collection findBySite(string $site) Return ChildArticle objects filtered by the site column - * @psalm-method Collection&\Traversable findBySite(string $site) Return ChildArticle objects filtered by the site column - * @method ChildArticle[]|Collection findByTs(int $ts) Return ChildArticle objects filtered by the ts column - * @psalm-method Collection&\Traversable findByTs(int $ts) Return ChildArticle objects filtered by the ts column - * @method ChildArticle[]|Collection findByTitle(string $title) Return ChildArticle objects filtered by the title column - * @psalm-method Collection&\Traversable findByTitle(string $title) Return ChildArticle objects filtered by the title column - * @method ChildArticle[]|Collection findByContent(string $content) Return ChildArticle objects filtered by the content column - * @psalm-method Collection&\Traversable findByContent(string $content) Return ChildArticle objects filtered by the content column - * @method ChildArticle[]|Collection findByCats(string $cats) Return ChildArticle objects filtered by the cats column - * @psalm-method Collection&\Traversable findByCats(string $cats) Return ChildArticle objects filtered by the cats column - * @method ChildArticle[]|Collection findByLastTagged(int $last_tagged) Return ChildArticle objects filtered by the last_tagged column - * @psalm-method Collection&\Traversable findByLastTagged(int $last_tagged) Return ChildArticle objects filtered by the last_tagged column - * @method ChildArticle[]|Collection findByType(string $type) Return ChildArticle objects filtered by the type column - * @psalm-method Collection&\Traversable findByType(string $type) Return ChildArticle objects filtered by the type column + * + * @method ChildArticle[]|Collection findById(int|array $id) Return ChildArticle objects filtered by the id column + * @psalm-method Collection&\Traversable findById(int|array $id) Return ChildArticle objects filtered by the id column + * @method ChildArticle[]|Collection findByArticleId(string|array $article_id) Return ChildArticle objects filtered by the article_id column + * @psalm-method Collection&\Traversable findByArticleId(string|array $article_id) Return ChildArticle objects filtered by the article_id column + * @method ChildArticle[]|Collection findByLink(string|array $link) Return ChildArticle objects filtered by the link column + * @psalm-method Collection&\Traversable findByLink(string|array $link) Return ChildArticle objects filtered by the link column + * @method ChildArticle[]|Collection findBySite(string|array $site) Return ChildArticle objects filtered by the site column + * @psalm-method Collection&\Traversable findBySite(string|array $site) Return ChildArticle objects filtered by the site column + * @method ChildArticle[]|Collection findByTs(int|array $ts) Return ChildArticle objects filtered by the ts column + * @psalm-method Collection&\Traversable findByTs(int|array $ts) Return ChildArticle objects filtered by the ts column + * @method ChildArticle[]|Collection findByTitle(string|array $title) Return ChildArticle objects filtered by the title column + * @psalm-method Collection&\Traversable findByTitle(string|array $title) Return ChildArticle objects filtered by the title column + * @method ChildArticle[]|Collection findByContent(string|array $content) Return ChildArticle objects filtered by the content column + * @psalm-method Collection&\Traversable findByContent(string|array $content) Return ChildArticle objects filtered by the content column + * @method ChildArticle[]|Collection findByCats(string|array $cats) Return ChildArticle objects filtered by the cats column + * @psalm-method Collection&\Traversable findByCats(string|array $cats) Return ChildArticle objects filtered by the cats column + * @method ChildArticle[]|Collection findByLastTagged(int|array $last_tagged) Return ChildArticle objects filtered by the last_tagged column + * @psalm-method Collection&\Traversable findByLastTagged(int|array $last_tagged) Return ChildArticle objects filtered by the last_tagged column + * @method ChildArticle[]|Collection findByType(string|array $type) Return ChildArticle objects filtered by the type column + * @psalm-method Collection&\Traversable findByType(string|array $type) Return ChildArticle objects filtered by the type column + * * @method ChildArticle[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class ArticleQuery extends ModelCriteria { @@ -745,20 +744,23 @@ public function withContentArticleQuery( return $this; } + /** * Use the ContentArticle relation to the ArticleContentTags table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery The inner query object of the EXISTS statement */ public function useContentArticleExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('ContentArticle', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery */ + $q = $this->useExistsQuery('ContentArticle', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -773,8 +775,46 @@ public function useContentArticleExistsQuery($modelAlias = null, $queryClass = n */ public function useContentArticleNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('ContentArticle', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery */ + $q = $this->useExistsQuery('ContentArticle', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; + } + + /** + * Use the ContentArticle relation to the ArticleContentTags table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery The inner query object of the IN statement + */ + public function useInContentArticleQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery */ + $q = $this->useInQuery('ContentArticle', $modelAlias, $queryClass, $typeOfIn); + return $q; } + + /** + * Use the ContentArticle relation to the ArticleContentTags table for a NOT IN query. + * + * @see useContentArticleInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery The inner query object of the NOT IN statement + */ + public function useNotInContentArticleQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery */ + $q = $this->useInQuery('ContentArticle', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Filter the query by a related \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTags object * @@ -877,20 +917,23 @@ public function withTitleArticleQuery( return $this; } + /** * Use the TitleArticle relation to the ArticleTitleTags table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery The inner query object of the EXISTS statement */ public function useTitleArticleExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('TitleArticle', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery */ + $q = $this->useExistsQuery('TitleArticle', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -905,18 +948,56 @@ public function useTitleArticleExistsQuery($modelAlias = null, $queryClass = nul */ public function useTitleArticleNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('TitleArticle', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery */ + $q = $this->useExistsQuery('TitleArticle', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; } + + /** + * Use the TitleArticle relation to the ArticleTitleTags table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery The inner query object of the IN statement + */ + public function useInTitleArticleQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery */ + $q = $this->useInQuery('TitleArticle', $modelAlias, $queryClass, $typeOfIn); + return $q; + } + + /** + * Use the TitleArticle relation to the ArticleTitleTags table for a NOT IN query. + * + * @see useTitleArticleInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery The inner query object of the NOT IN statement + */ + public function useNotInTitleArticleQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery */ + $q = $this->useInQuery('TitleArticle', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Filter the query by a related Tag object * using the article_tags table as cross reference * * @param Tag $tag the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL and Criteria::IN for queries * * @return $this The current query, for fluid interface */ - public function filterByContentTag($tag, string $comparison = Criteria::EQUAL) + public function filterByContentTag($tag, string $comparison = null) { $this ->useContentArticleQuery() @@ -931,11 +1012,11 @@ public function filterByContentTag($tag, string $comparison = Criteria::EQUAL) * using the article_title_tags table as cross reference * * @param Tag $tag the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL and Criteria::IN for queries * * @return $this The current query, for fluid interface */ - public function filterByTitleTag($tag, string $comparison = Criteria::EQUAL) + public function filterByTitleTag($tag, string $comparison = null) { $this ->useTitleArticleQuery() diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Article/Map/ArticleTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/Article/Map/ArticleTableMap.php index 723fcaf..f13d070 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Article/Map/ArticleTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Article/Map/ArticleTableMap.php @@ -45,6 +45,11 @@ class ArticleTableMap extends TableMap */ public const TABLE_NAME = 'article'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'Article'; + /** * The related Propel class for this table */ @@ -372,7 +377,7 @@ public static function populateObject(array $row, int $offset = 0, string $index ArticleTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Base/ArticleContentTags.php b/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Base/ArticleContentTags.php index 38d1a33..6ffbb83 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Base/ArticleContentTags.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Base/ArticleContentTags.php @@ -432,8 +432,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ArticleContentTagsTableMap::translateFieldName('TagId', TableMap::TYPE_PHPNAME, $indexType)]; $this->tag_id = (null !== $col) ? (int) $col : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -684,9 +684,11 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'article_id': $stmt->bindValue($identifier, $this->article_id, PDO::PARAM_INT); + break; case 'tag_id': $stmt->bindValue($identifier, $this->tag_id, PDO::PARAM_INT); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Base/ArticleContentTagsQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Base/ArticleContentTagsQuery.php index b0503d7..5247427 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Base/ArticleContentTagsQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Base/ArticleContentTagsQuery.php @@ -19,9 +19,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'article_tags' table. - * - * + * Base class that represents a query for the `article_tags` table. * * @method ChildArticleContentTagsQuery orderByArticleId($order = Criteria::ASC) Order by the article_id column * @method ChildArticleContentTagsQuery orderByTagId($order = Criteria::ASC) Order by the tag_id column @@ -63,8 +61,8 @@ * @method ChildArticleContentTags findOneOrCreate(?ConnectionInterface $con = null) Return the first ChildArticleContentTags matching the query, or a new ChildArticleContentTags object populated from the query conditions when no match is found * * @method ChildArticleContentTags|null findOneByArticleId(int $article_id) Return the first ChildArticleContentTags filtered by the article_id column - * @method ChildArticleContentTags|null findOneByTagId(int $tag_id) Return the first ChildArticleContentTags filtered by the tag_id column * - + * @method ChildArticleContentTags|null findOneByTagId(int $tag_id) Return the first ChildArticleContentTags filtered by the tag_id column + * * @method ChildArticleContentTags requirePk($key, ?ConnectionInterface $con = null) Return the ChildArticleContentTags by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildArticleContentTags requireOne(?ConnectionInterface $con = null) Return the first ChildArticleContentTags matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -73,13 +71,14 @@ * * @method ChildArticleContentTags[]|Collection find(?ConnectionInterface $con = null) Return ChildArticleContentTags objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildArticleContentTags objects based on current ModelCriteria - * @method ChildArticleContentTags[]|Collection findByArticleId(int $article_id) Return ChildArticleContentTags objects filtered by the article_id column - * @psalm-method Collection&\Traversable findByArticleId(int $article_id) Return ChildArticleContentTags objects filtered by the article_id column - * @method ChildArticleContentTags[]|Collection findByTagId(int $tag_id) Return ChildArticleContentTags objects filtered by the tag_id column - * @psalm-method Collection&\Traversable findByTagId(int $tag_id) Return ChildArticleContentTags objects filtered by the tag_id column + * + * @method ChildArticleContentTags[]|Collection findByArticleId(int|array $article_id) Return ChildArticleContentTags objects filtered by the article_id column + * @psalm-method Collection&\Traversable findByArticleId(int|array $article_id) Return ChildArticleContentTags objects filtered by the article_id column + * @method ChildArticleContentTags[]|Collection findByTagId(int|array $tag_id) Return ChildArticleContentTags objects filtered by the tag_id column + * @psalm-method Collection&\Traversable findByTagId(int|array $tag_id) Return ChildArticleContentTags objects filtered by the tag_id column + * * @method ChildArticleContentTags[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class ArticleContentTagsQuery extends ModelCriteria { @@ -474,20 +473,23 @@ public function withContentArticleQuery( return $this; } + /** * Use the ContentArticle relation to the Article table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\Article\ArticleQuery The inner query object of the EXISTS statement */ public function useContentArticleExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('ContentArticle', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\Article\ArticleQuery */ + $q = $this->useExistsQuery('ContentArticle', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -502,8 +504,46 @@ public function useContentArticleExistsQuery($modelAlias = null, $queryClass = n */ public function useContentArticleNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('ContentArticle', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\Article\ArticleQuery */ + $q = $this->useExistsQuery('ContentArticle', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; + } + + /** + * Use the ContentArticle relation to the Article table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\Article\ArticleQuery The inner query object of the IN statement + */ + public function useInContentArticleQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\Article\ArticleQuery */ + $q = $this->useInQuery('ContentArticle', $modelAlias, $queryClass, $typeOfIn); + return $q; } + + /** + * Use the ContentArticle relation to the Article table for a NOT IN query. + * + * @see useContentArticleInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\Article\ArticleQuery The inner query object of the NOT IN statement + */ + public function useNotInContentArticleQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\Article\ArticleQuery */ + $q = $this->useInQuery('ContentArticle', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Filter the query by a related \App\Schema\Crawl\Tag\Tag object * @@ -608,20 +648,23 @@ public function withContentTagQuery( return $this; } + /** * Use the ContentTag relation to the Tag table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\Tag\TagQuery The inner query object of the EXISTS statement */ public function useContentTagExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('ContentTag', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\Tag\TagQuery */ + $q = $this->useExistsQuery('ContentTag', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -636,8 +679,46 @@ public function useContentTagExistsQuery($modelAlias = null, $queryClass = null, */ public function useContentTagNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('ContentTag', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\Tag\TagQuery */ + $q = $this->useExistsQuery('ContentTag', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; } + + /** + * Use the ContentTag relation to the Tag table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\Tag\TagQuery The inner query object of the IN statement + */ + public function useInContentTagQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\Tag\TagQuery */ + $q = $this->useInQuery('ContentTag', $modelAlias, $queryClass, $typeOfIn); + return $q; + } + + /** + * Use the ContentTag relation to the Tag table for a NOT IN query. + * + * @see useContentTagInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\Tag\TagQuery The inner query object of the NOT IN statement + */ + public function useNotInContentTagQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\Tag\TagQuery */ + $q = $this->useInQuery('ContentTag', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Exclude object from result * diff --git a/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Map/ArticleContentTagsTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Map/ArticleContentTagsTableMap.php index b248d68..a5af1d0 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Map/ArticleContentTagsTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/ArticleContentTags/Map/ArticleContentTagsTableMap.php @@ -45,6 +45,11 @@ class ArticleContentTagsTableMap extends TableMap */ public const TABLE_NAME = 'article_tags'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'ArticleContentTags'; + /** * The related Propel class for this table */ @@ -341,7 +346,7 @@ public static function populateObject(array $row, int $offset = 0, string $index ArticleContentTagsTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Base/ArticleTitleTags.php b/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Base/ArticleTitleTags.php index 5e6851e..f8cb124 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Base/ArticleTitleTags.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Base/ArticleTitleTags.php @@ -432,8 +432,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : ArticleTitleTagsTableMap::translateFieldName('TagId', TableMap::TYPE_PHPNAME, $indexType)]; $this->tag_id = (null !== $col) ? (int) $col : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -684,9 +684,11 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'article_id': $stmt->bindValue($identifier, $this->article_id, PDO::PARAM_INT); + break; case 'tag_id': $stmt->bindValue($identifier, $this->tag_id, PDO::PARAM_INT); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Base/ArticleTitleTagsQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Base/ArticleTitleTagsQuery.php index ec19920..9c8416e 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Base/ArticleTitleTagsQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Base/ArticleTitleTagsQuery.php @@ -19,9 +19,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'article_title_tags' table. - * - * + * Base class that represents a query for the `article_title_tags` table. * * @method ChildArticleTitleTagsQuery orderByArticleId($order = Criteria::ASC) Order by the article_id column * @method ChildArticleTitleTagsQuery orderByTagId($order = Criteria::ASC) Order by the tag_id column @@ -63,8 +61,8 @@ * @method ChildArticleTitleTags findOneOrCreate(?ConnectionInterface $con = null) Return the first ChildArticleTitleTags matching the query, or a new ChildArticleTitleTags object populated from the query conditions when no match is found * * @method ChildArticleTitleTags|null findOneByArticleId(int $article_id) Return the first ChildArticleTitleTags filtered by the article_id column - * @method ChildArticleTitleTags|null findOneByTagId(int $tag_id) Return the first ChildArticleTitleTags filtered by the tag_id column * - + * @method ChildArticleTitleTags|null findOneByTagId(int $tag_id) Return the first ChildArticleTitleTags filtered by the tag_id column + * * @method ChildArticleTitleTags requirePk($key, ?ConnectionInterface $con = null) Return the ChildArticleTitleTags by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildArticleTitleTags requireOne(?ConnectionInterface $con = null) Return the first ChildArticleTitleTags matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -73,13 +71,14 @@ * * @method ChildArticleTitleTags[]|Collection find(?ConnectionInterface $con = null) Return ChildArticleTitleTags objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildArticleTitleTags objects based on current ModelCriteria - * @method ChildArticleTitleTags[]|Collection findByArticleId(int $article_id) Return ChildArticleTitleTags objects filtered by the article_id column - * @psalm-method Collection&\Traversable findByArticleId(int $article_id) Return ChildArticleTitleTags objects filtered by the article_id column - * @method ChildArticleTitleTags[]|Collection findByTagId(int $tag_id) Return ChildArticleTitleTags objects filtered by the tag_id column - * @psalm-method Collection&\Traversable findByTagId(int $tag_id) Return ChildArticleTitleTags objects filtered by the tag_id column + * + * @method ChildArticleTitleTags[]|Collection findByArticleId(int|array $article_id) Return ChildArticleTitleTags objects filtered by the article_id column + * @psalm-method Collection&\Traversable findByArticleId(int|array $article_id) Return ChildArticleTitleTags objects filtered by the article_id column + * @method ChildArticleTitleTags[]|Collection findByTagId(int|array $tag_id) Return ChildArticleTitleTags objects filtered by the tag_id column + * @psalm-method Collection&\Traversable findByTagId(int|array $tag_id) Return ChildArticleTitleTags objects filtered by the tag_id column + * * @method ChildArticleTitleTags[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class ArticleTitleTagsQuery extends ModelCriteria { @@ -474,20 +473,23 @@ public function withTitleArticleQuery( return $this; } + /** * Use the TitleArticle relation to the Article table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\Article\ArticleQuery The inner query object of the EXISTS statement */ public function useTitleArticleExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('TitleArticle', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\Article\ArticleQuery */ + $q = $this->useExistsQuery('TitleArticle', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -502,8 +504,46 @@ public function useTitleArticleExistsQuery($modelAlias = null, $queryClass = nul */ public function useTitleArticleNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('TitleArticle', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\Article\ArticleQuery */ + $q = $this->useExistsQuery('TitleArticle', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; + } + + /** + * Use the TitleArticle relation to the Article table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\Article\ArticleQuery The inner query object of the IN statement + */ + public function useInTitleArticleQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\Article\ArticleQuery */ + $q = $this->useInQuery('TitleArticle', $modelAlias, $queryClass, $typeOfIn); + return $q; } + + /** + * Use the TitleArticle relation to the Article table for a NOT IN query. + * + * @see useTitleArticleInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\Article\ArticleQuery The inner query object of the NOT IN statement + */ + public function useNotInTitleArticleQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\Article\ArticleQuery */ + $q = $this->useInQuery('TitleArticle', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Filter the query by a related \App\Schema\Crawl\Tag\Tag object * @@ -608,20 +648,23 @@ public function withTitleTagQuery( return $this; } + /** * Use the TitleTag relation to the Tag table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\Tag\TagQuery The inner query object of the EXISTS statement */ public function useTitleTagExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('TitleTag', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\Tag\TagQuery */ + $q = $this->useExistsQuery('TitleTag', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -636,8 +679,46 @@ public function useTitleTagExistsQuery($modelAlias = null, $queryClass = null, $ */ public function useTitleTagNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('TitleTag', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\Tag\TagQuery */ + $q = $this->useExistsQuery('TitleTag', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; } + + /** + * Use the TitleTag relation to the Tag table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\Tag\TagQuery The inner query object of the IN statement + */ + public function useInTitleTagQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\Tag\TagQuery */ + $q = $this->useInQuery('TitleTag', $modelAlias, $queryClass, $typeOfIn); + return $q; + } + + /** + * Use the TitleTag relation to the Tag table for a NOT IN query. + * + * @see useTitleTagInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\Tag\TagQuery The inner query object of the NOT IN statement + */ + public function useNotInTitleTagQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\Tag\TagQuery */ + $q = $this->useInQuery('TitleTag', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Exclude object from result * diff --git a/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Map/ArticleTitleTagsTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Map/ArticleTitleTagsTableMap.php index 1f34497..1beffee 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Map/ArticleTitleTagsTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/ArticleTitleTags/Map/ArticleTitleTagsTableMap.php @@ -45,6 +45,11 @@ class ArticleTitleTagsTableMap extends TableMap */ public const TABLE_NAME = 'article_title_tags'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'ArticleTitleTags'; + /** * The related Propel class for this table */ @@ -341,7 +346,7 @@ public static function populateObject(array $row, int $offset = 0, string $index ArticleTitleTagsTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Base/AuctionAggregates.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Base/AuctionAggregates.php index aebe49e..838ef34 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Base/AuctionAggregates.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Base/AuctionAggregates.php @@ -655,8 +655,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = null; } $this->inserted = (null !== $col) ? PropelDateTime::newInstance($col, null, 'DateTime') : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -914,24 +914,31 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'item_def': $stmt->bindValue($identifier, $this->item_def, PDO::PARAM_STR); + break; case 'server': $stmt->bindValue($identifier, $this->server, PDO::PARAM_STR); + break; case 'low': $stmt->bindValue($identifier, $this->low, PDO::PARAM_INT); + break; case 'mean': $stmt->bindValue($identifier, $this->mean, PDO::PARAM_STR); + break; case 'median': $stmt->bindValue($identifier, $this->median, PDO::PARAM_STR); + break; case 'count': $stmt->bindValue($identifier, $this->count, PDO::PARAM_INT); + break; case 'inserted': $stmt->bindValue($identifier, $this->inserted ? $this->inserted->format("Y-m-d H:i:s.u") : null, PDO::PARAM_STR); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Base/AuctionAggregatesQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Base/AuctionAggregatesQuery.php index f9e4260..0331c4e 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Base/AuctionAggregatesQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Base/AuctionAggregatesQuery.php @@ -17,9 +17,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'auction_aggregates' table. - * - * + * Base class that represents a query for the `auction_aggregates` table. * * @method ChildAuctionAggregatesQuery orderByItemDef($order = Criteria::ASC) Order by the item_def column * @method ChildAuctionAggregatesQuery orderByServer($order = Criteria::ASC) Order by the server column @@ -66,8 +64,8 @@ * @method ChildAuctionAggregates|null findOneByMean(double $mean) Return the first ChildAuctionAggregates filtered by the mean column * @method ChildAuctionAggregates|null findOneByMedian(double $median) Return the first ChildAuctionAggregates filtered by the median column * @method ChildAuctionAggregates|null findOneByCount(int $count) Return the first ChildAuctionAggregates filtered by the count column - * @method ChildAuctionAggregates|null findOneByInserted(string $inserted) Return the first ChildAuctionAggregates filtered by the inserted column * - + * @method ChildAuctionAggregates|null findOneByInserted(string $inserted) Return the first ChildAuctionAggregates filtered by the inserted column + * * @method ChildAuctionAggregates requirePk($key, ?ConnectionInterface $con = null) Return the ChildAuctionAggregates by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildAuctionAggregates requireOne(?ConnectionInterface $con = null) Return the first ChildAuctionAggregates matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -81,23 +79,24 @@ * * @method ChildAuctionAggregates[]|Collection find(?ConnectionInterface $con = null) Return ChildAuctionAggregates objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildAuctionAggregates objects based on current ModelCriteria - * @method ChildAuctionAggregates[]|Collection findByItemDef(string $item_def) Return ChildAuctionAggregates objects filtered by the item_def column - * @psalm-method Collection&\Traversable findByItemDef(string $item_def) Return ChildAuctionAggregates objects filtered by the item_def column - * @method ChildAuctionAggregates[]|Collection findByServer(string $server) Return ChildAuctionAggregates objects filtered by the server column - * @psalm-method Collection&\Traversable findByServer(string $server) Return ChildAuctionAggregates objects filtered by the server column - * @method ChildAuctionAggregates[]|Collection findByLow(int $low) Return ChildAuctionAggregates objects filtered by the low column - * @psalm-method Collection&\Traversable findByLow(int $low) Return ChildAuctionAggregates objects filtered by the low column - * @method ChildAuctionAggregates[]|Collection findByMean(double $mean) Return ChildAuctionAggregates objects filtered by the mean column - * @psalm-method Collection&\Traversable findByMean(double $mean) Return ChildAuctionAggregates objects filtered by the mean column - * @method ChildAuctionAggregates[]|Collection findByMedian(double $median) Return ChildAuctionAggregates objects filtered by the median column - * @psalm-method Collection&\Traversable findByMedian(double $median) Return ChildAuctionAggregates objects filtered by the median column - * @method ChildAuctionAggregates[]|Collection findByCount(int $count) Return ChildAuctionAggregates objects filtered by the count column - * @psalm-method Collection&\Traversable findByCount(int $count) Return ChildAuctionAggregates objects filtered by the count column - * @method ChildAuctionAggregates[]|Collection findByInserted(string $inserted) Return ChildAuctionAggregates objects filtered by the inserted column - * @psalm-method Collection&\Traversable findByInserted(string $inserted) Return ChildAuctionAggregates objects filtered by the inserted column + * + * @method ChildAuctionAggregates[]|Collection findByItemDef(string|array $item_def) Return ChildAuctionAggregates objects filtered by the item_def column + * @psalm-method Collection&\Traversable findByItemDef(string|array $item_def) Return ChildAuctionAggregates objects filtered by the item_def column + * @method ChildAuctionAggregates[]|Collection findByServer(string|array $server) Return ChildAuctionAggregates objects filtered by the server column + * @psalm-method Collection&\Traversable findByServer(string|array $server) Return ChildAuctionAggregates objects filtered by the server column + * @method ChildAuctionAggregates[]|Collection findByLow(int|array $low) Return ChildAuctionAggregates objects filtered by the low column + * @psalm-method Collection&\Traversable findByLow(int|array $low) Return ChildAuctionAggregates objects filtered by the low column + * @method ChildAuctionAggregates[]|Collection findByMean(double|array $mean) Return ChildAuctionAggregates objects filtered by the mean column + * @psalm-method Collection&\Traversable findByMean(double|array $mean) Return ChildAuctionAggregates objects filtered by the mean column + * @method ChildAuctionAggregates[]|Collection findByMedian(double|array $median) Return ChildAuctionAggregates objects filtered by the median column + * @psalm-method Collection&\Traversable findByMedian(double|array $median) Return ChildAuctionAggregates objects filtered by the median column + * @method ChildAuctionAggregates[]|Collection findByCount(int|array $count) Return ChildAuctionAggregates objects filtered by the count column + * @psalm-method Collection&\Traversable findByCount(int|array $count) Return ChildAuctionAggregates objects filtered by the count column + * @method ChildAuctionAggregates[]|Collection findByInserted(string|array $inserted) Return ChildAuctionAggregates objects filtered by the inserted column + * @psalm-method Collection&\Traversable findByInserted(string|array $inserted) Return ChildAuctionAggregates objects filtered by the inserted column + * * @method ChildAuctionAggregates[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class AuctionAggregatesQuery extends ModelCriteria { @@ -671,20 +670,23 @@ public function withAuctionItemsQuery( return $this; } + /** * Use the relation to AuctionItems table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\AuctionItems\AuctionItemsQuery The inner query object of the EXISTS statement */ public function useAuctionItemsExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('AuctionItems', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\AuctionItems\AuctionItemsQuery */ + $q = $this->useExistsQuery('AuctionItems', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -699,8 +701,46 @@ public function useAuctionItemsExistsQuery($modelAlias = null, $queryClass = nul */ public function useAuctionItemsNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('AuctionItems', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\AuctionItems\AuctionItemsQuery */ + $q = $this->useExistsQuery('AuctionItems', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; } + + /** + * Use the relation to AuctionItems table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\AuctionItems\AuctionItemsQuery The inner query object of the IN statement + */ + public function useInAuctionItemsQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\AuctionItems\AuctionItemsQuery */ + $q = $this->useInQuery('AuctionItems', $modelAlias, $queryClass, $typeOfIn); + return $q; + } + + /** + * Use the relation to AuctionItems table for a NOT IN query. + * + * @see useAuctionItemsInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\AuctionItems\AuctionItemsQuery The inner query object of the NOT IN statement + */ + public function useNotInAuctionItemsQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\AuctionItems\AuctionItemsQuery */ + $q = $this->useInQuery('AuctionItems', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Exclude object from result * diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Map/AuctionAggregatesTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Map/AuctionAggregatesTableMap.php index b6c4277..af8f02d 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Map/AuctionAggregatesTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionAggregates/Map/AuctionAggregatesTableMap.php @@ -45,6 +45,11 @@ class AuctionAggregatesTableMap extends TableMap */ public const TABLE_NAME = 'auction_aggregates'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'AuctionAggregates'; + /** * The related Propel class for this table */ @@ -407,7 +412,7 @@ public static function populateObject(array $row, int $offset = 0, string $index AuctionAggregatesTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Base/AuctionCrawlLog.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Base/AuctionCrawlLog.php index c6878ba..b975557 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Base/AuctionCrawlLog.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Base/AuctionCrawlLog.php @@ -490,8 +490,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : AuctionCrawlLogTableMap::translateFieldName('ItemCount', TableMap::TYPE_PHPNAME, $indexType)]; $this->item_count = (null !== $col) ? (int) $col : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -721,15 +721,19 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'item_def': $stmt->bindValue($identifier, $this->item_def, PDO::PARAM_STR); + break; case 'character_name': $stmt->bindValue($identifier, $this->character_name, PDO::PARAM_STR); + break; case 'account_name': $stmt->bindValue($identifier, $this->account_name, PDO::PARAM_STR); + break; case 'item_count': $stmt->bindValue($identifier, $this->item_count, PDO::PARAM_INT); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Base/AuctionCrawlLogQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Base/AuctionCrawlLogQuery.php index 30f423c..d590e29 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Base/AuctionCrawlLogQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Base/AuctionCrawlLogQuery.php @@ -15,9 +15,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'auction_crawl_log' table. - * - * + * Base class that represents a query for the `auction_crawl_log` table. * * @method ChildAuctionCrawlLogQuery orderByItemDef($order = Criteria::ASC) Order by the item_def column * @method ChildAuctionCrawlLogQuery orderByCharacterName($order = Criteria::ASC) Order by the character_name column @@ -43,8 +41,8 @@ * @method ChildAuctionCrawlLog|null findOneByItemDef(string $item_def) Return the first ChildAuctionCrawlLog filtered by the item_def column * @method ChildAuctionCrawlLog|null findOneByCharacterName(string $character_name) Return the first ChildAuctionCrawlLog filtered by the character_name column * @method ChildAuctionCrawlLog|null findOneByAccountName(string $account_name) Return the first ChildAuctionCrawlLog filtered by the account_name column - * @method ChildAuctionCrawlLog|null findOneByItemCount(int $item_count) Return the first ChildAuctionCrawlLog filtered by the item_count column * - + * @method ChildAuctionCrawlLog|null findOneByItemCount(int $item_count) Return the first ChildAuctionCrawlLog filtered by the item_count column + * * @method ChildAuctionCrawlLog requirePk($key, ?ConnectionInterface $con = null) Return the ChildAuctionCrawlLog by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildAuctionCrawlLog requireOne(?ConnectionInterface $con = null) Return the first ChildAuctionCrawlLog matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -55,17 +53,18 @@ * * @method ChildAuctionCrawlLog[]|Collection find(?ConnectionInterface $con = null) Return ChildAuctionCrawlLog objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildAuctionCrawlLog objects based on current ModelCriteria - * @method ChildAuctionCrawlLog[]|Collection findByItemDef(string $item_def) Return ChildAuctionCrawlLog objects filtered by the item_def column - * @psalm-method Collection&\Traversable findByItemDef(string $item_def) Return ChildAuctionCrawlLog objects filtered by the item_def column - * @method ChildAuctionCrawlLog[]|Collection findByCharacterName(string $character_name) Return ChildAuctionCrawlLog objects filtered by the character_name column - * @psalm-method Collection&\Traversable findByCharacterName(string $character_name) Return ChildAuctionCrawlLog objects filtered by the character_name column - * @method ChildAuctionCrawlLog[]|Collection findByAccountName(string $account_name) Return ChildAuctionCrawlLog objects filtered by the account_name column - * @psalm-method Collection&\Traversable findByAccountName(string $account_name) Return ChildAuctionCrawlLog objects filtered by the account_name column - * @method ChildAuctionCrawlLog[]|Collection findByItemCount(int $item_count) Return ChildAuctionCrawlLog objects filtered by the item_count column - * @psalm-method Collection&\Traversable findByItemCount(int $item_count) Return ChildAuctionCrawlLog objects filtered by the item_count column + * + * @method ChildAuctionCrawlLog[]|Collection findByItemDef(string|array $item_def) Return ChildAuctionCrawlLog objects filtered by the item_def column + * @psalm-method Collection&\Traversable findByItemDef(string|array $item_def) Return ChildAuctionCrawlLog objects filtered by the item_def column + * @method ChildAuctionCrawlLog[]|Collection findByCharacterName(string|array $character_name) Return ChildAuctionCrawlLog objects filtered by the character_name column + * @psalm-method Collection&\Traversable findByCharacterName(string|array $character_name) Return ChildAuctionCrawlLog objects filtered by the character_name column + * @method ChildAuctionCrawlLog[]|Collection findByAccountName(string|array $account_name) Return ChildAuctionCrawlLog objects filtered by the account_name column + * @psalm-method Collection&\Traversable findByAccountName(string|array $account_name) Return ChildAuctionCrawlLog objects filtered by the account_name column + * @method ChildAuctionCrawlLog[]|Collection findByItemCount(int|array $item_count) Return ChildAuctionCrawlLog objects filtered by the item_count column + * @psalm-method Collection&\Traversable findByItemCount(int|array $item_count) Return ChildAuctionCrawlLog objects filtered by the item_count column + * * @method ChildAuctionCrawlLog[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class AuctionCrawlLogQuery extends ModelCriteria { diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Map/AuctionCrawlLogTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Map/AuctionCrawlLogTableMap.php index 10ae79f..827dc2d 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Map/AuctionCrawlLogTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionCrawlLog/Map/AuctionCrawlLogTableMap.php @@ -45,6 +45,11 @@ class AuctionCrawlLogTableMap extends TableMap */ public const TABLE_NAME = 'auction_crawl_log'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'AuctionCrawlLog'; + /** * The related Propel class for this table */ @@ -359,7 +364,7 @@ public static function populateObject(array $row, int $offset = 0, string $index AuctionCrawlLogTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Base/AuctionDetails.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Base/AuctionDetails.php index 748f7f1..1e7d2ef 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Base/AuctionDetails.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Base/AuctionDetails.php @@ -665,8 +665,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : AuctionDetailsTableMap::translateFieldName('PricePer', TableMap::TYPE_PHPNAME, $indexType)]; $this->price_per = (null !== $col) ? (double) $col : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -927,27 +927,35 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'item_def': $stmt->bindValue($identifier, $this->item_def, PDO::PARAM_STR); + break; case 'server': $stmt->bindValue($identifier, $this->server, PDO::PARAM_STR); + break; case 'seller_name': $stmt->bindValue($identifier, $this->seller_name, PDO::PARAM_STR); + break; case 'seller_handle': $stmt->bindValue($identifier, $this->seller_handle, PDO::PARAM_STR); + break; case 'expire_time': $stmt->bindValue($identifier, $this->expire_time, PDO::PARAM_INT); + break; case 'price': $stmt->bindValue($identifier, $this->price, PDO::PARAM_INT); + break; case 'count': $stmt->bindValue($identifier, $this->count, PDO::PARAM_INT); + break; case 'price_per': $stmt->bindValue($identifier, $this->price_per, PDO::PARAM_STR); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Base/AuctionDetailsQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Base/AuctionDetailsQuery.php index 31d23c6..2aa7f1f 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Base/AuctionDetailsQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Base/AuctionDetailsQuery.php @@ -17,9 +17,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'auction_details' table. - * - * + * Base class that represents a query for the `auction_details` table. * * @method ChildAuctionDetailsQuery orderByItemDef($order = Criteria::ASC) Order by the item_def column * @method ChildAuctionDetailsQuery orderByServer($order = Criteria::ASC) Order by the server column @@ -69,8 +67,8 @@ * @method ChildAuctionDetails|null findOneByExpireTime(string $expire_time) Return the first ChildAuctionDetails filtered by the expire_time column * @method ChildAuctionDetails|null findOneByPrice(int $price) Return the first ChildAuctionDetails filtered by the price column * @method ChildAuctionDetails|null findOneByCount(int $count) Return the first ChildAuctionDetails filtered by the count column - * @method ChildAuctionDetails|null findOneByPricePer(double $price_per) Return the first ChildAuctionDetails filtered by the price_per column * - + * @method ChildAuctionDetails|null findOneByPricePer(double $price_per) Return the first ChildAuctionDetails filtered by the price_per column + * * @method ChildAuctionDetails requirePk($key, ?ConnectionInterface $con = null) Return the ChildAuctionDetails by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildAuctionDetails requireOne(?ConnectionInterface $con = null) Return the first ChildAuctionDetails matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -85,25 +83,26 @@ * * @method ChildAuctionDetails[]|Collection find(?ConnectionInterface $con = null) Return ChildAuctionDetails objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildAuctionDetails objects based on current ModelCriteria - * @method ChildAuctionDetails[]|Collection findByItemDef(string $item_def) Return ChildAuctionDetails objects filtered by the item_def column - * @psalm-method Collection&\Traversable findByItemDef(string $item_def) Return ChildAuctionDetails objects filtered by the item_def column - * @method ChildAuctionDetails[]|Collection findByServer(string $server) Return ChildAuctionDetails objects filtered by the server column - * @psalm-method Collection&\Traversable findByServer(string $server) Return ChildAuctionDetails objects filtered by the server column - * @method ChildAuctionDetails[]|Collection findBySellerName(string $seller_name) Return ChildAuctionDetails objects filtered by the seller_name column - * @psalm-method Collection&\Traversable findBySellerName(string $seller_name) Return ChildAuctionDetails objects filtered by the seller_name column - * @method ChildAuctionDetails[]|Collection findBySellerHandle(string $seller_handle) Return ChildAuctionDetails objects filtered by the seller_handle column - * @psalm-method Collection&\Traversable findBySellerHandle(string $seller_handle) Return ChildAuctionDetails objects filtered by the seller_handle column - * @method ChildAuctionDetails[]|Collection findByExpireTime(string $expire_time) Return ChildAuctionDetails objects filtered by the expire_time column - * @psalm-method Collection&\Traversable findByExpireTime(string $expire_time) Return ChildAuctionDetails objects filtered by the expire_time column - * @method ChildAuctionDetails[]|Collection findByPrice(int $price) Return ChildAuctionDetails objects filtered by the price column - * @psalm-method Collection&\Traversable findByPrice(int $price) Return ChildAuctionDetails objects filtered by the price column - * @method ChildAuctionDetails[]|Collection findByCount(int $count) Return ChildAuctionDetails objects filtered by the count column - * @psalm-method Collection&\Traversable findByCount(int $count) Return ChildAuctionDetails objects filtered by the count column - * @method ChildAuctionDetails[]|Collection findByPricePer(double $price_per) Return ChildAuctionDetails objects filtered by the price_per column - * @psalm-method Collection&\Traversable findByPricePer(double $price_per) Return ChildAuctionDetails objects filtered by the price_per column + * + * @method ChildAuctionDetails[]|Collection findByItemDef(string|array $item_def) Return ChildAuctionDetails objects filtered by the item_def column + * @psalm-method Collection&\Traversable findByItemDef(string|array $item_def) Return ChildAuctionDetails objects filtered by the item_def column + * @method ChildAuctionDetails[]|Collection findByServer(string|array $server) Return ChildAuctionDetails objects filtered by the server column + * @psalm-method Collection&\Traversable findByServer(string|array $server) Return ChildAuctionDetails objects filtered by the server column + * @method ChildAuctionDetails[]|Collection findBySellerName(string|array $seller_name) Return ChildAuctionDetails objects filtered by the seller_name column + * @psalm-method Collection&\Traversable findBySellerName(string|array $seller_name) Return ChildAuctionDetails objects filtered by the seller_name column + * @method ChildAuctionDetails[]|Collection findBySellerHandle(string|array $seller_handle) Return ChildAuctionDetails objects filtered by the seller_handle column + * @psalm-method Collection&\Traversable findBySellerHandle(string|array $seller_handle) Return ChildAuctionDetails objects filtered by the seller_handle column + * @method ChildAuctionDetails[]|Collection findByExpireTime(string|array $expire_time) Return ChildAuctionDetails objects filtered by the expire_time column + * @psalm-method Collection&\Traversable findByExpireTime(string|array $expire_time) Return ChildAuctionDetails objects filtered by the expire_time column + * @method ChildAuctionDetails[]|Collection findByPrice(int|array $price) Return ChildAuctionDetails objects filtered by the price column + * @psalm-method Collection&\Traversable findByPrice(int|array $price) Return ChildAuctionDetails objects filtered by the price column + * @method ChildAuctionDetails[]|Collection findByCount(int|array $count) Return ChildAuctionDetails objects filtered by the count column + * @psalm-method Collection&\Traversable findByCount(int|array $count) Return ChildAuctionDetails objects filtered by the count column + * @method ChildAuctionDetails[]|Collection findByPricePer(double|array $price_per) Return ChildAuctionDetails objects filtered by the price_per column + * @psalm-method Collection&\Traversable findByPricePer(double|array $price_per) Return ChildAuctionDetails objects filtered by the price_per column + * * @method ChildAuctionDetails[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class AuctionDetailsQuery extends ModelCriteria { @@ -696,20 +695,23 @@ public function withAuctionItemsQuery( return $this; } + /** * Use the relation to AuctionItems table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\AuctionItems\AuctionItemsQuery The inner query object of the EXISTS statement */ public function useAuctionItemsExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('AuctionItems', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\AuctionItems\AuctionItemsQuery */ + $q = $this->useExistsQuery('AuctionItems', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -724,8 +726,46 @@ public function useAuctionItemsExistsQuery($modelAlias = null, $queryClass = nul */ public function useAuctionItemsNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('AuctionItems', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\AuctionItems\AuctionItemsQuery */ + $q = $this->useExistsQuery('AuctionItems', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; } + + /** + * Use the relation to AuctionItems table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\AuctionItems\AuctionItemsQuery The inner query object of the IN statement + */ + public function useInAuctionItemsQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\AuctionItems\AuctionItemsQuery */ + $q = $this->useInQuery('AuctionItems', $modelAlias, $queryClass, $typeOfIn); + return $q; + } + + /** + * Use the relation to AuctionItems table for a NOT IN query. + * + * @see useAuctionItemsInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\AuctionItems\AuctionItemsQuery The inner query object of the NOT IN statement + */ + public function useNotInAuctionItemsQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\AuctionItems\AuctionItemsQuery */ + $q = $this->useInQuery('AuctionItems', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Exclude object from result * diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Map/AuctionDetailsTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Map/AuctionDetailsTableMap.php index 5ea07e3..e31aaf4 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Map/AuctionDetailsTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionDetails/Map/AuctionDetailsTableMap.php @@ -45,6 +45,11 @@ class AuctionDetailsTableMap extends TableMap */ public const TABLE_NAME = 'auction_details'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'AuctionDetails'; + /** * The related Propel class for this table */ @@ -434,7 +439,7 @@ public static function populateObject(array $row, int $offset = 0, string $index AuctionDetailsTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Base/AuctionItems.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Base/AuctionItems.php index 467df9b..d5db371 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Base/AuctionItems.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Base/AuctionItems.php @@ -847,8 +847,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = null; } $this->locked_date = (null !== $col) ? PropelDateTime::newInstance($col, null, 'DateTime') : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -1134,33 +1134,43 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'item_def': $stmt->bindValue($identifier, $this->item_def, PDO::PARAM_STR); + break; case 'item_name': $stmt->bindValue($identifier, $this->item_name, PDO::PARAM_STR); + break; case 'search_term': $stmt->bindValue($identifier, $this->search_term, PDO::PARAM_STR); + break; case 'quality': $stmt->bindValue($identifier, $this->quality, PDO::PARAM_STR); + break; case 'categories': $stmt->bindValue($identifier, $this->categories, PDO::PARAM_STR); + break; case 'crawl_category': $stmt->bindValue($identifier, $this->crawl_category, PDO::PARAM_STR); + break; case 'allow_auto': $stmt->bindValue($identifier, (int) $this->allow_auto, PDO::PARAM_INT); + break; case 'server': $stmt->bindValue($identifier, $this->server, PDO::PARAM_STR); + break; case 'update_date': $stmt->bindValue($identifier, $this->update_date ? $this->update_date->format("Y-m-d H:i:s.u") : null, PDO::PARAM_STR); + break; case 'locked_date': $stmt->bindValue($identifier, $this->locked_date ? $this->locked_date->format("Y-m-d H:i:s.u") : null, PDO::PARAM_STR); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Base/AuctionItemsQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Base/AuctionItemsQuery.php index d0cf2c8..9b96d90 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Base/AuctionItemsQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Base/AuctionItemsQuery.php @@ -19,9 +19,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'auction_items' table. - * - * + * Base class that represents a query for the `auction_items` table. * * @method ChildAuctionItemsQuery orderByItemDef($order = Criteria::ASC) Order by the item_def column * @method ChildAuctionItemsQuery orderByItemName($order = Criteria::ASC) Order by the item_name column @@ -87,8 +85,8 @@ * @method ChildAuctionItems|null findOneByAllowAuto(boolean $allow_auto) Return the first ChildAuctionItems filtered by the allow_auto column * @method ChildAuctionItems|null findOneByServer(string $server) Return the first ChildAuctionItems filtered by the server column * @method ChildAuctionItems|null findOneByUpdateDate(string $update_date) Return the first ChildAuctionItems filtered by the update_date column - * @method ChildAuctionItems|null findOneByLockedDate(string $locked_date) Return the first ChildAuctionItems filtered by the locked_date column * - + * @method ChildAuctionItems|null findOneByLockedDate(string $locked_date) Return the first ChildAuctionItems filtered by the locked_date column + * * @method ChildAuctionItems requirePk($key, ?ConnectionInterface $con = null) Return the ChildAuctionItems by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildAuctionItems requireOne(?ConnectionInterface $con = null) Return the first ChildAuctionItems matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -105,29 +103,30 @@ * * @method ChildAuctionItems[]|Collection find(?ConnectionInterface $con = null) Return ChildAuctionItems objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildAuctionItems objects based on current ModelCriteria - * @method ChildAuctionItems[]|Collection findByItemDef(string $item_def) Return ChildAuctionItems objects filtered by the item_def column - * @psalm-method Collection&\Traversable findByItemDef(string $item_def) Return ChildAuctionItems objects filtered by the item_def column - * @method ChildAuctionItems[]|Collection findByItemName(string $item_name) Return ChildAuctionItems objects filtered by the item_name column - * @psalm-method Collection&\Traversable findByItemName(string $item_name) Return ChildAuctionItems objects filtered by the item_name column - * @method ChildAuctionItems[]|Collection findBySearchTerm(string $search_term) Return ChildAuctionItems objects filtered by the search_term column - * @psalm-method Collection&\Traversable findBySearchTerm(string $search_term) Return ChildAuctionItems objects filtered by the search_term column - * @method ChildAuctionItems[]|Collection findByQuality(string $quality) Return ChildAuctionItems objects filtered by the quality column - * @psalm-method Collection&\Traversable findByQuality(string $quality) Return ChildAuctionItems objects filtered by the quality column - * @method ChildAuctionItems[]|Collection findByCategories(string $categories) Return ChildAuctionItems objects filtered by the categories column - * @psalm-method Collection&\Traversable findByCategories(string $categories) Return ChildAuctionItems objects filtered by the categories column - * @method ChildAuctionItems[]|Collection findByCrawlCategory(string $crawl_category) Return ChildAuctionItems objects filtered by the crawl_category column - * @psalm-method Collection&\Traversable findByCrawlCategory(string $crawl_category) Return ChildAuctionItems objects filtered by the crawl_category column - * @method ChildAuctionItems[]|Collection findByAllowAuto(boolean $allow_auto) Return ChildAuctionItems objects filtered by the allow_auto column - * @psalm-method Collection&\Traversable findByAllowAuto(boolean $allow_auto) Return ChildAuctionItems objects filtered by the allow_auto column - * @method ChildAuctionItems[]|Collection findByServer(string $server) Return ChildAuctionItems objects filtered by the server column - * @psalm-method Collection&\Traversable findByServer(string $server) Return ChildAuctionItems objects filtered by the server column - * @method ChildAuctionItems[]|Collection findByUpdateDate(string $update_date) Return ChildAuctionItems objects filtered by the update_date column - * @psalm-method Collection&\Traversable findByUpdateDate(string $update_date) Return ChildAuctionItems objects filtered by the update_date column - * @method ChildAuctionItems[]|Collection findByLockedDate(string $locked_date) Return ChildAuctionItems objects filtered by the locked_date column - * @psalm-method Collection&\Traversable findByLockedDate(string $locked_date) Return ChildAuctionItems objects filtered by the locked_date column + * + * @method ChildAuctionItems[]|Collection findByItemDef(string|array $item_def) Return ChildAuctionItems objects filtered by the item_def column + * @psalm-method Collection&\Traversable findByItemDef(string|array $item_def) Return ChildAuctionItems objects filtered by the item_def column + * @method ChildAuctionItems[]|Collection findByItemName(string|array $item_name) Return ChildAuctionItems objects filtered by the item_name column + * @psalm-method Collection&\Traversable findByItemName(string|array $item_name) Return ChildAuctionItems objects filtered by the item_name column + * @method ChildAuctionItems[]|Collection findBySearchTerm(string|array $search_term) Return ChildAuctionItems objects filtered by the search_term column + * @psalm-method Collection&\Traversable findBySearchTerm(string|array $search_term) Return ChildAuctionItems objects filtered by the search_term column + * @method ChildAuctionItems[]|Collection findByQuality(string|array $quality) Return ChildAuctionItems objects filtered by the quality column + * @psalm-method Collection&\Traversable findByQuality(string|array $quality) Return ChildAuctionItems objects filtered by the quality column + * @method ChildAuctionItems[]|Collection findByCategories(string|array $categories) Return ChildAuctionItems objects filtered by the categories column + * @psalm-method Collection&\Traversable findByCategories(string|array $categories) Return ChildAuctionItems objects filtered by the categories column + * @method ChildAuctionItems[]|Collection findByCrawlCategory(string|array $crawl_category) Return ChildAuctionItems objects filtered by the crawl_category column + * @psalm-method Collection&\Traversable findByCrawlCategory(string|array $crawl_category) Return ChildAuctionItems objects filtered by the crawl_category column + * @method ChildAuctionItems[]|Collection findByAllowAuto(boolean|array $allow_auto) Return ChildAuctionItems objects filtered by the allow_auto column + * @psalm-method Collection&\Traversable findByAllowAuto(boolean|array $allow_auto) Return ChildAuctionItems objects filtered by the allow_auto column + * @method ChildAuctionItems[]|Collection findByServer(string|array $server) Return ChildAuctionItems objects filtered by the server column + * @psalm-method Collection&\Traversable findByServer(string|array $server) Return ChildAuctionItems objects filtered by the server column + * @method ChildAuctionItems[]|Collection findByUpdateDate(string|array $update_date) Return ChildAuctionItems objects filtered by the update_date column + * @psalm-method Collection&\Traversable findByUpdateDate(string|array $update_date) Return ChildAuctionItems objects filtered by the update_date column + * @method ChildAuctionItems[]|Collection findByLockedDate(string|array $locked_date) Return ChildAuctionItems objects filtered by the locked_date column + * @psalm-method Collection&\Traversable findByLockedDate(string|array $locked_date) Return ChildAuctionItems objects filtered by the locked_date column + * * @method ChildAuctionItems[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class AuctionItemsQuery extends ModelCriteria { @@ -517,7 +516,7 @@ public function filterByCrawlCategory($crawlCategory = null, ?string $comparison public function filterByAllowAuto($allowAuto = null, ?string $comparison = null) { if (is_string($allowAuto)) { - $allowAuto = in_array(strtolower($allowAuto), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + $allowAuto = in_array(strtolower($allowAuto), array('false', 'off', '-', 'no', 'n', '0', ''), true) ? false : true; } $this->addUsingAlias(AuctionItemsTableMap::COL_ALLOW_AUTO, $allowAuto, $comparison); @@ -739,20 +738,23 @@ public function withAuctionAggregatesQuery( return $this; } + /** * Use the relation to AuctionAggregates table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\AuctionAggregates\AuctionAggregatesQuery The inner query object of the EXISTS statement */ public function useAuctionAggregatesExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('AuctionAggregates', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\AuctionAggregates\AuctionAggregatesQuery */ + $q = $this->useExistsQuery('AuctionAggregates', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -767,8 +769,46 @@ public function useAuctionAggregatesExistsQuery($modelAlias = null, $queryClass */ public function useAuctionAggregatesNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('AuctionAggregates', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\AuctionAggregates\AuctionAggregatesQuery */ + $q = $this->useExistsQuery('AuctionAggregates', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; + } + + /** + * Use the relation to AuctionAggregates table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\AuctionAggregates\AuctionAggregatesQuery The inner query object of the IN statement + */ + public function useInAuctionAggregatesQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\AuctionAggregates\AuctionAggregatesQuery */ + $q = $this->useInQuery('AuctionAggregates', $modelAlias, $queryClass, $typeOfIn); + return $q; } + + /** + * Use the relation to AuctionAggregates table for a NOT IN query. + * + * @see useAuctionAggregatesInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\AuctionAggregates\AuctionAggregatesQuery The inner query object of the NOT IN statement + */ + public function useNotInAuctionAggregatesQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\AuctionAggregates\AuctionAggregatesQuery */ + $q = $this->useInQuery('AuctionAggregates', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Filter the query by a related \App\Schema\Crawl\AuctionDetails\AuctionDetails object * @@ -865,20 +905,23 @@ public function withAuctionDetailsQuery( return $this; } + /** * Use the relation to AuctionDetails table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\AuctionDetails\AuctionDetailsQuery The inner query object of the EXISTS statement */ public function useAuctionDetailsExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('AuctionDetails', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\AuctionDetails\AuctionDetailsQuery */ + $q = $this->useExistsQuery('AuctionDetails', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -893,8 +936,46 @@ public function useAuctionDetailsExistsQuery($modelAlias = null, $queryClass = n */ public function useAuctionDetailsNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('AuctionDetails', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\AuctionDetails\AuctionDetailsQuery */ + $q = $this->useExistsQuery('AuctionDetails', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; } + + /** + * Use the relation to AuctionDetails table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\AuctionDetails\AuctionDetailsQuery The inner query object of the IN statement + */ + public function useInAuctionDetailsQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\AuctionDetails\AuctionDetailsQuery */ + $q = $this->useInQuery('AuctionDetails', $modelAlias, $queryClass, $typeOfIn); + return $q; + } + + /** + * Use the relation to AuctionDetails table for a NOT IN query. + * + * @see useAuctionDetailsInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\AuctionDetails\AuctionDetailsQuery The inner query object of the NOT IN statement + */ + public function useNotInAuctionDetailsQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\AuctionDetails\AuctionDetailsQuery */ + $q = $this->useInQuery('AuctionDetails', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Exclude object from result * diff --git a/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Map/AuctionItemsTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Map/AuctionItemsTableMap.php index 62b1d03..d40e9f5 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Map/AuctionItemsTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/AuctionItems/Map/AuctionItemsTableMap.php @@ -45,6 +45,11 @@ class AuctionItemsTableMap extends TableMap */ public const TABLE_NAME = 'auction_items'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'AuctionItems'; + /** * The related Propel class for this table */ @@ -459,7 +464,7 @@ public static function populateObject(array $row, int $offset = 0, string $index AuctionItemsTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Base/Devtracker.php b/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Base/Devtracker.php index 9880bf6..a563175 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Base/Devtracker.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Base/Devtracker.php @@ -899,8 +899,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = $row[TableMap::TYPE_NUM == $indexType ? 11 + $startcol : DevtrackerTableMap::translateFieldName('IsClosed', TableMap::TYPE_PHPNAME, $indexType)]; $this->is_closed = (null !== $col) ? (boolean) $col : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -1158,39 +1158,51 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'ID': $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; case 'dev_name': $stmt->bindValue($identifier, $this->dev_name, PDO::PARAM_STR); + break; case 'dev_id': $stmt->bindValue($identifier, $this->dev_id, PDO::PARAM_INT); + break; case 'category_id': $stmt->bindValue($identifier, $this->category_id, PDO::PARAM_INT); + break; case 'discussion_id': $stmt->bindValue($identifier, $this->discussion_id, PDO::PARAM_STR); + break; case 'discussion_name': $stmt->bindValue($identifier, $this->discussion_name, PDO::PARAM_STR); + break; case 'comment_id': $stmt->bindValue($identifier, $this->comment_id, PDO::PARAM_STR); + break; case 'body': $stmt->bindValue($identifier, $this->body, PDO::PARAM_STR); + break; case 'date': $stmt->bindValue($identifier, $this->date ? $this->date->format("Y-m-d H:i:s.u") : null, PDO::PARAM_STR); + break; case 'is_poll': $stmt->bindValue($identifier, (int) $this->is_poll, PDO::PARAM_INT); + break; case 'is_announce': $stmt->bindValue($identifier, (int) $this->is_announce, PDO::PARAM_INT); + break; case 'is_closed': $stmt->bindValue($identifier, (int) $this->is_closed, PDO::PARAM_INT); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Base/DevtrackerQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Base/DevtrackerQuery.php index 4e2342f..8c88a73 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Base/DevtrackerQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Base/DevtrackerQuery.php @@ -15,9 +15,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'devtracker' table. - * - * + * Base class that represents a query for the `devtracker` table. * * @method ChildDevtrackerQuery orderById($order = Criteria::ASC) Order by the ID column * @method ChildDevtrackerQuery orderByDevName($order = Criteria::ASC) Order by the dev_name column @@ -67,8 +65,8 @@ * @method ChildDevtracker|null findOneByDate(string $date) Return the first ChildDevtracker filtered by the date column * @method ChildDevtracker|null findOneByIsPoll(boolean $is_poll) Return the first ChildDevtracker filtered by the is_poll column * @method ChildDevtracker|null findOneByIsAnnounce(boolean $is_announce) Return the first ChildDevtracker filtered by the is_announce column - * @method ChildDevtracker|null findOneByIsClosed(boolean $is_closed) Return the first ChildDevtracker filtered by the is_closed column * - + * @method ChildDevtracker|null findOneByIsClosed(boolean $is_closed) Return the first ChildDevtracker filtered by the is_closed column + * * @method ChildDevtracker requirePk($key, ?ConnectionInterface $con = null) Return the ChildDevtracker by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildDevtracker requireOne(?ConnectionInterface $con = null) Return the first ChildDevtracker matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -87,33 +85,34 @@ * * @method ChildDevtracker[]|Collection find(?ConnectionInterface $con = null) Return ChildDevtracker objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildDevtracker objects based on current ModelCriteria - * @method ChildDevtracker[]|Collection findById(int $ID) Return ChildDevtracker objects filtered by the ID column - * @psalm-method Collection&\Traversable findById(int $ID) Return ChildDevtracker objects filtered by the ID column - * @method ChildDevtracker[]|Collection findByDevName(string $dev_name) Return ChildDevtracker objects filtered by the dev_name column - * @psalm-method Collection&\Traversable findByDevName(string $dev_name) Return ChildDevtracker objects filtered by the dev_name column - * @method ChildDevtracker[]|Collection findByDevId(int $dev_id) Return ChildDevtracker objects filtered by the dev_id column - * @psalm-method Collection&\Traversable findByDevId(int $dev_id) Return ChildDevtracker objects filtered by the dev_id column - * @method ChildDevtracker[]|Collection findByCategoryId(int $category_id) Return ChildDevtracker objects filtered by the category_id column - * @psalm-method Collection&\Traversable findByCategoryId(int $category_id) Return ChildDevtracker objects filtered by the category_id column - * @method ChildDevtracker[]|Collection findByDiscussionId(string $discussion_id) Return ChildDevtracker objects filtered by the discussion_id column - * @psalm-method Collection&\Traversable findByDiscussionId(string $discussion_id) Return ChildDevtracker objects filtered by the discussion_id column - * @method ChildDevtracker[]|Collection findByDiscussionName(string $discussion_name) Return ChildDevtracker objects filtered by the discussion_name column - * @psalm-method Collection&\Traversable findByDiscussionName(string $discussion_name) Return ChildDevtracker objects filtered by the discussion_name column - * @method ChildDevtracker[]|Collection findByCommentId(string $comment_id) Return ChildDevtracker objects filtered by the comment_id column - * @psalm-method Collection&\Traversable findByCommentId(string $comment_id) Return ChildDevtracker objects filtered by the comment_id column - * @method ChildDevtracker[]|Collection findByBody(string $body) Return ChildDevtracker objects filtered by the body column - * @psalm-method Collection&\Traversable findByBody(string $body) Return ChildDevtracker objects filtered by the body column - * @method ChildDevtracker[]|Collection findByDate(string $date) Return ChildDevtracker objects filtered by the date column - * @psalm-method Collection&\Traversable findByDate(string $date) Return ChildDevtracker objects filtered by the date column - * @method ChildDevtracker[]|Collection findByIsPoll(boolean $is_poll) Return ChildDevtracker objects filtered by the is_poll column - * @psalm-method Collection&\Traversable findByIsPoll(boolean $is_poll) Return ChildDevtracker objects filtered by the is_poll column - * @method ChildDevtracker[]|Collection findByIsAnnounce(boolean $is_announce) Return ChildDevtracker objects filtered by the is_announce column - * @psalm-method Collection&\Traversable findByIsAnnounce(boolean $is_announce) Return ChildDevtracker objects filtered by the is_announce column - * @method ChildDevtracker[]|Collection findByIsClosed(boolean $is_closed) Return ChildDevtracker objects filtered by the is_closed column - * @psalm-method Collection&\Traversable findByIsClosed(boolean $is_closed) Return ChildDevtracker objects filtered by the is_closed column + * + * @method ChildDevtracker[]|Collection findById(int|array $ID) Return ChildDevtracker objects filtered by the ID column + * @psalm-method Collection&\Traversable findById(int|array $ID) Return ChildDevtracker objects filtered by the ID column + * @method ChildDevtracker[]|Collection findByDevName(string|array $dev_name) Return ChildDevtracker objects filtered by the dev_name column + * @psalm-method Collection&\Traversable findByDevName(string|array $dev_name) Return ChildDevtracker objects filtered by the dev_name column + * @method ChildDevtracker[]|Collection findByDevId(int|array $dev_id) Return ChildDevtracker objects filtered by the dev_id column + * @psalm-method Collection&\Traversable findByDevId(int|array $dev_id) Return ChildDevtracker objects filtered by the dev_id column + * @method ChildDevtracker[]|Collection findByCategoryId(int|array $category_id) Return ChildDevtracker objects filtered by the category_id column + * @psalm-method Collection&\Traversable findByCategoryId(int|array $category_id) Return ChildDevtracker objects filtered by the category_id column + * @method ChildDevtracker[]|Collection findByDiscussionId(string|array $discussion_id) Return ChildDevtracker objects filtered by the discussion_id column + * @psalm-method Collection&\Traversable findByDiscussionId(string|array $discussion_id) Return ChildDevtracker objects filtered by the discussion_id column + * @method ChildDevtracker[]|Collection findByDiscussionName(string|array $discussion_name) Return ChildDevtracker objects filtered by the discussion_name column + * @psalm-method Collection&\Traversable findByDiscussionName(string|array $discussion_name) Return ChildDevtracker objects filtered by the discussion_name column + * @method ChildDevtracker[]|Collection findByCommentId(string|array $comment_id) Return ChildDevtracker objects filtered by the comment_id column + * @psalm-method Collection&\Traversable findByCommentId(string|array $comment_id) Return ChildDevtracker objects filtered by the comment_id column + * @method ChildDevtracker[]|Collection findByBody(string|array $body) Return ChildDevtracker objects filtered by the body column + * @psalm-method Collection&\Traversable findByBody(string|array $body) Return ChildDevtracker objects filtered by the body column + * @method ChildDevtracker[]|Collection findByDate(string|array $date) Return ChildDevtracker objects filtered by the date column + * @psalm-method Collection&\Traversable findByDate(string|array $date) Return ChildDevtracker objects filtered by the date column + * @method ChildDevtracker[]|Collection findByIsPoll(boolean|array $is_poll) Return ChildDevtracker objects filtered by the is_poll column + * @psalm-method Collection&\Traversable findByIsPoll(boolean|array $is_poll) Return ChildDevtracker objects filtered by the is_poll column + * @method ChildDevtracker[]|Collection findByIsAnnounce(boolean|array $is_announce) Return ChildDevtracker objects filtered by the is_announce column + * @psalm-method Collection&\Traversable findByIsAnnounce(boolean|array $is_announce) Return ChildDevtracker objects filtered by the is_announce column + * @method ChildDevtracker[]|Collection findByIsClosed(boolean|array $is_closed) Return ChildDevtracker objects filtered by the is_closed column + * @psalm-method Collection&\Traversable findByIsClosed(boolean|array $is_closed) Return ChildDevtracker objects filtered by the is_closed column + * * @method ChildDevtracker[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class DevtrackerQuery extends ModelCriteria { @@ -639,7 +638,7 @@ public function filterByDate($date = null, ?string $comparison = null) public function filterByIsPoll($isPoll = null, ?string $comparison = null) { if (is_string($isPoll)) { - $isPoll = in_array(strtolower($isPoll), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + $isPoll = in_array(strtolower($isPoll), array('false', 'off', '-', 'no', 'n', '0', ''), true) ? false : true; } $this->addUsingAlias(DevtrackerTableMap::COL_IS_POLL, $isPoll, $comparison); @@ -668,7 +667,7 @@ public function filterByIsPoll($isPoll = null, ?string $comparison = null) public function filterByIsAnnounce($isAnnounce = null, ?string $comparison = null) { if (is_string($isAnnounce)) { - $isAnnounce = in_array(strtolower($isAnnounce), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + $isAnnounce = in_array(strtolower($isAnnounce), array('false', 'off', '-', 'no', 'n', '0', ''), true) ? false : true; } $this->addUsingAlias(DevtrackerTableMap::COL_IS_ANNOUNCE, $isAnnounce, $comparison); @@ -697,7 +696,7 @@ public function filterByIsAnnounce($isAnnounce = null, ?string $comparison = nul public function filterByIsClosed($isClosed = null, ?string $comparison = null) { if (is_string($isClosed)) { - $isClosed = in_array(strtolower($isClosed), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true; + $isClosed = in_array(strtolower($isClosed), array('false', 'off', '-', 'no', 'n', '0', ''), true) ? false : true; } $this->addUsingAlias(DevtrackerTableMap::COL_IS_CLOSED, $isClosed, $comparison); diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Map/DevtrackerTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Map/DevtrackerTableMap.php index 527319b..e229aad 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Map/DevtrackerTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Devtracker/Map/DevtrackerTableMap.php @@ -45,6 +45,11 @@ class DevtrackerTableMap extends TableMap */ public const TABLE_NAME = 'devtracker'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'Devtracker'; + /** * The related Propel class for this table */ @@ -396,7 +401,7 @@ public static function populateObject(array $row, int $offset = 0, string $index DevtrackerTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Settings/Base/Settings.php b/src/Schema/generated-classes/App/Schema/Crawl/Settings/Base/Settings.php index 07b35fe..94d940b 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Settings/Base/Settings.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Settings/Base/Settings.php @@ -410,8 +410,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : SettingsTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]; $this->value = (null !== $col) ? (string) $col : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -635,9 +635,11 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'name': $stmt->bindValue($identifier, $this->name, PDO::PARAM_STR); + break; case 'value': $stmt->bindValue($identifier, $this->value, PDO::PARAM_STR); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Settings/Base/SettingsQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/Settings/Base/SettingsQuery.php index 657bed0..57019cf 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Settings/Base/SettingsQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Settings/Base/SettingsQuery.php @@ -15,9 +15,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'settings' table. - * - * + * Base class that represents a query for the `settings` table. * * @method ChildSettingsQuery orderByName($order = Criteria::ASC) Order by the name column * @method ChildSettingsQuery orderByValue($order = Criteria::ASC) Order by the value column @@ -37,8 +35,8 @@ * @method ChildSettings findOneOrCreate(?ConnectionInterface $con = null) Return the first ChildSettings matching the query, or a new ChildSettings object populated from the query conditions when no match is found * * @method ChildSettings|null findOneByName(string $name) Return the first ChildSettings filtered by the name column - * @method ChildSettings|null findOneByValue(string $value) Return the first ChildSettings filtered by the value column * - + * @method ChildSettings|null findOneByValue(string $value) Return the first ChildSettings filtered by the value column + * * @method ChildSettings requirePk($key, ?ConnectionInterface $con = null) Return the ChildSettings by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildSettings requireOne(?ConnectionInterface $con = null) Return the first ChildSettings matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -47,13 +45,14 @@ * * @method ChildSettings[]|Collection find(?ConnectionInterface $con = null) Return ChildSettings objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildSettings objects based on current ModelCriteria - * @method ChildSettings[]|Collection findByName(string $name) Return ChildSettings objects filtered by the name column - * @psalm-method Collection&\Traversable findByName(string $name) Return ChildSettings objects filtered by the name column - * @method ChildSettings[]|Collection findByValue(string $value) Return ChildSettings objects filtered by the value column - * @psalm-method Collection&\Traversable findByValue(string $value) Return ChildSettings objects filtered by the value column + * + * @method ChildSettings[]|Collection findByName(string|array $name) Return ChildSettings objects filtered by the name column + * @psalm-method Collection&\Traversable findByName(string|array $name) Return ChildSettings objects filtered by the name column + * @method ChildSettings[]|Collection findByValue(string|array $value) Return ChildSettings objects filtered by the value column + * @psalm-method Collection&\Traversable findByValue(string|array $value) Return ChildSettings objects filtered by the value column + * * @method ChildSettings[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class SettingsQuery extends ModelCriteria { diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Settings/Map/SettingsTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/Settings/Map/SettingsTableMap.php index dbf25fc..34d65ec 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Settings/Map/SettingsTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Settings/Map/SettingsTableMap.php @@ -45,6 +45,11 @@ class SettingsTableMap extends TableMap */ public const TABLE_NAME = 'settings'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'Settings'; + /** * The related Propel class for this table */ @@ -256,7 +261,7 @@ public static function populateObject(array $row, int $offset = 0, string $index SettingsTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Tag/Base/Tag.php b/src/Schema/generated-classes/App/Schema/Crawl/Tag/Base/Tag.php index 07d32f9..75edfc4 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Tag/Base/Tag.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Tag/Base/Tag.php @@ -486,8 +486,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : TagTableMap::translateFieldName('Term', TableMap::TYPE_PHPNAME, $indexType)]; $this->term = (null !== $col) ? (string) $col : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -813,9 +813,11 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'id': $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; case 'term': $stmt->bindValue($identifier, $this->term, PDO::PARAM_STR); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Tag/Base/TagQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/Tag/Base/TagQuery.php index 82aed5e..43abc4d 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Tag/Base/TagQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Tag/Base/TagQuery.php @@ -19,9 +19,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'tag' table. - * - * + * Base class that represents a query for the `tag` table. * * @method ChildTagQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildTagQuery orderByTerm($order = Criteria::ASC) Order by the term column @@ -63,8 +61,8 @@ * @method ChildTag findOneOrCreate(?ConnectionInterface $con = null) Return the first ChildTag matching the query, or a new ChildTag object populated from the query conditions when no match is found * * @method ChildTag|null findOneById(int $id) Return the first ChildTag filtered by the id column - * @method ChildTag|null findOneByTerm(string $term) Return the first ChildTag filtered by the term column * - + * @method ChildTag|null findOneByTerm(string $term) Return the first ChildTag filtered by the term column + * * @method ChildTag requirePk($key, ?ConnectionInterface $con = null) Return the ChildTag by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildTag requireOne(?ConnectionInterface $con = null) Return the first ChildTag matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -73,13 +71,14 @@ * * @method ChildTag[]|Collection find(?ConnectionInterface $con = null) Return ChildTag objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildTag objects based on current ModelCriteria - * @method ChildTag[]|Collection findById(int $id) Return ChildTag objects filtered by the id column - * @psalm-method Collection&\Traversable findById(int $id) Return ChildTag objects filtered by the id column - * @method ChildTag[]|Collection findByTerm(string $term) Return ChildTag objects filtered by the term column - * @psalm-method Collection&\Traversable findByTerm(string $term) Return ChildTag objects filtered by the term column + * + * @method ChildTag[]|Collection findById(int|array $id) Return ChildTag objects filtered by the id column + * @psalm-method Collection&\Traversable findById(int|array $id) Return ChildTag objects filtered by the id column + * @method ChildTag[]|Collection findByTerm(string|array $term) Return ChildTag objects filtered by the term column + * @psalm-method Collection&\Traversable findByTerm(string|array $term) Return ChildTag objects filtered by the term column + * * @method ChildTag[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class TagQuery extends ModelCriteria { @@ -443,20 +442,23 @@ public function withContentTagQuery( return $this; } + /** * Use the ContentTag relation to the ArticleContentTags table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery The inner query object of the EXISTS statement */ public function useContentTagExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('ContentTag', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery */ + $q = $this->useExistsQuery('ContentTag', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -471,8 +473,46 @@ public function useContentTagExistsQuery($modelAlias = null, $queryClass = null, */ public function useContentTagNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('ContentTag', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery */ + $q = $this->useExistsQuery('ContentTag', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; + } + + /** + * Use the ContentTag relation to the ArticleContentTags table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery The inner query object of the IN statement + */ + public function useInContentTagQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery */ + $q = $this->useInQuery('ContentTag', $modelAlias, $queryClass, $typeOfIn); + return $q; } + + /** + * Use the ContentTag relation to the ArticleContentTags table for a NOT IN query. + * + * @see useContentTagInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery The inner query object of the NOT IN statement + */ + public function useNotInContentTagQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\ArticleContentTags\ArticleContentTagsQuery */ + $q = $this->useInQuery('ContentTag', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Filter the query by a related \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTags object * @@ -575,20 +615,23 @@ public function withTitleTagQuery( return $this; } + /** * Use the TitleTag relation to the ArticleTitleTags table for an EXISTS query. * * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useExistsQuery() * - * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class * @param string|null $modelAlias sets an alias for the nested query - * @param string $typeOfExists Either ExistsCriterion::TYPE_EXISTS or ExistsCriterion::TYPE_NOT_EXISTS + * @param string|null $queryClass Allows to use a custom query class for the exists query, like ExtendedBookQuery::class + * @param string $typeOfExists Either ExistsQueryCriterion::TYPE_EXISTS or ExistsQueryCriterion::TYPE_NOT_EXISTS * * @return \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery The inner query object of the EXISTS statement */ public function useTitleTagExistsQuery($modelAlias = null, $queryClass = null, $typeOfExists = 'EXISTS') { - return $this->useExistsQuery('TitleTag', $modelAlias, $queryClass, $typeOfExists); + /** @var $q \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery */ + $q = $this->useExistsQuery('TitleTag', $modelAlias, $queryClass, $typeOfExists); + return $q; } /** @@ -603,18 +646,56 @@ public function useTitleTagExistsQuery($modelAlias = null, $queryClass = null, $ */ public function useTitleTagNotExistsQuery($modelAlias = null, $queryClass = null) { - return $this->useExistsQuery('TitleTag', $modelAlias, $queryClass, 'NOT EXISTS'); + /** @var $q \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery */ + $q = $this->useExistsQuery('TitleTag', $modelAlias, $queryClass, 'NOT EXISTS'); + return $q; } + + /** + * Use the TitleTag relation to the ArticleTitleTags table for an IN query. + * + * @see \Propel\Runtime\ActiveQuery\ModelCriteria::useInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the IN query, like ExtendedBookQuery::class + * @param string $typeOfIn Criteria::IN or Criteria::NOT_IN + * + * @return \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery The inner query object of the IN statement + */ + public function useInTitleTagQuery($modelAlias = null, $queryClass = null, $typeOfIn = 'IN') + { + /** @var $q \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery */ + $q = $this->useInQuery('TitleTag', $modelAlias, $queryClass, $typeOfIn); + return $q; + } + + /** + * Use the TitleTag relation to the ArticleTitleTags table for a NOT IN query. + * + * @see useTitleTagInQuery() + * + * @param string|null $modelAlias sets an alias for the nested query + * @param string|null $queryClass Allows to use a custom query class for the NOT IN query, like ExtendedBookQuery::class + * + * @return \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery The inner query object of the NOT IN statement + */ + public function useNotInTitleTagQuery($modelAlias = null, $queryClass = null) + { + /** @var $q \App\Schema\Crawl\ArticleTitleTags\ArticleTitleTagsQuery */ + $q = $this->useInQuery('TitleTag', $modelAlias, $queryClass, 'NOT IN'); + return $q; + } + /** * Filter the query by a related Article object * using the article_tags table as cross reference * * @param Article $article the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL and Criteria::IN for queries * * @return $this The current query, for fluid interface */ - public function filterByContentArticle($article, string $comparison = Criteria::EQUAL) + public function filterByContentArticle($article, string $comparison = null) { $this ->useContentTagQuery() @@ -629,11 +710,11 @@ public function filterByContentArticle($article, string $comparison = Criteria:: * using the article_title_tags table as cross reference * * @param Article $article the related object to use as filter - * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL and Criteria::IN for queries * * @return $this The current query, for fluid interface */ - public function filterByTitleArticle($article, string $comparison = Criteria::EQUAL) + public function filterByTitleArticle($article, string $comparison = null) { $this ->useTitleTagQuery() diff --git a/src/Schema/generated-classes/App/Schema/Crawl/Tag/Map/TagTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/Tag/Map/TagTableMap.php index ee12e84..550758a 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/Tag/Map/TagTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/Tag/Map/TagTableMap.php @@ -45,6 +45,11 @@ class TagTableMap extends TableMap */ public const TABLE_NAME = 'tag'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'Tag'; + /** * The related Propel class for this table */ @@ -272,7 +277,7 @@ public static function populateObject(array $row, int $offset = 0, string $index TagTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-classes/App/Schema/Crawl/User/Base/User.php b/src/Schema/generated-classes/App/Schema/Crawl/User/Base/User.php index 39dcd31..c2d7388 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/User/Base/User.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/User/Base/User.php @@ -450,8 +450,8 @@ public function hydrate(array $row, int $startcol = 0, bool $rehydrate = false, $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : UserTableMap::translateFieldName('Password', TableMap::TYPE_PHPNAME, $indexType)]; $this->password = (null !== $col) ? (string) $col : null; - $this->resetModified(); + $this->resetModified(); $this->setNew(false); if ($rehydrate) { @@ -682,12 +682,15 @@ protected function doInsert(ConnectionInterface $con): void switch ($columnName) { case 'id': $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; case 'username': $stmt->bindValue($identifier, $this->username, PDO::PARAM_STR); + break; case 'password': $stmt->bindValue($identifier, $this->password, PDO::PARAM_STR); + break; } } diff --git a/src/Schema/generated-classes/App/Schema/Crawl/User/Base/UserQuery.php b/src/Schema/generated-classes/App/Schema/Crawl/User/Base/UserQuery.php index 1188405..c07c208 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/User/Base/UserQuery.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/User/Base/UserQuery.php @@ -15,9 +15,7 @@ use Propel\Runtime\Exception\PropelException; /** - * Base class that represents a query for the 'user' table. - * - * + * Base class that represents a query for the `user` table. * * @method ChildUserQuery orderById($order = Criteria::ASC) Order by the id column * @method ChildUserQuery orderByUsername($order = Criteria::ASC) Order by the username column @@ -40,8 +38,8 @@ * * @method ChildUser|null findOneById(int $id) Return the first ChildUser filtered by the id column * @method ChildUser|null findOneByUsername(string $username) Return the first ChildUser filtered by the username column - * @method ChildUser|null findOneByPassword(string $password) Return the first ChildUser filtered by the password column * - + * @method ChildUser|null findOneByPassword(string $password) Return the first ChildUser filtered by the password column + * * @method ChildUser requirePk($key, ?ConnectionInterface $con = null) Return the ChildUser by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @method ChildUser requireOne(?ConnectionInterface $con = null) Return the first ChildUser matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found * @@ -51,15 +49,16 @@ * * @method ChildUser[]|Collection find(?ConnectionInterface $con = null) Return ChildUser objects based on current ModelCriteria * @psalm-method Collection&\Traversable find(?ConnectionInterface $con = null) Return ChildUser objects based on current ModelCriteria - * @method ChildUser[]|Collection findById(int $id) Return ChildUser objects filtered by the id column - * @psalm-method Collection&\Traversable findById(int $id) Return ChildUser objects filtered by the id column - * @method ChildUser[]|Collection findByUsername(string $username) Return ChildUser objects filtered by the username column - * @psalm-method Collection&\Traversable findByUsername(string $username) Return ChildUser objects filtered by the username column - * @method ChildUser[]|Collection findByPassword(string $password) Return ChildUser objects filtered by the password column - * @psalm-method Collection&\Traversable findByPassword(string $password) Return ChildUser objects filtered by the password column + * + * @method ChildUser[]|Collection findById(int|array $id) Return ChildUser objects filtered by the id column + * @psalm-method Collection&\Traversable findById(int|array $id) Return ChildUser objects filtered by the id column + * @method ChildUser[]|Collection findByUsername(string|array $username) Return ChildUser objects filtered by the username column + * @psalm-method Collection&\Traversable findByUsername(string|array $username) Return ChildUser objects filtered by the username column + * @method ChildUser[]|Collection findByPassword(string|array $password) Return ChildUser objects filtered by the password column + * @psalm-method Collection&\Traversable findByPassword(string|array $password) Return ChildUser objects filtered by the password column + * * @method ChildUser[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit - * */ abstract class UserQuery extends ModelCriteria { diff --git a/src/Schema/generated-classes/App/Schema/Crawl/User/Map/UserTableMap.php b/src/Schema/generated-classes/App/Schema/Crawl/User/Map/UserTableMap.php index 3230361..4fd4b08 100644 --- a/src/Schema/generated-classes/App/Schema/Crawl/User/Map/UserTableMap.php +++ b/src/Schema/generated-classes/App/Schema/Crawl/User/Map/UserTableMap.php @@ -45,6 +45,11 @@ class UserTableMap extends TableMap */ public const TABLE_NAME = 'user'; + /** + * The PHP name of this class (PascalCase) + */ + public const TABLE_PHP_NAME = 'User'; + /** * The related Propel class for this table */ @@ -268,7 +273,7 @@ public static function populateObject(array $row, int $offset = 0, string $index UserTableMap::addInstanceToPool($obj, $key); } - return array($obj, $col); + return [$obj, $col]; } /** diff --git a/src/Schema/generated-conf/loadDatabase.php b/src/Schema/generated-conf/loadDatabase.php index 7a4ef29..608d763 100644 --- a/src/Schema/generated-conf/loadDatabase.php +++ b/src/Schema/generated-conf/loadDatabase.php @@ -1,18 +1,35 @@ initDatabaseMaps(array ( +$serviceContainer->initDatabaseMapFromDumps(array ( 'crawl' => array ( - 0 => '\\App\\Schema\\Crawl\\ArticleContentTags\\Map\\ArticleContentTagsTableMap', - 1 => '\\App\\Schema\\Crawl\\ArticleTitleTags\\Map\\ArticleTitleTagsTableMap', - 2 => '\\App\\Schema\\Crawl\\Article\\Map\\ArticleTableMap', - 3 => '\\App\\Schema\\Crawl\\AuctionAggregates\\Map\\AuctionAggregatesTableMap', - 4 => '\\App\\Schema\\Crawl\\AuctionCrawlLog\\Map\\AuctionCrawlLogTableMap', - 5 => '\\App\\Schema\\Crawl\\AuctionDetails\\Map\\AuctionDetailsTableMap', - 6 => '\\App\\Schema\\Crawl\\AuctionItems\\Map\\AuctionItemsTableMap', - 7 => '\\App\\Schema\\Crawl\\Devtracker\\Map\\DevtrackerTableMap', - 8 => '\\App\\Schema\\Crawl\\Settings\\Map\\SettingsTableMap', - 9 => '\\App\\Schema\\Crawl\\Tag\\Map\\TagTableMap', - 10 => '\\App\\Schema\\Crawl\\User\\Map\\UserTableMap', + 'tablesByName' => + array ( + 'article' => '\\App\\Schema\\Crawl\\Article\\Map\\ArticleTableMap', + 'article_tags' => '\\App\\Schema\\Crawl\\ArticleContentTags\\Map\\ArticleContentTagsTableMap', + 'article_title_tags' => '\\App\\Schema\\Crawl\\ArticleTitleTags\\Map\\ArticleTitleTagsTableMap', + 'auction_aggregates' => '\\App\\Schema\\Crawl\\AuctionAggregates\\Map\\AuctionAggregatesTableMap', + 'auction_crawl_log' => '\\App\\Schema\\Crawl\\AuctionCrawlLog\\Map\\AuctionCrawlLogTableMap', + 'auction_details' => '\\App\\Schema\\Crawl\\AuctionDetails\\Map\\AuctionDetailsTableMap', + 'auction_items' => '\\App\\Schema\\Crawl\\AuctionItems\\Map\\AuctionItemsTableMap', + 'devtracker' => '\\App\\Schema\\Crawl\\Devtracker\\Map\\DevtrackerTableMap', + 'settings' => '\\App\\Schema\\Crawl\\Settings\\Map\\SettingsTableMap', + 'tag' => '\\App\\Schema\\Crawl\\Tag\\Map\\TagTableMap', + 'user' => '\\App\\Schema\\Crawl\\User\\Map\\UserTableMap', + ), + 'tablesByPhpName' => + array ( + '\\Article' => '\\App\\Schema\\Crawl\\Article\\Map\\ArticleTableMap', + '\\ArticleContentTags' => '\\App\\Schema\\Crawl\\ArticleContentTags\\Map\\ArticleContentTagsTableMap', + '\\ArticleTitleTags' => '\\App\\Schema\\Crawl\\ArticleTitleTags\\Map\\ArticleTitleTagsTableMap', + '\\AuctionAggregates' => '\\App\\Schema\\Crawl\\AuctionAggregates\\Map\\AuctionAggregatesTableMap', + '\\AuctionCrawlLog' => '\\App\\Schema\\Crawl\\AuctionCrawlLog\\Map\\AuctionCrawlLogTableMap', + '\\AuctionDetails' => '\\App\\Schema\\Crawl\\AuctionDetails\\Map\\AuctionDetailsTableMap', + '\\AuctionItems' => '\\App\\Schema\\Crawl\\AuctionItems\\Map\\AuctionItemsTableMap', + '\\Devtracker' => '\\App\\Schema\\Crawl\\Devtracker\\Map\\DevtrackerTableMap', + '\\Settings' => '\\App\\Schema\\Crawl\\Settings\\Map\\SettingsTableMap', + '\\Tag' => '\\App\\Schema\\Crawl\\Tag\\Map\\TagTableMap', + '\\User' => '\\App\\Schema\\Crawl\\User\\Map\\UserTableMap', + ), ), )); diff --git a/src/Services/DB.php b/src/Services/DB.php index ff3c5a4..7b01053 100644 --- a/src/Services/DB.php +++ b/src/Services/DB.php @@ -14,19 +14,19 @@ private function checkConnection() } } - public function connect(String $configSetIdent = "NWOUN") + public function connect(string $configSetIdent = "NWOUN") { $servername = $_ENV['MYSQL_SERVERNAME_' . $configSetIdent]; $username = $_ENV['MYSQL_USERNAME_' . $configSetIdent]; $password = $_ENV['MYSQL_PASSWORD_' . $configSetIdent]; try { $this->connection = new \mysqli($servername, $username, $password); - } catch (Exception $e) { + } catch (\Exception $e) { $this->error = true; } // Check connection - if ($conn->connect_error) { + if ($this->connection->connect_error) { $this->error = true; } else { $this->connection->select_db($_ENV['MYSQL_DB_' . $configSetIdent]); @@ -34,7 +34,7 @@ public function connect(String $configSetIdent = "NWOUN") } } - public function escape(String $s) + public function escape(string $s) { $this->checkConnection(); return $this->connection->real_escape_string($s); @@ -47,7 +47,7 @@ public function escape(String $s) * * @return Array */ - public function sql_fetch_array(String $query) :array + public function sql_fetch_array(string $query): array { $this->checkConnection(); $result = $this->connection->query($query); @@ -59,7 +59,7 @@ public function sql_fetch_array(String $query) :array return $results_ary; } - public function query(String $sql) + public function query(string $sql) { $this->checkConnection(); return $this->connection->query($sql);