diff --git a/composer.json b/composer.json index 61950e1c..43902054 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "config": { "sort-packages": true, "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true + "dealerdirect/phpcodesniffer-composer-installer": true, + "drupal/core-composer-scaffold": false } }, "require": { @@ -37,7 +38,7 @@ "ext-simplexml": "*", "chi-teck/drupal-coder-extension": "^2.0.0-rc2", "drupal/coder": "8.3.24", - "drupal/core": "11.x-dev", + "drupal/core": "11.x-dev || 12.x-dev", "phpspec/prophecy-phpunit": "^2.2", "phpunit/phpunit": "^10.5", "squizlabs/php_codesniffer": "^3.9", @@ -49,6 +50,6 @@ "squizlabs/php_codesniffer": "<3.6", "nikic/php-parser": "<4.17" }, - "minimum-stability": "RC", + "minimum-stability": "dev", "prefer-stable": true } diff --git a/phpunit.xml b/phpunit.xml index c054a88b..03c4fd82 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -4,6 +4,9 @@ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" colors="true" processIsolation="true"> + + + ./tests/unit diff --git a/src/Application.php b/src/Application.php index 350c280b..0fa7080c 100644 --- a/src/Application.php +++ b/src/Application.php @@ -113,7 +113,7 @@ public static function create(ContainerInterface $container): self { $application->dispatch(new GeneratorInfoAlter($all_generators))->generators, ); - $application->add(new Navigation()); + $application->addCommand(new Navigation()); $application->setDefaultCommand('navigation'); /** @var \DrupalCodeGenerator\Application $application */ diff --git a/src/Test/Functional/GeneratorTestBase.php b/src/Test/Functional/GeneratorTestBase.php index feaf140a..49f12c33 100644 --- a/src/Test/Functional/GeneratorTestBase.php +++ b/src/Test/Functional/GeneratorTestBase.php @@ -42,7 +42,7 @@ protected function execute(string $command_class, array $user_input): int { ->getInstanceFromDefinition($command_class); \assert($command instanceof Command); - $application->add($command); + $application->addCommand($command); $command_tester = new CommandTester($command); /** @psalm-var int<0, 1> $result */ diff --git a/src/Test/GeneratorTest.php b/src/Test/GeneratorTest.php index d3f67063..fcc7ec36 100644 --- a/src/Test/GeneratorTest.php +++ b/src/Test/GeneratorTest.php @@ -58,7 +58,7 @@ protected function tearDown(): void { * stream. */ protected function execute(Command $command, array $user_input): int { - $this->createApplication()->add($command); + $this->createApplication()->addCommand($command); $command_tester = new CommandTester($command); $result = $command_tester diff --git a/tests/functional/Generator/Entity/EntityBundleClassTest.php b/tests/functional/Generator/Entity/EntityBundleClassTest.php index 2dcd6d2f..81b85756 100644 --- a/tests/functional/Generator/Entity/EntityBundleClassTest.php +++ b/tests/functional/Generator/Entity/EntityBundleClassTest.php @@ -40,16 +40,14 @@ public function testSingleBundleWithoutBaseClass(): void { ➤ Entity type: - [ 1] Content block - [ 2] Comment - [ 3] Contact message - [ 4] File - [ 5] Custom menu link - [ 6] Content - [ 7] URL alias - [ 8] Shortcut link - [ 9] Taxonomy term - [10] User + [1] Content block + [2] Comment + [3] File + [4] Custom menu link + [5] Content + [6] URL alias + [7] Taxonomy term + [8] User ➤ Bundles, comma separated: @@ -104,16 +102,14 @@ public function testAllBundlesWithBaseClass(): void { ➤ Entity type: - [ 1] Content block - [ 2] Comment - [ 3] Contact message - [ 4] File - [ 5] Custom menu link - [ 6] Content - [ 7] URL alias - [ 8] Shortcut link - [ 9] Taxonomy term - [10] User + [1] Content block + [2] Comment + [3] File + [4] Custom menu link + [5] Content + [6] URL alias + [7] Taxonomy term + [8] User ➤ Bundles, comma separated: diff --git a/tests/functional/Generator/Yaml/_module_info/example.info.yml b/tests/functional/Generator/Yaml/_module_info/example.info.yml index e2dae2a4..9a202d4d 100644 --- a/tests/functional/Generator/Yaml/_module_info/example.info.yml +++ b/tests/functional/Generator/Yaml/_module_info/example.info.yml @@ -2,7 +2,7 @@ name: Example type: module description: Example description. package: Custom -core_version_requirement: ^10 || ^11 +core_version_requirement: ^10 || ^11 || ^12 dependencies: - views - node diff --git a/tests/functional/Generator/_module/bar/bar.info.yml b/tests/functional/Generator/_module/bar/bar.info.yml index 2aa653ae..7f1809ce 100644 --- a/tests/functional/Generator/_module/bar/bar.info.yml +++ b/tests/functional/Generator/_module/bar/bar.info.yml @@ -2,7 +2,7 @@ name: 'Bar' type: module description: 'Some description.' package: Custom -core_version_requirement: ^10 || ^11 +core_version_requirement: ^10 || ^11 || ^12 dependencies: - drupal:node - drupal:system diff --git a/tests/functional/Generator/_module/foo/foo.info.yml b/tests/functional/Generator/_module/foo/foo.info.yml index e5a3c36c..c53f6663 100644 --- a/tests/functional/Generator/_module/foo/foo.info.yml +++ b/tests/functional/Generator/_module/foo/foo.info.yml @@ -2,6 +2,6 @@ name: 'Foo' type: module description: 'Some description.' package: Custom -core_version_requirement: ^10 || ^11 +core_version_requirement: ^10 || ^11 || ^12 dependencies: - drupal:views diff --git a/tests/functional/Generator/_theme/foo/foo.info.yml b/tests/functional/Generator/_theme/foo/foo.info.yml index bab00c24..b7700cfd 100644 --- a/tests/functional/Generator/_theme/foo/foo.info.yml +++ b/tests/functional/Generator/_theme/foo/foo.info.yml @@ -3,7 +3,7 @@ type: theme base theme: bartik description: Some description. package: Custom -core_version_requirement: ^10 || ^11 +core_version_requirement: ^10 || ^11 || ^12 libraries: - foo/global regions: