Skip to content

Context validation proposal #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
slischka wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Context validation proposal #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fcd9523
Updated consistance for PHP 8.0
slischka Mar 23, 2021
43460fe
Supports PHP 7.4 and higher
slischka Mar 23, 2021
9a036bc
Full php 8.0
slischka Apr 26, 2021
2f76173
Fixed composer and code style
slischka Apr 26, 2021
172f084
cs
slischka May 6, 2021
fc4671a
Context validation proposal
slischka May 6, 2021
6883b11
Better API more code
slischka May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

strategy:
matrix:
php-version: [ '7.4' ]
php-version: [ '8.0' ]
operating-system: [ 'ubuntu-latest' ]
fail-fast: false

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:

strategy:
matrix:
php-version: [ '7.4' ]
php-version: [ '8.0' ]
operating-system: [ 'ubuntu-latest' ]
fail-fast: false

Expand Down Expand Up @@ -136,16 +136,9 @@ jobs:

strategy:
matrix:
php-version: [ '7.2', '7.3', '7.4' ]
php-version: [ '8.0' ]
operating-system: [ 'ubuntu-latest' ]
composer-args: [ '' ]
include:
- php-version: '7.2'
operating-system: 'ubuntu-latest'
composer-args: '--prefer-lowest'
- php-version: '8.0'
operating-system: 'ubuntu-latest'
composer-args: '--ignore-platform-reqs'

fail-fast: false

Expand Down Expand Up @@ -207,7 +200,7 @@ jobs:

strategy:
matrix:
php-version: [ '7.4' ]
php-version: [ '8.0' ]
operating-system: [ 'ubuntu-latest' ]
fail-fast: false

Expand Down
9 changes: 4 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,17 @@
}
],
"require": {
"php": "^7.2|^8.0",
"consistence/consistence": "^1.0 || ^2.0",
"php": "^8.0",
"consistence-community/consistence": "^2.1",
"nette/utils": "^3.0 || ^2.4",
"nette/http": "^3.0 || ^2.4",
"jschaedl/iban-validation": "^1.0",
"egulias/email-validator": "^3.1.1"
"egulias/email-validator": "^3.1"
},
"require-dev": {
"nette/tester": "^2.3.0",
"phpstan/phpstan-nette": "^0.12.8",
"slevomat/coding-standard": "^6.4",
"consistence/coding-standard": "^3.10",
"slevomat/coding-standard": "^7.0",
"tracy/tracy": "^2.8"
},
"autoload": {
Expand Down
26 changes: 7 additions & 19 deletions src/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,24 @@ final class Address

use ArrayExtractableTrait;

/**
* @var string
*/
private $streetAndNumber;
private string $streetAndNumber;

/**
* @var string
*/
private $town;
private string $town;

/**
* @var \SmartEmailing\Types\ZipCode
*/
private $zipCode;
private ZipCode $zipCode;

/**
* @var \SmartEmailing\Types\CountryCode
*/
private $country;
private CountryCode $country;

/**
* @param array<mixed> $data
*/
private function __construct(
array $data
) {
$this->streetAndNumber = PrimitiveTypes::extractString($data, 'street_and_number');
$this->town = PrimitiveTypes::extractString($data, 'town');
$this->zipCode = ZipCode::extract($data, 'zip_code');
$this->streetAndNumber = (string) NonEmptyString::extract($data, 'street_and_number');
$this->town = (string) NonEmptyString::extract($data, 'town');
$this->country = CountryCode::extract($data, 'country');
$this->zipCode = ZipCode::extract($data, 'zip_code', countryCode: $this->country);
}

/**
Expand Down
104 changes: 40 additions & 64 deletions src/Arrays.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ abstract class Arrays
{

/**
* @param mixed $value
* @return array<mixed>
*/
final public static function getArray(
$value
mixed $value
): array {
if (\is_array($value)) {
return $value;
Expand All @@ -24,14 +23,12 @@ final public static function getArray(
}

/**
* @param mixed $value
* @param bool $nullIfInvalid
* @return array<mixed>|null
*/
final public static function getArrayOrNull(
$value,
mixed $value,
bool $nullIfInvalid = false
): ?array {
): array | null {
if (\is_array($value)) {
return $value;
}
Expand All @@ -54,14 +51,13 @@ final public static function getArrayOrNull(
/**
* Preserves keys
*
* @param array<mixed> $data
* @param string $key
* @param array<mixed>|\ArrayAccess<string|int, mixed> $data
* @return array<mixed>
* @throws \SmartEmailing\Types\InvalidTypeException
*/
final public static function extractArray(
array $data,
string $key
array | \ArrayAccess $data,
string | int $key
): array
{
$value = ExtractableHelpers::extractValue($data, $key);
Expand All @@ -76,17 +72,15 @@ final public static function extractArray(
/**
* Preserves keys
*
* @param array<mixed> $data
* @param string $key
* @param bool $nullIfInvalid
* @param array<mixed>|\ArrayAccess<string|int, mixed> $data
* @return array<mixed>|null
* @throws \SmartEmailing\Types\InvalidTypeException
*/
final public static function extractArrayOrNull(
array $data,
string $key,
array | \ArrayAccess $data,
string | int $key,
bool $nullIfInvalid = false
): ?array {
): array | null {
if (!isset($data[$key])) {
return null;
}
Expand All @@ -103,11 +97,10 @@ final public static function extractArrayOrNull(
}

/**
* @param mixed $value
* @return array<int>
*/
final public static function getIntArray(
$value
mixed $value
): array {
$array = self::getArray($value);

Expand All @@ -121,14 +114,12 @@ final public static function getIntArray(
}

/**
* @param mixed $value
* @param bool $nullIfInvalid
* @return array<int>|null
*/
final public static function getIntArrayOrNull(
$value,
mixed $value,
bool $nullIfInvalid = false
): ?array {
): array | null {
$array = self::getArrayOrNull($value, $nullIfInvalid);

if ($array === null) {
Expand All @@ -153,14 +144,13 @@ final public static function getIntArrayOrNull(
}

/**
* @param array<mixed> $data
* @param string $key
* @param array<mixed>|\ArrayAccess<string|int, mixed> $data
* @return array<int>
* @throws \SmartEmailing\Types\InvalidTypeException
*/
final public static function extractIntArray(
array $data,
string $key
array | \ArrayAccess $data,
string | int $key
): array {
$array = Arrays::extractArray($data, $key);

Expand All @@ -174,17 +164,15 @@ final public static function extractIntArray(
}

/**
* @param array<mixed> $data
* @param string $key
* @param bool $nullIfInvalid
* @param array<mixed>|\ArrayAccess<string|int, mixed> $data
* @return array<int>|null
* @throws \SmartEmailing\Types\InvalidTypeException
*/
final public static function extractIntArrayOrNull(
array $data,
string $key,
array | \ArrayAccess $data,
string | int $key,
bool $nullIfInvalid = false
): ?array {
): array | null {
$array = Arrays::extractArrayOrNull($data, $key, $nullIfInvalid);

if ($array === null) {
Expand All @@ -195,11 +183,10 @@ final public static function extractIntArrayOrNull(
}

/**
* @param mixed $value
* @return array<float>
*/
final public static function getFloatArray(
$value
mixed $value
): array {
$array = self::getArray($value);

Expand All @@ -213,14 +200,12 @@ final public static function getFloatArray(
}

/**
* @param mixed $value
* @param bool $nullIfInvalid
* @return array<float>|null
*/
final public static function getFloatArrayOrNull(
$value,
mixed $value,
bool $nullIfInvalid = false
): ?array {
): array | null {
$array = self::getArrayOrNull($value, $nullIfInvalid);

if ($array === null) {
Expand All @@ -245,14 +230,13 @@ final public static function getFloatArrayOrNull(
}

/**
* @param array<mixed> $data
* @param string $key
* @param array<mixed>|\ArrayAccess<string|int, mixed> $data
* @return array<float>
* @throws \SmartEmailing\Types\InvalidTypeException
*/
final public static function extractFloatArray(
array $data,
string $key
array | \ArrayAccess $data,
string | int $key
): array {
$array = Arrays::extractArray($data, $key);

Expand All @@ -266,17 +250,15 @@ final public static function extractFloatArray(
}

/**
* @param array<mixed> $data
* @param string $key
* @param bool $nullIfInvalid
* @param array<mixed>|\ArrayAccess<string|int, mixed> $data
* @return array<float>|null
* @throws \SmartEmailing\Types\InvalidTypeException
*/
final public static function extractFloatArrayOrNull(
array $data,
string $key,
array | \ArrayAccess $data,
string | int $key,
bool $nullIfInvalid = false
): ?array {
): array | null {
$array = Arrays::extractArrayOrNull($data, $key, $nullIfInvalid);

if ($array === null) {
Expand All @@ -287,11 +269,10 @@ final public static function extractFloatArrayOrNull(
}

/**
* @param mixed $value
* @return array<string>
*/
final public static function getStringArray(
$value
mixed $value
): array {
$array = self::getArray($value);

Expand All @@ -305,14 +286,12 @@ final public static function getStringArray(
}

/**
* @param mixed $value
* @param bool $nullIfInvalid
* @return array<string>|null
*/
final public static function getStringArrayOrNull(
$value,
mixed $value,
bool $nullIfInvalid = false
): ?array {
): array | null {
$array = self::getArrayOrNull($value, $nullIfInvalid);

if ($array === null) {
Expand All @@ -337,14 +316,13 @@ final public static function getStringArrayOrNull(
}

/**
* @param array<mixed> $data
* @param string $key
* @param array<mixed>|\ArrayAccess<string|int, mixed> $data
* @return array<string>
* @throws \SmartEmailing\Types\InvalidTypeException
*/
final public static function extractStringArray(
array $data,
string $key
array | \ArrayAccess $data,
string | int $key
): array {
$array = Arrays::extractArray($data, $key);

Expand All @@ -358,17 +336,15 @@ final public static function extractStringArray(
}

/**
* @param array<mixed> $data
* @param string $key
* @param bool $nullIfInvalid
* @param array<mixed>|\ArrayAccess<string|int, mixed> $data
* @return array<string>|null
* @throws \SmartEmailing\Types\InvalidTypeException
*/
final public static function extractStringArrayOrNull(
array $data,
string $key,
array | \ArrayAccess $data,
string | int $key,
bool $nullIfInvalid = false
): ?array {
): array | null {
$array = Arrays::extractArrayOrNull($data, $key, $nullIfInvalid);

if ($array === null) {
Expand Down
Loading