Skip to content

Commit e479e99

Browse files
nidenniden
authored
Merge pull request #15 from niden-code/1.x
Video #7
2 parents 2d77f71 + 50fd7c2 commit e479e99

File tree

74 files changed

+2038
-1104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2038
-1104
lines changed

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"vlucas/phpdotenv": "^5.6"
2727
},
2828
"require-dev": {
29+
"fakerphp/faker": "^1.24",
2930
"pds/composer-script-names": "^1.0",
3031
"pds/skeleton": "^1.0",
3132
"phpstan/phpstan": "^2.1",

‎public/index.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
use Phalcon\Api\Domain\Services\Container;
6-
use Phalcon\Api\Domain\Services\Providers\ErrorHandlerProvider;
7-
use Phalcon\Api\Domain\Services\Providers\RouterProvider;
5+
use Phalcon\Api\Domain\Components\Container;
6+
use Phalcon\Api\Domain\Components\Providers\ErrorHandlerProvider;
7+
use Phalcon\Api\Domain\Components\Providers\RouterProvider;
88
use Phalcon\Di\ServiceProviderInterface;
99
use Phalcon\Mvc\Micro;
1010

‎resources/db/migrations/20250908190433_add_users_table.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
final class AddUsersTable extends AbstractMigration
88
{
9+
public function down(): void
10+
{
11+
$this->table('co_users')->drop()->save();
12+
}
13+
914
public function up(): void
1015
{
1116
$table = $this->table(
@@ -49,9 +54,4 @@ public function up(): void
4954
->save()
5055
;
5156
}
52-
53-
public function down(): void
54-
{
55-
$this->table('co_users')->drop()->save();
56-
}
5757
}

‎resources/db/migrations/20251017133633_add_more_fields_to_users_table.php‎

Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use Phinx\Migration\AbstractMigration;
6+
7+
final class AddMoreFieldsToUsersTable extends AbstractMigration
8+
{
9+
public function down(): void
10+
{
11+
$table = $this->table('co_users');
12+
$table
13+
->removeIndexByName('i_email_x_status')
14+
->removeIndexByName('i_id_x_status')
15+
->removeIndexByName('i_token_id')
16+
->removeIndexByName('i_email')
17+
->save()
18+
;
19+
20+
$table
21+
->removeColumn('usr_email')
22+
->removeColumn('usr_name_prefix')
23+
->removeColumn('usr_name_first')
24+
->removeColumn('usr_name_middle')
25+
->removeColumn('usr_name_last')
26+
->removeColumn('usr_name_suffix')
27+
->removeColumn('usr_issuer')
28+
->removeColumn('usr_token_password')
29+
->removeColumn('usr_token_id')
30+
->removeColumn('usr_preferences')
31+
->removeColumn('usr_created_date')
32+
->removeColumn('usr_created_usr_id')
33+
->removeColumn('usr_updated_date')
34+
->removeColumn('usr_updated_usr_id')
35+
->save()
36+
;
37+
38+
$table
39+
->addColumn(
40+
'usr_username',
41+
'string',
42+
[
43+
'limit' => 128,
44+
'null' => false,
45+
'default' => '',
46+
'after' => 'usr_status_flag',
47+
]
48+
)
49+
->addIndex('usr_status_flag')
50+
->addIndex('usr_username')
51+
->save()
52+
;
53+
}
54+
55+
public function up(): void
56+
{
57+
$table = $this->table('co_users');
58+
59+
$table
60+
->removeIndex('usr_status_flag')
61+
->removeIndex('usr_username')
62+
->save()
63+
;
64+
65+
$table->removeColumn('usr_username')->save();
66+
67+
$table
68+
->addColumn(
69+
'usr_email',
70+
'string',
71+
[
72+
'limit' => 128,
73+
'null' => false,
74+
'after' => 'usr_status_flag',
75+
]
76+
)
77+
->addColumn(
78+
'usr_name_prefix',
79+
'string',
80+
[
81+
'limit' => 16,
82+
'null' => false,
83+
'default' => '',
84+
]
85+
)
86+
->addColumn(
87+
'usr_name_first',
88+
'string',
89+
[
90+
'limit' => 64,
91+
'null' => false,
92+
'default' => '',
93+
]
94+
)
95+
->addColumn(
96+
'usr_name_middle',
97+
'string',
98+
[
99+
'limit' => 64,
100+
'null' => false,
101+
'default' => '',
102+
]
103+
)
104+
->addColumn(
105+
'usr_name_last',
106+
'string',
107+
[
108+
'limit' => 128,
109+
'null' => false,
110+
'default' => '',
111+
]
112+
)
113+
->addColumn(
114+
'usr_name_suffix',
115+
'string',
116+
[
117+
'limit' => 16,
118+
'null' => false,
119+
'default' => '',
120+
]
121+
)
122+
->addColumn(
123+
'usr_issuer',
124+
'string',
125+
[
126+
'limit' => 128,
127+
'null' => false,
128+
]
129+
)
130+
->addColumn(
131+
'usr_token_password',
132+
'string',
133+
[
134+
'limit' => 128,
135+
'null' => false,
136+
]
137+
)
138+
->addColumn(
139+
'usr_token_id',
140+
'string',
141+
[
142+
'limit' => 128,
143+
'null' => false,
144+
]
145+
)
146+
->addColumn(
147+
'usr_preferences',
148+
'text',
149+
[
150+
'null' => true,
151+
]
152+
)
153+
->addColumn(
154+
'usr_created_date',
155+
'timestamp',
156+
[
157+
'timezone' => true,
158+
'default' => 'CURRENT_TIMESTAMP',
159+
]
160+
)
161+
->addColumn(
162+
'usr_created_usr_id',
163+
'biginteger',
164+
[
165+
'null' => false,
166+
'default' => 0,
167+
]
168+
)
169+
->addColumn(
170+
'usr_updated_date',
171+
'timestamp',
172+
[
173+
'timezone' => true,
174+
'default' => null,
175+
]
176+
)
177+
->addColumn(
178+
'usr_updated_usr_id',
179+
'biginteger',
180+
[
181+
'null' => false,
182+
'default' => 0,
183+
]
184+
)
185+
->addIndex(
186+
[
187+
'usr_email',
188+
'usr_status_flag',
189+
],
190+
[
191+
'name' => 'i_email_x_status',
192+
]
193+
)
194+
->addIndex(
195+
[
196+
'usr_id',
197+
'usr_status_flag',
198+
],
199+
[
200+
'name' => 'i_id_x_status',
201+
]
202+
)
203+
->addIndex(
204+
[
205+
'usr_token_id',
206+
],
207+
[
208+
'unique' => true,
209+
'name' => 'i_token_id',
210+
]
211+
)
212+
->addIndex(
213+
[
214+
'usr_email',
215+
],
216+
[
217+
'unique' => true,
218+
'name' => 'i_email',
219+
]
220+
)
221+
->save()
222+
;
223+
}
224+
}

‎resources/docker/config/php/php.ini‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[PHP]
2-
date.timezone = UTC
3-
memory_limit = 512M
4-
max_execution_time = 120
5-
max_input_time = 120
6-
error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
7-
xmlrpc_errors = Off
8-
report_memleaks = On
9-
display_errors = On
10-
display_startup_errors = On
11-
log_errors = On
12-
html_errors = Off
13-
xdebug.mode = debug,develop,trace
2+
date.timezone = UTC
3+
memory_limit = 512M
4+
max_execution_time = 120
5+
max_input_time = 120
6+
error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
7+
xmlrpc_errors = Off
8+
report_memleaks = On
9+
display_errors = On
10+
display_startup_errors = On
11+
log_errors = On
12+
html_errors = Off
13+
xdebug.mode = debug,develop,trace

‎src/Domain/ADR/Action/ActionHandler.php‎ renamed to ‎src/Action/ActionHandler.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace Phalcon\Api\Domain\ADR\Action;
14+
namespace Phalcon\Api\Action;
1515

16-
use Phalcon\Api\Domain\ADR\Domain\DomainInterface;
17-
use Phalcon\Api\Domain\ADR\Domain\Input;
18-
use Phalcon\Api\Domain\ADR\Responder\ResponderInterface;
19-
use Phalcon\Api\Domain\Services\Http\Response;
20-
use Phalcon\Http\Request;
16+
use Phalcon\Api\Domain\ADR\DomainInterface;
17+
use Phalcon\Api\Domain\ADR\Input;
18+
use Phalcon\Api\Responder\ResponderInterface;
19+
use Phalcon\Http\RequestInterface;
20+
use Phalcon\Http\ResponseInterface;
2121

2222
final readonly class ActionHandler implements ActionInterface
2323
{
2424
public function __construct(
25-
private Request $request,
26-
private Response $response,
25+
private RequestInterface $request,
26+
private ResponseInterface $response,
2727
private DomainInterface $service,
2828
private ResponderInterface $responder
2929
) {

‎src/Domain/ADR/Action/ActionInterface.php‎ renamed to ‎src/Action/ActionInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace Phalcon\Api\Domain\ADR\Action;
14+
namespace Phalcon\Api\Action;
1515

1616
interface ActionInterface
1717
{

‎src/Domain/ADR/Domain/DomainInterface.php‎ renamed to ‎src/Domain/ADR/DomainInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace Phalcon\Api\Domain\ADR\Domain;
14+
namespace Phalcon\Api\Domain\ADR;
1515

1616
use Phalcon\Domain\Payload;
1717

‎src/Domain/ADR/Domain/Input.php‎ renamed to ‎src/Domain/ADR/Input.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace Phalcon\Api\Domain\ADR\Domain;
14+
namespace Phalcon\Api\Domain\ADR;
1515

16-
use Phalcon\Http\Request;
16+
use Phalcon\Http\RequestInterface;
1717

1818
/**
1919
* @phpstan-import-type TRequestQuery from InputTypes
2020
*/
2121
final class Input implements InputInterface
2222
{
2323
/**
24-
* @param Request $request
24+
* @param RequestInterface $request
2525
*
2626
* @return TRequestQuery
2727
*/
28-
public function __invoke(Request $request): array
28+
public function __invoke(RequestInterface $request): array
2929
{
3030
/** @var TRequestQuery $query */
3131
$query = $request->getQuery();

‎src/Domain/ADR/Domain/InputInterface.php‎ renamed to ‎src/Domain/ADR/InputInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace Phalcon\Api\Domain\ADR\Domain;
14+
namespace Phalcon\Api\Domain\ADR;
1515

1616
use Phalcon\Http\Request;
1717

0 commit comments

Comments
 (0)