Skip to content

Commit c8c4367

Browse files
committed
remove deprecated code (BC break!)
1 parent 6d3652c commit c8c4367

File tree

3 files changed

+1
-147
lines changed

3 files changed

+1
-147
lines changed

composer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
"tracy/tracy": "~2.7"
3434
},
3535
"autoload": {
36-
"psr-4": { "Nextras\\Dbal\\": "src/" },
37-
"files": ["srcCompat/compatibility.php"]
36+
"psr-4": { "Nextras\\Dbal\\": "src/" }
3837
},
3938
"scripts": {
4039
"phpstan": "phpstan analyze -c .phpstan.neon"

src/QueryBuilder/QueryBuilder.php

-65
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
namespace Nextras\Dbal\QueryBuilder;
44

55

6-
use Nextras\Dbal\Drivers\IDriver;
76
use Nextras\Dbal\Exception\InvalidArgumentException;
87
use Nextras\Dbal\Exception\InvalidStateException;
98
use Nextras\Dbal\Platforms\IPlatform;
109
use Nextras\Dbal\Utils\StrictObjectTrait;
11-
use function trigger_error;
1210

1311

1412
class QueryBuilder
@@ -190,69 +188,6 @@ public function getFromAlias(): ?string
190188
}
191189

192190

193-
/**
194-
* @phpstan-param array<int, mixed> $args
195-
* @deprecated QueryBuilder::innerJoin() is deprecated. Use QueryBuilder::joinInner() without $fromAlias and with $toAlias included in $toExpression.
196-
* @noinspection PhpUnusedParameterInspection
197-
*/
198-
public function innerJoin(
199-
string $fromAlias,
200-
string $toExpression,
201-
string $toAlias,
202-
string $onExpression,
203-
...$args
204-
): self
205-
{
206-
trigger_error(
207-
'QueryBuilder::innerJoin() is deprecated. Use QueryBuilder::joinInner() without $fromAlias and with $toAlias included in $toExpression.',
208-
E_USER_DEPRECATED
209-
);
210-
return $this->joinInner("$toExpression AS [$toAlias]", $onExpression, $args);
211-
}
212-
213-
214-
/**
215-
* @phpstan-param array<int, mixed> $args
216-
* @deprecated QueryBuilder::leftJoin() is deprecated. Use QueryBuilder::joinLeft() without $fromAlias and with $toAlias included in $toExpression.
217-
* @noinspection PhpUnusedParameterInspection
218-
*/
219-
public function leftJoin(
220-
string $fromAlias,
221-
string $toExpression,
222-
string $toAlias,
223-
string $onExpression,
224-
...$args
225-
): self
226-
{
227-
trigger_error(
228-
'QueryBuilder::leftJoin() is deprecated. Use QueryBuilder::joinLeft() without $fromAlias and with $toAlias included in $toExpression.',
229-
E_USER_DEPRECATED
230-
);
231-
return $this->joinLeft("$toExpression AS [$toAlias]", $onExpression, $args);
232-
}
233-
234-
235-
/**
236-
* @phpstan-param array<int, mixed> $args
237-
* @deprecated QueryBuilder::rightJoin() is deprecated. Use QueryBuilder::joinRight() without $fromAlias and with $toAlias included in $toExpression.
238-
* @noinspection PhpUnusedParameterInspection
239-
*/
240-
public function rightJoin(
241-
string $fromAlias,
242-
string $toExpression,
243-
string $toAlias,
244-
string $onExpression,
245-
...$args
246-
): self
247-
{
248-
trigger_error(
249-
'QueryBuilder::rightJoin() is deprecated. Use QueryBuilder::joinRight() without $fromAlias and with $toAlias included in $toExpression.',
250-
E_USER_DEPRECATED
251-
);
252-
return $this->joinRight("$toExpression AS [$toAlias]", $onExpression, $args);
253-
}
254-
255-
256191
/**
257192
* @phpstan-param array<int, mixed> $args
258193
*/

srcCompat/compatibility.php

-80
This file was deleted.

0 commit comments

Comments
 (0)