feat: attributed orm mapping

Signed-off-by: romanetar <roman_ag@hotmail.com>

Author: romanetar

app/Models/BannedIP.php

@@ -16,36 +16,35 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping AS ORM;
 /**
- * @ORM\Entity(repositoryClass="App\Repositories\DoctrineBannedIPRepository")
- * @ORM\Table(name="banned_ips")
- * Class BannedIP
  * @package Models
  */
+#[ORM\Table(name: 'banned_ips')]
+#[ORM\Entity(repositoryClass: \App\Repositories\DoctrineBannedIPRepository::class)]
 class BannedIP extends BaseEntity
 {
     /**
-     * @ORM\Column(name="exception_type", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'exception_type', type: 'string')]
     private $exception_type;
 
     /**
-     * @ORM\Column(name="ip", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'ip', type: 'string')]
     private $ip;
 
     /**
-     * @ORM\Column(name="hits", type="integer")
      * @var int
      */
+    #[ORM\Column(name: 'hits', type: 'integer')]
     private $hits;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Auth\User")
-     * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
      * @var User
      */
+    #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id')]
+    #[ORM\ManyToOne(targetEntity: \Auth\User::class)]
     private $user;
 
     /**

app/Models/OAuth2/AccessToken.php

@@ -19,77 +19,76 @@
 use Illuminate\Support\Facades\Log;
 
 /**
- * @ORM\Entity(repositoryClass="App\Repositories\DoctrineAccessTokenRepository")
- * @ORM\Table(name="oauth2_access_token")
- * @ORM\Cache("NONSTRICT_READ_WRITE")
- * Class AccessToken
  * @package Models\OAuth2
  */
+#[ORM\Table(name: 'oauth2_access_token')]
+#[ORM\Entity(repositoryClass: \App\Repositories\DoctrineAccessTokenRepository::class)]
+#[ORM\Cache('NONSTRICT_READ_WRITE')] // Class AccessToken
 class AccessToken extends BaseEntity {
 
     /**
-     * @ORM\Column(name="from_ip", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'from_ip', type: 'string')]
     private $from_ip;
 
     /**
-     * @ORM\Column(name="value", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'value', type: 'string')]
     private $value;
 
     /**
-     * @ORM\Column(name="associated_authorization_code", type="string", nullable=true)
      * @var string
      */
+    #[ORM\Column(name: 'associated_authorization_code', type: 'string', nullable: true)]
     private $associated_authorization_code;
 
     /**
-     * @ORM\Column(name="lifetime", type="integer")
      * @var int
      */
+    #[ORM\Column(name: 'lifetime', type: 'integer')]
     private $lifetime;
 
     /**
-     * @ORM\Column(name="scope", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'scope', type: 'string')]
     private $scope;
 
     /**
-     * @ORM\Column(name="audience", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'audience', type: 'string')]
     private $audience;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Models\OAuth2\RefreshToken", inversedBy="access_tokens", cascade={"persist"})
-     * @ORM\JoinColumn(name="refresh_token_id", referencedColumnName="id", nullable=true)
      * @var RefreshToken
      */
+    #[ORM\JoinColumn(name: 'refresh_token_id', referencedColumnName: 'id', nullable: true)]
+    #[ORM\ManyToOne(targetEntity: \Models\OAuth2\RefreshToken::class, inversedBy: 'access_tokens', cascade: ['persist'])]
     private $refresh_token;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Models\OAuth2\Client", inversedBy="access_tokens", cascade={"persist"})
-     * @ORM\JoinColumn(name="client_id", referencedColumnName="id", nullable=true)
      * @var Client
      */
+    #[ORM\JoinColumn(name: 'client_id', referencedColumnName: 'id', nullable: true)]
+    #[ORM\ManyToOne(targetEntity: \Models\OAuth2\Client::class, inversedBy: 'access_tokens', cascade: ['persist'])]
     private $client;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Auth\User", inversedBy="access_tokens", cascade={"persist"})
-     * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=true)
      * @var User
      */
+    #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)]
+    #[ORM\ManyToOne(targetEntity: \Auth\User::class, inversedBy: 'access_tokens', cascade: ['persist'])]
     private $owner;
 
     private $friendly_scopes;
 
     /**
-     * @ORM\Column(name="device_info", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'device_info', type: 'string')]
     private $device_info;
 
 

app/Models/OAuth2/Api.php

@@ -15,50 +15,49 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping AS ORM;
 /**
- * @ORM\Entity(repositoryClass="App\Repositories\DoctrineApiRepository")
- * @ORM\Table(name="oauth2_api")
- * Class Api
  * @package Models\OAuth2
  */
+#[ORM\Table(name: 'oauth2_api')]
+#[ORM\Entity(repositoryClass: \App\Repositories\DoctrineApiRepository::class)]
 class Api extends BaseEntity
 {
 
     /**
-     * @ORM\Column(name="name", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'name', type: 'string')]
     private $name;
 
     /**
-     * @ORM\Column(name="description", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'description', type: 'string')]
     private $description;
 
     /**
-     * @ORM\Column(name="active", type="boolean")
      * @var bool
      */
+    #[ORM\Column(name: 'active', type: 'boolean')]
     private $active;
 
     /**
-     * @ORM\OneToMany(targetEntity="ApiScope", mappedBy="api", cascade={"persist"}, orphanRemoval=true)
      * @var ArrayCollection
      */
+    #[ORM\OneToMany(targetEntity: \ApiScope::class, mappedBy: 'api', cascade: ['persist'], orphanRemoval: true)]
     private $scopes;
 
     /**
-     * @ORM\OneToMany(targetEntity="ApiEndpoint", mappedBy="api", cascade={"persist"},orphanRemoval=true)
      * @var ArrayCollection
      *
      */
+    #[ORM\OneToMany(targetEntity: \ApiEndpoint::class, mappedBy: 'api', cascade: ['persist'], orphanRemoval: true)]
     private $endpoints;
 
     /**
-     * @ORM\ManyToOne(targetEntity="ResourceServer", inversedBy="apis", cascade={"persist"})
-     * @ORM\JoinColumn(name="resource_server_id", referencedColumnName="id")
      * @var ResourceServer
      */
+    #[ORM\JoinColumn(name: 'resource_server_id', referencedColumnName: 'id')]
+    #[ORM\ManyToOne(targetEntity: \ResourceServer::class, inversedBy: 'apis', cascade: ['persist'])]
     private $resource_server;
 
     /**

app/Models/OAuth2/ApiEndpoint.php

@@ -15,85 +15,83 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping AS ORM;
 /**
- * @ORM\Entity(repositoryClass="App\Repositories\DoctrineApiEndpointRepository")
- * @ORM\Table(name="oauth2_api_endpoint")
- * Class ApiEndpoint
  * @package Models\OAuth2
  */
+#[ORM\Table(name: 'oauth2_api_endpoint')]
+#[ORM\Entity(repositoryClass: \App\Repositories\DoctrineApiEndpointRepository::class)]
 class ApiEndpoint extends BaseEntity {
 
     /**
      * attributes
      */
     /**
-     * @ORM\Column(name="name", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'name', type: 'string')]
     private $name;
 
     /**
-     * @ORM\Column(name="description", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'description', type: 'string')]
     private $description;
 
     /**
-     * @ORM\Column(name="active", type="boolean")
      * @var bool
      */
+    #[ORM\Column(name: 'active', type: 'boolean')]
     private $active;
 
     /**
-     * @ORM\Column(name="allow_cors", type="boolean")
      * @var bool
      */
+    #[ORM\Column(name: 'allow_cors', type: 'boolean')]
     private $allow_cors;
 
     /**
-     * @ORM\Column(name="allow_credentials", type="boolean")
      * @var bool
      */
+    #[ORM\Column(name: 'allow_credentials', type: 'boolean')]
     private $allow_credentials;
 
     /**
-     * @ORM\Column(name="route", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'route', type: 'string')]
     private $route;
 
     /**
-     * @ORM\Column(name="http_method", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'http_method', type: 'string')]
     private $http_method;
 
     /**
-     * @ORM\Column(name="rate_limit", type="integer")
      * @var int
      */
+    #[ORM\Column(name: 'rate_limit', type: 'integer')]
     private $rate_limit;
 
     /**
-     * @ORM\Column(name="rate_limit_decay", type="integer")
      * @var int
      */
+    #[ORM\Column(name: 'rate_limit_decay', type: 'integer')]
     private $rate_limit_decay;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Api", inversedBy="endpoints", cascade={"persist"})
-     * @ORM\JoinColumn(name="api_id", referencedColumnName="id")
      * @var Api
      */
+    #[ORM\JoinColumn(name: 'api_id', referencedColumnName: 'id')]
+    #[ORM\ManyToOne(targetEntity: \Api::class, inversedBy: 'endpoints', cascade: ['persist'])]
     private $api;
 
     /**
-     * @ORM\ManyToMany(targetEntity="ApiScope")
-     * @ORM\JoinTable(name="oauth2_api_endpoint_api_scope",
-     *      joinColumns={@ORM\JoinColumn(name="api_endpoint_id", referencedColumnName="id")},
-     *      inverseJoinColumns={@ORM\JoinColumn(name="scope_id", referencedColumnName="id")}
-     * )
      * @var ApiScope[]
      */
+    #[ORM\JoinTable(name: 'oauth2_api_endpoint_api_scope')]
+    #[ORM\JoinColumn(name: 'api_endpoint_id', referencedColumnName: 'id')]
+    #[ORM\InverseJoinColumn(name: 'scope_id', referencedColumnName: 'id')]
+    #[ORM\ManyToMany(targetEntity: \ApiScope::class)]
     private $scopes;
 
     /**

app/Models/OAuth2/ApiScope.php

@@ -15,66 +15,63 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping AS ORM;
 /**
- * @ORM\Entity(repositoryClass="App\Repositories\DoctrineApiScopeRepository")
- * @ORM\Table(name="oauth2_api_scope")
- * Class ApiScope
  * @package Models\OAuth2
  */
+#[ORM\Table(name: 'oauth2_api_scope')]
+#[ORM\Entity(repositoryClass: \App\Repositories\DoctrineApiScopeRepository::class)]
 class ApiScope extends BaseEntity
 {
 
     /**
-     * @ORM\Column(name="name", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'name', type: 'string')]
     private $name;
 
     /**
-     * @ORM\Column(name="description", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'description', type: 'string')]
     private $description;
 
     /**
-     * @ORM\Column(name="short_description", type="string")
      * @var string
      */
+    #[ORM\Column(name: 'short_description', type: 'string')]
     private $short_description;
 
     /**
-     * @ORM\Column(name="`active`", type="boolean")
      * @var bool
      */
+    #[ORM\Column(name: '`active`', type: 'boolean')]
     private $active;
 
     /**
-     * @ORM\Column(name="`is_default`", type="boolean")
      * @var bool
      */
+    #[ORM\Column(name: '`is_default`', type: 'boolean')]
     private $default;
 
     /**
-     * @ORM\Column(name="`is_system`", type="boolean")
      * @var bool
      */
+    #[ORM\Column(name: '`is_system`', type: 'boolean')]
     private $is_system;
 
     /**
-     * @ORM\Column(name="`assigned_by_groups`", type="boolean")
      * @var bool
      */
+    #[ORM\Column(name: '`assigned_by_groups`', type: 'boolean')]
     private $assigned_by_groups;
 
-    /**
-     * @ORM\ManyToMany(targetEntity="Models\OAuth2\ApiScopeGroup", mappedBy="scopes")
-     */
+    #[ORM\ManyToMany(targetEntity: \Models\OAuth2\ApiScopeGroup::class, mappedBy: 'scopes')]
     private $scope_groups;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Api", inversedBy="scopes", cascade={"persist"})
-     * @ORM\JoinColumn(name="api_id", referencedColumnName="id")
      * @var Api
      */
+    #[ORM\JoinColumn(name: 'api_id', referencedColumnName: 'id')]
+    #[ORM\ManyToOne(targetEntity: \Api::class, inversedBy: 'scopes', cascade: ['persist'])]
     private $api;