Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ DB_BUNDLE_PASS=admin
DB_BUNDLE_HOST=mysql
DB_BUNDLE_PORT=3306
DB_BUNDLE_NAME=serializerbundle
DB_BUNDLE_URL=mysql://${DB_BUNDLE_USER}:${DB_BUNDLE_PASS}@${DB_BUNDLE_HOST}:${DB_BUNDLE_PORT}/${DB_BUNDLE_NAME}?serverVersion=8.0
DB_BUNDLE_URL=mysql://${DB_BUNDLE_USER}:${DB_BUNDLE_PASS}@${DB_BUNDLE_HOST}:${DB_BUNDLE_PORT}/${DB_BUNDLE_NAME}?serverVersion=8.0.31
8 changes: 3 additions & 5 deletions bin/ecs
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
#!/bin/bash
# Script used to run ECS check in the application docker container
# Script used to run ECS check in the application container

PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
CHECK_DIR=${1:-src}

cd "${PROJECT_ROOT}" || exit 1

if [ -f /.dockerenv ]; then
echo "[INFO] Running ECS check"
vendor/bin/ecs check --fix --config=ecs.php "${CHECK_DIR}"
vendor/bin/ecs check --fix --config=ecs.php
exit
fi

bin/docker-compose run --rm app bash -c \'bin/ecs "${CHECK_DIR}"\'
bin/docker-compose run --rm app bash -c \'bin/ecs\'
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"php": ">=8.3",
"ext-json": "*",
"doctrine/common": "^3.3",
"nelmio/api-doc-bundle": "^5.9",
"symfony/property-info": "^6.3|^7.0"
},
"require-dev": {
"doctrine/doctrine-bundle": "^2.18",
"doctrine/orm": "^3.5",
"nelmio/api-doc-bundle": "^4.13",
"slevomat/coding-standard": "8.22",
"symfony/dotenv": "^6.3|^7.0",
"symfony/test-pack": "^1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/OpenApi/SerializerModelDescriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ private function getSymfonyConstraintAnnotationReader(): SymfonyConstraintAnnota
{
if (null === $this->symfonyConstraintAnnotationReader) {
/** @psalm-suppress NullArgument */
$this->symfonyConstraintAnnotationReader = new SymfonyConstraintAnnotationReader(null);
$this->symfonyConstraintAnnotationReader = new SymfonyConstraintAnnotationReader();
}

return $this->symfonyConstraintAnnotationReader;
Expand Down
2 changes: 1 addition & 1 deletion tests/TestApp/Controller/DummyController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Attribute\Route;

#[Route('/dummy')]
final class DummyController extends AbstractController
Expand Down