Merge branch 'test' into prod

acdh-oeaw · Nov 6, 2024 · 245e32a · 245e32a
2 parents 584866f + 70d4cca
commit 245e32a
Show file tree

Hide file tree

Showing 18 changed files with 181 additions and 263 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,18 @@
 # Release notes
 
+## Version 2024-10
+*Release date: 2024-11-06*
+
+### Changes
+-  Migrated to CakePHP 4.5.7 and PHP 8.3 #85
+
+### Small changes
+- Added ddev config
+- Updated Composer to 2.8.1
+- Updated dependencies
+- Required PHP version 8.3 or later, since version 8.2 active support ends on 2024-12-31
+
+
 ## Version 2024-09/3
 *Release date: 2024-10-30*
 
@@ -410,4 +423,4 @@ This is a major release which contains a lot of big changes. The complete login
     - Change email
     - Change password
     - Subscribe to mailing list
-    - Edit profile
+    - Edit profile
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-2024-09/3
+2024-10
diff --git a/api/v2 b/api/v2
diff --git a/composer.json b/composer.json
@@ -5,12 +5,12 @@
     "type": "project",
     "license": "MIT",
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-intl": "*",
         "ext-curl": "*",
         "cakephp/authentication": "^2.0",
         "cakephp/authorization": "^2.0",
-        "cakephp/cakephp": "^4.4",
+        "cakephp/cakephp": "^4.5",
         "cakephp/migrations": "@stable",
         "cakephp/plugin-installer": "^1.3",
         "jeremyharris/cakephp-lazyload": "^4.0",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.phar b/composer.phar
diff --git a/config/app.php b/config/app.php
@@ -182,7 +182,7 @@
      *   breathing room to complete logging or error handling.
      */
     'Error' => [
-        'errorLevel' => E_ALL & ~E_USER_DEPRECATED,
+        'errorLevel' => E_ALL,
         'exceptionRenderer' => 'Cake\Error\ExceptionRenderer',
         'skipLog' => [],
         'log' => true,

diff --git a/plugins/DhcrCore b/plugins/DhcrCore
diff --git a/src/Controller/CitiesController.php b/src/Controller/CitiesController.php
@@ -29,12 +29,9 @@ public function index()
         $breadcrumControllers[1] = 'Cities';
         $breadcrumActions[1] = 'index';
         $this->set((compact('breadcrumTitles', 'breadcrumControllers', 'breadcrumActions')));
-        $cities = $this->paginate($this->Cities, [
-            'contain' => ['Countries'],
-            'order' => ['id' => 'asc']
-        ]);
+        $query = $this->Cities->find('all', ['order' => ['Cities.id' => 'ASC']])->contain('Countries');
+        $this->set('cities', $this->paginate($query));
         $this->set(compact('user')); // required for contributors menu
-        $this->set(compact('cities'));
     }
 
     public function add()