Merge 4fcd3a2 into 3884557

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["7.4"]
+        php-version: ["8.0"]
         operating-system: ["ubuntu-latest"]
       fail-fast: false
 
@@ -80,20 +80,18 @@ jobs:
     runs-on: "${{ matrix.operating-system }}"
     strategy:
       matrix:
-        php-version: ["7.4"]
+        php-version: ["8.0"]
         operating-system: ["ubuntu-latest"]
         composer-args: [ "" ]
         include:
-          - php-version: "7.4"
+          - php-version: "8.0"
             operating-system: "ubuntu-latest"
             composer-args: "--prefer-lowest"
           - php-version: "8.0"
             operating-system: "ubuntu-latest"
             composer-args: "--ignore-platform-reqs"
       fail-fast: false
 
-    continue-on-error: "${{ matrix.php-version == '8.0' }}"
-
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -149,7 +147,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["7.4"]
+        php-version: ["8.0"]
         operating-system: ["ubuntu-latest"]
       fail-fast: false
 
@@ -205,7 +203,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ["7.4"]
+        php-version: ["8.0"]
         operating-system: ["ubuntu-latest"]
       fail-fast: false
 

composer.json

@@ -3,13 +3,12 @@
   "description": "rest api",
   "license": ["MIT"],
   "require": {
-    "php": "^7.4 || ^8.0",
+    "php": "^8.0",
     "psr/log": "^1.1",
     "nette/di": "^3.0",
     "nette/application": "^3.0",
     "nette/forms": "^3.1.2",
-    "nette/reflection": "^2.4",
-    "wedo/utilities": "^1.0 || ^2.0"
+    "wedo/utilities": "^2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.0",
@@ -18,7 +17,7 @@
     "phpstan/phpstan-dibi": "^0.12",
     "phpstan/phpstan-nette": "^0.12",
     "phpstan/phpstan-strict-rules": "^0.12",
-    "ninjify/qa": "^0.12"
+    "contributte/qa": "^0.1"
   },
   "autoload": {
     "psr-4": {

ruleset.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <ruleset>
     <!-- Contributte Coding Standard -->
-    <rule ref="./vendor/ninjify/coding-standard/contributte.xml">
-        <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"></exclude>
+    <rule ref="./vendor/contributte/qa/ruleset.xml">
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousErrorNaming.SuperfluousSuffix"></exclude>
      </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint" />
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint" />

src/Attributes/ChoiceControlItems.php

@@ -0,0 +1,25 @@
+<?php declare (strict_types = 1);
+
+namespace Wedo\Api\Attributes;
+
+use Attribute;
+
+#[Attribute]
+class ChoiceControlItems
+{
+
+	/** @var mixed[] */
+	public array $items;
+
+	public bool $useKeys;
+
+	/**
+	 * @param mixed[] $items
+	 */
+	public function __construct(array $items, bool $useKeys = false)
+	{
+		$this->items = $items;
+		$this->useKeys = $useKeys;
+	}
+
+}

src/Attributes/ContainerType.php

@@ -0,0 +1,22 @@
+<?php declare (strict_types = 1);
+
+namespace Wedo\Api\Attributes;
+
+use Attribute;
+
+#[Attribute]
+class ContainerType
+{
+
+	/** @var class-string */
+	public string $value;
+
+	/**
+	 * @param class-string $value
+	 */
+	public function __construct(string $value)
+	{
+		$this->value = $value;
+	}
+
+}

src/Attributes/Control.php

@@ -0,0 +1,34 @@
+<?php declare (strict_types = 1);
+
+namespace Wedo\Api\Attributes;
+
+use Attribute;
+
+#[Attribute]
+class Control
+{
+
+	public const TEXT = 'Text';
+	public const PASSWORD = 'Password';
+	public const TEXT_AREA = 'TextArea';
+	public const EMAIL = 'Email';
+	public const INTEGER = 'Integer';
+	public const UPLOAD = 'Upload';
+	public const MULTI_UPLOAD = 'MultiUpload';
+	public const HIDDEN = 'Hidden';
+	public const CHECKBOX = 'Checkbox';
+	public const RADIO_LIST = 'RadioList';
+	public const CHECKBOX_LIST = 'CheckboxList';
+	public const SELECT = 'Select';
+	public const MULTI_SELECT = 'MultiSelect';
+	public const IMAGE = 'Image';
+	public const CONTAINER = 'Container';
+
+	public string $value;
+
+	public function __construct(string $value)
+	{
+		$this->value = $value;
+	}
+
+}

src/Attributes/HttpMethod.php

@@ -0,0 +1,18 @@
+<?php declare (strict_types = 1);
+
+namespace Wedo\Api\Attributes;
+
+use Attribute;
+
+#[Attribute]
+class HttpMethod
+{
+
+	public string $value;
+
+	public function __construct(string $value)
+	{
+		$this->value = $value;
+	}
+
+}

src/Attributes/Internal.php

@@ -0,0 +1,11 @@
+<?php declare (strict_types = 1);
+
+namespace Wedo\Api\Attributes;
+
+use Attribute;
+
+#[Attribute]
+class Internal
+{
+
+}

src/Attributes/RequiredRule.php

@@ -0,0 +1,18 @@
+<?php declare (strict_types = 1);
+
+namespace Wedo\Api\Attributes;
+
+use Attribute;
+
+#[Attribute]
+class RequiredRule
+{
+
+	public bool $required;
+
+	public function __construct(bool $required = true)
+	{
+		$this->required = $required;
+	}
+
+}

src/Attributes/ValidationRule.php

@@ -0,0 +1,25 @@
+<?php declare (strict_types = 1);
+
+namespace Wedo\Api\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_PROPERTY)]
+class ValidationRule
+{
+
+	/** @var callable|string */
+	public $validator;
+
+	public string|object|null $errorMessage;
+
+	public mixed $args;
+
+	public function __construct(callable|string $validator, string|object|null $errorMessage = null, mixed $args = null)
+	{
+		$this->validator = $validator;
+		$this->errorMessage = $errorMessage;
+		$this->args = $args;
+	}
+
+}