Merge pull request #7 from netbrothers-gmbh/6-symfony-63

🔀 ready for symfony 6.3

.gitignore

@@ -1,16 +1 @@
-###> symfony/framework-bundle ###
-/.env.local
-/.env.local.php
-/.env.*.local
-/config/secrets/prod/prod.decrypt.private.php
-/public/bundles/
-/var/
-/vendor/
-###< symfony/framework-bundle ###
-
-###> symfony/phpunit-bridge ###
-.phpunit
-.phpunit.result.cache
-/phpunit.xml
-###< symfony/phpunit-bridge ###
-/.idea
+.idea

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog for NetBrothers SyncAcc
 ===================================
 
+Version 0.1.0 - 22.08.2023
+----------------------------------
+- Replace annotations with attributes for using in Symfony ^6.3
+
+
 Version 0.0.2 - 03.02.2022
 ----------------------------------
 - Fix Bug SyncCommand option `sync-table` does not accept any value. 

composer.json

@@ -1,15 +1,12 @@
 {
   "name": "netbrothers-gmbh/syncacc-bundle",
   "description": "Using NetBrothers Access Control Center in Symfony",
-  "version": "0.0.2",
   "keywords": ["symfony","bundle","permissions","acl"],
   "type": "symfony-bundle",
   "require": {
-    "php": ">=7.4",
-    "symfony/console": "*",
-    "symfony/dotenv": "*",
-    "symfony/orm-pack": "*",
-    "ext-json": "*"
+    "php": ">=8.1",
+    "ext-json": "*",
+    "symfony/console": "^6.3"
   },
   "autoload": {
     "psr-4": {

src/Command/SyncCommand.php

@@ -13,6 +13,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use NetBrothers\SyncAccBundle\Services\HttpClientService;
 use NetBrothers\SyncAccBundle\Services\SyncService;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -27,6 +28,10 @@
  * Class SyncCommand
  * @package NetBrothers\SyncAccBundle\Command
  */
+#[AsCommand(
+    name: 'netbrothers:sync-acc',
+    description: 'Synchronize permissions with Access Control Center in your local instance.',
+)]
 class SyncCommand extends Command
 {
     protected static $defaultName = 'netbrothers:sync-acc';
@@ -72,11 +77,10 @@ class SyncCommand extends Command
     /** @var HttpClientService */
     private HttpClientService $httpService;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName(self::$defaultName)
-            ->setDescription('Synchronize permissions with Access Control Center in your local instance.')
             ->setHelp(self::HELP_TEXT)
             ->addOption(
                 'sync-table',
@@ -91,11 +95,12 @@ protected function configure()
      * SyncAccCommand constructor.
      * @param EntityManagerInterface $entityManager
      * @param array $config
+     * @param string|null $name
      * @throws \Exception
      */
-    public function __construct(EntityManagerInterface $entityManager, array $config = [])
+    public function __construct(EntityManagerInterface $entityManager, array $config = [], string $name = null)
     {
-        parent::__construct();
+        parent::__construct($name);
         $this->setConfig($config);
         $this->httpService = new HttpClientService($this->config, $this->clientConfig);
         $this->service = new SyncService($entityManager, $this->httpService);

src/Entity/AclAllow.php

@@ -9,45 +9,37 @@
 
 namespace NetBrothers\SyncAccBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
+use NetBrothers\SyncAccBundle\Repository\AclAllowRepository;
 
 /**
  * Class AclAllow
  * @package NetBrothers\SyncAccBundle\Entity
- * @ORM\Entity(repositoryClass="NetBrothers\SyncAccBundle\Repository\AclAllowRepository")
  */
+#[ORM\Entity(repositoryClass: AclAllowRepository::class)]
 class AclAllow
 {
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
     private int $id;
 
-    /**
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Column]
     private int $idAclRole;
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
+    #[ORM\Column(length: 255)]
     private string $controllerName;
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
+    #[ORM\Column(length: 255)]
     private string $actionName;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
      */
+    #[ORM\Column(length: 255, nullable: true)]
     private string $method;
 
-    /**
-     * @ORM\Column(type="integer", nullable=true)
-     */
-    private int $reasonType;
+    #[ORM\Column(nullable: true)]
+    private ?int $reasonType = null;
 
     public function getId(): ?int
     {

src/Entity/AclRole.php

@@ -8,50 +8,41 @@
  */
 
 namespace NetBrothers\SyncAccBundle\Entity;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
+use NetBrothers\SyncAccBundle\Repository\AclRoleRepository;
 
 /**
  * Class AclRole
  * @package NetBrothers\SyncAccBundle\Entity
- * @ORM\Entity(repositoryClass="NetBrothers\SyncAccBundle\Repository\AclRoleRepository")
  */
+#[ORM\Entity(repositoryClass: AclRoleRepository::class)]
 class AclRole
 {
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue(strategy="NONE")
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
     private int $id;
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
+    #[ORM\Column(length: 255)]
     private string $name;
 
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     */
+    #[ORM\Column(length: 255, nullable: true)]
     private ?string $displayName = null;
 
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     */
+    #[ORM\Column(type: Types::TEXT, nullable: true)]
     private ?string $beschreibung = null;
 
-    /**
-     * @ORM\Column(type="integer", nullable=true, options={"default":0})
-     */
+    #[ORM\Column(nullable: true, options: ['default' => 0])]
     private int $hierarchyId = 0;
 
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     */
+    #[ORM\Column(length: 255, nullable: true)]
     private ?string $defaultRoute = null;
 
     /**
      * @ORM\Column(type="boolean", options={"default":false})
      */
+    #[ORM\Column(options: ["default" => false])]
     private bool $isHidden = false;
 
     public function setId(int $id): self

src/Entity/SyncAcc.php

@@ -8,30 +8,26 @@
  */
 
 namespace NetBrothers\SyncAccBundle\Entity;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
+use NetBrothers\SyncAccBundle\Repository\SyncAccRepository;
 
 /**
  * Class SyncAcc
  * @package NetBrothers\SyncAccBundle\Entity
- * @ORM\Entity(repositoryClass="NetBrothers\SyncAccBundle\Repository\SyncAccRepository")
  */
+#[ORM\Entity(repositoryClass: SyncAccRepository::class)]
 class SyncAcc
 {
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
     private int $id;
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
+    #[ORM\Column(length: 255)]
     private string $actionName;
 
-    /**
-     * @ORM\Column(type="datetime")
-     */
+    #[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
     private ?\DateTimeInterface $lastCall = null;
 
     public function getId(): ?int
@@ -47,7 +43,6 @@ public function getActionName(): ?string
     public function setActionName(string $actionName): self
     {
         $this->actionName = $actionName;
-
         return $this;
     }
 
@@ -56,10 +51,9 @@ public function getLastCall(): ?\DateTimeInterface
         return $this->lastCall;
     }
 
-    public function setLastCall(\DateTimeInterface $lastCall): self
+    public function setLastCall(?\DateTimeInterface $lastCall = null): self
     {
         $this->lastCall = $lastCall;
-
         return $this;
     }
 }

src/Services/AccService.php

@@ -9,7 +9,6 @@
 
 namespace NetBrothers\SyncAccBundle\Services;
 
-
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use NetBrothers\SyncAccBundle\Entity\AclAllow;

src/Services/HttpClientService.php

@@ -82,13 +82,13 @@ public function getRoles(SyncAcc $syncAcc)
     /**
      * @param SyncAcc $syncAcc
      * @param int $idRole
-     * @return bool
+     * @return false|mixed
      * @throws ClientExceptionInterface
      * @throws RedirectionExceptionInterface
      * @throws ServerExceptionInterface
      * @throws TransportExceptionInterface
      */
-    public function getPermissionForOneRole(SyncAcc $syncAcc, int $idRole)
+    public function getPermissionForOneRole(SyncAcc $syncAcc, int $idRole): mixed
     {
         $url = $this->createUrl($syncAcc, $idRole);
         return $this->send($url);
@@ -124,7 +124,7 @@ private function createUrl(SyncAcc $syncAcc, int $idRole = null): string
      * @throws ServerExceptionInterface
      * @throws TransportExceptionInterface
      */
-    private function send(string $url)
+    private function send(string $url): mixed
     {
         $client = HttpClient::create($this->clientConfig);
         $response = $client->request('GET', $url);

src/Services/SyncService.php

@@ -55,7 +55,7 @@ public function __construct(EntityManagerInterface $entityManager, HttpClientSer
      * @param string $requestAction
      * @throws \Exception|TransportExceptionInterface
      */
-    public function execute(string $requestAction = 'get-roles')
+    public function execute(string $requestAction = 'get-roles'): void
     {
         if ($requestAction == 'all') {
             $this->requestAction = 'get-roles';
@@ -84,7 +84,7 @@ public function execute(string $requestAction = 'get-roles')
      * @throws TransportExceptionInterface
      * @throws \Exception
      */
-    private function getRoles()
+    private function getRoles(): void
     {
         $response = $this->clientService->getRoles($this->tableService->getSyncAccEntity());
         if (false === $response) {
@@ -107,7 +107,7 @@ private function getRoles()
      * @throws TransportExceptionInterface
      * @throws \Exception
      */
-    private function getPermissionsForRoles()
+    private function getPermissionsForRoles(): void
     {
         $repository = $this->entityManager->getRepository(AclRole::class);
         /** @var AclRole $role */