Merge remote-tracking branch 'upstream/develop' into 4.5

obozdag · Jan 20, 2024 · b28948e · b28948e
2 parents 787382c + 0f43ba1
commit b28948e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.19.1",
+        "rector/rector": "0.19.2",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -170,7 +170,6 @@ public function run(): void
 
         if ($this->db->DBDriver === 'OCI8') {
             $this->db->query('alter session set NLS_DATE_FORMAT=?', ['YYYY-MM-DD HH24:MI:SS']);
-            $data['type_test'][0]['type_time']      = '2020-07-18 15:22:00';
             $data['type_test'][0]['type_date']      = '2020-01-11 22:11:00';
             $data['type_test'][0]['type_time']      = '2020-07-18 15:22:00';
             $data['type_test'][0]['type_datetime']  = '2020-06-18 05:12:24';

diff --git a/user_guide_src/requirements.txt b/user_guide_src/requirements.txt
@@ -1,5 +1,5 @@
-sphinx>=4.5.0,<5
-sphinxcontrib-phpdomain>=0.8.0
-docutils>=0.16
-sphinx-rtd-theme>=0.5.0
-jinja2<3.1
+sphinx>=5.3.0,<6.0.0
+sphinxcontrib-phpdomain>=0.11.0
+docutils>=0.19
+sphinx-rtd-theme>=2.0.0,<3.0.0
+jinja2>=3.1.3,<4.0.0