Skip to content

Commit 4080e98

Browse files
dereuromarkdereuromark
committed
Updates
1 parent ea3e1f7 commit 4080e98

File tree

5 files changed

+687
-426
lines changed

5 files changed

+687
-426
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ yarn-error.log
5555
webroot/assets/
5656
webroot/css/webfonts/
5757
.ddev/*
58+
/config/Migrations/schema-dump-default.lock

‎.phpstorm.meta.php/.ide-helper.meta.php‎

Lines changed: 80 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,13 @@
163163
'datetimefractional' => \Cake\Database\Type\DateTimeFractionalType::class,
164164
'decimal' => \Cake\Database\Type\DecimalType::class,
165165
'float' => \Cake\Database\Type\FloatType::class,
166+
'geometry' => \Cake\Database\Type\StringType::class,
166167
'integer' => \Cake\Database\Type\IntegerType::class,
167168
'json' => \Cake\Database\Type\JsonType::class,
169+
'linestring' => \Cake\Database\Type\StringType::class,
170+
'nativeuuid' => \Cake\Database\Type\UuidType::class,
171+
'point' => \Cake\Database\Type\StringType::class,
172+
'polygon' => \Cake\Database\Type\StringType::class,
168173
'smallinteger' => \Cake\Database\Type\IntegerType::class,
169174
'string' => \Cake\Database\Type\StringType::class,
170175
'text' => \Cake\Database\Type\StringType::class,
@@ -190,8 +195,13 @@
190195
'datetimefractional',
191196
'decimal',
192197
'float',
198+
'geometry',
193199
'integer',
194200
'json',
201+
'linestring',
202+
'nativeuuid',
203+
'point',
204+
'polygon',
195205
'smallinteger',
196206
'string',
197207
'text',
@@ -229,6 +239,23 @@
229239
]),
230240
);
231241

242+
override(
243+
\Cake\Http\ServerRequest::getAttribute(0),
244+
map([
245+
'base' => 'string',
246+
'cspScriptNonce' => 'string',
247+
'cspStyleNonce' => 'string',
248+
'csrfToken' => 'string',
249+
'formTokenData' => 'array',
250+
'here' => 'string',
251+
'paging' => 'array',
252+
'params' => 'array',
253+
'route' => \Cake\Routing\Route\Route::class,
254+
'session' => \Cake\Http\Session::class,
255+
'webroot' => 'string',
256+
]),
257+
);
258+
232259
expectedArguments(
233260
\Cake\Http\ServerRequest::getParam(),
234261
0,
@@ -303,6 +330,27 @@
303330
]),
304331
);
305332

333+
override(
334+
\Cake\ORM\Table::getBehavior(),
335+
map([
336+
'CounterCache' => \Cake\ORM\Behavior\CounterCacheBehavior::class,
337+
'Timed' => \DebugKit\Model\Behavior\TimedBehavior::class,
338+
'Timestamp' => \Cake\ORM\Behavior\TimestampBehavior::class,
339+
'Translate' => \Cake\ORM\Behavior\TranslateBehavior::class,
340+
'Tree' => \Cake\ORM\Behavior\TreeBehavior::class,
341+
]),
342+
);
343+
344+
expectedArguments(
345+
\Cake\ORM\Table::hasBehavior(),
346+
0,
347+
'CounterCache',
348+
'Timed',
349+
'Timestamp',
350+
'Translate',
351+
'Tree',
352+
);
353+
306354
override(
307355
\Cake\ORM\Table::hasMany(0),
308356
map([
@@ -422,6 +470,7 @@
422470
'plugin.Bake.Posts',
423471
'plugin.Bake.ProductVersions',
424472
'plugin.Bake.Products',
473+
'plugin.Bake.Relations',
425474
'plugin.Bake.Tags',
426475
'plugin.Bake.TodoItems',
427476
'plugin.Bake.TodoItemsTodoLabels',
@@ -793,71 +842,65 @@
793842
);
794843

795844
expectedArguments(
796-
\Migrations\AbstractMigration::table(),
845+
\Migrations\BaseMigration::table(),
797846
0,
798847
argumentsSet('tableNames'),
799848
);
800849

801850
expectedArguments(
802-
\Migrations\AbstractSeed::table(),
851+
\Migrations\BaseSeed::table(),
803852
0,
804853
argumentsSet('tableNames'),
805854
);
806855

807856
expectedArguments(
808-
\Migrations\Table::addColumn(),
857+
\Migrations\Db\Table::addColumn(),
809858
0,
810859
argumentsSet('columnNames'),
811860
);
812861

813862
expectedArguments(
814-
\Migrations\Table::addColumn(),
863+
\Migrations\Db\Table::addColumn(),
815864
1,
816865
argumentsSet('columnTypes'),
817866
);
818867

819868
expectedArguments(
820-
\Migrations\Table::changeColumn(),
869+
\Migrations\Db\Table::changeColumn(),
821870
0,
822871
argumentsSet('columnNames'),
823872
);
824873

825874
expectedArguments(
826-
\Migrations\Table::changeColumn(),
875+
\Migrations\Db\Table::changeColumn(),
827876
1,
828877
argumentsSet('columnTypes'),
829878
);
830879

831880
expectedArguments(
832-
\Migrations\Table::hasColumn(),
881+
\Migrations\Db\Table::hasColumn(),
833882
0,
834883
argumentsSet('columnNames'),
835884
);
836885

837886
expectedArguments(
838-
\Migrations\Table::removeColumn(),
887+
\Migrations\Db\Table::removeColumn(),
839888
0,
840889
argumentsSet('columnNames'),
841890
);
842891

843892
expectedArguments(
844-
\Migrations\Table::renameColumn(),
893+
\Migrations\Db\Table::renameColumn(),
845894
0,
846895
argumentsSet('columnNames'),
847896
);
848897

849898
expectedArguments(
850-
\Migrations\Table::renameColumn(),
899+
\Migrations\Db\Table::renameColumn(),
851900
1,
852901
argumentsSet('columnNames'),
853902
);
854903

855-
expectedArguments(
856-
\Phinx\Seed\AbstractSeed::table(),
857-
0,
858-
argumentsSet('tableNames'),
859-
);
860-
861904
expectedArguments(
862905
\__d(),
863906
0,
@@ -886,37 +929,43 @@
886929
'CONTENT_TYPE',
887930
'COREPACK_ENABLE_DOWNLOAD_PROMPT',
888931
'COREPACK_HOME',
932+
'DDEV_APPROOT',
889933
'DDEV_COMPOSER_ROOT',
890934
'DDEV_DATABASE',
891935
'DDEV_DATABASE_FAMILY',
892936
'DDEV_DOCROOT',
893937
'DDEV_FILES_DIR',
894938
'DDEV_FILES_DIRS',
939+
'DDEV_GOARCH',
940+
'DDEV_GOOS',
895941
'DDEV_HOSTNAME',
896942
'DDEV_MUTAGEN_ENABLED',
897943
'DDEV_PHP_VERSION',
898944
'DDEV_PRIMARY_URL',
945+
'DDEV_PRIMARY_URL_PORT',
946+
'DDEV_PRIMARY_URL_WITHOUT_PORT',
899947
'DDEV_PROJECT',
900948
'DDEV_PROJECT_TYPE',
901949
'DDEV_ROUTER_HTTPS_PORT',
902950
'DDEV_ROUTER_HTTP_PORT',
951+
'DDEV_SCHEME',
903952
'DDEV_SITENAME',
904953
'DDEV_TLD',
905954
'DDEV_VERSION',
906955
'DDEV_WEBSERVER_TYPE',
907956
'DDEV_WEB_ENTRYPOINT',
908957
'DDEV_XDEBUG_ENABLED',
958+
'DDEV_XHPROF_MODE',
909959
'DEBIAN_FRONTEND',
910960
'DEPLOY_NAME',
911961
'DOCKER_IP',
912962
'DOCROOT',
913963
'DOCUMENT_ROOT',
914964
'DOCUMENT_URI',
915965
'DRUSH_OPTIONS_URI',
966+
'EXECIGNORE',
916967
'GATEWAY_INTERFACE',
917968
'GIT_ASKPASS',
918-
'GOARCH',
919-
'GOOS',
920969
'HISTFILE',
921970
'HOME',
922971
'HOSTNAME',
@@ -938,7 +987,6 @@
938987
'LS_COLORS',
939988
'MH_SMTP_BIND_ADDR',
940989
'MYSQL_HISTFILE',
941-
'MYSQL_PWD',
942990
'NGINX_SITE_TEMPLATE',
943991
'NODE_EXTRA_CA_CERTS',
944992
'NVM_CD_FLAGS',
@@ -973,6 +1021,7 @@
9731021
'SHELL_VERBOSITY',
9741022
'SHLVL',
9751023
'SSH_AUTH_SOCK',
1024+
'START_SCRIPT_TIMEOUT',
9761025
'TERM',
9771026
'TERMINUS_CACHE_DIR',
9781027
'TERMINUS_HIDE_UPDATE_MESSAGE',
@@ -1000,7 +1049,12 @@
10001049

10011050
registerArgumentsSet(
10021051
'columnNames',
1003-
1052+
'content',
1053+
'created',
1054+
'id',
1055+
'modified',
1056+
'status',
1057+
'title',
10041058
);
10051059

10061060
registerArgumentsSet(
@@ -1072,6 +1126,11 @@
10721126
'Error.log',
10731127
'Error.skipLog',
10741128
'Error.trace',
1129+
'IdeHelper',
1130+
'IdeHelper.arrayAsGenerics',
1131+
'IdeHelper.objectAsGenerics',
1132+
'IdeHelper.preferLinkOverUsesInTests',
1133+
'IdeHelper.templateCollectionObject',
10751134
'Migrations',
10761135
'Migrations.backend',
10771136
'Security',
@@ -1128,7 +1187,7 @@
11281187

11291188
registerArgumentsSet(
11301189
'tableNames',
1131-
1190+
'articles',
11321191
);
11331192

11341193
registerArgumentsSet(

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"require-dev": {
1515
"cakephp/bake": "^3.0.0",
16-
"dereuromark/cakephp-ide-helper": "^2.5.3",
16+
"dereuromark/cakephp-ide-helper": "dev-master",
1717
"cakephp/debug_kit": "^5.0.0",
1818
"phpunit/phpunit": "^11.1.3",
1919
"phpstan/phpstan": "^1.12.7",

0 commit comments

Comments
 (0)