From 340748375ab9b43d06d2f0cc8c5e601bdcf49ccb Mon Sep 17 00:00:00 2001
From: Dmitrii Derepko <xepozz@list.ru>
Date: Fri, 14 Oct 2022 13:02:01 +0300
Subject: [PATCH 1/8] Add composer-require-checker [batch]

---
 .../workflows/composer-require-checker.yml    | 33 +++++++++++++
 src/Generator/AbstractGeneratorDTO.php        | 47 +++++++++++++++++++
 src/Generator/Controller/ControllerDTO.php    | 34 ++++++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 .github/workflows/composer-require-checker.yml
 create mode 100644 src/Generator/AbstractGeneratorDTO.php
 create mode 100644 src/Generator/Controller/ControllerDTO.php

diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
new file mode 100644
index 00000000..ae5893f5
--- /dev/null
+++ b/.github/workflows/composer-require-checker.yml
@@ -0,0 +1,33 @@
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'phpunit.xml.dist'
+      - 'psalm.xml'
+
+  push:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'phpunit.xml.dist'
+      - 'psalm.xml'
+
+name: Composer require checker
+
+jobs:
+  composer-require-checker:
+    uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@master
+    with:
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0', '8.1']
diff --git a/src/Generator/AbstractGeneratorDTO.php b/src/Generator/AbstractGeneratorDTO.php
new file mode 100644
index 00000000..31715ccb
--- /dev/null
+++ b/src/Generator/AbstractGeneratorDTO.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\Gii\Generator;
+
+use Yiisoft\Validator\Result;
+use Yiisoft\Validator\Rule\Callback;
+use Yiisoft\Validator\Rule\Required;
+use Yiisoft\Validator\ValidationContext;
+
+abstract class AbstractGeneratorDTO
+{
+    #[Required(message: 'A code template must be selected.')]
+    #[Callback(['validateTemplate'])]
+    private $template = [];
+
+    /**
+     * Validates the template selection.
+     * This method validates whether the user selects an existing template
+     * and the template contains all required template files as specified in {@see requiredTemplates()}.
+     *
+     * @param string $value
+     */
+    public function validateTemplate(mixed $value, Callback $rule, ValidationContext $validationContext): Result
+    {
+        /** @var self $dataSet */
+        $dataSet = $validationContext->getDataSet();
+        $result = new Result();
+        $templates = $dataSet->getTemplates();
+        if ($templates === []) {
+            return $result;
+        }
+        if (!isset($templates[$value])) {
+            $result->addError('Invalid template selection.');
+        } else {
+            $templatePath = $templates[$value];
+            foreach ($dataSet->requiredTemplates() as $template) {
+                if (!is_file($dataSet->aliases->get($templatePath . '/' . $template))) {
+                    $result->addError("Unable to find the required code template file '$template'.");
+                }
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Generator/Controller/ControllerDTO.php b/src/Generator/Controller/ControllerDTO.php
new file mode 100644
index 00000000..5e9145f4
--- /dev/null
+++ b/src/Generator/Controller/ControllerDTO.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\Gii\Generator\Controller;
+
+use Yiisoft\Validator\Rule\Callback;
+use Yiisoft\Validator\Rule\Regex;
+use Yiisoft\Validator\Rule\Required;
+use Yiisoft\Yii\Gii\Generator\AbstractGeneratorDTO;
+
+class ControllerDTO extends AbstractGeneratorDTO
+{
+    #[Required()]
+    #[Regex(
+        pattern: '/^[A-Z][\w]*Controller$/',
+        message: 'Only word characters are allowed, and the class name must start with a capital letter and end with "Controller".'
+    )]
+    #[Callback(['validateNewClass'])]
+    private $controllerClass = [];
+
+    #[Regex(
+        pattern: '/^[\w\\\\]*$/',
+        message: 'Only word characters and backslashes are allowed.',
+        skipOnEmpty: true,
+    )]
+    private $baseClass = [];
+
+    #[Regex(
+        pattern: '/^[a-z][a-z0-9\\-,\\s]*$/',
+        message: 'Only a-z, 0-9, dashes (-), spaces and commas are allowed.'
+    )]
+    private $actions = [];
+}

From 1b9de17a0367921ebe6cd7cc5735cee020371719 Mon Sep 17 00:00:00 2001
From: Dmitrii Derepko <xepozz@list.ru>
Date: Fri, 14 Oct 2022 13:30:56 +0300
Subject: [PATCH 2/8] Add composer-require-checker dependency [batch]

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 15dfd8f7..b1caf161 100644
--- a/composer.json
+++ b/composer.json
@@ -31,6 +31,7 @@
         "yiisoft/yii-console": "^1.3"
     },
     "require-dev": {
+        "maglnet/composer-require-checker": "^4.2",
         "nyholm/psr7": "^1.5",
         "phpunit/phpunit": "^9.5",
         "rector/rector": "^0.14.3",

From 46d38447700ca485d5ec2158801ad974fec25629 Mon Sep 17 00:00:00 2001
From: Dmitrii Derepko <xepozz@list.ru>
Date: Sat, 15 Oct 2022 10:45:48 +0300
Subject: [PATCH 3/8] Add changelog [batch]

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94fa58f0..647386c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,4 +2,4 @@
 
 ## 1.0.0 under development
 
-- Initial release.
+- Enh: Add composer require checker into CI

From 9c4d2e3dbf714c8f4f1a759b7690a96b92aaebed Mon Sep 17 00:00:00 2001
From: Dmitriy Derepko <xepozz@list.ru>
Date: Sun, 9 Jun 2024 13:57:27 +0300
Subject: [PATCH 4/8] Apply suggestions from code review

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
---
 .github/workflows/composer-require-checker.yml | 2 +-
 CHANGELOG.md                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
index ae5893f5..6cb40992 100644
--- a/.github/workflows/composer-require-checker.yml
+++ b/.github/workflows/composer-require-checker.yml
@@ -30,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.0']
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 139a6503..fff84aa3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,4 +2,4 @@
 
 ## 1.0.0 under development
 
-- Enh: Add composer require checker into CI
+- Initial release.

From bc3f4e7b599477fbe3cb5003728aa9159373cf1f Mon Sep 17 00:00:00 2001
From: Dmitrii Derepko <xepozz@list.ru>
Date: Sun, 9 Jun 2024 13:58:21 +0300
Subject: [PATCH 5/8] Remove unused files

---
 src/Generator/AbstractGeneratorDTO.php     | 47 ----------------------
 src/Generator/Controller/ControllerDTO.php | 34 ----------------
 2 files changed, 81 deletions(-)
 delete mode 100644 src/Generator/AbstractGeneratorDTO.php
 delete mode 100644 src/Generator/Controller/ControllerDTO.php

diff --git a/src/Generator/AbstractGeneratorDTO.php b/src/Generator/AbstractGeneratorDTO.php
deleted file mode 100644
index 31715ccb..00000000
--- a/src/Generator/AbstractGeneratorDTO.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Yii\Gii\Generator;
-
-use Yiisoft\Validator\Result;
-use Yiisoft\Validator\Rule\Callback;
-use Yiisoft\Validator\Rule\Required;
-use Yiisoft\Validator\ValidationContext;
-
-abstract class AbstractGeneratorDTO
-{
-    #[Required(message: 'A code template must be selected.')]
-    #[Callback(['validateTemplate'])]
-    private $template = [];
-
-    /**
-     * Validates the template selection.
-     * This method validates whether the user selects an existing template
-     * and the template contains all required template files as specified in {@see requiredTemplates()}.
-     *
-     * @param string $value
-     */
-    public function validateTemplate(mixed $value, Callback $rule, ValidationContext $validationContext): Result
-    {
-        /** @var self $dataSet */
-        $dataSet = $validationContext->getDataSet();
-        $result = new Result();
-        $templates = $dataSet->getTemplates();
-        if ($templates === []) {
-            return $result;
-        }
-        if (!isset($templates[$value])) {
-            $result->addError('Invalid template selection.');
-        } else {
-            $templatePath = $templates[$value];
-            foreach ($dataSet->requiredTemplates() as $template) {
-                if (!is_file($dataSet->aliases->get($templatePath . '/' . $template))) {
-                    $result->addError("Unable to find the required code template file '$template'.");
-                }
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/src/Generator/Controller/ControllerDTO.php b/src/Generator/Controller/ControllerDTO.php
deleted file mode 100644
index 5e9145f4..00000000
--- a/src/Generator/Controller/ControllerDTO.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Yii\Gii\Generator\Controller;
-
-use Yiisoft\Validator\Rule\Callback;
-use Yiisoft\Validator\Rule\Regex;
-use Yiisoft\Validator\Rule\Required;
-use Yiisoft\Yii\Gii\Generator\AbstractGeneratorDTO;
-
-class ControllerDTO extends AbstractGeneratorDTO
-{
-    #[Required()]
-    #[Regex(
-        pattern: '/^[A-Z][\w]*Controller$/',
-        message: 'Only word characters are allowed, and the class name must start with a capital letter and end with "Controller".'
-    )]
-    #[Callback(['validateNewClass'])]
-    private $controllerClass = [];
-
-    #[Regex(
-        pattern: '/^[\w\\\\]*$/',
-        message: 'Only word characters and backslashes are allowed.',
-        skipOnEmpty: true,
-    )]
-    private $baseClass = [];
-
-    #[Regex(
-        pattern: '/^[a-z][a-z0-9\\-,\\s]*$/',
-        message: 'Only a-z, 0-9, dashes (-), spaces and commas are allowed.'
-    )]
-    private $actions = [];
-}

From ee1ba0363b68840c173e82bdb077901d08dd2ab1 Mon Sep 17 00:00:00 2001
From: Dmitrii Derepko <xepozz@list.ru>
Date: Sun, 9 Jun 2024 14:03:07 +0300
Subject: [PATCH 6/8] Fix missing dependencies

---
 composer.json                                  | 7 +++++--
 src/Component/CodeFile/CodeFileWriteResult.php | 7 -------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index e13f8756..0fe1b0e6 100644
--- a/composer.json
+++ b/composer.json
@@ -33,9 +33,14 @@
         "php": "^8.1",
         "httpsoft/http-basis": "^1.1",
         "phpspec/php-diff": "^1.1.3",
+        "psr/http-message": "^2.0",
+        "symfony/console": "^7.1",
+        "yiisoft/active-record": "dev-master",
         "yiisoft/aliases": "^3.0",
         "yiisoft/arrays": "^2.1|^3.0",
         "yiisoft/data-response": "^2.0",
+        "yiisoft/db": "1.2 as dev-master",
+        "yiisoft/friendly-exception": "^1.1",
         "yiisoft/http": "^1.2",
         "yiisoft/hydrator": "^1.0",
         "yiisoft/injector": "^1.1",
@@ -56,9 +61,7 @@
         "roave/infection-static-analysis-plugin": "^1.23",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^5.13",
-        "yiisoft/active-record": "dev-master",
         "yiisoft/cache": "^3.0",
-        "yiisoft/db": "1.2 as dev-master",
         "yiisoft/db-sqlite": "^1.0",
         "yiisoft/di": "^1.1",
         "yiisoft/dummy-provider": "^1.0",
diff --git a/src/Component/CodeFile/CodeFileWriteResult.php b/src/Component/CodeFile/CodeFileWriteResult.php
index f0f6b406..6b3b1098 100644
--- a/src/Component/CodeFile/CodeFileWriteResult.php
+++ b/src/Component/CodeFile/CodeFileWriteResult.php
@@ -4,8 +4,6 @@
 
 namespace Yiisoft\Yii\Gii\Component\CodeFile;
 
-use JetBrains\PhpStorm\ArrayShape;
-
 class CodeFileWriteResult
 {
     private array $results = [];
@@ -28,11 +26,6 @@ public function addError(CodeFile $file, string $error): void
         ];
     }
 
-    #[ArrayShape([
-        'id' => 'string',
-        'status' => 'string',
-        'error' => 'null|string',
-    ])]
     public function getResults(): array
     {
         return $this->results;

From 59ea922fc56067f9ccb5f7bbb955da585e77d53b Mon Sep 17 00:00:00 2001
From: Dmitrii Derepko <xepozz@list.ru>
Date: Sun, 9 Jun 2024 14:04:12 +0300
Subject: [PATCH 7/8] Fix php version

---
 .github/workflows/composer-require-checker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
index 6cb40992..b115ab1d 100644
--- a/.github/workflows/composer-require-checker.yml
+++ b/.github/workflows/composer-require-checker.yml
@@ -30,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.1']

From c80081d796a21d653336a8bc8f157959eb3ef6df Mon Sep 17 00:00:00 2001
From: Dmitrii Derepko <xepozz@list.ru>
Date: Sun, 9 Jun 2024 14:05:49 +0300
Subject: [PATCH 8/8] Fix symfony/console version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0fe1b0e6..d925fb73 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "httpsoft/http-basis": "^1.1",
         "phpspec/php-diff": "^1.1.3",
         "psr/http-message": "^2.0",
-        "symfony/console": "^7.1",
+        "symfony/console": "^6.0|^7.0",
         "yiisoft/active-record": "dev-master",
         "yiisoft/aliases": "^3.0",
         "yiisoft/arrays": "^2.1|^3.0",