- Правки на scope

src/AggregateRoot.php

@@ -8,6 +8,12 @@
 class AggregateRoot implements AggregateRootEventsEmitterInterface
 {
     protected array $events = [];
+
+    public function getEvents(): array
+    {
+        return $this->events;
+    }
+
     public function emitEvents(): array
     {
         $events = $this->events;

src/Bitrix24Accounts/Entity/Bitrix24Account.php

@@ -33,7 +33,7 @@
 
 class Bitrix24Account extends AggregateRoot implements Bitrix24AccountInterface
 {
-    private array|Scope $applicationScope;
+    private Scope $applicationScope;
 
     private ?string $applicationToken = null;
 
@@ -57,8 +57,7 @@
         bool $isEmitBitrix24AccountCreatedEvent = false
     ) {
         $this->authToken = $authToken;
-        $array =  $applicationScope->getScopeCodes();
-        $this->applicationScope = $array;
+        $this->applicationScope = $applicationScope->getScopeCodes();
         $this->addAccountCreatedEventIfNeeded($isEmitBitrix24AccountCreatedEvent);
     }
 
@@ -148,8 +147,7 @@
     #[\Override]
     public function getApplicationScope(): Scope
     {
-        return new Scope($this->applicationScope);
-     //   return $this->applicationScope;
+        return $this->applicationScope;
     }
 
     /**
@@ -290,7 +288,7 @@
 
         $this->applicationVersion = $version;
         if ($newScope instanceof Scope) {
             $this->applicationScope = $newScope->getScopeCodes();
         }
 
         $this->updatedAt = new CarbonImmutable();
@@ -346,10 +344,6 @@
         return $this->comment;
     }
 
-    public function getEvents(): array
-    {
-        return $this->events;
-    }
 
     private function addAccountCreatedEventIfNeeded(bool $isEmitCreatedEvent): void
     {

tests/Functional/Bitrix24Accounts/FetcherTest.php

@@ -52,9 +52,7 @@ protected function setUp(): void
     public function testListReturnsPaginatedResults(): void
     {
 
-        $bitrix24Account = (new Bitrix24AccountBuilder())
-            ->build()
-        ;
+        $bitrix24Account = (new Bitrix24AccountBuilder())->build();
         $this->repository->save($bitrix24Account);
         $this->flusher->flush();