Merge 055a2f07bc into 161196288a

Updates the requirements on [spaze/phpstan-disallowed-calls](https://github.com/spaze/phpstan-disallowed-calls) to permit the latest version.
- [Release notes](https://github.com/spaze/phpstan-disallowed-calls/releases)
- [Commits](https://github.com/spaze/phpstan-disallowed-calls/compare/v3.5.1...v4.0.1)

---
updated-dependencies:
- dependency-name: spaze/phpstan-disallowed-calls
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Classes/Command/CreateTestDataCommand.php

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TTN\Tea\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use TYPO3\CMS\Core\Database\Connection;
+use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\ReferenceIndex;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+/*
+ * Command to create test data for the tea extension.
+ */
+final class CreateTestDataCommand extends Command
+{
+    /**
+     * @var list<array{title: non-empty-string, description: non-empty-string, sys_language_uid: int<0, max>}>
+     */
+    protected array $teaData = [
+        [
+            'title' => 'Darjeeling',
+            'description' => 'I love that tea!',
+            'sys_language_uid' => 0,
+        ],
+        [
+            'title' => 'Earl Grey',
+            'description' => 'A nice tea!',
+            'sys_language_uid' => 0,
+        ],
+    ];
+
+    protected function configure(): void
+    {
+        $this
+            ->setHelp('Create test data for the tea extension in an already existing page (sysfolder).')
+            ->addArgument(
+                'pageUid',
+                InputArgument::REQUIRED,
+                'Existing sysfolder page id.'
+            )
+            ->addOption(
+                'delete-data-before',
+                'd',
+                InputOption::VALUE_NONE,
+                'Delete all tea data in the defined pid before creating new data.'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $pageUid = $input->getArgument('pageUid') ?? 0;
+        \assert(\is_int($pageUid));
+        $deleteDataBefore = $input->getOption('delete-data-before') ?? false;
+        \assert(\is_bool($deleteDataBefore));
+        $table = 'tx_tea_domain_model_tea';
+        $connectionForTable = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable($table);
+
+        if ($deleteDataBefore) {
+            $query = $connectionForTable;
+            $query->delete($table, ['pid' => $pageUid], [Connection::PARAM_INT]);
+            $output->writeln(sprintf('Existing data in page %s deleted.', $pageUid));
+        }
+
+        $query = $connectionForTable;
+        foreach ($this->teaData as $item) {
+            $item = ['pid' => $pageUid, 'title' => $item['title'], 'description' => $item['description']];
+            $query->insert(
+                $table,
+                $item
+            );
+        }
+        $output->writeln(sprintf('Test data in page %s created.', $pageUid));
+
+        $referenceIndex = GeneralUtility::makeInstance(ReferenceIndex::class);
+        $referenceIndex->updateIndex(false);
+        $output->writeln('Reference index updated.');
+
+        return Command::SUCCESS;
+    }
+}

Configuration/Services.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use TTN\Tea\Command\CreateTestDataCommand;
+
 return static function (ContainerConfigurator $containerConfigurator) {
     $services = $containerConfigurator->services()
         ->defaults()
@@ -12,4 +14,13 @@ return static function (ContainerConfigurator $containerConfigurator) {
 
     $services->load('TTN\\Tea\\', '../Classes/*')
         ->exclude('../Classes/Domain/Model/*');
+
+    $services->set(CreateTestDataCommand::class)
+        ->tag(
+            'console.command',
+            [
+                'command' => 'tea:createtestdata',
+                'description' => 'Create test data in existing sysfolder',
+            ]
+        );
 };

Documentation/CommandController.rst

@@ -0,0 +1,28 @@
+.. include:: /Includes.rst.txt
+
+.. _command-controller:
+
+==================
+Command Controller
+==================
+
+The "tea" extension comes with a CommandController that can be used for the
+automatic creation of test data. It also serves to illustrate how data can be
+created in the database using a command controller.
+
+You must set a page id as argument. Therefore it's necessary to create an
+sysfolder before.
+
+You can add option `-d` to delete already existing data.
+
+
+.. code-block:: bash
+
+   vendor/bin/typo3 tea:createtestdata 3
+
+
+.. seealso::
+
+   For further details to Console Commands read the
+   :ref:`Creating a basic command <t3coreapi:console-command-tutorial-create>`
+   tutorial.

Documentation/Index.rst

@@ -47,6 +47,7 @@ continuous integration.
    ReleaseBranchingStrategy
    Environment
    DependencyManager
+   CommandController
    Running
    ContinuousIntegration
    Documentation

Tests/Functional/Command/CreateTestDataCommandTest.php

@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TTN\Tea\Tests\Functional\Command;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Tester\CommandTester;
+use TTN\Tea\Command\CreateTestDataCommand;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
+
+/**
+ * @covers \TTN\Tea\Command\CreateTestDataCommand
+ */
+class CreateTestDataCommandTest extends FunctionalTestCase
+{
+    private const COMMAND_NAME = 'tea:createtestdata';
+
+    protected array $testExtensionsToLoad = ['ttn/tea'];
+
+    private CreateTestDataCommand $subject;
+
+    private CommandTester $commandTester;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Database/Pages.csv');
+        $this->subject = new CreateTestDataCommand(self::COMMAND_NAME);
+        $application = new Application();
+        $application->add($this->subject);
+
+        $command = $application->find('tea:createtestdata');
+        $this->commandTester = new CommandTester($command);
+    }
+
+    /**
+     * @test
+     */
+    public function isConsoleCommand(): void
+    {
+        self::assertInstanceOf(Command::class, $this->subject);
+    }
+
+    /**
+     * @test
+     */
+    public function hasDescription(): void
+    {
+        $expected = 'Create test data for the tea extension in an already existing page (sysfolder).';
+        self::assertSame($expected, $this->subject->getHelp());
+    }
+
+    /**
+     * @test
+     */
+    public function hasHelpText(): void
+    {
+        $expected = 'Create test data for the tea extension in an already existing page (sysfolder).';
+        self::assertSame($expected, $this->subject->getHelp());
+    }
+
+    /**
+     * @test
+     */
+    public function runReturnsSuccessStatus(): void
+    {
+        $result = $this->commandTester->execute(
+            [
+                'pageUid' => '1',
+            ],
+        );
+
+        self::assertSame(Command::SUCCESS, $result);
+    }
+
+    /**
+     * @test
+     */
+    public function createsTestData(): void
+    {
+        $this->commandTester->execute([
+            'pageUid' => '1',
+        ]);
+
+        self::assertCSVDataSet(__DIR__ . '/Fixtures/Database/Teas.csv');
+    }
+
+    /**
+     * @test
+     */
+    public function deletesExistingDataOnGivenPidBeforeCreatingNewData(): void
+    {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Database/ExistingTeas.csv');
+        $this->commandTester->execute(
+            [
+                'pageUid' => '1',
+                '--delete-data-before' => true,
+            ]
+        );
+
+        self::assertCSVDataSet(__DIR__ . '/Fixtures/Database/TeasAfterDelete.csv');
+    }
+
+    /**
+     * @test
+     */
+    public function doesNotDeleteDataOnOtherPid(): void
+    {
+        $this->importCSVDataSet(__DIR__ . '/Fixtures/Database/OtherExistingTeas.csv');
+        $this->commandTester->execute(
+            [
+                'pageUid' => '1',
+                '--delete-data-before' => true,
+            ]
+        );
+
+        self::assertCSVDataSet(__DIR__ . '/Fixtures/Database/TeasAfterDeleteOtherExistingTeas.csv');
+    }
+}

Tests/Functional/Command/Fixtures/Database/ExistingTeas.csv

@@ -0,0 +1,4 @@
+"tx_tea_domain_model_tea"
+,"uid","pid","title","description","deleted"
+,1,1,"Darjeeling","Which already existed in the system",0
+,2,1,"Earl Grey","Which already existed in the system",0

Tests/Functional/Command/Fixtures/Database/OtherExistingTeas.csv

@@ -0,0 +1,6 @@
+"tx_tea_domain_model_tea"
+,"uid","pid","title","description","deleted"
+,3,1,"Darjeeling","Exists and should be deleted","0"
+,4,1,"Earl Grey","Exists and should be deleted","0"
+,1,2,"Darjeeling","Which already existed in the system",0
+,2,2,"Earl Grey","Which already existed in the system",0

Tests/Functional/Command/Fixtures/Database/Pages.csv

@@ -0,0 +1,4 @@
+"pages",,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","title",,,
+,1,0,256,0,0,"Tea data",,,
+,2,0,512,0,0,"Other tea data",,,

Tests/Functional/Command/Fixtures/Database/Teas.csv

@@ -0,0 +1,4 @@
+"tx_tea_domain_model_tea"
+,"uid","pid","title","description","deleted"
+,1,1,"Darjeeling","I love that tea!",0
+,2,1,"Earl Grey","A nice tea!",0

Tests/Functional/Command/Fixtures/Database/TeasAfterDelete.csv

@@ -0,0 +1,4 @@
+"tx_tea_domain_model_tea"
+,"pid","title","description","deleted"
+,1,"Darjeeling","I love that tea!",0
+,1,"Earl Grey","A nice tea!",0

Tests/Functional/Command/Fixtures/Database/TeasAfterDeleteOtherExistingTeas.csv

@@ -0,0 +1,6 @@
+"tx_tea_domain_model_tea"
+,"pid","title","description","deleted"
+,1,"Darjeeling","I love that tea!",0
+,1,"Earl Grey","A nice tea!",0
+,2,"Darjeeling","Which already existed in the system",0
+,2,"Earl Grey","Which already existed in the system",0

composer.json

@@ -54,14 +54,14 @@
 		"php-parallel-lint/php-parallel-lint": "1.4.0",
 		"phpmd/phpmd": "2.15.0",
 		"phpstan/extension-installer": "1.4.3",
-		"phpstan/phpstan": "1.12.8",
+		"phpstan/phpstan": "1.12.9",
 		"phpstan/phpstan-phpunit": "1.4.0",
 		"phpstan/phpstan-strict-rules": "1.6.1",
 		"phpunit/phpunit": "9.6.20",
 		"saschaegerer/phpstan-typo3": "1.10.2",
 		"seld/jsonlint": "1.11.0",
-		"spaze/phpstan-disallowed-calls": "3.5.1",
+		"spaze/phpstan-disallowed-calls": "4.0.1",
-		"squizlabs/php_codesniffer": "3.10.3",
+		"squizlabs/php_codesniffer": "3.11.0",
 		"ssch/typo3-rector": "2.11.0",
 		"ssch/typo3-rector-testing-framework": "2.0.1",
 		"symfony/console": "^5.4.44 || ^6.4.12 || ^7.1.5",