diff --git a/composer.lock b/composer.lock index 7e465ff..13fbc5b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,33 +4,33 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "91c8becfcc4e28fd439184a6c94a6e88", + "content-hash": "05beb2d3b4bdb5cc6a18c8ba21582853", "packages": [ { "name": "nette/caching", - "version": "v3.1.4", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/nette/caching.git", - "reference": "e1e38105956bb631e2295ef7a2fdef83485238e9" + "reference": "ceb814d7f0a2bb4eb5afbe908467801001187745" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/caching/zipball/e1e38105956bb631e2295ef7a2fdef83485238e9", - "reference": "e1e38105956bb631e2295ef7a2fdef83485238e9", + "url": "https://api.github.com/repos/nette/caching/zipball/ceb814d7f0a2bb4eb5afbe908467801001187745", + "reference": "ceb814d7f0a2bb4eb5afbe908467801001187745", "shasum": "" }, "require": { "nette/finder": "^2.4 || ^3.0", - "nette/utils": "^2.4 || ^3.0", - "php": ">=7.2 <8.3" + "nette/utils": "^3.2 || ~4.0.0", + "php": ">=8.0 <8.3" }, "require-dev": { "latte/latte": "^2.11 || ^3.0", - "nette/di": "^v3.0", - "nette/tester": "^2.0", - "phpstan/phpstan": "^0.12", - "tracy/tracy": "^2.4" + "nette/di": "^3.1 || ^4.0", + "nette/tester": "^2.4", + "phpstan/phpstan": "^1.0", + "tracy/tracy": "^2.9" }, "suggest": { "ext-pdo_sqlite": "to use SQLiteStorage or SQLiteJournal" @@ -38,7 +38,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -73,9 +73,9 @@ ], "support": { "issues": "https://github.com/nette/caching/issues", - "source": "https://github.com/nette/caching/tree/v3.1.4" + "source": "https://github.com/nette/caching/tree/v3.2.2" }, - "time": "2022-10-18T23:27:44+00:00" + "time": "2023-02-04T13:52:33+00:00" }, { "name": "nette/database", @@ -228,41 +228,27 @@ }, { "name": "nette/finder", - "version": "v2.6.0", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/nette/finder.git", - "reference": "991aefb42860abeab8e003970c3809a9d83cb932" + "reference": "027395c638637de95c8e9fad49a7c51249404ed2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/finder/zipball/991aefb42860abeab8e003970c3809a9d83cb932", - "reference": "991aefb42860abeab8e003970c3809a9d83cb932", + "url": "https://api.github.com/repos/nette/finder/zipball/027395c638637de95c8e9fad49a7c51249404ed2", + "reference": "027395c638637de95c8e9fad49a7c51249404ed2", "shasum": "" }, "require": { - "nette/utils": "^2.4 || ^3.0", - "php": ">=7.1" - }, - "conflict": { - "nette/nette": "<2.2" - }, - "require-dev": { - "nette/tester": "^2.0", - "phpstan/phpstan": "^0.12", - "tracy/tracy": "^2.3" + "nette/utils": "^4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "3.0-dev" } }, - "autoload": { - "classmap": [ - "src/" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause", @@ -289,31 +275,31 @@ ], "support": { "issues": "https://github.com/nette/finder/issues", - "source": "https://github.com/nette/finder/tree/v2.6.0" + "source": "https://github.com/nette/finder/tree/v3.0.0" }, - "time": "2022-10-13T01:31:15+00:00" + "time": "2022-12-14T17:05:54+00:00" }, { "name": "nette/neon", - "version": "v3.3.3", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95" + "reference": "372d945c156ee7f35c953339fb164538339e6283" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/22e384da162fab42961d48eb06c06d3ad0c11b95", - "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95", + "url": "https://api.github.com/repos/nette/neon/zipball/372d945c156ee7f35c953339fb164538339e6283", + "reference": "372d945c156ee7f35c953339fb164538339e6283", "shasum": "" }, "require": { "ext-json": "*", - "php": ">=7.1" + "php": ">=8.0 <8.3" }, "require-dev": { - "nette/tester": "^2.0", - "phpstan/phpstan": "^0.12", + "nette/tester": "^2.4", + "phpstan/phpstan": "^1.0", "tracy/tracy": "^2.7" }, "bin": [ @@ -322,7 +308,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -357,29 +343,30 @@ ], "support": { "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.3.3" + "source": "https://github.com/nette/neon/tree/v3.4.0" }, - "time": "2022-03-10T02:04:26+00:00" + "time": "2023-01-13T03:08:29+00:00" }, { "name": "nette/php-generator", - "version": "v3.6.9", + "version": "v4.0.8", "source": { "type": "git", "url": "https://github.com/nette/php-generator.git", - "reference": "d31782f7bd2ae84ad06f863391ec3fb77ca4d0a6" + "reference": "d9157df8463b198dcbcd9f979fb09a9367c7fe99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/php-generator/zipball/d31782f7bd2ae84ad06f863391ec3fb77ca4d0a6", - "reference": "d31782f7bd2ae84ad06f863391ec3fb77ca4d0a6", + "url": "https://api.github.com/repos/nette/php-generator/zipball/d9157df8463b198dcbcd9f979fb09a9367c7fe99", + "reference": "d9157df8463b198dcbcd9f979fb09a9367c7fe99", "shasum": "" }, "require": { - "nette/utils": "^3.1.2", - "php": ">=7.2 <8.3" + "nette/utils": "^3.2.9 || ^4.0", + "php": ">=8.0 <8.4" }, "require-dev": { + "jetbrains/phpstorm-attributes": "dev-master", "nette/tester": "^2.4", "nikic/php-parser": "^4.15", "phpstan/phpstan": "^1.0", @@ -425,39 +412,38 @@ ], "support": { "issues": "https://github.com/nette/php-generator/issues", - "source": "https://github.com/nette/php-generator/tree/v3.6.9" + "source": "https://github.com/nette/php-generator/tree/v4.0.8" }, - "time": "2022-10-04T11:49:47+00:00" + "time": "2023-07-30T12:05:00+00:00" }, { "name": "nette/robot-loader", - "version": "v3.4.2", + "version": "v4.0.0", "source": { "type": "git", "url": "https://github.com/nette/robot-loader.git", - "reference": "970c8f82be98ec54180c88a468cd2b057855d993" + "reference": "2970fc5a7ba858d996801df3af68005ca51f26a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/robot-loader/zipball/970c8f82be98ec54180c88a468cd2b057855d993", - "reference": "970c8f82be98ec54180c88a468cd2b057855d993", + "url": "https://api.github.com/repos/nette/robot-loader/zipball/2970fc5a7ba858d996801df3af68005ca51f26a9", + "reference": "2970fc5a7ba858d996801df3af68005ca51f26a9", "shasum": "" }, "require": { "ext-tokenizer": "*", - "nette/finder": "^2.5 || ^3.0", - "nette/utils": "^3.0", - "php": ">=7.1" + "nette/utils": "^4.0", + "php": ">=8.0 <8.3" }, "require-dev": { - "nette/tester": "^2.0", - "phpstan/phpstan": "^0.12", - "tracy/tracy": "^2.3" + "nette/tester": "^2.4", + "phpstan/phpstan": "^1.0", + "tracy/tracy": "^2.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -492,9 +478,9 @@ ], "support": { "issues": "https://github.com/nette/robot-loader/issues", - "source": "https://github.com/nette/robot-loader/tree/v3.4.2" + "source": "https://github.com/nette/robot-loader/tree/v4.0.0" }, - "time": "2022-12-14T15:41:06+00:00" + "time": "2023-01-18T04:17:49+00:00" }, { "name": "nette/schema", @@ -560,29 +546,30 @@ }, { "name": "nette/utils", - "version": "v3.2.9", + "version": "v4.0.1", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "c91bac3470c34b2ecd5400f6e6fdf0b64a836a5c" + "reference": "9124157137da01b1f5a5a22d6486cb975f26db7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/c91bac3470c34b2ecd5400f6e6fdf0b64a836a5c", - "reference": "c91bac3470c34b2ecd5400f6e6fdf0b64a836a5c", + "url": "https://api.github.com/repos/nette/utils/zipball/9124157137da01b1f5a5a22d6486cb975f26db7e", + "reference": "9124157137da01b1f5a5a22d6486cb975f26db7e", "shasum": "" }, "require": { - "php": ">=7.2 <8.3" + "php": ">=8.0 <8.4" }, "conflict": { - "nette/di": "<3.0.6" + "nette/finder": "<3", + "nette/schema": "<1.2.2" }, "require-dev": { "jetbrains/phpstorm-attributes": "dev-master", - "nette/tester": "~2.0", + "nette/tester": "^2.5", "phpstan/phpstan": "^1.0", - "tracy/tracy": "^2.3" + "tracy/tracy": "^2.9" }, "suggest": { "ext-gd": "to use Image", @@ -596,7 +583,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -640,28 +627,28 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v3.2.9" + "source": "https://github.com/nette/utils/tree/v4.0.1" }, - "time": "2023-01-18T03:26:20+00:00" + "time": "2023-07-30T15:42:21+00:00" } ], "packages-dev": [ { "name": "nette/tester", - "version": "v2.4.3", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/nette/tester.git", - "reference": "451f6e97b117797e817446de8d19fe06e54fd33f" + "reference": "92ad30ca60ac1e27f0c7e48b8b4e4ff1395c00c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/tester/zipball/451f6e97b117797e817446de8d19fe06e54fd33f", - "reference": "451f6e97b117797e817446de8d19fe06e54fd33f", + "url": "https://api.github.com/repos/nette/tester/zipball/92ad30ca60ac1e27f0c7e48b8b4e4ff1395c00c0", + "reference": "92ad30ca60ac1e27f0c7e48b8b4e4ff1395c00c0", "shasum": "" }, "require": { - "php": ">=7.2 <8.3" + "php": ">=8.0 <8.4" }, "require-dev": { "ext-simplexml": "*", @@ -673,7 +660,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "2.5-dev" } }, "autoload": { @@ -717,9 +704,9 @@ ], "support": { "issues": "https://github.com/nette/tester/issues", - "source": "https://github.com/nette/tester/tree/v2.4.3" + "source": "https://github.com/nette/tester/tree/v2.5.1" }, - "time": "2022-08-29T16:39:38+00:00" + "time": "2023-07-30T10:24:11+00:00" }, { "name": "phpstan/phpstan", @@ -785,16 +772,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.1", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" + "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625", + "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625", "shasum": "" }, "require": { @@ -837,7 +824,7 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2022-06-18T07:21:10+00:00" + "time": "2021-04-09T00:54:41+00:00" } ], "aliases": [], diff --git a/tests/ORM/EventService.php b/tests/ORM/EventService.php index 6f60751..ef5f945 100644 --- a/tests/ORM/EventService.php +++ b/tests/ORM/EventService.php @@ -6,6 +6,9 @@ use Fykosak\NetteORM\Service; +/** + * @phpstan-extends Service + */ class EventService extends Service { } diff --git a/tests/ORM/ParticipantModel.php b/tests/ORM/ParticipantModel.php index fa9c830..a361c76 100644 --- a/tests/ORM/ParticipantModel.php +++ b/tests/ORM/ParticipantModel.php @@ -7,8 +7,8 @@ use Fykosak\NetteORM\Model; /** - * @property-read EventModel event - * @property-read ParticipantStatus status + * @property-read EventModel $event + * @property-read ParticipantStatus $status */ class ParticipantModel extends Model { diff --git a/tests/ORM/ParticipantService.php b/tests/ORM/ParticipantService.php index af1bb8d..6bc16e1 100644 --- a/tests/ORM/ParticipantService.php +++ b/tests/ORM/ParticipantService.php @@ -6,6 +6,9 @@ use Fykosak\NetteORM\Service; +/** + * @phpstan-extends Service + */ class ParticipantService extends Service { }