Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"vlucas/phpdotenv": "^5.6"
},
"require-dev": {
"fakerphp/faker": "^1.24",
"pds/composer-script-names": "^1.0",
"pds/skeleton": "^1.0",
"phpstan/phpstan": "^2.1",
Expand Down
6 changes: 3 additions & 3 deletions public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

declare(strict_types=1);

use Phalcon\Api\Domain\Services\Container;
use Phalcon\Api\Domain\Services\Providers\ErrorHandlerProvider;
use Phalcon\Api\Domain\Services\Providers\RouterProvider;
use Phalcon\Api\Domain\Components\Container;
use Phalcon\Api\Domain\Components\Providers\ErrorHandlerProvider;
use Phalcon\Api\Domain\Components\Providers\RouterProvider;
use Phalcon\Di\ServiceProviderInterface;
use Phalcon\Mvc\Micro;

Expand Down
10 changes: 5 additions & 5 deletions resources/db/migrations/20250908190433_add_users_table.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

final class AddUsersTable extends AbstractMigration
{
public function down(): void
{
$this->table('co_users')->drop()->save();
}

public function up(): void
{
$table = $this->table(
Expand Down Expand Up @@ -49,9 +54,4 @@ public function up(): void
->save()
;
}

public function down(): void
{
$this->table('co_users')->drop()->save();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
<?php

declare(strict_types=1);

use Phinx\Migration\AbstractMigration;

final class AddMoreFieldsToUsersTable extends AbstractMigration
{
public function down(): void
{
$table = $this->table('co_users');
$table
->removeIndexByName('i_email_x_status')
->removeIndexByName('i_id_x_status')
->removeIndexByName('i_token_id')
->removeIndexByName('i_email')
->save()
;

$table
->removeColumn('usr_email')
->removeColumn('usr_name_prefix')
->removeColumn('usr_name_first')
->removeColumn('usr_name_middle')
->removeColumn('usr_name_last')
->removeColumn('usr_name_suffix')
->removeColumn('usr_issuer')
->removeColumn('usr_token_password')
->removeColumn('usr_token_id')
->removeColumn('usr_preferences')
->removeColumn('usr_created_date')
->removeColumn('usr_created_usr_id')
->removeColumn('usr_updated_date')
->removeColumn('usr_updated_usr_id')
->save()
;

$table
->addColumn(
'usr_username',
'string',
[
'limit' => 128,
'null' => false,
'default' => '',
'after' => 'usr_status_flag',
]
)
->addIndex('usr_status_flag')
->addIndex('usr_username')
->save()
;
}

public function up(): void
{
$table = $this->table('co_users');

$table
->removeIndex('usr_status_flag')
->removeIndex('usr_username')
->save()
;

$table->removeColumn('usr_username')->save();

$table
->addColumn(
'usr_email',
'string',
[
'limit' => 128,
'null' => false,
'after' => 'usr_status_flag',
]
)
->addColumn(
'usr_name_prefix',
'string',
[
'limit' => 16,
'null' => false,
'default' => '',
]
)
->addColumn(
'usr_name_first',
'string',
[
'limit' => 64,
'null' => false,
'default' => '',
]
)
->addColumn(
'usr_name_middle',
'string',
[
'limit' => 64,
'null' => false,
'default' => '',
]
)
->addColumn(
'usr_name_last',
'string',
[
'limit' => 128,
'null' => false,
'default' => '',
]
)
->addColumn(
'usr_name_suffix',
'string',
[
'limit' => 16,
'null' => false,
'default' => '',
]
)
->addColumn(
'usr_issuer',
'string',
[
'limit' => 128,
'null' => false,
]
)
->addColumn(
'usr_token_password',
'string',
[
'limit' => 128,
'null' => false,
]
)
->addColumn(
'usr_token_id',
'string',
[
'limit' => 128,
'null' => false,
]
)
->addColumn(
'usr_preferences',
'text',
[
'null' => true,
]
)
->addColumn(
'usr_created_date',
'timestamp',
[
'timezone' => true,
'default' => 'CURRENT_TIMESTAMP',
]
)
->addColumn(
'usr_created_usr_id',
'biginteger',
[
'null' => false,
'default' => 0,
]
)
->addColumn(
'usr_updated_date',
'timestamp',
[
'timezone' => true,
'default' => null,
]
)
->addColumn(
'usr_updated_usr_id',
'biginteger',
[
'null' => false,
'default' => 0,
]
)
->addIndex(
[
'usr_email',
'usr_status_flag',
],
[
'name' => 'i_email_x_status',
]
)
->addIndex(
[
'usr_id',
'usr_status_flag',
],
[
'name' => 'i_id_x_status',
]
)
->addIndex(
[
'usr_token_id',
],
[
'unique' => true,
'name' => 'i_token_id',
]
)
->addIndex(
[
'usr_email',
],
[
'unique' => true,
'name' => 'i_email',
]
)
->save()
;
}
}
24 changes: 12 additions & 12 deletions resources/docker/config/php/php.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[PHP]
date.timezone = UTC
memory_limit = 512M
max_execution_time = 120
max_input_time = 120
error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
xmlrpc_errors = Off
report_memleaks = On
display_errors = On
display_startup_errors = On
log_errors = On
html_errors = Off
xdebug.mode = debug,develop,trace
date.timezone = UTC
memory_limit = 512M
max_execution_time = 120
max_input_time = 120
error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
xmlrpc_errors = Off
report_memleaks = On
display_errors = On
display_startup_errors = On
log_errors = On
html_errors = Off
xdebug.mode = debug,develop,trace
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@

declare(strict_types=1);

namespace Phalcon\Api\Domain\ADR\Action;
namespace Phalcon\Api\Action;

use Phalcon\Api\Domain\ADR\Domain\DomainInterface;
use Phalcon\Api\Domain\ADR\Domain\Input;
use Phalcon\Api\Domain\ADR\Responder\ResponderInterface;
use Phalcon\Api\Domain\Services\Http\Response;
use Phalcon\Http\Request;
use Phalcon\Api\Domain\ADR\DomainInterface;
use Phalcon\Api\Domain\ADR\Input;
use Phalcon\Api\Responder\ResponderInterface;
use Phalcon\Http\RequestInterface;
use Phalcon\Http\ResponseInterface;

final readonly class ActionHandler implements ActionInterface
{
public function __construct(
private Request $request,
private Response $response,
private RequestInterface $request,
private ResponseInterface $response,
private DomainInterface $service,
private ResponderInterface $responder
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Phalcon\Api\Domain\ADR\Action;
namespace Phalcon\Api\Action;

interface ActionInterface
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Phalcon\Api\Domain\ADR\Domain;
namespace Phalcon\Api\Domain\ADR;

use Phalcon\Domain\Payload;

Expand Down
8 changes: 4 additions & 4 deletions src/Domain/ADR/Domain/Input.php → src/Domain/ADR/Input.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@

declare(strict_types=1);

namespace Phalcon\Api\Domain\ADR\Domain;
namespace Phalcon\Api\Domain\ADR;

use Phalcon\Http\Request;
use Phalcon\Http\RequestInterface;

/**
* @phpstan-import-type TRequestQuery from InputTypes
*/
final class Input implements InputInterface
{
/**
* @param Request $request
* @param RequestInterface $request
*
* @return TRequestQuery
*/
public function __invoke(Request $request): array
public function __invoke(RequestInterface $request): array
{
/** @var TRequestQuery $query */
$query = $request->getQuery();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Phalcon\Api\Domain\ADR\Domain;
namespace Phalcon\Api\Domain\ADR;

use Phalcon\Http\Request;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare(strict_types=1);

namespace Phalcon\Api\Domain\ADR\Domain;
namespace Phalcon\Api\Domain\ADR;

/**
* @phpstan-type THelloInput array{}
Expand Down
Loading
Loading