remove legacy keywords

composer.json

@@ -20,7 +20,7 @@
   },
   "require-dev": {
     "vimeo/psalm": "^4.0",
-    "psx/schema": "^5.0"
+    "psx/schema": "^7.0"
   },
   "autoload": {
     "psr-4": {

src/Backend/AccountChangePassword.php

@@ -4,19 +4,10 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\MaxLength;
-use PSX\Schema\Attribute\MinLength;
-
 class AccountChangePassword implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
-    #[MinLength(8)]
-    #[MaxLength(128)]
     protected ?string $oldPassword = null;
-    #[MinLength(8)]
-    #[MaxLength(128)]
     protected ?string $newPassword = null;
-    #[MinLength(8)]
-    #[MaxLength(128)]
     protected ?string $verifyPassword = null;
     public function setOldPassword(?string $oldPassword) : void
     {

src/Backend/Action.php

@@ -4,13 +4,10 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class Action implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
     protected ?int $status = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_]{3,255}$')]
     protected ?string $name = null;
     protected ?string $class = null;
     protected ?bool $async = null;

src/Backend/ActionCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('name'))]
 class ActionCreate extends Action implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/ActionExecuteRequest.php

@@ -4,13 +4,8 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('method'))]
 class ActionExecuteRequest implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
-    #[Pattern('GET|POST|PUT|PATCH|DELETE')]
     protected ?string $method = null;
     protected ?string $uriFragments = null;
     protected ?string $parameters = null;

src/Backend/App.php

@@ -4,14 +4,11 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class App implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
     protected ?int $userId = null;
     protected ?int $status = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_]{3,64}$')]
     protected ?string $name = null;
     protected ?string $url = null;
     protected ?string $parameters = null;

src/Backend/AppCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('userId', 'name', 'url', 'scopes'))]
 class AppCreate extends App implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/Category.php

@@ -4,12 +4,9 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class Category implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_]{3,64}$')]
     protected ?string $name = null;
     public function setId(?int $id) : void
     {

src/Backend/CategoryCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('name'))]
 class CategoryCreate extends Category implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/Connection.php

@@ -6,12 +6,10 @@
 
 use PSX\Schema\Attribute\Description;
 use PSX\Schema\Attribute\Key;
-use PSX\Schema\Attribute\Pattern;
 
 class Connection implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_]{3,255}$')]
     protected ?string $name = null;
     protected ?string $class = null;
     #[Key('oauth2')]

src/Backend/ConnectionConfig.php

@@ -4,11 +4,9 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\MaxProperties;
 /**
  * @extends \PSX\Record\Record<mixed>
  */
-#[MaxProperties(16)]
 class ConnectionConfig extends \PSX\Record\Record
 {
 }

src/Backend/Cronjob.php

@@ -4,12 +4,9 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class Cronjob implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_]{3,64}$')]
     protected ?string $name = null;
     protected ?string $cron = null;
     protected ?string $action = null;

src/Backend/CronjobCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('name', 'cron', 'action'))]
 class CronjobCreate extends Cronjob implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/Event.php

@@ -4,12 +4,9 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class Event implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_\\.]{3,64}$')]
     protected ?string $name = null;
     protected ?string $description = null;
     protected ?string $schema = null;

src/Backend/EventCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('name'))]
 class EventCreate extends Event implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/GeneratorProviderConfig.php

@@ -4,11 +4,9 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\MaxProperties;
 /**
  * @extends \PSX\Record\Record<mixed>
  */
-#[MaxProperties(16)]
 class GeneratorProviderConfig extends \PSX\Record\Record
 {
 }

src/Backend/Identity.php

@@ -4,14 +4,11 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class Identity implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
     protected ?int $appId = null;
     protected ?int $roleId = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_]{3,255}$')]
     protected ?string $name = null;
     protected ?string $icon = null;
     protected ?string $class = null;

src/Backend/IdentityCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('appId', 'name', 'icon', 'class'))]
 class IdentityCreate extends Identity implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/Operation.php

@@ -4,8 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class Operation implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
@@ -17,7 +15,6 @@ class Operation implements \JsonSerializable, \PSX\Record\RecordableInterface
     protected ?string $httpMethod = null;
     protected ?string $httpPath = null;
     protected ?int $httpCode = null;
-    #[Pattern('^[a-zA-Z0-9\\_\\.]{3,64}$')]
     protected ?string $name = null;
     protected ?OperationParameters $parameters = null;
     protected ?string $incoming = null;

src/Backend/OperationCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('httpMethod', 'httpPath', 'httpCode', 'name', 'outgoing', 'action'))]
 class OperationCreate extends Operation implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/PageCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('title', 'content'))]
 class PageCreate extends Page implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/PlanCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('name', 'price'))]
 class PlanCreate extends Plan implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/Rate.php

@@ -4,17 +4,11 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Minimum;
-use PSX\Schema\Attribute\Pattern;
-
 class Rate implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
-    #[Minimum(0)]
     protected ?int $priority = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_]{3,64}$')]
     protected ?string $name = null;
-    #[Minimum(0)]
     protected ?int $rateLimit = null;
     protected ?\PSX\DateTime\Duration $timespan = null;
     /**

src/Backend/RateCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('name'))]
 class RateCreate extends Rate implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/Role.php

@@ -4,13 +4,10 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class Role implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
     protected ?int $categoryId = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_]{3,64}$')]
     protected ?string $name = null;
     /**
      * @var array<string>|null

src/Backend/RoleCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('categoryId', 'name'))]
 class RoleCreate extends Role implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/Schema.php

@@ -4,13 +4,10 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class Schema implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
     protected ?int $status = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_]{3,255}$')]
     protected ?string $name = null;
     protected ?SchemaSource $source = null;
     protected ?SchemaForm $form = null;

src/Backend/SchemaCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('name'))]
 class SchemaCreate extends Schema implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/Scope.php

@@ -4,12 +4,9 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class Scope implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_\\.]{3,64}$')]
     protected ?string $name = null;
     protected ?string $description = null;
     /**

src/Backend/ScopeCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('name'))]
 class ScopeCreate extends Scope implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

src/Backend/User.php

@@ -4,15 +4,12 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Pattern;
-
 class User implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?int $id = null;
     protected ?int $roleId = null;
     protected ?int $planId = null;
     protected ?int $status = null;
-    #[Pattern('^[a-zA-Z0-9\\-\\_\\.]{3,32}$')]
     protected ?string $name = null;
     protected ?string $email = null;
     protected ?int $points = null;

src/Backend/UserCreate.php

@@ -4,9 +4,6 @@
 
 namespace Fusio\Model\Backend;
 
-use PSX\Schema\Attribute\Required;
-
-#[Required(array('roleId', 'status', 'name', 'email', 'password'))]
 class UserCreate extends User implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?string $password = null;