Merge pull request #2129 from griidc/release/6.80.0

Release/6.80.0

Author: mickel1138

.editorconfig

@@ -10,8 +10,12 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.js]
+indent_size = 2
+
 [{compose.yaml,compose.*.yaml}]
 indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
+

.env

@@ -17,6 +17,7 @@
 ###> symfony/framework-bundle ###
 APP_ENV=dev
 APP_SECRET=
+APP_SHARE_DIR=var/share
 ###< symfony/framework-bundle ###
 
 ###> doctrine/doctrine-bundle ###
@@ -120,3 +121,9 @@ ESRI_API_KEY='yourkeyhere'
 
 ### Minimum reasonable number of datasets ###
 EXPECTED_DATASET_COUNT_MIN=0
+
+###> symfony/routing ###
+# Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
+# See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
+DEFAULT_URI=http://localhost
+###< symfony/routing ###

.github/workflows/eslint.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2

.github/workflows/phpcs.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2

.github/workflows/phpunit.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2

assets/js/entry/map-search.js

@@ -136,7 +136,7 @@ $(() => {
   }).dxTreeList('instance');
 
   const kwTreeList = $('#kw-tree').dxTreeList({
-    dataSource: `${Routing.generate('api_keywords_level2')}/all`,
+    dataSource: `${Routing.generate('api_keywords_level2')}/anzsrc`,
     keyExpr: 'id',
     parentIdExpr: 'parent',
     filterRow: {
@@ -154,6 +154,7 @@ $(() => {
         {
           widget: 'dxSelectBox',
           options: {
+            visible: false,
             items: keywordFilters,
             valueExpr: 'id',
             displayExpr: 'text',
@@ -166,19 +167,20 @@ $(() => {
         'searchPanel',
       ],
     },
-    columns: [{
-      dataField: 'label',
-      caption: 'Keyword',
-      dataType: 'string',
-      allowSearch: true,
-    },
-    {
-      dataType: 'string',
-      dataField: 'type',
-      caption: 'Type',
-      visible: true,
-      allowSearch: false,
-    },
+    columns: [
+      {
+        dataField: 'label',
+        caption: 'Keyword',
+        dataType: 'string',
+        allowSearch: true,
+      },
+      {
+        dataType: 'integer',
+        dataField: 'count',
+        caption: 'Count',
+        visible: true,
+        allowSearch: false,
+      },
     ],
     disabled: false,
     showRowLines: false,

composer.json

@@ -40,25 +40,25 @@
         "opensoft/doctrine-postgres-types": "^1.2",
         "phayes/geophp": "^1.2",
         "ramsey/uuid": "^4.1",
-        "symfony/asset": "7.3.*",
-        "symfony/console": "7.3.*",
-        "symfony/doctrine-messenger": "7.3.*",
-        "symfony/dotenv": "7.3.*",
+        "symfony/asset": "7.4.*",
+        "symfony/console": "7.4.*",
+        "symfony/doctrine-messenger": "7.4.*",
+        "symfony/dotenv": "7.4.*",
         "symfony/flex": "^2.4",
-        "symfony/form": "7.3.*",
-        "symfony/framework-bundle": "7.3.*",
-        "symfony/ldap": "7.3.*",
-        "symfony/mailer": "7.3.*",
+        "symfony/form": "7.4.*",
+        "symfony/framework-bundle": "7.4.*",
+        "symfony/ldap": "7.4.*",
+        "symfony/mailer": "7.4.*",
         "symfony/maker-bundle": "^1.13",
-        "symfony/messenger": "7.3.*",
+        "symfony/messenger": "7.4.*",
         "symfony/monolog-bundle": "^3.0",
-        "symfony/runtime": "7.3.*",
-        "symfony/security-bundle": "7.3.*",
-        "symfony/translation": "7.3.*",
-        "symfony/twig-bundle": "7.3.*",
-        "symfony/validator": "7.3.*",
+        "symfony/runtime": "7.4.*",
+        "symfony/security-bundle": "7.4.*",
+        "symfony/translation": "7.4.*",
+        "symfony/twig-bundle": "7.4.*",
+        "symfony/validator": "7.4.*",
         "symfony/webpack-encore-bundle": "^2.0",
-        "symfony/yaml": "7.3.*",
+        "symfony/yaml": "7.4.*",
         "twig/extra-bundle": "^3.0",
         "twig/twig": "^3.0"
     },
@@ -72,12 +72,12 @@
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^1.2",
         "squizlabs/php_codesniffer": "^3.4",
-        "symfony/browser-kit": "7.3.*",
-        "symfony/css-selector": "7.3.*",
-        "symfony/debug-bundle": "7.3.*",
-        "symfony/phpunit-bridge": "7.3.*",
-        "symfony/stopwatch": "7.3.*",
-        "symfony/web-profiler-bundle": "7.3.*",
+        "symfony/browser-kit": "7.4.*",
+        "symfony/css-selector": "7.4.*",
+        "symfony/debug-bundle": "7.4.*",
+        "symfony/phpunit-bridge": "7.4.*",
+        "symfony/stopwatch": "7.4.*",
+        "symfony/web-profiler-bundle": "7.4.*",
         "vimeo/psalm": "^6.0"
     },
     "config": {
@@ -129,7 +129,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "7.3.*"
+            "require": "7.4.*"
         }
     }
 }