diff --git a/composer.json b/composer.json index f5b229d..37222ff 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "fykosak/nette-frontend-component", "require": { "php": "8.1.*", - "fykosak/nette-fks-utils": "*", + "fykosak/nette-fks-utils": "dev-master#57491d0", "nette/application": "^v3.1.0", "nette/forms": "^3.1.0" }, diff --git a/composer.lock b/composer.lock index df83fb7..02e858f 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": "78537ff33653caec783ea718bb47e9bc", + "content-hash": "843d4828333b8bb2af30bee2ba4276ed", "packages": [ { "name": "fykosak/nette-fks-utils", @@ -12,12 +12,12 @@ "source": { "type": "git", "url": "https://github.com/fykosak/nette-fks-utils.git", - "reference": "4054d9ff" + "reference": "57491d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fykosak/nette-fks-utils/zipball/4054d9ff", - "reference": "4054d9ff", + "url": "https://api.github.com/repos/fykosak/nette-fks-utils/zipball/57491d0", + "reference": "57491d0", "shasum": "" }, "require": { @@ -30,11 +30,11 @@ "nette/forms": "^v3.1.0", "nette/http": "^v3.1.0", "nette/utils": "^v3.2.0", - "php": "7.4.* | 8.0.* | 8.1.* " + "php": "8.1.*" }, "require-dev": { "nette/tester": "^v2.4.0", - "squizlabs/php_codesniffer": "3.6.0" + "squizlabs/php_codesniffer": "3.7.1" }, "default-branch": true, "type": "library", @@ -56,22 +56,22 @@ ], "support": { "issues": "https://github.com/fykosak/nette-fks-utils/issues", - "source": "https://github.com/fykosak/nette-fks-utils/tree/v0.1.0-RC2" + "source": "https://github.com/fykosak/nette-fks-utils/tree/master" }, - "time": "2022-01-11T17:04:47+00:00" + "time": "2022-10-19T20:43:50+00:00" }, { "name": "latte/latte", - "version": "v2.11.0", + "version": "v2.11.5", "source": { "type": "git", "url": "https://github.com/nette/latte.git", - "reference": "a815687bfadaf3af51ae99f92edb4ea310c43426" + "reference": "89e647e51213af8a270fe9903b8735a2f6c83ad1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/latte/zipball/a815687bfadaf3af51ae99f92edb4ea310c43426", - "reference": "a815687bfadaf3af51ae99f92edb4ea310c43426", + "url": "https://api.github.com/repos/nette/latte/zipball/89e647e51213af8a270fe9903b8735a2f6c83ad1", + "reference": "89e647e51213af8a270fe9903b8735a2f6c83ad1", "shasum": "" }, "require": { @@ -84,9 +84,9 @@ }, "require-dev": { "nette/php-generator": "^3.3.4", - "nette/tester": "~2.0", + "nette/tester": "^2.0", "nette/utils": "^3.0", - "phpstan/phpstan": "^0.12", + "phpstan/phpstan": "^1", "tracy/tracy": "^2.3" }, "suggest": { @@ -140,22 +140,22 @@ ], "support": { "issues": "https://github.com/nette/latte/issues", - "source": "https://github.com/nette/latte/tree/v2.11.0" + "source": "https://github.com/nette/latte/tree/v2.11.5" }, - "time": "2022-02-22T18:39:58+00:00" + "time": "2022-06-26T10:12:18+00:00" }, { "name": "nette/application", - "version": "v3.1.5", + "version": "v3.1.7", "source": { "type": "git", "url": "https://github.com/nette/application.git", - "reference": "fa5da6a90ff71724353568894a4839aec627eae3" + "reference": "a831a22c8291638624b39a673d40935c854371e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/application/zipball/fa5da6a90ff71724353568894a4839aec627eae3", - "reference": "fa5da6a90ff71724353568894a4839aec627eae3", + "url": "https://api.github.com/repos/nette/application/zipball/a831a22c8291638624b39a673d40935c854371e3", + "reference": "a831a22c8291638624b39a673d40935c854371e3", "shasum": "" }, "require": { @@ -166,7 +166,7 @@ "php": ">=7.2" }, "conflict": { - "latte/latte": "<2.7.1 || >=3.0", + "latte/latte": "<2.7.1 || >=3.1 || =3.0.0", "nette/caching": "<3.1", "nette/di": "<3.0.7", "nette/forms": "<3.0", @@ -174,7 +174,7 @@ "tracy/tracy": "<2.5" }, "require-dev": { - "latte/latte": "^2.10.2", + "latte/latte": "^2.10.2 || ^3.0.1", "mockery/mockery": "^1.0", "nette/di": "^v3.0", "nette/forms": "^3.0", @@ -231,9 +231,9 @@ ], "support": { "issues": "https://github.com/nette/application/issues", - "source": "https://github.com/nette/application/tree/v3.1.5" + "source": "https://github.com/nette/application/tree/v3.1.7" }, - "time": "2021-12-20T12:24:49+00:00" + "time": "2022-06-01T12:25:37+00:00" }, { "name": "nette/component-model", @@ -299,26 +299,26 @@ }, { "name": "nette/di", - "version": "v3.0.12", + "version": "v3.0.14", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "11c236b9f7bbfc5a95e7b24742ad8847936feeb5" + "reference": "9aba53b844f2f66ce4ebe37beffaa7119b3551d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/11c236b9f7bbfc5a95e7b24742ad8847936feeb5", - "reference": "11c236b9f7bbfc5a95e7b24742ad8847936feeb5", + "url": "https://api.github.com/repos/nette/di/zipball/9aba53b844f2f66ce4ebe37beffaa7119b3551d0", + "reference": "9aba53b844f2f66ce4ebe37beffaa7119b3551d0", "shasum": "" }, "require": { "ext-tokenizer": "*", - "nette/neon": "^3.3", - "nette/php-generator": "^3.5.4", + "nette/neon": "^3.3 || ^4.0", + "nette/php-generator": "^3.5.4 || ^4.0", "nette/robot-loader": "^3.2", "nette/schema": "^1.1", "nette/utils": "^3.1.6", - "php": ">=7.1 <8.2" + "php": ">=7.1 <8.3" }, "conflict": { "nette/bootstrap": "<3.0" @@ -368,22 +368,22 @@ ], "support": { "issues": "https://github.com/nette/di/issues", - "source": "https://github.com/nette/di/tree/v3.0.12" + "source": "https://github.com/nette/di/tree/v3.0.14" }, - "time": "2021-12-15T21:05:11+00:00" + "time": "2022-11-02T16:27:55+00:00" }, { "name": "nette/finder", - "version": "v2.5.3", + "version": "v2.5.4", "source": { "type": "git", "url": "https://github.com/nette/finder.git", - "reference": "64dc25b7929b731e72a1bc84a9e57727f5d5d3e8" + "reference": "4a1236db9067d86a75c3dcc0d9c2aced17f9bde8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/finder/zipball/64dc25b7929b731e72a1bc84a9e57727f5d5d3e8", - "reference": "64dc25b7929b731e72a1bc84a9e57727f5d5d3e8", + "url": "https://api.github.com/repos/nette/finder/zipball/4a1236db9067d86a75c3dcc0d9c2aced17f9bde8", + "reference": "4a1236db9067d86a75c3dcc0d9c2aced17f9bde8", "shasum": "" }, "require": { @@ -435,22 +435,22 @@ ], "support": { "issues": "https://github.com/nette/finder/issues", - "source": "https://github.com/nette/finder/tree/v2.5.3" + "source": "https://github.com/nette/finder/tree/v2.5.4" }, - "time": "2021-12-12T17:43:24+00:00" + "time": "2022-10-13T01:30:47+00:00" }, { "name": "nette/forms", - "version": "v3.1.6", + "version": "v3.1.7", "source": { "type": "git", "url": "https://github.com/nette/forms.git", - "reference": "4ed52434b61d7e532cb3bc77b048717703b91b0b" + "reference": "fe2109ce8b77846a5f664bc412c7cf3008f63074" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/forms/zipball/4ed52434b61d7e532cb3bc77b048717703b91b0b", - "reference": "4ed52434b61d7e532cb3bc77b048717703b91b0b", + "url": "https://api.github.com/repos/nette/forms/zipball/fe2109ce8b77846a5f664bc412c7cf3008f63074", + "reference": "fe2109ce8b77846a5f664bc412c7cf3008f63074", "shasum": "" }, "require": { @@ -460,11 +460,11 @@ "php": ">=7.2 <8.2" }, "conflict": { - "latte/latte": ">=3.0", + "latte/latte": ">=3.1", "nette/di": "<3.0-stable" }, "require-dev": { - "latte/latte": "^2.10.2", + "latte/latte": "^2.10.2 || ^3.0", "nette/application": "^3.0", "nette/di": "^3.0", "nette/tester": "^2.0", @@ -510,22 +510,22 @@ ], "support": { "issues": "https://github.com/nette/forms/issues", - "source": "https://github.com/nette/forms/tree/v3.1.6" + "source": "https://github.com/nette/forms/tree/v3.1.7" }, - "time": "2021-11-09T11:56:09+00:00" + "time": "2022-05-12T15:30:17+00:00" }, { "name": "nette/http", - "version": "v3.1.5", + "version": "v3.1.6", "source": { "type": "git", "url": "https://github.com/nette/http.git", - "reference": "8146c2f2a262691a7139f9c56007961dcc5c1f42" + "reference": "65bfe68f9c611e7cd1935a5f794a560c52e4614f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/http/zipball/8146c2f2a262691a7139f9c56007961dcc5c1f42", - "reference": "8146c2f2a262691a7139f9c56007961dcc5c1f42", + "url": "https://api.github.com/repos/nette/http/zipball/65bfe68f9c611e7cd1935a5f794a560c52e4614f", + "reference": "65bfe68f9c611e7cd1935a5f794a560c52e4614f", "shasum": "" }, "require": { @@ -588,22 +588,22 @@ ], "support": { "issues": "https://github.com/nette/http/issues", - "source": "https://github.com/nette/http/tree/v3.1.5" + "source": "https://github.com/nette/http/tree/v3.1.6" }, - "time": "2021-11-29T18:56:42+00:00" + "time": "2022-04-02T16:05:07+00:00" }, { "name": "nette/neon", - "version": "v3.3.2", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "54b287d8c2cdbe577b02e28ca1713e275b05ece2" + "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/54b287d8c2cdbe577b02e28ca1713e275b05ece2", - "reference": "54b287d8c2cdbe577b02e28ca1713e275b05ece2", + "url": "https://api.github.com/repos/nette/neon/zipball/22e384da162fab42961d48eb06c06d3ad0c11b95", + "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95", "shasum": "" }, "require": { @@ -656,41 +656,41 @@ ], "support": { "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.3.2" + "source": "https://github.com/nette/neon/tree/v3.3.3" }, - "time": "2021-11-25T15:57:41+00:00" + "time": "2022-03-10T02:04:26+00:00" }, { "name": "nette/php-generator", - "version": "v3.6.6", + "version": "v4.0.5", "source": { "type": "git", "url": "https://github.com/nette/php-generator.git", - "reference": "ad7d0a77f58260001bd263605eb2b9fbaf1d61a7" + "reference": "a8d6abeae5d8c7202cd69600e086a7a72877fc86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/php-generator/zipball/ad7d0a77f58260001bd263605eb2b9fbaf1d61a7", - "reference": "ad7d0a77f58260001bd263605eb2b9fbaf1d61a7", + "url": "https://api.github.com/repos/nette/php-generator/zipball/a8d6abeae5d8c7202cd69600e086a7a72877fc86", + "reference": "a8d6abeae5d8c7202cd69600e086a7a72877fc86", "shasum": "" }, "require": { - "nette/utils": "^3.1.2", - "php": ">=7.2 <8.2" + "nette/utils": "^3.2.7 || ^4.0", + "php": ">=8.0 <8.3" }, "require-dev": { "nette/tester": "^2.4", - "nikic/php-parser": "^4.13", - "phpstan/phpstan": "^0.12", + "nikic/php-parser": "^4.15", + "phpstan/phpstan": "^1.0", "tracy/tracy": "^2.8" }, "suggest": { - "nikic/php-parser": "to use ClassType::withBodiesFrom() & GlobalFunction::withBodyFrom()" + "nikic/php-parser": "to use ClassType::from(withBodies: true) & ClassType::fromCode()" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -714,7 +714,7 @@ "homepage": "https://nette.org/contributors" } ], - "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 8.1 features.", + "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 8.2 features.", "homepage": "https://nette.org", "keywords": [ "code", @@ -724,9 +724,9 @@ ], "support": { "issues": "https://github.com/nette/php-generator/issues", - "source": "https://github.com/nette/php-generator/tree/v3.6.6" + "source": "https://github.com/nette/php-generator/tree/v4.0.5" }, - "time": "2022-02-20T18:06:09+00:00" + "time": "2022-11-02T20:37:46+00:00" }, { "name": "nette/robot-loader", @@ -797,16 +797,16 @@ }, { "name": "nette/routing", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/nette/routing.git", - "reference": "5532e7e3612e13def357f089c1a5c25793a16843" + "reference": "5e02bdde257029db0223d3291c281d913abd587f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/routing/zipball/5532e7e3612e13def357f089c1a5c25793a16843", - "reference": "5532e7e3612e13def357f089c1a5c25793a16843", + "url": "https://api.github.com/repos/nette/routing/zipball/5e02bdde257029db0223d3291c281d913abd587f", + "reference": "5e02bdde257029db0223d3291c281d913abd587f", "shasum": "" }, "require": { @@ -816,7 +816,7 @@ }, "require-dev": { "nette/tester": "^2.0", - "phpstan/phpstan": "^0.12", + "phpstan/phpstan": "^1", "tracy/tracy": "^2.3" }, "type": "library", @@ -853,9 +853,9 @@ ], "support": { "issues": "https://github.com/nette/routing/issues", - "source": "https://github.com/nette/routing/tree/v3.0.2" + "source": "https://github.com/nette/routing/tree/v3.0.3" }, - "time": "2021-02-06T04:08:30+00:00" + "time": "2022-04-16T23:08:16+00:00" }, { "name": "nette/schema", @@ -921,20 +921,20 @@ }, { "name": "nette/utils", - "version": "v3.2.7", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99" + "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/0af4e3de4df9f1543534beab255ccf459e7a2c99", - "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99", + "url": "https://api.github.com/repos/nette/utils/zipball/02a54c4c872b99e4ec05c4aec54b5a06eb0f6368", + "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368", "shasum": "" }, "require": { - "php": ">=7.2 <8.2" + "php": ">=7.2 <8.3" }, "conflict": { "nette/di": "<3.0.6" @@ -1000,9 +1000,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v3.2.7" + "source": "https://github.com/nette/utils/tree/v3.2.8" }, - "time": "2022-01-24T11:29:14+00:00" + "time": "2022-09-12T23:36:20+00:00" } ], "packages-dev": [], @@ -1014,7 +1014,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.4" + "php": "8.1.*" }, "platform-dev": [], "plugin-api-version": "2.1.0" diff --git a/src/Components/FrontEndComponent.php b/src/Components/FrontEndComponent.php index b299daf..0193fce 100644 --- a/src/Components/FrontEndComponent.php +++ b/src/Components/FrontEndComponent.php @@ -4,11 +4,11 @@ namespace Fykosak\NetteFrontendComponent\Components; -use Fykosak\Utils\BaseComponent\BaseComponent; +use Fykosak\Utils\Components\DIComponent; use Nette\DI\Container; use Nette\Utils\Html; -abstract class FrontEndComponent extends BaseComponent +abstract class FrontEndComponent extends DIComponent { use FrontEndComponentTrait; diff --git a/src/Components/layout.latte b/src/Components/layout.latte index 92cc478..9640f34 100644 --- a/src/Components/layout.latte +++ b/src/Components/layout.latte @@ -1,4 +1,4 @@ -{layout dirname((new \ReflectionClass(Fykosak\Utils\BaseComponent\BaseComponent::class))->getFileName()) . '/@layout.latte'} +{layout dirname((new \ReflectionClass(Fykosak\Utils\Components\DIComponent::class))->getFileName()) . '/@layout.latte'} {varType \Nette\Utils\Html $html} {block content} {$html}