Skip to content

Commit 7771863

Browse files
LordSimalLordSimal
committed
composer and npm updates
1 parent 1d697c6 commit 7771863

8 files changed

Lines changed: 420 additions & 374 deletions

File tree

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cakephp/cakephp": "5.3.*",
1212
"cakephp/migrations": "^5.0.0",
1313
"cakephp/plugin-installer": "^2.0",
14-
"dereuromark/cakephp-tags": "^2.2",
14+
"dereuromark/cakephp-tags": "^3.0",
1515
"friendsofcake/search": "^7.5",
1616
"knplabs/packagist-api": "^2.1",
1717
"mobiledetect/mobiledetectlib": "^4.8.03"
@@ -21,7 +21,7 @@
2121
"cakephp/bake": "^3.0.0",
2222
"cakephp/cakephp-codesniffer": "^5.0",
2323
"cakephp/debug_kit": "^5.0.0",
24-
"dereuromark/cakephp-ide-helper": "dev-master",
24+
"dereuromark/cakephp-ide-helper": "^2.16.8",
2525
"josegonzalez/dotenv": "^4.0",
2626
"phpunit/phpunit": "^10.5.5 || ^11.1.3 || ^12.1"
2727
},

‎composer.lock‎

Lines changed: 162 additions & 165 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/app.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,5 +485,8 @@
485485
'arrayAsGenerics' => true,
486486
'objectAsGenerics' => true,
487487
'assocsAsGenerics' => true,
488+
'genericsInParam' => true,
489+
'concreteEntitiesInParam' => true,
490+
'tableEntityQuery' => true,
488491
],
489492
];

‎package-lock.json‎

Lines changed: 226 additions & 182 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Model/Filter/PackagesCollection.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ public function initialize(): void
2828
}
2929

3030
/**
31+
* @param string $filterName
3132
* @return void
3233
*/
3334
protected function addTaggedSlugFilter(string $filterName): void
3435
{
3536
$this->callback($filterName, [
3637
'callback' => function (SelectQuery $query, array $args) use ($filterName): void {
37-
$args['slug'] = $args[$filterName];
38-
unset($args[$filterName]);
39-
$query->find('tagged', ...$args);
38+
$query->find('tagged', value: $args[$filterName]);
4039
},
4140
]);
4241
}

‎src/Model/Table/PackagesTable.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,24 @@
1212
* Packages Model
1313
*
1414
* @method \App\Model\Entity\Package newEmptyEntity()
15-
* @method \App\Model\Entity\Package newEntity(array $data, array $options = [])
16-
* @method array<\App\Model\Entity\Package> newEntities(array $data, array $options = [])
15+
* @method \App\Model\Entity\Package newEntity(array<mixed> $data, array<string, mixed> $options = [])
16+
* @method array<\App\Model\Entity\Package> newEntities(array<mixed> $data, array<string, mixed> $options = [])
1717
* @method \App\Model\Entity\Package get(mixed $primaryKey, array|string $finder = 'all', \Psr\SimpleCache\CacheInterface|string|null $cache = null, \Closure|string|null $cacheKey = null, mixed ...$args)
18-
* @method \App\Model\Entity\Package findOrCreate(\Cake\ORM\Query\SelectQuery|callable|array $search, ?callable $callback = null, array $options = [])
19-
* @method \App\Model\Entity\Package patchEntity(\Cake\Datasource\EntityInterface $entity, array $data, array $options = [])
20-
* @method array<\App\Model\Entity\Package> patchEntities(iterable $entities, array $data, array $options = [])
21-
* @method \App\Model\Entity\Package|false save(\Cake\Datasource\EntityInterface $entity, array $options = [])
22-
* @method \App\Model\Entity\Package saveOrFail(\Cake\Datasource\EntityInterface $entity, array $options = [])
23-
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\Package>|false saveMany(iterable $entities, array $options = [])
24-
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\Package> saveManyOrFail(iterable $entities, array $options = [])
25-
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\Package>|false deleteMany(iterable $entities, array $options = [])
26-
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\Package> deleteManyOrFail(iterable $entities, array $options = [])
18+
* @method \App\Model\Entity\Package findOrCreate(\Cake\ORM\Query\SelectQuery|callable|array $search, ?callable $callback = null, array<string, mixed> $options = [])
19+
* @method \App\Model\Entity\Package patchEntity(\App\Model\Entity\Package $entity, array<mixed> $data, array<string, mixed> $options = [])
20+
* @method array<\App\Model\Entity\Package> patchEntities(iterable<\App\Model\Entity\Package> $entities, array<mixed> $data, array<string, mixed> $options = [])
21+
* @method \App\Model\Entity\Package|false save(\App\Model\Entity\Package $entity, array<string, mixed> $options = [])
22+
* @method \App\Model\Entity\Package saveOrFail(\App\Model\Entity\Package $entity, array<string, mixed> $options = [])
23+
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\Package>|false saveMany(iterable<\App\Model\Entity\Package> $entities, array<string, mixed> $options = [])
24+
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\Package> saveManyOrFail(iterable<\App\Model\Entity\Package> $entities, array<string, mixed> $options = [])
25+
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\Package>|false deleteMany(iterable<\App\Model\Entity\Package> $entities, array<string, mixed> $options = [])
26+
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\Package> deleteManyOrFail(iterable<\App\Model\Entity\Package> $entities, array<string, mixed> $options = [])
2727
* @property \Cake\ORM\Association\HasMany<\Tags\Model\Table\TaggedTable> $Tagged
2828
* @property \Cake\ORM\Association\BelongsToMany<\Tags\Model\Table\TagsTable> $Tags
2929
* @mixin \Search\Model\Behavior\SearchBehavior
3030
* @mixin \Tags\Model\Behavior\TagBehavior
3131
* @extends \Cake\ORM\Table<array{Search: \Search\Model\Behavior\SearchBehavior, Tag: \Tags\Model\Behavior\TagBehavior}>
32+
* @method \Cake\ORM\Query\SelectQuery<\App\Model\Entity\Package> find(string $type = 'all', mixed ...$args)
3233
*/
3334
class PackagesTable extends Table
3435
{

‎src/Model/Table/UsersTable.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
* Users Model
1616
*
1717
* @method \App\Model\Entity\User newEmptyEntity()
18-
* @method \App\Model\Entity\User newEntity(array $data, array $options = [])
19-
* @method array<\App\Model\Entity\User> newEntities(array $data, array $options = [])
18+
* @method \App\Model\Entity\User newEntity(array<mixed> $data, array<string, mixed> $options = [])
19+
* @method array<\App\Model\Entity\User> newEntities(array<mixed> $data, array<string, mixed> $options = [])
2020
* @method \App\Model\Entity\User get(mixed $primaryKey, array|string $finder = 'all', \Psr\SimpleCache\CacheInterface|string|null $cache = null, \Closure|string|null $cacheKey = null, mixed ...$args)
21-
* @method \App\Model\Entity\User findOrCreate(\Cake\ORM\Query\SelectQuery|callable|array $search, ?callable $callback = null, array $options = [])
22-
* @method \App\Model\Entity\User patchEntity(\Cake\Datasource\EntityInterface $entity, array $data, array $options = [])
23-
* @method array<\App\Model\Entity\User> patchEntities(iterable $entities, array $data, array $options = [])
24-
* @method \App\Model\Entity\User|false save(\Cake\Datasource\EntityInterface $entity, array $options = [])
25-
* @method \App\Model\Entity\User saveOrFail(\Cake\Datasource\EntityInterface $entity, array $options = [])
26-
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\User>|false saveMany(iterable $entities, array $options = [])
27-
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\User> saveManyOrFail(iterable $entities, array $options = [])
28-
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\User>|false deleteMany(iterable $entities, array $options = [])
29-
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\User> deleteManyOrFail(iterable $entities, array $options = [])
21+
* @method \App\Model\Entity\User findOrCreate(\Cake\ORM\Query\SelectQuery|callable|array $search, ?callable $callback = null, array<string, mixed> $options = [])
22+
* @method \App\Model\Entity\User patchEntity(\App\Model\Entity\User $entity, array<mixed> $data, array<string, mixed> $options = [])
23+
* @method array<\App\Model\Entity\User> patchEntities(iterable<\App\Model\Entity\User> $entities, array<mixed> $data, array<string, mixed> $options = [])
24+
* @method \App\Model\Entity\User|false save(\App\Model\Entity\User $entity, array<string, mixed> $options = [])
25+
* @method \App\Model\Entity\User saveOrFail(\App\Model\Entity\User $entity, array<string, mixed> $options = [])
26+
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\User>|false saveMany(iterable<\App\Model\Entity\User> $entities, array<string, mixed> $options = [])
27+
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\User> saveManyOrFail(iterable<\App\Model\Entity\User> $entities, array<string, mixed> $options = [])
28+
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\User>|false deleteMany(iterable<\App\Model\Entity\User> $entities, array<string, mixed> $options = [])
29+
* @method \Cake\Datasource\ResultSetInterface<\App\Model\Entity\User> deleteManyOrFail(iterable<\App\Model\Entity\User> $entities, array<string, mixed> $options = [])
3030
* @mixin \Cake\ORM\Behavior\TimestampBehavior
3131
* @extends \Cake\ORM\Table<array{Timestamp: \Cake\ORM\Behavior\TimestampBehavior}>
32+
* @method \Cake\ORM\Query\SelectQuery<\App\Model\Entity\User> find(string $type = 'all', mixed ...$args)
3233
*/
3334
class UsersTable extends Table
3435
{

‎src/View/AppView.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*
2525
* @link https://book.cakephp.org/5/en/views.html#the-app-view
2626
* @property \Authentication\View\Helper\IdentityHelper $Identity
27+
* @property \App\View\Helper\UserHelper $User
2728
*/
2829
class AppView extends View
2930
{

0 commit comments

Comments
 (0)