diff --git a/app-test/_includes/AppTest.php b/app-test/_includes/AppTest.php index 9f94b12..a7ef42f 100644 --- a/app-test/_includes/AppTest.php +++ b/app-test/_includes/AppTest.php @@ -11,8 +11,8 @@ use Fohn\Ui\Component\Navigation\Group; use Fohn\Ui\Component\Navigation\Item; use Fohn\Ui\Page; +use Fohn\Ui\Page\Layout\SideNavigation; use Fohn\Ui\Page\Package; -use Fohn\Ui\PageLayout\SideNavigation; use Fohn\Ui\Service\Ui; use Fohn\Ui\Tailwind\Tw; use Fohn\Ui\View; diff --git a/app-test/interactive/virtual.php b/app-test/interactive/virtual.php index f265bfb..025123d 100644 --- a/app-test/interactive/virtual.php +++ b/app-test/interactive/virtual.php @@ -8,7 +8,7 @@ use Fohn\Ui\Js\Jquery; use Fohn\Ui\Js\JsReload; use Fohn\Ui\Page; -use Fohn\Ui\PageLayout\Layout; +use Fohn\Ui\Page\Layout; use Fohn\Ui\Service\Ui; use Fohn\Ui\View; use Fohn\Ui\View\Button; diff --git a/composer.lock b/composer.lock index 84aa7d8..102bea2 100644 --- a/composer.lock +++ b/composer.lock @@ -804,16 +804,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.13.3", + "version": "1.13.4", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "faed855a7b5f4d4637717c2b3863e277116beb36" + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/faed855a7b5f4d4637717c2b3863e277116beb36", - "reference": "faed855a7b5f4d4637717c2b3863e277116beb36", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a", "shasum": "" }, "require": { @@ -852,7 +852,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.13.3" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4" }, "funding": [ { @@ -860,7 +860,7 @@ "type": "tidelift" } ], - "time": "2025-07-05T12:25:42+00:00" + "time": "2025-08-01T08:46:24+00:00" }, { "name": "psr/cache", @@ -1693,16 +1693,16 @@ }, { "name": "symfony/yaml", - "version": "v6.4.23", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "93e29e0deb5f1b2e360adfb389a20d25eb81a27b" + "reference": "742a8efc94027624b36b10ba58e23d402f961f51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/93e29e0deb5f1b2e360adfb389a20d25eb81a27b", - "reference": "93e29e0deb5f1b2e360adfb389a20d25eb81a27b", + "url": "https://api.github.com/repos/symfony/yaml/zipball/742a8efc94027624b36b10ba58e23d402f961f51", + "reference": "742a8efc94027624b36b10ba58e23d402f961f51", "shasum": "" }, "require": { @@ -1745,7 +1745,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.23" + "source": "https://github.com/symfony/yaml/tree/v6.4.24" }, "funding": [ { @@ -1756,12 +1756,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-06-03T06:46:12+00:00" + "time": "2025-07-10T08:14:14+00:00" } ], "packages-dev": [ @@ -2570,20 +2574,20 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.84.0", + "version": "v3.85.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "38dad0767bf2a9b516b976852200ae722fe984ca" + "reference": "2fb6d7f6c3398dca5786a1635b27405d73a417ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/38dad0767bf2a9b516b976852200ae722fe984ca", - "reference": "38dad0767bf2a9b516b976852200ae722fe984ca", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2fb6d7f6c3398dca5786a1635b27405d73a417ba", + "reference": "2fb6d7f6c3398dca5786a1635b27405d73a417ba", "shasum": "" }, "require": { - "clue/ndjson-react": "^1.0", + "clue/ndjson-react": "^1.3", "composer/semver": "^3.4", "composer/xdebug-handler": "^3.0.5", "ext-filter": "*", @@ -2593,12 +2597,12 @@ "fidry/cpu-core-counter": "^1.2", "php": "^7.4 || ^8.0", "react/child-process": "^0.6.6", - "react/event-loop": "^1.0", - "react/promise": "^2.11 || ^3.0", - "react/socket": "^1.0", - "react/stream": "^1.0", + "react/event-loop": "^1.5", + "react/promise": "^3.2", + "react/socket": "^1.16", + "react/stream": "^1.4", "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0", - "symfony/console": "^5.4.45 || ^6.4.13 || ^7.0", + "symfony/console": "^5.4.47 || ^6.4.13 || ^7.0", "symfony/event-dispatcher": "^5.4.45 || ^6.4.13 || ^7.0", "symfony/filesystem": "^5.4.45 || ^6.4.13 || ^7.0", "symfony/finder": "^5.4.45 || ^6.4.17 || ^7.0", @@ -2663,7 +2667,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.84.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.85.1" }, "funding": [ { @@ -2671,7 +2675,7 @@ "type": "github" } ], - "time": "2025-07-15T18:21:57+00:00" + "time": "2025-07-29T22:22:50+00:00" }, { "name": "guzzlehttp/guzzle", @@ -3673,16 +3677,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.27", + "version": "11.5.28", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "446d43867314781df7e9adf79c3ec7464956fd8f" + "reference": "93f30aa3889e785ac63493d4976df0ae9fdecb60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/446d43867314781df7e9adf79c3ec7464956fd8f", - "reference": "446d43867314781df7e9adf79c3ec7464956fd8f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/93f30aa3889e785ac63493d4976df0ae9fdecb60", + "reference": "93f30aa3889e785ac63493d4976df0ae9fdecb60", "shasum": "" }, "require": { @@ -3754,7 +3758,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.27" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.28" }, "funding": [ { @@ -3778,7 +3782,7 @@ "type": "tidelift" } ], - "time": "2025-07-11T04:10:06+00:00" + "time": "2025-07-31T07:10:28+00:00" }, { "name": "psr/event-dispatcher", @@ -5956,16 +5960,16 @@ }, { "name": "symfony/finder", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d" + "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ec2344cf77a48253bbca6939aa3d2477773ea63d", - "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d", + "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe", + "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe", "shasum": "" }, "require": { @@ -6000,7 +6004,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.3.0" + "source": "https://github.com/symfony/finder/tree/v7.3.2" }, "funding": [ { @@ -6011,25 +6015,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-12-30T19:00:26+00:00" + "time": "2025-07-15T13:41:35+00:00" }, { "name": "symfony/options-resolver", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "afb9a8038025e5dbc657378bfab9198d75f10fca" + "reference": "119bcf13e67dbd188e5dbc74228b1686f66acd37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/afb9a8038025e5dbc657378bfab9198d75f10fca", - "reference": "afb9a8038025e5dbc657378bfab9198d75f10fca", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/119bcf13e67dbd188e5dbc74228b1686f66acd37", + "reference": "119bcf13e67dbd188e5dbc74228b1686f66acd37", "shasum": "" }, "require": { @@ -6067,7 +6075,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.3.0" + "source": "https://github.com/symfony/options-resolver/tree/v7.3.2" }, "funding": [ { @@ -6078,12 +6086,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-04T13:12:05+00:00" + "time": "2025-07-15T11:36:08+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -6610,16 +6622,16 @@ }, { "name": "symfony/string", - "version": "v6.4.21", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "73e2c6966a5aef1d4892873ed5322245295370c6" + "reference": "f0ce0bd36a3accb4a225435be077b4b4875587f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/73e2c6966a5aef1d4892873ed5322245295370c6", - "reference": "73e2c6966a5aef1d4892873ed5322245295370c6", + "url": "https://api.github.com/repos/symfony/string/zipball/f0ce0bd36a3accb4a225435be077b4b4875587f4", + "reference": "f0ce0bd36a3accb4a225435be077b4b4875587f4", "shasum": "" }, "require": { @@ -6676,7 +6688,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.21" + "source": "https://github.com/symfony/string/tree/v6.4.24" }, "funding": [ { @@ -6687,12 +6699,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-18T15:23:29+00:00" + "time": "2025-07-10T08:14:14+00:00" }, { "name": "symfony/translation", diff --git a/src/Page.php b/src/Page.php index f3305da..57d06c2 100644 --- a/src/Page.php +++ b/src/Page.php @@ -16,8 +16,8 @@ use Fohn\Ui\Js\Js; use Fohn\Ui\Js\JsChain; use Fohn\Ui\Js\JsFunction; +use Fohn\Ui\Page\Layout; use Fohn\Ui\Page\Package; -use Fohn\Ui\PageLayout\Layout; use Fohn\Ui\Service\Theme\Base; use Fohn\Ui\Service\Ui; diff --git a/src/PageLayout/Layout.php b/src/Page/Layout.php similarity index 79% rename from src/PageLayout/Layout.php rename to src/Page/Layout.php index 798004b..ffc0f2c 100644 --- a/src/PageLayout/Layout.php +++ b/src/Page/Layout.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Fohn\Ui\PageLayout; +namespace Fohn\Ui\Page; /** * Base Page layout view. diff --git a/src/PageLayout/SideNavigation.php b/src/Page/Layout/SideNavigation.php similarity index 96% rename from src/PageLayout/SideNavigation.php rename to src/Page/Layout/SideNavigation.php index 4688849..062ecce 100644 --- a/src/PageLayout/SideNavigation.php +++ b/src/Page/Layout/SideNavigation.php @@ -2,9 +2,10 @@ declare(strict_types=1); -namespace Fohn\Ui\PageLayout; +namespace Fohn\Ui\Page\Layout; use Fohn\Ui\Component\Navigation; +use Fohn\Ui\Page\Layout; use Fohn\Ui\View; /** diff --git a/src/Service/Ui.php b/src/Service/Ui.php index df65162..6d3a2e0 100644 --- a/src/Service/Ui.php +++ b/src/Service/Ui.php @@ -25,7 +25,7 @@ use Fohn\Ui\Js\JsRenderInterface; use Fohn\Ui\Js\Type\Type; use Fohn\Ui\Page; -use Fohn\Ui\PageLayout\Layout; +use Fohn\Ui\Page\Layout; use Fohn\Ui\Service\Theme\Base; use Fohn\Ui\Service\Theme\Fohn; use Fohn\Ui\Service\Theme\ThemeInterface; diff --git a/src/Service/UiInterface.php b/src/Service/UiInterface.php index a1bfdd5..dd91ba4 100644 --- a/src/Service/UiInterface.php +++ b/src/Service/UiInterface.php @@ -12,7 +12,7 @@ use Fohn\Ui\Component\Form\Layout\FormLayoutInterface; use Fohn\Ui\HtmlTemplate; use Fohn\Ui\Page; -use Fohn\Ui\PageLayout\Layout; +use Fohn\Ui\Page\Layout; use Fohn\Ui\Service\Theme\ThemeInterface; use Fohn\Ui\View; use Fohn\Ui\ViewRenderer;