Skip to content

Commit 221aa35

Browse files
TomHAndersonTomHAnderson
authored
Merge pull request #83 from Lanatel/add-php-8.4-support
Add PHP 8.4 support
2 parents 01d5792 + 81d9e88 commit 221aa35

File tree

18 files changed

+130
-130
lines changed

18 files changed

+130
-130
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: PHP ${{ matrix.php }} - Doctrine ${{ matrix.doctrine }}
1111
strategy:
1212
matrix:
13-
php: ['8.0', '8.1', '8.2']
13+
php: ['8.0', '8.1', '8.2', '8.3', '8.4']
1414
doctrine: ['2.11', '2.12', '2.13', '2.14']
1515
steps:
1616
- uses: actions/checkout@v3

‎src/Builders/AbstractBuilder.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ abstract class AbstractBuilder
2121

2222
/**
2323
* @param ClassMetadataBuilder $builder
24-
* @param NamingStrategy $namingStrategy
24+
* @param NamingStrategy|null $namingStrategy
2525
*/
26-
public function __construct(ClassMetadataBuilder $builder, NamingStrategy $namingStrategy = null)
26+
public function __construct(ClassMetadataBuilder $builder, ?NamingStrategy $namingStrategy = null)
2727
{
2828
$this->builder = $builder;
2929
$this->namingStrategy = $namingStrategy ?: new DefaultNamingStrategy();

‎src/Builders/Builder.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use LogicException;
1010

1111
/**
12-
* @method Field array($name, callable $callback = null)
12+
* @method Field array($name, ?callable $callback = null)
1313
*/
1414
class Builder extends AbstractBuilder implements Fluent
1515
{
@@ -26,7 +26,7 @@ class Builder extends AbstractBuilder implements Fluent
2626
/**
2727
* {@inheritdoc}
2828
*/
29-
public function table($name, callable $callback = null)
29+
public function table($name, ?callable $callback = null)
3030
{
3131
$this->disallowInEmbeddedClasses();
3232

@@ -40,7 +40,7 @@ public function table($name, callable $callback = null)
4040
/**
4141
* {@inheritdoc}
4242
*/
43-
public function entity(callable $callback = null)
43+
public function entity(?callable $callback = null)
4444
{
4545
$this->disallowInEmbeddedClasses();
4646

@@ -54,7 +54,7 @@ public function entity(callable $callback = null)
5454
/**
5555
* {@inheritdoc}
5656
*/
57-
public function inheritance($type, callable $callback = null)
57+
public function inheritance($type, ?callable $callback = null)
5858
{
5959
$inheritance = Inheritance\InheritanceFactory::create($type, $this->builder);
6060

@@ -66,23 +66,23 @@ public function inheritance($type, callable $callback = null)
6666
/**
6767
* {@inheritdoc}
6868
*/
69-
public function singleTableInheritance(callable $callback = null)
69+
public function singleTableInheritance(?callable $callback = null)
7070
{
7171
return $this->inheritance(Inheritance\Inheritance::SINGLE, $callback);
7272
}
7373

7474
/**
7575
* {@inheritdoc}
7676
*/
77-
public function joinedTableInheritance(callable $callback = null)
77+
public function joinedTableInheritance(?callable $callback = null)
7878
{
7979
return $this->inheritance(Inheritance\Inheritance::JOINED, $callback);
8080
}
8181

8282
/**
8383
* {@inheritdoc}
8484
*/
85-
public function embed($embeddable, $field = null, callable $callback = null)
85+
public function embed($embeddable, $field = null, ?callable $callback = null)
8686
{
8787
$embedded = new Embedded(
8888
$this->builder,
@@ -116,7 +116,7 @@ public function override($name, callable $callback)
116116
/**
117117
* {@inheritdoc}
118118
*/
119-
public function events(callable $callback = null)
119+
public function events(?callable $callback = null)
120120
{
121121
$events = new LifecycleEvents($this->builder);
122122

@@ -128,7 +128,7 @@ public function events(callable $callback = null)
128128
/**
129129
* {@inheritdoc}
130130
*/
131-
public function listen(callable $callback = null)
131+
public function listen(?callable $callback = null)
132132
{
133133
$events = new EntityListeners($this->builder);
134134

@@ -151,7 +151,7 @@ public function isEmbeddedClass()
151151
*
152152
* @return Field
153153
*/
154-
protected function setArray($name, callable $callback = null)
154+
protected function setArray($name, ?callable $callback = null)
155155
{
156156
return $this->field(Types::ARRAY, $name, $callback);
157157
}

‎src/Builders/Field.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public function autoIncrement()
161161
*
162162
* @return Field
163163
*/
164-
public function generatedValue(callable $callback = null)
164+
public function generatedValue(?callable $callback = null)
165165
{
166166
$generatedValue = new GeneratedValue($this->fieldBuilder, $this->classMetadata);
167167

‎src/Builders/Traits/Aliases.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ trait Aliases
77
/**
88
* {@inheritdoc}
99
*/
10-
public function increments($name, callable $callback = null)
10+
public function increments($name, ?callable $callback = null)
1111
{
1212
$this->disallowInEmbeddedClasses();
1313

@@ -17,7 +17,7 @@ public function increments($name, callable $callback = null)
1717
/**
1818
* {@inheritdoc}
1919
*/
20-
public function smallIncrements($name, callable $callback = null)
20+
public function smallIncrements($name, ?callable $callback = null)
2121
{
2222
$this->disallowInEmbeddedClasses();
2323

@@ -27,7 +27,7 @@ public function smallIncrements($name, callable $callback = null)
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function bigIncrements($name, callable $callback = null)
30+
public function bigIncrements($name, ?callable $callback = null)
3131
{
3232
$this->disallowInEmbeddedClasses();
3333

@@ -37,31 +37,31 @@ public function bigIncrements($name, callable $callback = null)
3737
/**
3838
* {@inheritdoc}
3939
*/
40-
public function unsignedSmallInteger($name, callable $callback = null)
40+
public function unsignedSmallInteger($name, ?callable $callback = null)
4141
{
4242
return $this->smallInteger($name, $callback)->unsigned();
4343
}
4444

4545
/**
4646
* {@inheritdoc}
4747
*/
48-
public function unsignedInteger($name, callable $callback = null)
48+
public function unsignedInteger($name, ?callable $callback = null)
4949
{
5050
return $this->integer($name, $callback)->unsigned();
5151
}
5252

5353
/**
5454
* {@inheritdoc}
5555
*/
56-
public function unsignedBigInteger($name, callable $callback = null)
56+
public function unsignedBigInteger($name, ?callable $callback = null)
5757
{
5858
return $this->bigInteger($name, $callback)->unsigned();
5959
}
6060

6161
/**
6262
* {@inheritdoc}
6363
*/
64-
public function rememberToken($name = 'rememberToken', callable $callback = null)
64+
public function rememberToken($name = 'rememberToken', ?callable $callback = null)
6565
{
6666
return $this->string($name, $callback)->nullable()->length(100);
6767
}
@@ -79,29 +79,29 @@ abstract protected function disallowInEmbeddedClasses($message = '');
7979
*
8080
* @return \LaravelDoctrine\Fluent\Builders\Field
8181
*/
82-
abstract public function integer($name, callable $callback = null);
82+
abstract public function integer($name, ?callable $callback = null);
8383

8484
/**
8585
* @param string $name
8686
* @param callable|null $callback
8787
*
8888
* @return \LaravelDoctrine\Fluent\Builders\Field
8989
*/
90-
abstract public function smallInteger($name, callable $callback = null);
90+
abstract public function smallInteger($name, ?callable $callback = null);
9191

9292
/**
9393
* @param string $name
9494
* @param callable|null $callback
9595
*
9696
* @return \LaravelDoctrine\Fluent\Builders\Field
9797
*/
98-
abstract public function bigInteger($name, callable $callback = null);
98+
abstract public function bigInteger($name, ?callable $callback = null);
9999

100100
/**
101101
* @param string $name
102102
* @param callable|null $callback
103103
*
104104
* @return \LaravelDoctrine\Fluent\Builders\Field
105105
*/
106-
abstract public function string($name, callable $callback = null);
106+
abstract public function string($name, ?callable $callback = null);
107107
}

‎src/Builders/Traits/Dates.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,87 +9,87 @@ trait Dates
99
/**
1010
* {@inheritdoc}
1111
*/
12-
public function date($name, callable $callback = null)
12+
public function date($name, ?callable $callback = null)
1313
{
1414
return $this->field(Types::DATE_MUTABLE, $name, $callback);
1515
}
1616

1717
/**
1818
* {@inheritdoc}
1919
*/
20-
public function dateTime($name, callable $callback = null)
20+
public function dateTime($name, ?callable $callback = null)
2121
{
2222
return $this->field(Types::DATETIME_MUTABLE, $name, $callback);
2323
}
2424

2525
/**
2626
* {@inheritdoc}
2727
*/
28-
public function dateTimeTz($name, callable $callback = null)
28+
public function dateTimeTz($name, ?callable $callback = null)
2929
{
3030
return $this->field(Types::DATETIMETZ_MUTABLE, $name, $callback);
3131
}
3232

3333
/**
3434
* {@inheritdoc}
3535
*/
36-
public function time($name, callable $callback = null)
36+
public function time($name, ?callable $callback = null)
3737
{
3838
return $this->field(Types::TIME_MUTABLE, $name, $callback);
3939
}
4040

4141
/**
4242
* {@inheritdoc}
4343
*/
44-
public function carbonDateTime($name, callable $callback = null)
44+
public function carbonDateTime($name, ?callable $callback = null)
4545
{
4646
return $this->field('carbondatetime', $name, $callback);
4747
}
4848

4949
/**
5050
* {@inheritdoc}
5151
*/
52-
public function carbonDateTimeTz($name, callable $callback = null)
52+
public function carbonDateTimeTz($name, ?callable $callback = null)
5353
{
5454
return $this->field('carbondatetimetz', $name, $callback);
5555
}
5656

5757
/**
5858
* {@inheritdoc}
5959
*/
60-
public function carbonDate($name, callable $callback = null)
60+
public function carbonDate($name, ?callable $callback = null)
6161
{
6262
return $this->field('carbondate', $name, $callback);
6363
}
6464

6565
/**
6666
* {@inheritdoc}
6767
*/
68-
public function carbonTime($name, callable $callback = null)
68+
public function carbonTime($name, ?callable $callback = null)
6969
{
7070
return $this->field('carbontime', $name, $callback);
7171
}
7272

7373
/**
7474
* {@inheritdoc}
7575
*/
76-
public function zendDate($name, callable $callback = null)
76+
public function zendDate($name, ?callable $callback = null)
7777
{
7878
return $this->field('zenddate', $name, $callback);
7979
}
8080

8181
/**
8282
* {@inheritdoc}
8383
*/
84-
public function timestamp($name, callable $callback = null)
84+
public function timestamp($name, ?callable $callback = null)
8585
{
8686
return $this->carbonDateTime($name, $callback);
8787
}
8888

8989
/**
9090
* {@inheritdoc}
9191
*/
92-
public function timestampTz($name, callable $callback = null)
92+
public function timestampTz($name, ?callable $callback = null)
9393
{
9494
return $this->carbonDateTimeTz($name, $callback);
9595
}
@@ -101,5 +101,5 @@ public function timestampTz($name, callable $callback = null)
101101
*
102102
* @return \LaravelDoctrine\Fluent\Builders\Field
103103
*/
104-
abstract public function field($type, $name, callable $callback = null);
104+
abstract public function field($type, $name, ?callable $callback = null);
105105
}

0 commit comments

Comments
 (0)