generic collections/repositories (ref #333)

ro0NL · ro0NL · commit b110ed05a225 · 2019-07-13T13:33:58.000+02:00
diff --git a/Infrastructure/Console/Command/SynchronizeUsernamesCommand.php b/Infrastructure/Console/Command/SynchronizeUsernamesCommand.php
@@ -67,7 +67,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $this->repository->delete($unknownUsername);
             }
 
-            $rows[] = 'Deleted username <info>'.$unknownUsername.'</info> from user <info>'.$unknownUsername->getUser()->getId()->toString().'</info>';
+            $rows[] = 'Deleted username <info>'.$unknownUsername->toString().'</info> from user <info>'.$unknownUsername->getUser()->getId()->toString().'</info>';
             ++$deleted;
         }
 
diff --git a/Infrastructure/Doctrine/Repository/UsernameRepository.php b/Infrastructure/Doctrine/Repository/UsernameRepository.php
@@ -34,7 +34,7 @@ public function __construct(string $class, EntityManagerInterface $em, UsernameL
 
     public function lookup(): DomainCollection
     {
-        return new GenericDomainCollection($this->lookup->lookup());
+        return GenericDomainCollection::fromValue($this->lookup->lookup());
     }
 
     public function findAll(int $offset = 0, int $limit = 0): DomainCollection
diff --git a/Model/EmailsField.php b/Model/EmailsField.php
@@ -13,14 +13,14 @@
  */
 trait EmailsField
 {
-    /** @var iterable<UserEmail> */
+    /** @var iterable<array-key, UserEmail> */
     private $emails = [];
 
     /**
-     * @return DomainCollection<UserEmail>
+     * @return DomainCollection<array-key, UserEmail>
      */
     public function getEmails(): DomainCollection
     {
-        return new GenericDomainCollection($this->emails);
+        return GenericDomainCollection::fromValue($this->emails);
     }
 }
diff --git a/Model/RolesField.php b/Model/RolesField.php
@@ -13,14 +13,14 @@
  */
 trait RolesField
 {
-    /** @var iterable<UserRole> */
+    /** @var iterable<array-key, UserRole> */
     private $roles = [];
 
     /**
-     * @return DomainCollection<UserRole>
+     * @return DomainCollection<array-key, UserRole>
      */
     public function getRoles(): DomainCollection
     {
-        return new GenericDomainCollection($this->roles);
+        return GenericDomainCollection::fromValue($this->roles);
     }
 }
diff --git a/Repository/RoleRepository.php b/Repository/RoleRepository.php
@@ -13,7 +13,7 @@
 interface RoleRepository
 {
     /**
-     * @return DomainCollection<Role>
+     * @return DomainCollection<array-key, Role>
      */
     public function findAll(int $offset = 0, int $limit = 0): DomainCollection;
 
diff --git a/Repository/UserEmailRepository.php b/Repository/UserEmailRepository.php
@@ -14,7 +14,7 @@
 interface UserEmailRepository
 {
     /**
-     * @return DomainCollection<UserEmail>
+     * @return DomainCollection<array-key, UserEmail>
      */
     public function findAllByUserId(UserId $userId, int $offset = 0, int $limit = 0): DomainCollection;
 
diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
@@ -14,7 +14,7 @@
 interface UserRepository
 {
     /**
-     * @return DomainCollection<User>
+     * @return DomainCollection<array-key, User>
      */
     public function findAll(int $offset = 0, int $limit = 0): DomainCollection;
 
diff --git a/Repository/UserRoleRepository.php b/Repository/UserRoleRepository.php
@@ -14,7 +14,7 @@
 interface UserRoleRepository
 {
     /**
-     * @return DomainCollection<UserRole>
+     * @return DomainCollection<array-key, UserRole>
      */
     public function findAllByUserId(UserId $userId, int $offset = 0, int $limit = 0): DomainCollection;
 
diff --git a/Repository/UsernameRepository.php b/Repository/UsernameRepository.php
@@ -13,12 +13,12 @@
 interface UsernameRepository
 {
     /**
-     * @return DomainCollection<Username>
+     * @return DomainCollection<array-key, Username>
      */
     public function lookup(): DomainCollection;
 
     /**
-     * @return DomainCollection<Username>
+     * @return DomainCollection<array-key, Username>
      */
     public function findAll(int $offset = 0, int $limit = 0): DomainCollection;
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`67`	`67`	`$this->repository->delete($unknownUsername);`
`68`	`68`	`}`
`69`	`69`
`70`		`- $rows[] = 'Deleted username <info>'.$unknownUsername.'</info> from user <info>'.$unknownUsername->getUser()->getId()->toString().'</info>';`
	`70`	`+ $rows[] = 'Deleted username <info>'.$unknownUsername->toString().'</info> from user <info>'.$unknownUsername->getUser()->getId()->toString().'</info>';`
`71`	`71`	`++$deleted;`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(string $class, EntityManagerInterface $em, UsernameL`
`34`	`34`
`35`	`35`	`public function lookup(): DomainCollection`
`36`	`36`	`{`
`37`		`- return new GenericDomainCollection($this->lookup->lookup());`
	`37`	`+ return GenericDomainCollection::fromValue($this->lookup->lookup());`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public function findAll(int $offset = 0, int $limit = 0): DomainCollection`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,14 @@`
`13`	`13`	`*/`
`14`	`14`	`trait EmailsField`
`15`	`15`	`{`
`16`		`- /** @var iterable<UserEmail> */`
	`16`	`+ /** @var iterable<array-key, UserEmail> */`
`17`	`17`	`private $emails = [];`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * @return DomainCollection<UserEmail>`
	`20`	`+ * @return DomainCollection<array-key, UserEmail>`
`21`	`21`	`*/`
`22`	`22`	`public function getEmails(): DomainCollection`
`23`	`23`	`{`
`24`		`- return new GenericDomainCollection($this->emails);`
	`24`	`+ return GenericDomainCollection::fromValue($this->emails);`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`interface RoleRepository`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`		`- * @return DomainCollection<Role>`
	`16`	`+ * @return DomainCollection<array-key, Role>`
`17`	`17`	`*/`
`18`	`18`	`public function findAll(int $offset = 0, int $limit = 0): DomainCollection;`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`interface UserEmailRepository`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`		`- * @return DomainCollection<UserEmail>`
	`17`	`+ * @return DomainCollection<array-key, UserEmail>`
`18`	`18`	`*/`
`19`	`19`	`public function findAllByUserId(UserId $userId, int $offset = 0, int $limit = 0): DomainCollection;`
`20`	`20`