Skip to content

Commit e1b95aa

Browse files
connorhuderrabustattali
authored
ORM3 compatibility (beberlei#421)
* Add ORM3 compatibility * added dev branch to doctrine/orm Co-authored-by: Alexander M. Turek <me@derrabus.de> * fix attr type Co-authored-by: Théo Attali <theoattali@gmail.com> --------- Co-authored-by: Alexander M. Turek <me@derrabus.de> Co-authored-by: Théo Attali <theoattali@gmail.com>
1 parent c802a73 commit e1b95aa

File tree

171 files changed

+897
-838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+897
-838
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"require": {
1212
"php": "^7.2 || ^8.0",
13-
"doctrine/orm": "^2.15"
13+
"doctrine/orm": "^2.19 || ^3.0 @dev"
1414
},
1515
"require-dev": {
1616
"doctrine/annotations": "^1.14 || ^2",

‎src/Query/Mysql/Acos.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace DoctrineExtensions\Query\Mysql;
44

55
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
6-
use Doctrine\ORM\Query\Lexer;
76
use Doctrine\ORM\Query\Parser;
87
use Doctrine\ORM\Query\SqlWalker;
8+
use Doctrine\ORM\Query\TokenType;
99

1010
class Acos extends FunctionNode
1111
{
@@ -20,11 +20,11 @@ public function getSql(SqlWalker $sqlWalker): string
2020

2121
public function parse(Parser $parser): void
2222
{
23-
$parser->match(Lexer::T_IDENTIFIER);
24-
$parser->match(Lexer::T_OPEN_PARENTHESIS);
23+
$parser->match(TokenType::T_IDENTIFIER);
24+
$parser->match(TokenType::T_OPEN_PARENTHESIS);
2525

2626
$this->arithmeticExpression = $parser->SimpleArithmeticExpression();
2727

28-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
28+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
2929
}
3030
}

‎src/Query/Mysql/AddTime.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace DoctrineExtensions\Query\Mysql;
44

55
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
6-
use Doctrine\ORM\Query\Lexer;
76
use Doctrine\ORM\Query\Parser;
87
use Doctrine\ORM\Query\SqlWalker;
8+
use Doctrine\ORM\Query\TokenType;
99

1010
/** @author Pascal Wacker <hello@pascalwacker.ch> */
1111
class AddTime extends FunctionNode
@@ -21,15 +21,15 @@ public function getSql(SqlWalker $sqlWalker): string
2121

2222
public function parse(Parser $parser): void
2323
{
24-
$parser->match(Lexer::T_IDENTIFIER);
25-
$parser->match(Lexer::T_OPEN_PARENTHESIS);
24+
$parser->match(TokenType::T_IDENTIFIER);
25+
$parser->match(TokenType::T_OPEN_PARENTHESIS);
2626

2727
$this->date = $parser->ArithmeticPrimary();
2828

29-
$parser->match(Lexer::T_COMMA);
29+
$parser->match(TokenType::T_COMMA);
3030

3131
$this->time = $parser->ArithmeticPrimary();
3232

33-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
33+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
3434
}
3535
}

‎src/Query/Mysql/AesDecrypt.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace DoctrineExtensions\Query\Mysql;
44

55
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
6-
use Doctrine\ORM\Query\Lexer;
76
use Doctrine\ORM\Query\Parser;
87
use Doctrine\ORM\Query\SqlWalker;
8+
use Doctrine\ORM\Query\TokenType;
99

1010
use function sprintf;
1111

@@ -17,12 +17,12 @@ class AesDecrypt extends FunctionNode
1717

1818
public function parse(Parser $parser): void
1919
{
20-
$parser->match(Lexer::T_IDENTIFIER);
21-
$parser->match(Lexer::T_OPEN_PARENTHESIS);
20+
$parser->match(TokenType::T_IDENTIFIER);
21+
$parser->match(TokenType::T_OPEN_PARENTHESIS);
2222
$this->field = $parser->StringExpression();
23-
$parser->match(Lexer::T_COMMA);
23+
$parser->match(TokenType::T_COMMA);
2424
$this->key = $parser->StringExpression();
25-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
25+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
2626
}
2727

2828
public function getSql(SqlWalker $sqlWalker): string

‎src/Query/Mysql/AesEncrypt.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace DoctrineExtensions\Query\Mysql;
44

55
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
6-
use Doctrine\ORM\Query\Lexer;
76
use Doctrine\ORM\Query\Parser;
87
use Doctrine\ORM\Query\SqlWalker;
8+
use Doctrine\ORM\Query\TokenType;
99

1010
use function sprintf;
1111

@@ -17,12 +17,12 @@ class AesEncrypt extends FunctionNode
1717

1818
public function parse(Parser $parser): void
1919
{
20-
$parser->match(Lexer::T_IDENTIFIER);
21-
$parser->match(Lexer::T_OPEN_PARENTHESIS);
20+
$parser->match(TokenType::T_IDENTIFIER);
21+
$parser->match(TokenType::T_OPEN_PARENTHESIS);
2222
$this->field = $parser->StringExpression();
23-
$parser->match(Lexer::T_COMMA);
23+
$parser->match(TokenType::T_COMMA);
2424
$this->key = $parser->StringExpression();
25-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
25+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
2626
}
2727

2828
public function getSql(SqlWalker $sqlWalker): string

‎src/Query/Mysql/AnyValue.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace DoctrineExtensions\Query\Mysql;
44

55
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
6-
use Doctrine\ORM\Query\Lexer;
76
use Doctrine\ORM\Query\Parser;
87
use Doctrine\ORM\Query\SqlWalker;
8+
use Doctrine\ORM\Query\TokenType;
99

1010
use function sprintf;
1111

@@ -15,10 +15,10 @@ class AnyValue extends FunctionNode
1515

1616
public function parse(Parser $parser): void
1717
{
18-
$parser->match(Lexer::T_IDENTIFIER);
19-
$parser->match(Lexer::T_OPEN_PARENTHESIS);
18+
$parser->match(TokenType::T_IDENTIFIER);
19+
$parser->match(TokenType::T_OPEN_PARENTHESIS);
2020
$this->value = $parser->StringPrimary();
21-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
21+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
2222
}
2323

2424
public function getSql(SqlWalker $sqlWalker): string

‎src/Query/Mysql/Ascii.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace DoctrineExtensions\Query\Mysql;
44

55
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
6-
use Doctrine\ORM\Query\Lexer;
76
use Doctrine\ORM\Query\Parser;
87
use Doctrine\ORM\Query\SqlWalker;
8+
use Doctrine\ORM\Query\TokenType;
99

1010
class Ascii extends FunctionNode
1111
{
@@ -18,11 +18,11 @@ public function getSql(SqlWalker $sqlWalker): string
1818

1919
public function parse(Parser $parser): void
2020
{
21-
$parser->match(Lexer::T_IDENTIFIER);
22-
$parser->match(Lexer::T_OPEN_PARENTHESIS);
21+
$parser->match(TokenType::T_IDENTIFIER);
22+
$parser->match(TokenType::T_OPEN_PARENTHESIS);
2323

2424
$this->string = $parser->ArithmeticExpression();
2525

26-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
26+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
2727
}
2828
}

‎src/Query/Mysql/Asin.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace DoctrineExtensions\Query\Mysql;
44

55
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
6-
use Doctrine\ORM\Query\Lexer;
76
use Doctrine\ORM\Query\Parser;
87
use Doctrine\ORM\Query\SqlWalker;
8+
use Doctrine\ORM\Query\TokenType;
99

1010
class Asin extends FunctionNode
1111
{
@@ -20,11 +20,11 @@ public function getSql(SqlWalker $sqlWalker): string
2020

2121
public function parse(Parser $parser): void
2222
{
23-
$parser->match(Lexer::T_IDENTIFIER);
24-
$parser->match(Lexer::T_OPEN_PARENTHESIS);
23+
$parser->match(TokenType::T_IDENTIFIER);
24+
$parser->match(TokenType::T_OPEN_PARENTHESIS);
2525

2626
$this->arithmeticExpression = $parser->SimpleArithmeticExpression();
2727

28-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
28+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
2929
}
3030
}

‎src/Query/Mysql/Atan.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace DoctrineExtensions\Query\Mysql;
44

55
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
6-
use Doctrine\ORM\Query\Lexer;
76
use Doctrine\ORM\Query\Parser;
87
use Doctrine\ORM\Query\QueryException;
98
use Doctrine\ORM\Query\SqlWalker;
9+
use Doctrine\ORM\Query\TokenType;
1010

1111
class Atan extends FunctionNode
1212
{
@@ -32,19 +32,19 @@ public function getSql(SqlWalker $sqlWalker): string
3232

3333
public function parse(Parser $parser): void
3434
{
35-
$parser->match(Lexer::T_IDENTIFIER);
36-
$parser->match(Lexer::T_OPEN_PARENTHESIS);
35+
$parser->match(TokenType::T_IDENTIFIER);
36+
$parser->match(TokenType::T_OPEN_PARENTHESIS);
3737

3838
$this->arithmeticExpression = $parser->SimpleArithmeticExpression();
3939

4040
try {
41-
$parser->match(Lexer::T_COMMA);
41+
$parser->match(TokenType::T_COMMA);
4242

4343
$this->optionalSecondExpression = $parser->SimpleArithmeticExpression();
4444

45-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
45+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
4646
} catch (QueryException $e) {
47-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
47+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
4848
}
4949
}
5050
}

‎src/Query/Mysql/Atan2.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace DoctrineExtensions\Query\Mysql;
44

55
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
6-
use Doctrine\ORM\Query\Lexer;
76
use Doctrine\ORM\Query\Parser;
87
use Doctrine\ORM\Query\SqlWalker;
8+
use Doctrine\ORM\Query\TokenType;
99

1010
class Atan2 extends FunctionNode
1111
{
@@ -28,15 +28,15 @@ public function getSql(SqlWalker $sqlWalker): string
2828

2929
public function parse(Parser $parser): void
3030
{
31-
$parser->match(Lexer::T_IDENTIFIER);
32-
$parser->match(Lexer::T_OPEN_PARENTHESIS);
31+
$parser->match(TokenType::T_IDENTIFIER);
32+
$parser->match(TokenType::T_OPEN_PARENTHESIS);
3333

3434
$this->firstExpression = $parser->SimpleArithmeticExpression();
3535

36-
$parser->match(Lexer::T_COMMA);
36+
$parser->match(TokenType::T_COMMA);
3737

3838
$this->secondExpression = $parser->SimpleArithmeticExpression();
3939

40-
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
40+
$parser->match(TokenType::T_CLOSE_PARENTHESIS);
4141
}
4242
}

0 commit comments

Comments
 (0)