Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update egulias/email-validator to 4.0.1 and bump multiple doctrine deps #33459

Merged
merged 5 commits into from
Sep 27, 2023
Merged

Update egulias/email-validator to 4.0.1 and bump multiple doctrine deps #33459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
164e16b
Update lock file
Jul 27, 2023
85486ad
Remove aliasMap, see https://github.com/doctrine/orm/issues/8818
Jul 28, 2023
7a3408a
Upgrade of depreciated functions
Jul 27, 2023
68def09
Fix named parameters
Aug 2, 2023
7c42d9b
Fix db query in seacrh product command
jolelievre Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
153 changes: 82 additions & 71 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion install-dev/init.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Exception as DBALException;

ob_start();

Expand Down
8 changes: 4 additions & 4 deletions src/Adapter/Alias/Repository/AliasRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function aliasExists(string $alias, string $searchTerm): bool
->setParameter('alias', $alias)
;

return (bool) $qb->execute()->fetchOne();
return (bool) $qb->executeQuery()->fetchOne();
}

/**
Expand All @@ -140,7 +140,7 @@ public function getAliasesBySearchTerm(string $searchTerm): array
->setParameter('search', $searchTerm)
;

return $qb->execute()->fetchFirstColumn();
return $qb->executeQuery()->fetchFirstColumn();
}

public function delete(AliasId $aliasId): void
Expand Down Expand Up @@ -175,7 +175,7 @@ public function deleteAliasesBySearchTerm(string $searchTerm): void
->from($this->dbPrefix . 'alias', 'a')
->where('a.search = :searchTerm')
->setParameter('searchTerm', $searchTerm)
->execute()
->executeQuery()
->fetchFirstColumn()
;

Expand Down Expand Up @@ -216,7 +216,7 @@ public function searchSearchTerms(string $searchPhrase, ?int $limit = null): arr
->setMaxResults($limit)
->where('a.search LIKE :searchPhrase')
->setParameter('searchPhrase', '%' . $searchPhrase . '%')
->execute()
->executeQuery()
->fetchAllAssociative();
}
}