Skip to content

Commit b28948e

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.5
2 parents 787382c + 0f43ba1 commit b28948e

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"phpunit/phpcov": "^8.2",
3333
"phpunit/phpunit": "^9.1",
3434
"predis/predis": "^1.1 || ^2.0",
35-
"rector/rector": "0.19.1",
35+
"rector/rector": "0.19.2",
3636
"vimeo/psalm": "^5.0"
3737
},
3838
"replace": {

tests/_support/Database/Seeds/CITestSeeder.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ public function run(): void
170170

171171
if ($this->db->DBDriver === 'OCI8') {
172172
$this->db->query('alter session set NLS_DATE_FORMAT=?', ['YYYY-MM-DD HH24:MI:SS']);
173-
$data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';
174173
$data['type_test'][0]['type_date'] = '2020-01-11 22:11:00';
175174
$data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';
176175
$data['type_test'][0]['type_datetime'] = '2020-06-18 05:12:24';

user_guide_src/requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
sphinx>=4.5.0,<5
2-
sphinxcontrib-phpdomain>=0.8.0
3-
docutils>=0.16
4-
sphinx-rtd-theme>=0.5.0
5-
jinja2<3.1
1+
sphinx>=5.3.0,<6.0.0
2+
sphinxcontrib-phpdomain>=0.11.0
3+
docutils>=0.19
4+
sphinx-rtd-theme>=2.0.0,<3.0.0
5+
jinja2>=3.1.3,<4.0.0

0 commit comments

Comments
 (0)