Skip to content

Commit

Permalink
Bumped
Browse files Browse the repository at this point in the history
  • Loading branch information
roadiz-ci committed Feb 21, 2024
1 parent 65213e4 commit 7248a7f
Show file tree
Hide file tree
Showing 20 changed files with 37 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: ['8.1', '8.2', '8.3']
php-version: ['8.0', '8.1']
steps:
- uses: shivammathur/setup-php@v2
with:
Expand Down
17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
language: php
sudo: required
php:
- 7.4
- 8.0
- 8.1
- nightly
install:
- curl -s http://getcomposer.org/installer | php
- php composer.phar install --dev --no-interaction
script:
- vendor/bin/phpunit -v --bootstrap=tests/bootstrap.php --whitelist ./src --coverage-clover ./build/logs/clover.xml tests/
- vendor/bin/phpcs --report=full --report-file=./report.txt -p ./src
- vendor/bin/phpstan analyse -c phpstan.neon
jobs:
allow_failures:
- php: nightly
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
}
],
"require": {
"php": ">=8.1",
"doctrine/orm": "~2.17.0",
"php": ">=8.0",
"doctrine/orm": "<2.17",
"jms/serializer": "^3.9.0",
"symfony/string": "5.4.*",
"symfony/translation-contracts": "^2.3",
Expand All @@ -35,7 +35,7 @@
},
"autoload": {
"psr-4": {
"RZ\\Roadiz\\": "src/"
"RZ\\": "src/"
}
},
"config": {
Expand All @@ -46,8 +46,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.2.x-dev",
"dev-develop": "2.3.x-dev"
"dev-master": "2.1.x-dev",
"dev-develop": "2.2.x-dev"
}
}
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@

namespace RZ\Roadiz\Core\AbstractEntities;

use ApiPlatform\Doctrine\Orm\Filter\NumericFilter;
use ApiPlatform\Metadata\ApiFilter;
use Doctrine\Common\Comparable;
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Annotation as SymfonySerializer;
use ApiPlatform\Doctrine\Orm\Filter\RangeFilter;

/**
* Combined AbstractDateTimed and PositionedTrait.
Expand All @@ -31,9 +28,7 @@ abstract class AbstractDateTimedPositioned extends AbstractDateTimed implements
ORM\Column(type: "float"),
Serializer\Groups(["position"]),
Serializer\Type("float"),
SymfonySerializer\Groups(["position"]),
ApiFilter(RangeFilter::class),
ApiFilter(NumericFilter::class)
SymfonySerializer\Groups(["position"])
]
protected float $position = 0.0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ abstract class AbstractField extends AbstractPositioned
];

#[
ORM\Column(name: "group_name", type: "string", length: 250, nullable: true),
ORM\Column(name: "group_name", type: "string", nullable: true),
Assert\Length(max: 250),
SymfonySerializer\Groups(["node_type", "setting"]),
Serializer\Groups(["node_type", "setting"]),
Expand All @@ -265,7 +265,7 @@ abstract class AbstractField extends AbstractPositioned
protected ?string $groupName = null;

#[
ORM\Column(name: "group_name_canonical", type: "string", length: 250, nullable: true),
ORM\Column(name: "group_name_canonical", type: "string", nullable: true),
Serializer\Groups(["node_type", "setting"]),
SymfonySerializer\Groups(["node_type", "setting"]),
Assert\Length(max: 250),
Expand All @@ -275,7 +275,7 @@ abstract class AbstractField extends AbstractPositioned
protected ?string $groupNameCanonical = null;

#[
ORM\Column(type: "string", length: 250),
ORM\Column(type: "string"),
Serializer\Expose,
Serializer\Groups(["node_type", "setting"]),
SymfonySerializer\Groups(["node_type", "setting"]),
Expand All @@ -287,7 +287,7 @@ abstract class AbstractField extends AbstractPositioned
protected string $name;

#[
ORM\Column(type: "string", length: 250),
ORM\Column(type: "string"),
Serializer\Expose,
Serializer\Groups(["node_type", "setting"]),
Serializer\Type("string"),
Expand All @@ -299,7 +299,7 @@ abstract class AbstractField extends AbstractPositioned
protected ?string $label;

#[
ORM\Column(type: "string", length: 250, nullable: true),
ORM\Column(type: "string", nullable: true),
Serializer\Expose,
Serializer\Groups(["node_type", "setting"]),
SymfonySerializer\Groups(["node_type", "setting"]),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
abstract class AbstractHuman extends AbstractDateTimed
{
#[
ORM\Column(type: "string", length: 200, unique: true),
ORM\Column(type: "string", unique: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\NotNull(),
Expand All @@ -37,47 +37,47 @@ abstract class AbstractHuman extends AbstractDateTimed
* Public name (pseudonyme) that can be displayed to a public audience.
*/
#[
ORM\Column(name: "publicName", type: "string", length: 250, nullable: true),
ORM\Column(name: "publicName", type: "string", nullable: true),
Serializer\Groups(["user_public", "human"]),
SymfonySerializer\Groups(["user_public", "human"]),
Assert\Length(max: 250)
]
protected ?string $publicName = null;

#[
ORM\Column(name: "firstName", type: "string", length: 250, nullable: true),
ORM\Column(name: "firstName", type: "string", nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 250)
]
protected ?string $firstName = null;

#[
ORM\Column(name: "lastName", type: "string", length: 250, nullable: true),
ORM\Column(name: "lastName", type: "string", nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 250)
]
protected ?string $lastName = null;

#[
ORM\Column(type: "string", length: 50, nullable: true),
ORM\Column(type: "string", nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 50)
Assert\Length(max: 20)
]
protected ?string $phone = null;

#[
ORM\Column(type: "string", length: 250, nullable: true),
ORM\Column(type: "string", nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 250)
]
protected ?string $company = null;

#[
ORM\Column(type: "string", length: 250, nullable: true),
ORM\Column(type: "string", nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 250)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7248a7f

Please sign in to comment.