refactor: rationalise namespaces in olcs-backend. (#198)

* refactor: rationalise namespaces in olcs-backend.

* refactor: fix composer dump-autoload -o namespace warnings.

composer.json

@@ -53,10 +53,10 @@
     },
     "autoload": {
         "classmap": [
-            "module/Olcs/Db/src"
+          "module/Db/src"
         ],
         "psr-4": {
-            "Olcs\\Db\\": "module/Olcs/Db/src",
+            "Dvsa\\Olcs\\Db\\": "module/Db/src",
             "Dvsa\\Olcs\\AcquiredRights\\": "module/AcquiredRights/src",
             "Dvsa\\Olcs\\Api\\": "module/Api/src",
             "Dvsa\\Olcs\\DocumentShare\\": "module/DocumentShare/src",
@@ -75,10 +75,10 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Dvsa\\Olcs\\Auth\\Test\\": "module/Auth/test",
-            "Dvsa\\Olcs\\CompaniesHouse\\Test\\": "module/CompaniesHouse/test",
-            "Dvsa\\Olcs\\Cpms\\Test\\": "module/Cpms/test",
-            "OlcsTest\\Db\\": "test/module/Olcs/Db/src",
+            "Dvsa\\OlcsTest\\Auth\\": "test/module/Auth/src",
+            "Dvsa\\OlcsTest\\CompaniesHouse\\": "test/module/CompaniesHouse/src",
+            "Dvsa\\OlcsTest\\Cpms\\": "test/module/Cpms/src",
+            "Dvsa\\OlcsTest\\Db\\": "test/module/Olcs/Db/src",
             "Dvsa\\OlcsTest\\": "test/src",
             "Dvsa\\OlcsTest\\Address\\": "test/module/Address/src",
             "Dvsa\\OlcsTest\\Api\\": "test/module/Api/src",

config/application.config.php

@@ -25,7 +25,6 @@
         'Dvsa\Olcs\Transfer',
         'DoctrineModule',
         'DoctrineORMModule',
-        'Olcs\Db',
         'Dvsa\Olcs\AcquiredRights',
         'Dvsa\Olcs\Api',
         'Dvsa\Olcs\Scanning',

module/Api/src/Domain/CommandHandler/Vehicle/UpdateSection26.php

@@ -4,6 +4,7 @@
 
 use Dvsa\Olcs\Api\Domain\CommandHandler\AbstractCommandHandler;
 use Dvsa\Olcs\Api\Domain\CommandHandler\TransactionedInterface;
+use Dvsa\Olcs\Db\Service\Search\Search;
 use Dvsa\Olcs\Transfer\Command\CommandInterface;
 use Psr\Container\ContainerInterface;
 
@@ -17,7 +18,7 @@ final class UpdateSection26 extends AbstractCommandHandler implements Transactio
     protected $repoServiceName = 'Vehicle';
 
     /**
-     * @var \Olcs\Db\Service\Search\Search
+     * @var Search
      */
     private $searchService;
 

module/Olcs/Db/Module.php → module/Db/Module.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Olcs\Db;
+namespace Dvsa\Olcs\Db;
 
 use Laminas\EventManager\EventInterface;
 use Laminas\ModuleManager\Feature\BootstrapListenerInterface;

module/Olcs/Db/config/module.config.php → module/Db/config/module.config.php

@@ -19,16 +19,16 @@
             \Laminas\Log\LoggerAbstractServiceFactory::class
         ],
         'factories' => [
-            \Elasticsearch\Client::class => \Olcs\Db\Service\Search\ClientFactory::class,
-            'Elasticsearch\Search' => \Olcs\Db\Service\Search\SearchFactory::class,
+            \Elasticsearch\Client::class => Dvsa\Olcs\Db\Service\Search\ClientFactory::class,
+            'Elasticsearch\Search' => Dvsa\Olcs\Db\Service\Search\SearchFactory::class,
         ],
     ],
     'controllers' => [
         'invokables' => [
 
         ],
         'factories' => [
-            'Search' => Olcs\Db\Controller\SearchControllerFactory::class,
+            'Search' => Dvsa\Olcs\Db\Controller\SearchControllerFactory::class,
         ],
     ],
     'view_manager' => [

module/Olcs/Db/src/Controller/AbstractController.php → module/Db/src/Controller/AbstractController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Olcs\Db\Controller;
+namespace Dvsa\Olcs\Db\Controller;
 
 use Olcs\Logging\Log\Logger;
 use Laminas\Mvc\Controller\AbstractRestfulController as LaminasAbstractRestfulController;
 use Laminas\Mvc\Exception;
 use Laminas\Mvc\MvcEvent;
 use Laminas\Http\Response;
-use Olcs\Db\Exceptions\RestResponseException;
-use Olcs\Db\Traits\RestResponseTrait;
+use Dvsa\Olcs\Db\Exceptions\RestResponseException;
+use Dvsa\Olcs\Db\Traits\RestResponseTrait;
 
 /**
  * Abstract Controller

module/Olcs/Db/src/Controller/SearchController.php → module/Db/src/Controller/SearchController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Olcs\Db\Controller;
+namespace Dvsa\Olcs\Db\Controller;
 
-use Olcs\Db\Exceptions\SearchDateFilterParseException;
+use Dvsa\Olcs\Db\Exceptions\SearchDateFilterParseException;
 use Laminas\Http\PhpEnvironment\Response;
-use Olcs\Db\Service\Search\Search;
+use Dvsa\Olcs\Db\Service\Search\Search;
 
 /**
  * Class SearchController

module/Olcs/Db/src/Controller/SearchControllerFactory.php → module/Db/src/Controller/SearchControllerFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Olcs\Db\Controller;
+namespace Dvsa\Olcs\Db\Controller;
 
 use Dvsa\Olcs\Api\Service\Permits\CandidatePermits\IrhpCandidatePermitsCreator;
 use Psr\Container\ContainerInterface;

module/Olcs/Db/src/Exceptions/RestResponseException.php → module/Db/src/Exceptions/RestResponseException.php

@@ -6,7 +6,7 @@
  * @author Someone <[email protected]>
  */
 
-namespace Olcs\Db\Exceptions;
+namespace Dvsa\Olcs\Db\Exceptions;
 
 /**
  * RestResponseException

module/Olcs/Db/src/Exceptions/SearchDateFilterParseException.php → module/Db/src/Exceptions/SearchDateFilterParseException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Olcs\Db\Exceptions;
+namespace Dvsa\Olcs\Db\Exceptions;
 
 use Throwable;
 

module/Olcs/Db/src/Service/Search/ClientFactory.php → module/Db/src/Service/Search/ClientFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Olcs\Db\Service\Search;
+namespace Dvsa\Olcs\Db\Service\Search;
 
 use Elastica\Client;
 use Olcs\Logging\Log\Logger;

module/Olcs/Db/src/Service/Search/Indices/AbstractIndex.php → module/Db/src/Service/Search/Indices/AbstractIndex.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Olcs\Db\Service\Search\Indices;
+namespace Dvsa\Olcs\Db\Service\Search\Indices;
 
 use InvalidArgumentException;
-use Olcs\Db\Service\Search\Indices\Terms\ComplexTermInterface;
-use Olcs\Db\Service\Search\Indices\Terms\TransportManagerLicenceStatus;
+use Dvsa\Olcs\Db\Service\Search\Indices\Terms\ComplexTermInterface;
+use Dvsa\Olcs\Db\Service\Search\Indices\Terms\TransportManagerLicenceStatus;
 
 abstract class AbstractIndex
 {

module/Olcs/Db/src/Service/Search/Indices/Person.php → module/Db/src/Service/Search/Indices/Person.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Olcs\Db\Service\Search\Indices;
+namespace Dvsa\Olcs\Db\Service\Search\Indices;
 
-use Olcs\Db\Service\Search\Indices\Terms\ComplexTermInterface;
-use Olcs\Db\Service\Search\Indices\Terms\TransportManagerLicenceStatus;
+use Dvsa\Olcs\Db\Service\Search\Indices\Terms\ComplexTermInterface;
+use Dvsa\Olcs\Db\Service\Search\Indices\Terms\TransportManagerLicenceStatus;
 
 class Person extends AbstractIndex
 {

module/Olcs/Db/src/Service/Search/Indices/Terms/ComplexTermInterface.php → module/Db/src/Service/Search/Indices/Terms/ComplexTermInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Olcs\Db\Service\Search\Indices\Terms;
+namespace Dvsa\Olcs\Db\Service\Search\Indices\Terms;
 
 interface ComplexTermInterface
 {

module/Olcs/Db/src/Service/Search/Indices/Terms/TransportManagerLicenceStatus.php → module/Db/src/Service/Search/Indices/Terms/TransportManagerLicenceStatus.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Olcs\Db\Service\Search\Indices\Terms;
+namespace Dvsa\Olcs\Db\Service\Search\Indices\Terms;
 
 class TransportManagerLicenceStatus implements ComplexTermInterface
 {

module/Olcs/Db/src/Service/Search/QueryTemplate.php → module/Db/src/Service/Search/QueryTemplate.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Olcs\Db\Service\Search;
+namespace Dvsa\Olcs\Db\Service\Search;
 
 use DomainException;
 use Elastica\Query;
 use InvalidArgumentException;
-use Olcs\Db\Service\Search\Indices\AbstractIndex;
-use Olcs\Db\Service\Search\Indices\Terms\ComplexTermInterface;
+use Dvsa\Olcs\Db\Service\Search\Indices\AbstractIndex;
+use Dvsa\Olcs\Db\Service\Search\Indices\Terms\ComplexTermInterface;
 use RuntimeException;
 
 /**

module/Olcs/Db/src/Service/Search/Search.php → module/Db/src/Service/Search/Search.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Olcs\Db\Service\Search;
+namespace Dvsa\Olcs\Db\Service\Search;
 
 use Dvsa\Olcs\Api\Entity\TrafficArea\TrafficArea;
 use Dvsa\Olcs\Api\Domain\Repository\SystemParameter as SysParamRepo;
@@ -11,13 +11,13 @@
 use Elastica\Query\MatchQuery;
 use Elastica\Query;
 use Elastica\ResultSet;
-use Olcs\Db\Exceptions\SearchDateFilterParseException;
+use Dvsa\Olcs\Db\Exceptions\SearchDateFilterParseException;
 use Laminas\Filter\Word\CamelCaseToUnderscore;
 use Laminas\Filter\Word\UnderscoreToCamelCase;
 use Dvsa\Olcs\Api\Domain\AuthAwareInterface;
 use Dvsa\Olcs\Api\Domain\AuthAwareTrait;
 use LmcRbacMvc\Service\AuthorizationService;
-use Olcs\Db\Service\Search\Indices\AbstractIndex;
+use Dvsa\Olcs\Db\Service\Search\Indices\AbstractIndex;
 
 /**
  * Class Search

module/Olcs/Db/src/Service/Search/SearchFactory.php → module/Db/src/Service/Search/SearchFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Olcs\Db\Service\Search;
+namespace Dvsa\Olcs\Db\Service\Search;
 
 use Elasticsearch\Client;
 use Psr\Container\ContainerInterface;

module/Olcs/Db/src/Traits/RestResponseTrait.php → module/Db/src/Traits/RestResponseTrait.php

@@ -6,7 +6,7 @@
  * @author Someone <[email protected]>
  */
 
-namespace Olcs\Db\Traits;
+namespace Dvsa\Olcs\Db\Traits;
 
 use Laminas\Http\Response;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateAddressesStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateAddressesStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateBusinessDetailsStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateBusinessDetailsStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateBusinessTypeStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateBusinessTypeStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateCommunityLicencesStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateCommunityLicencesStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateConditionsUndertakingsStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateConditionsUndertakingsStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateConvictionsPenaltiesStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateConvictionsPenaltiesStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateFinancialEvidenceStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateFinancialEvidenceStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateFinancialHistoryStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateFinancialHistoryStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateLicenceHistoryStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateLicenceHistoryStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateOperatingCentresStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateOperatingCentresStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdatePeopleStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdatePeopleStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateSafetyStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateSafetyStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateTaxiPhvStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateTaxiPhvStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateTransportManagersStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateTransportManagersStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateTypeOfLicenceStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateTypeOfLicenceStatus;
 

test/module/Api/src/Domain/Command/ApplicationCompletion/UpdateUndertakingsStatusTest.php

@@ -6,7 +6,7 @@
  * @author Rob Caiger <[email protected]>
  */
 
-namespace Dvsa\OlcsTest\Api\Domain\Command\Application;
+namespace Dvsa\OlcsTest\Api\Domain\Command\ApplicationCompletion;
 
 use Dvsa\Olcs\Api\Domain\Command\ApplicationCompletion\UpdateUndertakingsStatus;