Skip to content

Commit

Permalink
remove deprecated code (BC break!)
Browse files Browse the repository at this point in the history
  • Loading branch information
hrach committed Mar 8, 2021
1 parent 6d3652c commit c8c4367
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 147 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 33,7 @@
"tracy/tracy": "~2.7"
},
"autoload": {
"psr-4": { "Nextras\\Dbal\\": "src/" },
"files": ["srcCompat/compatibility.php"]
"psr-4": { "Nextras\\Dbal\\": "src/" }
},
"scripts": {
"phpstan": "phpstan analyze -c .phpstan.neon"
Expand Down
65 changes: 0 additions & 65 deletions src/QueryBuilder/QueryBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 3,10 @@
namespace Nextras\Dbal\QueryBuilder;


use Nextras\Dbal\Drivers\IDriver;
use Nextras\Dbal\Exception\InvalidArgumentException;
use Nextras\Dbal\Exception\InvalidStateException;
use Nextras\Dbal\Platforms\IPlatform;
use Nextras\Dbal\Utils\StrictObjectTrait;
use function trigger_error;


class QueryBuilder
Expand Down Expand Up @@ -190,69 188,6 @@ public function getFromAlias(): ?string
}


/**
* @phpstan-param array<int, mixed> $args
* @deprecated QueryBuilder::innerJoin() is deprecated. Use QueryBuilder::joinInner() without $fromAlias and with $toAlias included in $toExpression.
* @noinspection PhpUnusedParameterInspection
*/
public function innerJoin(
string $fromAlias,
string $toExpression,
string $toAlias,
string $onExpression,
...$args
): self
{
trigger_error(
'QueryBuilder::innerJoin() is deprecated. Use QueryBuilder::joinInner() without $fromAlias and with $toAlias included in $toExpression.',
E_USER_DEPRECATED
);
return $this->joinInner("$toExpression AS [$toAlias]", $onExpression, $args);
}


/**
* @phpstan-param array<int, mixed> $args
* @deprecated QueryBuilder::leftJoin() is deprecated. Use QueryBuilder::joinLeft() without $fromAlias and with $toAlias included in $toExpression.
* @noinspection PhpUnusedParameterInspection
*/
public function leftJoin(
string $fromAlias,
string $toExpression,
string $toAlias,
string $onExpression,
...$args
): self
{
trigger_error(
'QueryBuilder::leftJoin() is deprecated. Use QueryBuilder::joinLeft() without $fromAlias and with $toAlias included in $toExpression.',
E_USER_DEPRECATED
);
return $this->joinLeft("$toExpression AS [$toAlias]", $onExpression, $args);
}


/**
* @phpstan-param array<int, mixed> $args
* @deprecated QueryBuilder::rightJoin() is deprecated. Use QueryBuilder::joinRight() without $fromAlias and with $toAlias included in $toExpression.
* @noinspection PhpUnusedParameterInspection
*/
public function rightJoin(
string $fromAlias,
string $toExpression,
string $toAlias,
string $onExpression,
...$args
): self
{
trigger_error(
'QueryBuilder::rightJoin() is deprecated. Use QueryBuilder::joinRight() without $fromAlias and with $toAlias included in $toExpression.',
E_USER_DEPRECATED
);
return $this->joinRight("$toExpression AS [$toAlias]", $onExpression, $args);
}


/**
* @phpstan-param array<int, mixed> $args
*/
Expand Down
80 changes: 0 additions & 80 deletions srcCompat/compatibility.php

This file was deleted.

0 comments on commit c8c4367

Please sign in to comment.