Merge pull request #83 from alexpott/symfony-console-6-and-psr-log-3

Allow symfony console 6 and psr log 3

Author: Chi-teck

composer.json

@@ -29,8 +29,8 @@
     "require": {
         "php": ">=7.4",
         "ext-json": "*",
-        "psr/log": "^1.1 || ^2.0",
-        "symfony/console": "^4.4.15 || ^5.1",
+        "psr/log": "^1.1 || ^2.0 || ^3.0",
+        "symfony/console": "^4.4.15 || ^5.1 || ^6.0",
         "symfony/filesystem": "^4.4 || ^5.1 || ^6",
         "symfony/polyfill-php80": "^1.23",
         "symfony/string": "^5.1 || ^6",
@@ -39,12 +39,12 @@
     "require-dev": {
         "chi-teck/drupal-coder-extension": "^1.2",
         "drupal/coder": "^8.3.14",
-        "friendsoftwig/twigcs": "^5.0",
+        "friendsoftwig/twigcs": "dev-master",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.4",
         "squizlabs/php_codesniffer": "^3.5",
-        "symfony/var-dumper": "^5.2",
-        "symfony/yaml": "^5.2"
+        "symfony/var-dumper": "^5.2 || ^6.0",
+        "symfony/yaml": "^5.2 || ^6.0"
     },
     "conflict": {
         "squizlabs/php_codesniffer": "<3.6"

phpcs.xml

@@ -10,6 +10,8 @@
     <!-- Conflicts with PHP attributes. -->
     <exclude name="Drupal.Commenting.InlineComment.DocBlock"/>
     <exclude name="Drupal.Commenting.FunctionComment.Missing"/>
+    <!-- Conflicts with BC layer. -->
+    <exclude name="Drupal.Commenting.FileComment.Missing"/>
   </rule>
   <rule ref="vendor/drupal/coder/coder_sniffer/DrupalPractice">
     <exclude name="Drupal.Commenting.VariableComment.Missing"/>

src/Compatibility/AskQuestionTrait.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace DrupalCodeGenerator\Compatibility;
+
+if (\PHP_VERSION_ID >= 80000) {
+  \class_alias(
+    '\DrupalCodeGenerator\Compatibility\Php8\AskQuestionTrait',
+    '\DrupalCodeGenerator\Compatibility\AskQuestionTrait'
+  );
+}
+else {
+  \class_alias(
+    '\DrupalCodeGenerator\Compatibility\Php7\AskQuestionTrait',
+    '\DrupalCodeGenerator\Compatibility\AskQuestionTrait'
+  );
+}

src/Compatibility/AskTrait.php

@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+
+/**
+ * @file
+ * Compatibility shim.
+ */
+
+namespace DrupalCodeGenerator\Compatibility;
+
+if (\PHP_VERSION_ID >= 80000) {
+  \class_alias(
+    '\DrupalCodeGenerator\Compatibility\Php8\AskTrait',
+    '\DrupalCodeGenerator\Compatibility\AskTrait'
+  );
+}
+else {
+  \class_alias(
+    '\DrupalCodeGenerator\Compatibility\Php7\AskTrait',
+    '\DrupalCodeGenerator\Compatibility\AskTrait'
+  );
+}

src/Compatibility/GeneratorStyleCompatibilityInterface.php

@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+
+/**
+ * @file
+ * Compatibility shim.
+ */
+
+namespace DrupalCodeGenerator\Compatibility;
+
+if (\PHP_VERSION_ID >= 80000) {
+  \class_alias(
+    '\DrupalCodeGenerator\Compatibility\Php8\GeneratorStyleInterface',
+    '\DrupalCodeGenerator\Compatibility\GeneratorStyleCompatibilityInterface'
+  );
+}
+else {
+  \class_alias(
+    '\DrupalCodeGenerator\Compatibility\Php7\GeneratorStyleInterface',
+    '\DrupalCodeGenerator\Compatibility\GeneratorStyleCompatibilityInterface'
+  );
+}

src/Compatibility/Php7/AskQuestionTrait.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace DrupalCodeGenerator\Compatibility\Php7;
+
+use Symfony\Component\Console\Question\Question;
+
+/**
+ * PHP 7 compatibility.
+ */
+trait AskQuestionTrait {
+
+  /**
+   * Asks a question.
+   *
+   * @return mixed
+   *   The answer.
+   */
+  public function askQuestion(Question $question) {
+    return $this->compatAskQuestion($question);
+  }
+
+  /**
+   * Asks a question.
+   *
+   * @return mixed
+   *   The answer.
+   */
+  abstract protected function compatAskQuestion(Question $question);
+
+}

src/Compatibility/Php7/AskTrait.php

@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace DrupalCodeGenerator\Compatibility\Php7;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+
+/**
+ * PHP 7 compatibility.
+ */
+trait AskTrait {
+
+  /**
+   * Asks a question.
+   *
+   * @return mixed
+   *   The answer.
+   */
+  public function ask(InputInterface $input, OutputInterface $output, Question $question) {
+    return $this->compatAsk($input, $output, $question);
+  }
+
+  /**
+   * Asks a question.
+   *
+   * @return mixed
+   *   The answer.
+   */
+  abstract protected function compatAsk(InputInterface $input, OutputInterface $output, Question $question);
+
+}

src/Compatibility/Php7/GeneratorStyleInterface.php

@@ -0,0 +1,20 @@
+<?php declare(strict_types=1);
+
+namespace DrupalCodeGenerator\Compatibility\Php7;
+
+use Symfony\Component\Console\Question\Question;
+
+/**
+ * PHP 7 compatibility.
+ */
+interface GeneratorStyleInterface {
+
+  /**
+   * Asks a question to the user.
+   *
+   * @return mixed
+   *   The answer.
+   */
+  public function askQuestion(Question $question);
+
+}

src/Compatibility/Php8/AskQuestionTrait.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types=1);
+
+namespace DrupalCodeGenerator\Compatibility\Php8;
+
+use Symfony\Component\Console\Question\Question;
+
+/**
+ * PHP 8 compatibility.
+ */
+trait AskQuestionTrait {
+
+  public function askQuestion(Question $question): mixed {
+    return $this->compatAskQuestion($question);
+  }
+
+  /**
+   * Asks a question.
+   *
+   * @return mixed
+   *   The answer.
+   */
+  abstract protected function compatAskQuestion(Question $question);
+
+}

src/Compatibility/Php8/AskTrait.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+
+namespace DrupalCodeGenerator\Compatibility\Php8;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+
+/**
+ * PHP 8 compatibility.
+ */
+trait AskTrait {
+
+  public function ask(InputInterface $input, OutputInterface $output, Question $question): mixed {
+    return $this->compatAsk($input, $output, $question);
+  }
+
+  /**
+   * Asks a question.
+   *
+   * @return mixed
+   *   The answer.
+   */
+  abstract protected function compatAsk(InputInterface $input, OutputInterface $output, Question $question);
+
+}