From 74117441ecf83e6b6a5996fa5a075b87e5dbbf4e Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Wed, 22 Jan 2025 15:33:31 +0000 Subject: [PATCH 1/6] [ast] use single page display for ast display, to avoid jumpoing back and forth --- composer.json | 25 +++++--- phpstan.neon | 6 +- .../_snippets/form/form_textarea.blade.php | 6 +- resources/views/ast/ast.blade.php | 63 +++++++++++-------- resources/views/ast/ast_detail.blade.php | 9 --- .../views/livewire/ast-component.blade.php | 11 +--- routes/web.php | 2 +- src/Ast/Controller/AstController.php | 10 ++- src/Ast/Controller/AstDetailController.php | 15 +++-- .../Controller/ProcessAstFormController.php | 12 +++- src/Livewire/AstComponent.php | 7 --- src/Repository/AstRunRepository.php | 20 ++++++ 12 files changed, 111 insertions(+), 75 deletions(-) delete mode 100644 resources/views/ast/ast_detail.blade.php create mode 100644 src/Repository/AstRunRepository.php diff --git a/composer.json b/composer.json index 5e588877b..2cdd332e9 100644 --- a/composer.json +++ b/composer.json @@ -4,30 +4,35 @@ "description": "Website of getrector.com", "require": { "php": "^8.2", - "imagine/imagine": "^1.3.5", + "imagine/imagine": "^1.5", "jajo/jsondb": "^3.0.1", - "laravel/framework": "^11.21", - "league/commonmark": "^2.5", + "laravel/framework": "^11.36", + "league/commonmark": "^2.6", "livewire/livewire": "^3.5", "nesbot/carbon": "^3.8", - "nikic/php-parser": "^5.0", + "nikic/php-parser": "^5.4", "rector/rector": "dev-main as 2.0", - "samsonasik/array-lookup": "^1.6", - "symfony/filesystem": "^7.1", - "symfony/uid": "^7.1", - "symfony/yaml": "^7.1", + "samsonasik/array-lookup": "^1.8", + "symfony/filesystem": "^7.2", + "symfony/uid": "^7.2", + "symfony/yaml": "^7.2", "symplify/vendor-patches": "^11.3" }, "require-dev": { +<<<<<<< HEAD "barryvdh/laravel-ide-helper": "^3.2", "driftingly/rector-laravel": "dev-main as 2.0", +======= + "barryvdh/laravel-ide-helper": "^3.3", + "driftingly/rector-laravel": "^2.0", +>>>>>>> 87a55e07 ([ast] use single page display for ast display, to avoid jumpoing back and forth) "nette/robot-loader": "^4.0", "phpstan/extension-installer": "^1.4", "phpstan/phpstan": "^2.0", "phpstan/phpstan-webmozart-assert": "^2.0", - "phpunit/phpunit": "11.4.0", + "phpunit/phpunit": "^11.5", "rector/swiss-knife": "^1.0", - "symplify/easy-coding-standard": "^12.4", + "phpecs/phpecs": "^2.0", "tomasvotruba/class-leak": "^2.0" }, "autoload": { diff --git a/phpstan.neon b/phpstan.neon index 0627eeb12..889f46f3d 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -79,11 +79,15 @@ parameters: message: '#Cannot call method format\(\) on Carbon\\Carbon\|null#' path: src/Controller/Stats/FindRuleStatsController.php + # magic model methods + - '#Call to an undefined static method App\\Ast\\Entity\\AstRun::where#' + - message: '#Call to an undefined method Rector\\Contract\\Rector\\RectorInterface\:\:getRuleDefinition\(\)#' path: src/FileSystem/RectorFinder.php - + path: src/Utils/ClickablePrinterBuilder.php identifier: argument.type # realpath usage @@ -92,4 +96,4 @@ parameters: # enforce native - - identifier: varTag.nativeType \ No newline at end of file + identifier: varTag.nativeType diff --git a/resources/views/_snippets/form/form_textarea.blade.php b/resources/views/_snippets/form/form_textarea.blade.php index 4a295f233..0f8054196 100644 --- a/resources/views/_snippets/form/form_textarea.blade.php +++ b/resources/views/_snippets/form/form_textarea.blade.php @@ -1,5 +1,5 @@ @php - /** @var string $label */ + /** @var string|null $label */ /** @var string $inputName */ /** @var string $defaultValue */ @endphp @@ -13,7 +13,9 @@ @enderror
-
{!! $label !!}
+ @if ($label) +
{!! $label !!}
+ @endif