Sync changes with other apps (#7)

yiisoft · Nov 20, 2022 · 9992ee3 · 9992ee3
1 parent a55192f
commit 9992ee3
Show file tree

Hide file tree

Showing 18 changed files with 224 additions and 41 deletions.
diff --git a/.env.test b/.env.test
@@ -0,0 +1,2 @@
+YII_ENV=test
+YII_DEBUG=true
diff --git a/codeception.yml b/codeception.yml
@@ -1,17 +1,24 @@
-namespace: App\Console\Tests
+namespace: App\Tests
 support_namespace: Support
 paths:
-    tests: tests
-    output: runtime/tests/_output
-    data: tests/Support/Data
-    support: tests/Support
-    envs: tests/_envs
+  tests: tests
+  output: runtime/tests/_output
+  data: tests/Support/Data
+  support: tests/Support
+  envs: tests/_envs
 actor_suffix: Tester
 extensions:
-    enabled:
-        - Codeception\Extension\RunFailed
+  enabled:
+    - Codeception\Extension\RunFailed
+settings:
+  suite_class: \PHPUnit_Framework_TestSuite
+  memory_limit: 1024M
+  colors: true
 coverage:
-    enabled: true
-    whitelist:
-        include:
-            - src/*
+  enabled: true
+  whitelist:
+    include:
+      - src/*
+params:
+  - .env
+  - .env.test
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
         "yiisoft/log": "^2.0",
         "yiisoft/log-target-file": "^2.0",
         "yiisoft/yii-console": "^1.3",
-        "yiisoft/yii-runner-console": "^1.0"
+        "yiisoft/yii-runner-console": "^1.1"
     },
     "require-dev": {
         "codeception/codeception": "^5.0",
@@ -49,12 +49,12 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\Console\\": "src"
+            "App\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\Console\\Tests\\": "tests"
+            "App\\Tests\\": "tests"
         }
     },
     "extra": {
@@ -64,6 +64,23 @@
         "config-plugin-options": {
             "source-directory": "config"
         },
+        "config-plugin-environments": {
+            "dev": {
+                "params": [
+                    "test/params.php"
+                ]
+            },
+            "prod": {
+                "params": [
+                    "test/params.php"
+                ]
+            },
+            "test": {
+                "params": [
+                    "test/params.php"
+                ]
+            }
+        },
         "config-plugin": {
             "params": "params.php",
             "bootstrap": "bootstrap.php",
@@ -104,7 +121,7 @@
         }
     },
     "scripts": {
-        "test": "phpunit --testdox --no-interaction",
+        "test": "codecept run",
         "test-watch": "phpunit-watcher watch"
     }
 }
diff --git a/config/.merge-plan.php b/config/.merge-plan.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+// Do not edit. Content will be replaced.
+return [
+    '/' => [
+        'params' => [
+            'yiisoft/aliases' => [
+                'config/params.php',
+            ],
+            'yiisoft/log-target-file' => [
+                'config/params.php',
+            ],
+            'yiisoft/yii-console' => [
+                'config/params.php',
+            ],
+            '/' => [
+                'params.php',
+            ],
+        ],
+        'common' => [
+            'yiisoft/aliases' => [
+                'config/common.php',
+            ],
+            'yiisoft/log-target-file' => [
+                'config/common.php',
+            ],
+            'yiisoft/yii-event' => [
+                'config/common.php',
+            ],
+            '/' => [
+                'common/*.php',
+            ],
+        ],
+        'events-console' => [
+            'yiisoft/log' => [
+                'config/events-console.php',
+            ],
+            'yiisoft/yii-console' => [
+                'config/events-console.php',
+            ],
+            'yiisoft/yii-event' => [
+                '$events',
+                'config/events-console.php',
+            ],
+            '/' => [
+                '$events',
+                'events-console.php',
+            ],
+        ],
+        'events-web' => [
+            'yiisoft/log' => [
+                'config/events-web.php',
+            ],
+            'yiisoft/yii-event' => [
+                '$events',
+                'config/events-web.php',
+            ],
+        ],
+        'console' => [
+            'yiisoft/yii-console' => [
+                'config/console.php',
+            ],
+            'yiisoft/yii-event' => [
+                'config/console.php',
+            ],
+            '/' => [
+                '$common',
+                'console/*.php',
+            ],
+        ],
+        'providers-console' => [
+            'yiisoft/yii-console' => [
+                'config/providers-console.php',
+            ],
+            '/' => [
+                '$providers',
+                'providers-console.php',
+            ],
+        ],
+        'events' => [
+            'yiisoft/yii-event' => [
+                'config/events.php',
+            ],
+            '/' => [
+                'events.php',
+            ],
+        ],
+        'web' => [
+            'yiisoft/yii-event' => [
+                'config/web.php',
+            ],
+        ],
+        'bootstrap' => [
+            '/' => [
+                'bootstrap.php',
+            ],
+        ],
+        'bootstrap-console' => [
+            '/' => [
+                '$bootstrap',
+                'bootstrap-console.php',
+            ],
+        ],
+        'providers' => [
+            '/' => [
+                'providers.php',
+            ],
+        ],
+        'delegates' => [
+            '/' => [
+                'delegates.php',
+            ],
+        ],
+        'delegates-console' => [
+            '/' => [
+                '$delegates',
+                'delegates-console.php',
+            ],
+        ],
+    ],
+    'dev' => [
+        'params' => [
+            '/' => [
+                'test/params.php',
+            ],
+        ],
+    ],
+    'prod' => [
+        'params' => [
+            '/' => [
+                'test/params.php',
+            ],
+        ],
+    ],
+    'test' => [
+        'params' => [
+            '/' => [
+                'test/params.php',
+            ],
+        ],
+    ],
+];
diff --git a/config/dev/params.php b/config/dev/params.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+return [];
diff --git a/config/params.php b/config/params.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use App\Console\Hello;
+use App\Command\HelloCommand;
 
 return [
     'yiisoft/aliases' => [
@@ -14,7 +14,7 @@
 
     'yiisoft/yii-console' => [
         'commands' => [
-            'hello' => Hello::class,
+            HelloCommand::$defaultName => HelloCommand::class,
         ],
     ],
 ];
diff --git a/config/prod/params.php b/config/prod/params.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+return [];
diff --git a/config/test/params.php b/config/test/params.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+return [];
diff --git a/src/Hello.php → src/Command/HelloCommand.php b/src/Hello.php → src/Command/HelloCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Console;
+namespace App\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -11,9 +11,9 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Yiisoft\Yii\Console\ExitCode;
 
-final class Hello extends Command
+final class HelloCommand extends Command
 {
-    protected static $defaultName = 'hello';
+    public static $defaultName = 'hello';
     protected static $defaultDescription = 'An example command';
 
     private string $sentence = 'sentence';

diff --git a/tests/Acceptance/.gitkeep b/tests/Acceptance/.gitkeep
diff --git a/tests/Cli.suite.yml b/tests/Cli.suite.yml
@@ -1,5 +1,5 @@
 actor: CliTester
-suite_namespace: App\Console\Tests\Cli
 modules:
-    # enable helpers as array
-    enabled: [Cli]
+  enabled:
+    - Cli
+  step_decorators: ~
diff --git a/tests/Cli/ConsoleCest.php b/tests/Cli/ConsoleCest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Console\Tests\Cli;
+namespace App\Tests\Cli;
 
-use App\Console\Tests\Support\CliTester;
+use App\Tests\Support\CliTester;
 
 final class ConsoleCest
 {

diff --git a/tests/Functional/.gitkeep b/tests/Functional/.gitkeep
diff --git a/tests/Support/CliTester.php b/tests/Support/CliTester.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Console\Tests\Support;
+namespace App\Tests\Support;
+
+use Codeception\Actor;
 
 /**
  * Inherited Methods
@@ -19,7 +21,7 @@
  *
  * @SuppressWarnings(PHPMD)
 */
-class CliTester extends \Codeception\Actor
+class CliTester extends Actor
 {
     use _generated\CliTesterActions;
 

diff --git a/tests/Support/UnitTester.php b/tests/Support/UnitTester.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Console\Tests\Support;
+namespace App\Tests\Support;
+
+use Codeception\Actor;
 
 /**
  * Inherited Methods
@@ -19,7 +21,7 @@
  *
  * @SuppressWarnings(PHPMD)
 */
-class UnitTester extends \Codeception\Actor
+class UnitTester extends Actor
 {
     use _generated\UnitTesterActions;
 

diff --git a/tests/Unit.suite.yml b/tests/Unit.suite.yml
@@ -1,9 +1,5 @@
-# Codeception Test Suite Configuration
-#
-# Suite for unit or integration tests.
-
 actor: UnitTester
 modules:
-    enabled:
-        - Asserts
-    step_decorators: ~
+  enabled:
+    - Asserts
+  step_decorators: ~
diff --git a/tests/Unit/HelloCest.php b/tests/Unit/HelloCest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Console\Tests\Unit;
+namespace App\Tests\Unit;
 
-use App\Console\Tests\Support\UnitTester;
+use App\Tests\Support\UnitTester;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;

diff --git a/tests/_output/.gitignore b/tests/_output/.gitignore