Skip to content

0.3.3-merge-up-into-0.4.x #97

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

Merged
tyrsson merged 6 commits into from
Dec 2, 2025
Merged

0.3.3-merge-up-into-0.4.x #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ee273c
Fix return type issue between SMv3 and SMv4
tyrsson Dec 1, 2025
7acc1d0
Merge pull request #93 from tyrsson/0.3.1-patch
tyrsson Dec 1, 2025
16d0979
Fixes abstract factory, maybe
tyrsson Dec 1, 2025
b3df2ff
Merge pull request #95 from tyrsson/0.3.2-patch
tyrsson Dec 1, 2025
689a1e6
Remove readonly constraint from AbstractPdo driver to allow concrete …
tyrsson Dec 2, 2025
b6d55ff
Merge pull request #96 from tyrsson/abstractpdo-readonly-fix
tyrsson Dec 2, 2025
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
6 changes: 3 additions & 3 deletions src/Adapter/Driver/Pdo/AbstractPdo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ abstract class AbstractPdo implements PdoDriverInterface, ProfilerAwareInterface
protected ?ProfilerInterface $profiler;

public function __construct(
protected readonly AbstractPdoConnection|PDO $connection,
protected readonly StatementInterface&PdoDriverAwareInterface $statementPrototype,
protected readonly ResultInterface $resultPrototype,
protected AbstractPdoConnection|PDO $connection,
protected StatementInterface&PdoDriverAwareInterface $statementPrototype,
protected ResultInterface $resultPrototype,
array $features = [],
) {
if ($this->connection instanceof PdoDriverAwareInterface) {
Expand Down
9 changes: 3 additions & 6 deletions src/Container/AdapterAbstractServiceFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class AdapterAbstractServiceFactory implements AbstractFactoryInterface
/**
* Can we create an adapter by the requested name?
*/
public function canCreate(ContainerInterface $container, string $requestedName): bool
public function canCreate(ContainerInterface $container, $requestedName): bool
{
$config = $this->getConfig($container);
if (empty($config)) {
Expand All @@ -42,14 +42,13 @@ public function canCreate(ContainerInterface $container, string $requestedName):
*/
public function __invoke(
ContainerInterface $container,
string $requestedName,
$requestedName,
?array $options = null
): AdapterInterface {
$driverFactory = ($container->get(DriverInterfaceFactoryFactoryInterface::class))($container, $requestedName);
$driverInstance = $driverFactory::createFromConfig($container, $requestedName);
$platformFactory = ($container->get(PlatformInterfaceFactoryFactoryInterface::class))();

//$config = $this->getConfig($container);
return new Adapter(
$driverInstance,
$platformFactory::fromDriver($driverInstance),
Expand All @@ -59,10 +58,8 @@ public function __invoke(

/**
* Get db configuration, if any
*
* @return array
*/
protected function getConfig(ContainerInterface $container)
protected function getConfig(ContainerInterface $container): array
{
if ($this->config !== null) {
return $this->config;
Expand Down
Loading