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: 2 additions & 0 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
php:
- "8.2"
- "8.3"
- "8.4"
- "8.5"

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qodana_code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
checks: write
strategy:
matrix:
php-versions: [ '8.2', '8.3' ]
php-versions: [ '8.2', '8.3', '8.4', '8.5' ]
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
php:
- "8.2"
- "8.3"
- "8.4"
- "8.5"

steps:
- name: Checkout
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/validate-database-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
php:
- "8.2"
- "8.3"
- "8.4"
- "8.5"

steps:
- name: Checkout
Expand Down
13 changes: 5 additions & 8 deletions bin/doctrine
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,24 @@
declare(strict_types=1);

use Core\App\Event\TablePrefixEventListener;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Events;
use Doctrine\ORM\Tools\Console\ConsoleRunner;
use Doctrine\ORM\Tools\Console\EntityManagerProvider\SingleManagerProvider;
use Dot\DataFixtures\Command\ExecuteFixturesCommand;
use Dot\DataFixtures\Command\ListFixturesCommand;
use Doctrine\ORM\EntityManager;

require_once 'vendor/autoload.php';

$container = require 'config/container.php' ;
$container = require 'config/container.php';

$entityManager = $container->get(EntityManager::class);
$entityManager->getEventManager()
->addEventListener(Events::loadClassMetadata, $container->get(TablePrefixEventListener::class));

$commands = [
$container->get(ExecuteFixturesCommand::class),
$container->get(ListFixturesCommand::class),
$container->get(ExecuteFixturesCommand::class),
$container->get(ListFixturesCommand::class),
];

ConsoleRunner::run(
new SingleManagerProvider($entityManager),
$commands
);
ConsoleRunner::run(new SingleManagerProvider($entityManager), $commands);
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}
},
"require": {
"php": "~8.2.0 || ~8.3.0",
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
"ext-gd": "*",
"ext-json": "*",
"dotkernel/dot-cache": "^4.3",
Expand Down Expand Up @@ -77,7 +77,7 @@
"mezzio/mezzio-problem-details": "^1.15.0",
"ramsey/uuid": "^4.5.0",
"ramsey/uuid-doctrine": "^2.1.0",
"roave/psr-container-doctrine": "^5.2.2",
"roave/psr-container-doctrine": "^5.2.2 || ^6.0.0",
"symfony/filesystem": "^7.2.0",
"zircote/swagger-php": "^5.0.7"
},
Expand Down
6 changes: 3 additions & 3 deletions config/autoload/cli.global.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
'version' => '1.0.0',
'name' => 'Dotkernel CLI',
'commands' => [
RouteListCommand::getDefaultName() => RouteListCommand::class,
AdminCreateCommand::getDefaultName() => AdminCreateCommand::class,
TokenGenerateCommand::getDefaultName() => TokenGenerateCommand::class,
RouteListCommand::$defaultName => RouteListCommand::class,
AdminCreateCommand::$defaultName => AdminCreateCommand::class,
TokenGenerateCommand::$defaultName => TokenGenerateCommand::class,
],
],
FileLockerInterface::class => [
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/src/Command/AdminCreateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
class AdminCreateCommand extends Command
{
/** @var string $defaultName */
protected static $defaultName = 'admin:create';
public static $defaultName = 'admin:create';

#[Inject(
AdminServiceInterface::class,
Expand Down
2 changes: 1 addition & 1 deletion src/App/src/Command/TokenGenerateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
class TokenGenerateCommand extends Command
{
/** @var string $defaultName */
protected static $defaultName = 'token:generate';
public static $defaultName = 'token:generate';
private string $typeErrorReporting = 'error-reporting';

#[Inject(
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/App/src/Command/RouteListCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
class RouteListCommand extends Command
{
/** @var string $defaultName */
protected static $defaultName = 'route:list';
public static $defaultName = 'route:list';

#[Inject(
Application::class,
Expand Down
3 changes: 2 additions & 1 deletion test/Unit/App/Attribute/MethodDeprecationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
}

/**
* @param ReflectionClass<RequestHandlerInterface> $reflectionClass
* @template T of RequestHandlerInterface
* @param ReflectionClass<T> $reflectionClass
* @return array<int, mixed>
*/
private function getAttributes(ReflectionClass $reflectionClass): array
Expand Down