From b4cabe6ab7817097cf811d69dbf25ed3cd0a40a9 Mon Sep 17 00:00:00 2001 From: xGrz Date: Wed, 1 Oct 2025 12:24:08 +0200 Subject: [dev] Return types added --- .gitignore | 1 + composer.json | 3 ++- src/FirebirdConnection.php | 11 ++++++----- src/FirebirdConnector.php | 5 +++-- src/FirebirdServiceProvider.php | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 57872d0..b8673c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +/.idea /vendor/ diff --git a/composer.json b/composer.json index 78b146a..9437101 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,8 @@ "illuminate/support": "^12.0", "illuminate/container": "^12.0", "illuminate/database": "^12.0", - "illuminate/events": "^12.0" + "illuminate/events": "^12.0", + "ext-pdo": "*" }, "autoload": { "psr-4": { diff --git a/src/FirebirdConnection.php b/src/FirebirdConnection.php index 8128b18..2826f66 100755 --- a/src/FirebirdConnection.php +++ b/src/FirebirdConnection.php @@ -3,6 +3,7 @@ namespace Xgrz\Firebird; use Illuminate\Database\Connection as DatabaseConnection; +use Illuminate\Support\Collection; use Xgrz\Firebird\Query\Builder as FirebirdQueryBuilder; use Xgrz\Firebird\Query\Grammars\FirebirdGrammar as FirebirdQueryGrammar; use Xgrz\Firebird\Query\Processors\FirebirdProcessor as FirebirdQueryProcessor; @@ -16,7 +17,7 @@ class FirebirdConnection extends DatabaseConnection * * @return \Illuminate\Database\Query\Grammars\Grammar */ - protected function getDefaultQueryGrammar() + protected function getDefaultQueryGrammar(): FirebirdQueryGrammar { return new FirebirdQueryGrammar($this); } @@ -26,7 +27,7 @@ class FirebirdConnection extends DatabaseConnection * * @return \Illuminate\Database\Query\Processors\Processor */ - protected function getDefaultPostProcessor() + protected function getDefaultPostProcessor(): FirebirdQueryProcessor { return new FirebirdQueryProcessor; } @@ -36,7 +37,7 @@ class FirebirdConnection extends DatabaseConnection * * @return \Firebird\Schema\Builder */ - public function getSchemaBuilder() + public function getSchemaBuilder(): FirebirdSchemaBuilder { if (is_null($this->schemaGrammar)) { $this->useDefaultSchemaGrammar(); @@ -72,9 +73,9 @@ class FirebirdConnection extends DatabaseConnection * * @param string $procedure * @param array $values - * @return \Illuminate\Support\Collection + * @return Collection */ - public function executeProcedure($procedure, array $values = []) + public function executeProcedure($procedure, array $values = []): Collection { return $this->query()->fromProcedure($procedure, $values)->get(); } diff --git a/src/FirebirdConnector.php b/src/FirebirdConnector.php index 99ed3ba..d7a807d 100755 --- a/src/FirebirdConnector.php +++ b/src/FirebirdConnector.php @@ -4,6 +4,7 @@ namespace Xgrz\Firebird; use Illuminate\Database\Connectors\Connector; use Illuminate\Database\Connectors\ConnectorInterface; +use PDO; class FirebirdConnector extends Connector implements ConnectorInterface { @@ -13,7 +14,7 @@ class FirebirdConnector extends Connector implements ConnectorInterface * @param array $config * @return \PDO */ - public function connect(array $config) + public function connect(array $config): PDO { return $this->createConnection( $this->getDsn($config), @@ -28,7 +29,7 @@ class FirebirdConnector extends Connector implements ConnectorInterface * @param array $config * @return string */ - protected function getDsn(array $config) + protected function getDsn(array $config): string { extract($config); diff --git a/src/FirebirdServiceProvider.php b/src/FirebirdServiceProvider.php index 7c2b1ac..58cc761 100755 --- a/src/FirebirdServiceProvider.php +++ b/src/FirebirdServiceProvider.php @@ -12,7 +12,7 @@ class FirebirdServiceProvider extends ServiceProvider * * @return void */ - public function register() + public function register(): void { Connection::resolverFor('firebird', function($connection, $database, $tablePrefix, $config) { return new FirebirdConnection($connection, $database, $tablePrefix, $config); -- cgit v1.3