Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion compatibility/patches/Id.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
--- src/Mapping/Id.php 2024-02-08 14:18:20
+++ src/Mapping/Id.php 2024-02-08 14:18:23
@@ -6,6 +6,10 @@
@@ -6,6 +6,11 @@

use Attribute;

+/**
+ * @Annotation
+ * @NamedArgumentConstructor
+ * @Target("PROPERTY")
+ */
#[Attribute(Attribute::TARGET_PROPERTY)]
Expand Down
17 changes: 8 additions & 9 deletions compatibility/patches/JoinColumns.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
--- src/Mapping/JoinColumns.php 2024-02-03 17:50:09
+++ src/Mapping/JoinColumns.php 2024-02-08 14:26:44
@@ -4,6 +4,10 @@

namespace Doctrine\ORM\Mapping;

+/**
--- src/Mapping/JoinColumns.php
+++ src/Mapping/JoinColumns.php
@@ -7,6 +7,9 @@
/**
* @deprecated Using this attribute has no effect, use the `#[JoinColumn]`
* attribute instead, it is repeatable.
+ *
+ * @Annotation
+ * @Target("PROPERTY")
+ */
*/
final class JoinColumns implements MappingAttribute
{
/** @param array<JoinColumn> $value */
12 changes: 6 additions & 6 deletions compatibility/patches/OrderBy.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- src/Mapping/OrderBy.php 2024-02-03 17:50:09
+++ src/Mapping/OrderBy.php 2024-02-08 18:01:12
@@ -5,7 +5,13 @@
namespace Doctrine\ORM\Mapping;

--- src/Mapping/OrderBy.php
+++ src/Mapping/OrderBy.php
@@ -6,7 +6,13 @@

use Attribute;
use SortDirection;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;

+/**
+ * @Annotation
+ * @NamedArgumentConstructor()
Expand Down
27 changes: 27 additions & 0 deletions phpstan-baseline-deprecations.neon
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,30 @@ parameters:
identifier: new.deprecated
count: 1
path: tests/Type/Doctrine/DBAL/pdo.php

-
message: '#^Access to constant on deprecated class Doctrine\\DBAL\\Types\\SimpleArrayType\:#'
identifier: classConstant.deprecatedClass
count: 1
path: src/Type/Doctrine/Descriptors/SimpleArrayType.php

-
message: '#^Instanceof references deprecated interface Doctrine\\ORM\\Query\\AST\\TypedExpression\:#'
identifier: instanceof.deprecatedInterface
count: 1
path: src/Type/Doctrine/Query/QueryResultTypeWalker.php

-
message: '#^Call to method getReturnType\(\) of deprecated interface Doctrine\\ORM\\Query\\AST\\TypedExpression\:#'
identifier: method.deprecatedInterface
count: 3
path: src/Type/Doctrine/Query/QueryResultTypeWalker.php

-
message: '#^Class PHPStan\\Platform\\TypedExpression[a-zA-Z]+Function implements deprecated interface Doctrine\\ORM\\Query\\AST\\TypedExpression\:#'
identifier: class.implementsDeprecatedInterface
paths:
- tests/Platform/TypedExpressionBooleanPiFunction.php
- tests/Platform/TypedExpressionIntegerPiFunction.php
- tests/Platform/TypedExpressionIntegerWrapFunction.php
- tests/Platform/TypedExpressionStringPiFunction.php
6 changes: 3 additions & 3 deletions stubs/DBAL/Connection4.stub
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class Connection
*
* @throws Exception
*/
public function delete(string $table, array $criteria = [], array $types = []): int|string;
public function delete(string $table, array $criteria = [], array $types = []);

/**
* Executes an SQL UPDATE statement on a table.
Expand All @@ -116,7 +116,7 @@ class Connection
*
* @throws Exception
*/
public function update(string $table, array $data, array $criteria = [], array $types = []): int|string;
public function update(string $table, array $data, array $criteria = [], array $types = []);

/**
* Inserts a table row with specified data.
Expand All @@ -131,7 +131,7 @@ class Connection
*
* @throws Exception
*/
public function insert(string $table, array $data, array $types = []): int|string;
public function insert(string $table, array $data, array $types = []);

/**
* @param list<mixed>|array<string, mixed> $params
Expand Down
Loading