Merge branch '3.x' into 3.next

Author: markstory

.editorconfig

@@ -19,3 +19,6 @@ indent_size = 2
 
 [*.twig]
 insert_final_newline = false
+
+[tests/comparisons/Template/*.php]
+insert_final_newline = false

composer.json

@@ -21,7 +21,7 @@
     },
     "require": {
         "php": ">=8.1",
-        "brick/varexporter": "^0.5.0",
+        "brick/varexporter": "^0.6.0",
         "cakephp/cakephp": "^5.1",
         "cakephp/twig-view": "^2.0.0",
         "nikic/php-parser": "^5.0.0"

src/Command/CommandCommand.php

@@ -16,6 +16,9 @@
  */
 namespace Bake\Command;
 
+use Cake\Console\Arguments;
+use Cake\Utility\Inflector;
+
 /**
  * Console Command generator.
  */
@@ -51,4 +54,24 @@ public function template(): string
     {
         return 'Bake.Command/command';
     }
+
+    /**
+     * Get template data.
+     *
+     * @param \Cake\Console\Arguments $arguments Arguments object.
+     * @return array
+     * @phpstan-return array<string, mixed>
+     */
+    public function templateData(Arguments $arguments): array
+    {
+        $data = parent::templateData($arguments);
+
+        $data['command_name'] = Inflector::underscore(str_replace(
+            '.',
+            ' ',
+            $arguments->getArgument('name')
+        ));
+
+        return $data;
+    }
 }

src/Command/PluginCommand.php

@@ -45,17 +45,6 @@ class PluginCommand extends BakeCommand
 
     protected bool $isVendor = false;
 
-    /**
-     * initialize
-     *
-     * @return void
-     */
-    public function initialize(): void
-    {
-        parent::initialize();
-        $this->path = current(App::path('plugins'));
-    }
-
     /**
      * Execute the command.
      *
@@ -114,10 +103,15 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
      */
     public function bake(string $plugin, Arguments $args, ConsoleIo $io): ?bool
     {
-        $pathOptions = App::path('plugins');
-        if (count($pathOptions) > 1) {
-            $this->findPath($pathOptions, $io);
+        if (!$this->isVendor) {
+            $pathOptions = App::path('plugins');
+            $this->path = current($pathOptions);
+
+            if (count($pathOptions) > 1) {
+                $this->findPath($pathOptions, $io);
+            }
         }
+
         $io->out(sprintf('<info>Plugin Name:</info> %s', $plugin));
         $io->out(sprintf('<info>Plugin Directory:</info> %s', $this->path . $plugin));
         $io->hr();

src/Utility/Model/EnumParser.php

@@ -5,7 +5,7 @@
 
 use InvalidArgumentException;
 
-enum EnumParser
+class EnumParser
 {
     /**
      * @param string|null $casesString

templates/bake/Command/command.twig

@@ -28,6 +28,23 @@
  */
 class {{ name }}Command extends Command
 {
+    /**
+     * The name of this command.
+     *
+     * @var string
+     */
+    protected string $name = '{{ command_name }}';
+
+    /**
+     * Get the default command name.
+     *
+     * @return string
+     */
+    public static function defaultName(): string
+    {
+        return '{{ command_name }}';
+    }
+
     /**
      * Get the command description.
      *

templates/bake/Template/index.twig

@@ -65,7 +65,14 @@
                     <td class="actions">
                         <?= $this->Html->link(__('View'), ['action' => 'view', {{ pk|raw }}]) ?>
                         <?= $this->Html->link(__('Edit'), ['action' => 'edit', {{ pk|raw }}]) ?>
-                        <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', {{ pk|raw }}], ['confirm' => __('Are you sure you want to delete # {0}?', {{ pk|raw }})]) ?>
+                        <?= $this->Form->postLink(
+                            __('Delete'),
+                            ['action' => 'delete', {{ pk|raw }}],
+                            [
+                                'method' => 'delete',
+                                'confirm' => __('Are you sure you want to delete # {0}?', {{ pk|raw }}),
+                            ]
+                        ) ?>
                     </td>
                 </tr>
                 <?php endforeach; ?>

templates/bake/Template/view.twig

@@ -141,7 +141,14 @@
                             <td class="actions">
                                 <?= $this->Html->link(__('View'), ['controller' => '{{ details.controller }}', 'action' => 'view', {{ otherPk|raw }}]) ?>
                                 <?= $this->Html->link(__('Edit'), ['controller' => '{{ details.controller }}', 'action' => 'edit', {{ otherPk|raw }}]) ?>
-                                <?= $this->Form->postLink(__('Delete'), ['controller' => '{{ details.controller }}', 'action' => 'delete', {{ otherPk|raw }}], ['confirm' => __('Are you sure you want to delete # {0}?', {{ otherPk|raw }})]) ?>
+                                <?= $this->Form->postLink(
+                                    __('Delete'),
+                                    ['controller' => '{{ details.controller }}', 'action' => 'delete', {{ otherPk|raw }}],
+                                    [
+                                        'method' => 'delete',
+                                        'confirm' => __('Are you sure you want to delete # {0}?', {{ otherPk|raw }}),
+                                    ]
+                                ) ?>
                             </td>
                         </tr>
                         <?php endforeach; ?>

tests/comparisons/Command/testBakePlugin.php

@@ -13,6 +13,23 @@
  */
 class ExampleCommand extends Command
 {
+    /**
+     * The name of this command.
+     *
+     * @var string
+     */
+    protected string $name = 'test_bake example';
+
+    /**
+     * Get the default command name.
+     *
+     * @return string
+     */
+    public static function defaultName(): string
+    {
+        return 'test_bake example';
+    }
+
     /**
      * Get the command description.
      *

tests/comparisons/Template/testBakeIndex.php

@@ -32,7 +32,14 @@
                     <td class="actions">
                         <?= $this->Html->link(__('View'), ['action' => 'view', $templateTaskComment->id]) ?>
                         <?= $this->Html->link(__('Edit'), ['action' => 'edit', $templateTaskComment->id]) ?>
-                        <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', $templateTaskComment->id], ['confirm' => __('Are you sure you want to delete # {0}?', $templateTaskComment->id)]) ?>
+                        <?= $this->Form->postLink(
+                            __('Delete'),
+                            ['action' => 'delete', $templateTaskComment->id],
+                            [
+                                'method' => 'delete',
+                                'confirm' => __('Are you sure you want to delete # {0}?', $templateTaskComment->id),
+                            ]
+                        ) ?>
                     </td>
                 </tr>
                 <?php endforeach; ?>