Merge pull request #38 from systopia/code-style

Code style
systopia · Oct 27, 2023 · 2f16422 · 2f16422
2 parents 7fe584c + 65be6ad
commit 2f16422
Show file tree

Hide file tree

Showing 22 changed files with 77 additions and 65 deletions.
diff --git a/src/Breadcrumb/BreadcrumbRouteAnalyzer.php b/src/Breadcrumb/BreadcrumbRouteAnalyzer.php
@@ -14,7 +14,7 @@ final class BreadcrumbRouteAnalyzer implements ContainerInjectionInterface {
   private RouteAnalyzer $routeAnalyzer;
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    */

diff --git a/src/Element/CiviremoteFundingApplicationHistory.php b/src/Element/CiviremoteFundingApplicationHistory.php
@@ -31,7 +31,7 @@
 final class CiviremoteFundingApplicationHistory extends RenderElement {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    */
   public function getInfo(): array {
     return [

diff --git a/src/Element/CiviremoteFundingApplicationHistoryComment.php b/src/Element/CiviremoteFundingApplicationHistoryComment.php
@@ -30,7 +30,7 @@
 final class CiviremoteFundingApplicationHistoryComment extends RenderElement {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @phpstan-return array<string, mixed>
    */

diff --git a/src/Element/CiviremoteFundingApplicationHistoryCreate.php b/src/Element/CiviremoteFundingApplicationHistoryCreate.php
@@ -30,7 +30,7 @@
 final class CiviremoteFundingApplicationHistoryCreate extends RenderElement {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    */
   public function getInfo(): array {
     return [

diff --git a/src/Element/CiviremoteFundingApplicationHistoryEntry.php b/src/Element/CiviremoteFundingApplicationHistoryEntry.php
@@ -28,7 +28,7 @@
 final class CiviremoteFundingApplicationHistoryEntry extends RenderElement {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    */
   public function getInfo(): array {
     return [

diff --git a/src/Element/CiviremoteFundingApplicationHistoryStatusChange.php b/src/Element/CiviremoteFundingApplicationHistoryStatusChange.php
@@ -30,7 +30,7 @@
 final class CiviremoteFundingApplicationHistoryStatusChange extends RenderElement {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    */
   public function getInfo(): array {
     return [

diff --git a/src/EventSubscriber/ViewTranslationSubscriber.php b/src/EventSubscriber/ViewTranslationSubscriber.php
@@ -37,7 +37,7 @@ public function __construct(ViewTranslator $viewTranslator) {
   }
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    */
   public static function getSubscribedEvents(): array {
     return [

diff --git a/src/Form/AbstractFundingJsonFormsForm.php b/src/Form/AbstractFundingJsonFormsForm.php
@@ -115,7 +115,7 @@ public function validateForm(array &$form, FormStateInterface $formState): void
   }
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @param array<int|string, mixed> $form
    * @param \Drupal\Core\Form\FormStateInterface $formState

diff --git a/src/Form/AddApplicationForm.php b/src/Form/AddApplicationForm.php
@@ -30,7 +30,7 @@
 final class AddApplicationForm extends AbstractFundingJsonFormsForm {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    */

diff --git a/src/Form/ApplicationForm.php b/src/Form/ApplicationForm.php
@@ -30,7 +30,7 @@
 final class ApplicationForm extends AbstractFundingJsonFormsForm {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    */

diff --git a/src/Form/ChooseFundingProgramForm.php b/src/Form/ChooseFundingProgramForm.php
@@ -36,7 +36,7 @@ public function __construct(FundingApi $fundingApi) {
   }
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    */

diff --git a/src/Form/FundingCaseForm.php b/src/Form/FundingCaseForm.php
@@ -30,7 +30,7 @@
 final class FundingCaseForm extends AbstractFundingJsonFormsForm {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    */

diff --git a/src/Form/NewApplicationForm.php b/src/Form/NewApplicationForm.php
@@ -30,7 +30,7 @@
 final class NewApplicationForm extends AbstractFundingJsonFormsForm {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    */

diff --git a/src/Form/NewDrawdownForm.php b/src/Form/NewDrawdownForm.php
@@ -39,7 +39,7 @@ public function __construct(FundingApi $fundingApi) {
   }
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    */
@@ -52,7 +52,7 @@ public function getFormId(): string {
   }
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    */
   public function buildForm(
     array $form,

diff --git a/src/Form/NewFundingCaseForm.php b/src/Form/NewFundingCaseForm.php
@@ -30,7 +30,7 @@
 final class NewFundingCaseForm extends AbstractFundingJsonFormsForm {
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    */

diff --git a/src/JsonForms/Callbacks/FileUploadCallback.php b/src/JsonForms/Callbacks/FileUploadCallback.php
@@ -49,7 +49,7 @@ public function __construct(
   }
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    *

diff --git a/src/JsonForms/FileUploadArrayFactory.php b/src/JsonForms/FileUploadArrayFactory.php
@@ -48,7 +48,7 @@ public static function getPriority(): int {
   }
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    */
   public function createFormArray(DefinitionInterface $definition,
     FormStateInterface $formState,

diff --git a/src/Route/RouteAnalyzer.php b/src/Route/RouteAnalyzer.php
@@ -29,7 +29,7 @@ final class RouteAnalyzer implements ContainerInjectionInterface {
   private RouteProvider $routeProvider;
 
   /**
-   * @inheritDoc
+   * {@inheritDoc}
    *
    * @return static
    */

diff --git a/src/ViewTranslator.php b/src/ViewTranslator.php
@@ -27,6 +27,14 @@
 
 final class ViewTranslator {
 
+  private const DEFAULT_TRANSLATABLE_KEYS = [
+    'label',
+    'title',
+    'description',
+    'text',
+    'submit_button',
+  ];
+
   private ConfigFactoryInterface $configFactory;
 
   private LanguageManagerInterface $languageManager;
@@ -41,10 +49,11 @@ final class ViewTranslator {
   /**
    * @phpstan-param array<string> $translatableKeys
    */
-  public function __construct(ConfigFactoryInterface $configFactory,
+  public function __construct(
+    ConfigFactoryInterface $configFactory,
     LanguageManagerInterface $languageManager,
     TranslatorInterface $translator,
-    array $translatableKeys = ['label', 'title', 'description', 'text', 'submit_button']
+    array $translatableKeys = self::DEFAULT_TRANSLATABLE_KEYS
   ) {
     $this->configFactory = $configFactory;
     $this->languageManager = $languageManager;
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ public function __construct(FundingApi $fundingApi) { @@
       }
       /**
-       * @inheritDoc
+       * {@inheritDoc}
        *
        * @return static
        */
@@ Expand Down @@