From 5bd1882e082614c91e36deb464df4432a3088f2d Mon Sep 17 00:00:00 2001
From: phenaproxima <phenaproxima@205645.no-reply.drupal.org>
Date: Tue, 11 Jan 2022 19:09:43 +0000
Subject: [PATCH] Issue #3258065 by phenaproxima: Create package_manager
 Validator namespace

---
 package_manager/package_manager.services.yml         | 12 ++++++------
 .../ComposerExecutableValidator.php                  |  2 +-
 .../ComposerSettingsValidator.php                    |  2 +-
 .../DiskSpaceValidator.php                           |  2 +-
 .../LockFileValidator.php                            |  2 +-
 .../PendingUpdatesValidator.php                      |  2 +-
 .../PreOperationStageValidatorInterface.php          |  2 +-
 .../WritableFileSystemValidator.php                  |  2 +-
 .../src/Kernel/ComposerExecutableValidatorTest.php   |  6 +++---
 .../src/Kernel/ComposerSettingsValidatorTest.php     |  2 +-
 .../tests/src/Kernel/DiskSpaceValidatorTest.php      |  2 +-
 .../tests/src/Kernel/LockFileValidatorTest.php       |  4 ++--
 .../src/Kernel/PackageManagerKernelTestBase.php      |  2 +-
 .../tests/src/Kernel/PendingUpdatesValidatorTest.php |  2 +-
 .../src/Kernel/WritableFileSystemValidatorTest.php   |  4 ++--
 src/Validator/PackageManagerReadinessCheck.php       |  6 +++---
 .../PackageManagerReadinessChecksTest.php            |  2 +-
 17 files changed, 28 insertions(+), 28 deletions(-)
 rename package_manager/src/{EventSubscriber => Validator}/ComposerExecutableValidator.php (98%)
 rename package_manager/src/{EventSubscriber => Validator}/ComposerSettingsValidator.php (96%)
 rename package_manager/src/{EventSubscriber => Validator}/DiskSpaceValidator.php (99%)
 rename package_manager/src/{EventSubscriber => Validator}/LockFileValidator.php (98%)
 rename package_manager/src/{EventSubscriber => Validator}/PendingUpdatesValidator.php (97%)
 rename package_manager/src/{EventSubscriber => Validator}/PreOperationStageValidatorInterface.php (91%)
 rename package_manager/src/{EventSubscriber => Validator}/WritableFileSystemValidator.php (97%)

diff --git a/package_manager/package_manager.services.yml b/package_manager/package_manager.services.yml
index f5e04442d0..7480aaae79 100644
--- a/package_manager/package_manager.services.yml
+++ b/package_manager/package_manager.services.yml
@@ -77,21 +77,21 @@ services:
 
   # Validators.
   package_manager.validator.composer_executable:
-    class: Drupal\package_manager\EventSubscriber\ComposerExecutableValidator
+    class: Drupal\package_manager\Validator\ComposerExecutableValidator
     arguments:
       - '@package_manager.composer_runner'
       - '@string_translation'
     tags:
       - { name: event_subscriber }
   package_manager.validator.disk_space:
-    class: Drupal\package_manager\EventSubscriber\DiskSpaceValidator
+    class: Drupal\package_manager\Validator\DiskSpaceValidator
     arguments:
       - '@package_manager.path_locator'
       - '@string_translation'
     tags:
       - { name: event_subscriber }
   package_manager.validator.pending_updates:
-    class: Drupal\package_manager\EventSubscriber\PendingUpdatesValidator
+    class: Drupal\package_manager\Validator\PendingUpdatesValidator
     arguments:
       - '%app.root%'
       - '@update.post_update_registry'
@@ -99,7 +99,7 @@ services:
     tags:
       - { name: event_subscriber }
   package_manager.validator.lock_file:
-    class: Drupal\package_manager\EventSubscriber\LockFileValidator
+    class: Drupal\package_manager\Validator\LockFileValidator
     arguments:
       - '@state'
       - '@package_manager.path_locator'
@@ -107,7 +107,7 @@ services:
     tags:
       - { name: event_subscriber }
   package_manager.validator.file_system:
-    class: Drupal\package_manager\EventSubscriber\WritableFileSystemValidator
+    class: Drupal\package_manager\Validator\WritableFileSystemValidator
     arguments:
       - '@package_manager.path_locator'
       - '%app.root%'
@@ -115,7 +115,7 @@ services:
     tags:
       - { name: event_subscriber }
   package_manager.validator.composer_settings:
-    class: Drupal\package_manager\EventSubscriber\ComposerSettingsValidator
+    class: Drupal\package_manager\Validator\ComposerSettingsValidator
     arguments:
       - '@string_translation'
     tags:
diff --git a/package_manager/src/EventSubscriber/ComposerExecutableValidator.php b/package_manager/src/Validator/ComposerExecutableValidator.php
similarity index 98%
rename from package_manager/src/EventSubscriber/ComposerExecutableValidator.php
rename to package_manager/src/Validator/ComposerExecutableValidator.php
index f91e852930..2ed03cd378 100644
--- a/package_manager/src/EventSubscriber/ComposerExecutableValidator.php
+++ b/package_manager/src/Validator/ComposerExecutableValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\package_manager\EventSubscriber;
+namespace Drupal\package_manager\Validator;
 
 use Drupal\package_manager\Event\PreCreateEvent;
 use Drupal\package_manager\Event\PreOperationStageEvent;
diff --git a/package_manager/src/EventSubscriber/ComposerSettingsValidator.php b/package_manager/src/Validator/ComposerSettingsValidator.php
similarity index 96%
rename from package_manager/src/EventSubscriber/ComposerSettingsValidator.php
rename to package_manager/src/Validator/ComposerSettingsValidator.php
index 64c7249564..0ad1c7c254 100644
--- a/package_manager/src/EventSubscriber/ComposerSettingsValidator.php
+++ b/package_manager/src/Validator/ComposerSettingsValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\package_manager\EventSubscriber;
+namespace Drupal\package_manager\Validator;
 
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
diff --git a/package_manager/src/EventSubscriber/DiskSpaceValidator.php b/package_manager/src/Validator/DiskSpaceValidator.php
similarity index 99%
rename from package_manager/src/EventSubscriber/DiskSpaceValidator.php
rename to package_manager/src/Validator/DiskSpaceValidator.php
index c54a653052..31441f8625 100644
--- a/package_manager/src/EventSubscriber/DiskSpaceValidator.php
+++ b/package_manager/src/Validator/DiskSpaceValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\package_manager\EventSubscriber;
+namespace Drupal\package_manager\Validator;
 
 use Drupal\package_manager\Event\PreCreateEvent;
 use Drupal\package_manager\Event\PreOperationStageEvent;
diff --git a/package_manager/src/EventSubscriber/LockFileValidator.php b/package_manager/src/Validator/LockFileValidator.php
similarity index 98%
rename from package_manager/src/EventSubscriber/LockFileValidator.php
rename to package_manager/src/Validator/LockFileValidator.php
index dab3d8d298..daf807e601 100644
--- a/package_manager/src/EventSubscriber/LockFileValidator.php
+++ b/package_manager/src/Validator/LockFileValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\package_manager\EventSubscriber;
+namespace Drupal\package_manager\Validator;
 
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
diff --git a/package_manager/src/EventSubscriber/PendingUpdatesValidator.php b/package_manager/src/Validator/PendingUpdatesValidator.php
similarity index 97%
rename from package_manager/src/EventSubscriber/PendingUpdatesValidator.php
rename to package_manager/src/Validator/PendingUpdatesValidator.php
index 53cbc74206..16062a98a6 100644
--- a/package_manager/src/EventSubscriber/PendingUpdatesValidator.php
+++ b/package_manager/src/Validator/PendingUpdatesValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\package_manager\EventSubscriber;
+namespace Drupal\package_manager\Validator;
 
 use Drupal\package_manager\Event\PreCreateEvent;
 use Drupal\package_manager\Event\PreOperationStageEvent;
diff --git a/package_manager/src/EventSubscriber/PreOperationStageValidatorInterface.php b/package_manager/src/Validator/PreOperationStageValidatorInterface.php
similarity index 91%
rename from package_manager/src/EventSubscriber/PreOperationStageValidatorInterface.php
rename to package_manager/src/Validator/PreOperationStageValidatorInterface.php
index a48ff5127f..a30bfbcda5 100644
--- a/package_manager/src/EventSubscriber/PreOperationStageValidatorInterface.php
+++ b/package_manager/src/Validator/PreOperationStageValidatorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\package_manager\EventSubscriber;
+namespace Drupal\package_manager\Validator;
 
 use Drupal\package_manager\Event\PreOperationStageEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/package_manager/src/EventSubscriber/WritableFileSystemValidator.php b/package_manager/src/Validator/WritableFileSystemValidator.php
similarity index 97%
rename from package_manager/src/EventSubscriber/WritableFileSystemValidator.php
rename to package_manager/src/Validator/WritableFileSystemValidator.php
index 95bc5d1104..24ccc24186 100644
--- a/package_manager/src/EventSubscriber/WritableFileSystemValidator.php
+++ b/package_manager/src/Validator/WritableFileSystemValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\package_manager\EventSubscriber;
+namespace Drupal\package_manager\Validator;
 
 use Drupal\package_manager\Event\PreCreateEvent;
 use Drupal\package_manager\Event\PreOperationStageEvent;
diff --git a/package_manager/tests/src/Kernel/ComposerExecutableValidatorTest.php b/package_manager/tests/src/Kernel/ComposerExecutableValidatorTest.php
index bc57b4fa75..12b4fe415c 100644
--- a/package_manager/tests/src/Kernel/ComposerExecutableValidatorTest.php
+++ b/package_manager/tests/src/Kernel/ComposerExecutableValidatorTest.php
@@ -3,14 +3,14 @@
 namespace Drupal\Tests\package_manager\Kernel;
 
 use Drupal\package_manager\Event\PreCreateEvent;
-use Drupal\package_manager\EventSubscriber\ComposerExecutableValidator;
+use Drupal\package_manager\Validator\ComposerExecutableValidator;
 use Drupal\package_manager\ValidationResult;
 use PhpTuf\ComposerStager\Exception\IOException;
 use PhpTuf\ComposerStager\Infrastructure\Process\ExecutableFinderInterface;
 use Prophecy\Argument;
 
 /**
- * @covers \Drupal\package_manager\EventSubscriber\ComposerExecutableValidator
+ * @covers \Drupal\package_manager\Validator\ComposerExecutableValidator
  *
  * @group package_manager
  */
@@ -120,7 +120,7 @@ class ComposerExecutableValidatorTest extends PackageManagerKernelTestBase {
       // $arguments, and we know exactly what that will contain: an array of
       // command arguments for Composer, and the validator object.
       ->will(function (array $arguments) use ($reported_version) {
-        /** @var \Drupal\package_manager\EventSubscriber\ComposerExecutableValidator $validator */
+        /** @var \Drupal\package_manager\Validator\ComposerExecutableValidator $validator */
         $validator = $arguments[1];
         // Invoke the validator (which, as mentioned, is a callback function),
         // with fake output from `composer --version`. It should try to tease a
diff --git a/package_manager/tests/src/Kernel/ComposerSettingsValidatorTest.php b/package_manager/tests/src/Kernel/ComposerSettingsValidatorTest.php
index d964c09ba9..af6f12bde6 100644
--- a/package_manager/tests/src/Kernel/ComposerSettingsValidatorTest.php
+++ b/package_manager/tests/src/Kernel/ComposerSettingsValidatorTest.php
@@ -7,7 +7,7 @@ use Drupal\package_manager\Exception\StageValidationException;
 use Drupal\package_manager\ValidationResult;
 
 /**
- * @covers \Drupal\package_manager\EventSubscriber\ComposerSettingsValidator
+ * @covers \Drupal\package_manager\Validator\ComposerSettingsValidator
  *
  * @group package_manager
  */
diff --git a/package_manager/tests/src/Kernel/DiskSpaceValidatorTest.php b/package_manager/tests/src/Kernel/DiskSpaceValidatorTest.php
index 7b1f406859..a972c7e8a4 100644
--- a/package_manager/tests/src/Kernel/DiskSpaceValidatorTest.php
+++ b/package_manager/tests/src/Kernel/DiskSpaceValidatorTest.php
@@ -7,7 +7,7 @@ use Drupal\package_manager\ValidationResult;
 use Drupal\Component\Utility\Bytes;
 
 /**
- * @covers \Drupal\package_manager\EventSubscriber\DiskSpaceValidator
+ * @covers \Drupal\package_manager\Validator\DiskSpaceValidator
  *
  * @group package_manager
  */
diff --git a/package_manager/tests/src/Kernel/LockFileValidatorTest.php b/package_manager/tests/src/Kernel/LockFileValidatorTest.php
index ed02f41c3a..c6cfeb535d 100644
--- a/package_manager/tests/src/Kernel/LockFileValidatorTest.php
+++ b/package_manager/tests/src/Kernel/LockFileValidatorTest.php
@@ -5,11 +5,11 @@ namespace Drupal\Tests\package_manager\Kernel;
 use Drupal\package_manager\Event\PreApplyEvent;
 use Drupal\package_manager\Event\PreCreateEvent;
 use Drupal\package_manager\Event\PreRequireEvent;
-use Drupal\package_manager\EventSubscriber\LockFileValidator;
+use Drupal\package_manager\Validator\LockFileValidator;
 use Drupal\package_manager\ValidationResult;
 
 /**
- * @coversDefaultClass \Drupal\package_manager\EventSubscriber\LockFileValidator
+ * @coversDefaultClass \Drupal\package_manager\Validator\LockFileValidator
  *
  * @group package_manager
  */
diff --git a/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php b/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php
index aa26879c9f..25d08dac8b 100644
--- a/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php
+++ b/package_manager/tests/src/Kernel/PackageManagerKernelTestBase.php
@@ -5,7 +5,7 @@ namespace Drupal\Tests\package_manager\Kernel;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\package_manager\Event\StageEvent;
-use Drupal\package_manager\EventSubscriber\DiskSpaceValidator;
+use Drupal\package_manager\Validator\DiskSpaceValidator;
 use Drupal\package_manager\Exception\StageException;
 use Drupal\package_manager\Exception\StageValidationException;
 use Drupal\package_manager\PathLocator;
diff --git a/package_manager/tests/src/Kernel/PendingUpdatesValidatorTest.php b/package_manager/tests/src/Kernel/PendingUpdatesValidatorTest.php
index ea90029ca2..35605045ea 100644
--- a/package_manager/tests/src/Kernel/PendingUpdatesValidatorTest.php
+++ b/package_manager/tests/src/Kernel/PendingUpdatesValidatorTest.php
@@ -6,7 +6,7 @@ use Drupal\package_manager\Event\PreCreateEvent;
 use Drupal\package_manager\ValidationResult;
 
 /**
- * @covers \Drupal\package_manager\EventSubscriber\PendingUpdatesValidator
+ * @covers \Drupal\package_manager\Validator\PendingUpdatesValidator
  *
  * @group package_manager
  */
diff --git a/package_manager/tests/src/Kernel/WritableFileSystemValidatorTest.php b/package_manager/tests/src/Kernel/WritableFileSystemValidatorTest.php
index a2dc72efd2..40e3f683c8 100644
--- a/package_manager/tests/src/Kernel/WritableFileSystemValidatorTest.php
+++ b/package_manager/tests/src/Kernel/WritableFileSystemValidatorTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\package_manager\Kernel;
 
 use Drupal\package_manager\Event\PreCreateEvent;
-use Drupal\package_manager\EventSubscriber\WritableFileSystemValidator;
+use Drupal\package_manager\Validator\WritableFileSystemValidator;
 use Drupal\package_manager\ValidationResult;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 
@@ -15,7 +15,7 @@ use Drupal\Core\DependencyInjection\ContainerBuilder;
  *
  * @see \Drupal\Tests\automatic_updates\Build\CoreUpdateTest::assertReadOnlyFileSystemError()
  *
- * @covers \Drupal\package_manager\EventSubscriber\WritableFileSystemValidator
+ * @covers \Drupal\package_manager\Validator\WritableFileSystemValidator
  *
  * @group package_manager
  */
diff --git a/src/Validator/PackageManagerReadinessCheck.php b/src/Validator/PackageManagerReadinessCheck.php
index b7754315f4..1a6bb48a80 100644
--- a/src/Validator/PackageManagerReadinessCheck.php
+++ b/src/Validator/PackageManagerReadinessCheck.php
@@ -3,7 +3,7 @@
 namespace Drupal\automatic_updates\Validator;
 
 use Drupal\automatic_updates\Event\ReadinessCheckEvent;
-use Drupal\package_manager\EventSubscriber\PreOperationStageValidatorInterface;
+use Drupal\package_manager\Validator\PreOperationStageValidatorInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -18,14 +18,14 @@ class PackageManagerReadinessCheck implements EventSubscriberInterface {
   /**
    * The validator to run.
    *
-   * @var \Drupal\package_manager\EventSubscriber\PreOperationStageValidatorInterface
+   * @var \Drupal\package_manager\Validator\PreOperationStageValidatorInterface
    */
   protected $validator;
 
   /**
    * Constructs a PackageManagerReadinessCheck object.
    *
-   * @param \Drupal\package_manager\EventSubscriber\PreOperationStageValidatorInterface $validator
+   * @param \Drupal\package_manager\Validator\PreOperationStageValidatorInterface $validator
    *   The Package Manager validator to run during readiness checking.
    */
   public function __construct(PreOperationStageValidatorInterface $validator) {
diff --git a/tests/src/Kernel/ReadinessValidation/PackageManagerReadinessChecksTest.php b/tests/src/Kernel/ReadinessValidation/PackageManagerReadinessChecksTest.php
index 19dff1be7c..7b2fd421b6 100644
--- a/tests/src/Kernel/ReadinessValidation/PackageManagerReadinessChecksTest.php
+++ b/tests/src/Kernel/ReadinessValidation/PackageManagerReadinessChecksTest.php
@@ -4,7 +4,7 @@ namespace Drupal\Tests\automatic_updates\Kernel\ReadinessValidation;
 
 use Drupal\automatic_updates\Event\ReadinessCheckEvent;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\package_manager\EventSubscriber\PreOperationStageValidatorInterface;
+use Drupal\package_manager\Validator\PreOperationStageValidatorInterface;
 use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
 use Prophecy\Argument;
 
-- 
GitLab