Merge pull request #1661 from griidc/release/6.63.0

Release/6.63.0
griidc · Oct 29, 2024 · 69fc63e · 69fc63e
2 parents db76920 + 4289865
commit 69fc63e
Show file tree

Hide file tree

Showing 128 changed files with 4,032 additions and 5,177 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,4 +47,6 @@ phpstan.neon
 pnpm-lock.yaml
 ###< pnpm ###
 
-
+###> rector/rector ###
+rector.php
+###< rector/rector ###
diff --git a/assets/js/main/app.js b/assets/js/main/app.js
@@ -23,10 +23,12 @@ require('../../css/griidc-app.css');
 const axios = require('axios');
 
 const mainsite = process.env.MAINSITE;
-const griidcMenuElement = document.getElementById('griidc-menu');
-const showAdmin = griidcMenuElement.hasAttribute('show-admin') && griidcMenuElement.getAttribute('show-admin') === 'true';
+const griidcMenu = document.getElementById('griidc-menu');
 
-createRoot(griidcMenuElement).render(<GriidcMenu mainsite={mainsite} showAdmin={ showAdmin }/>);
+if (typeof (griidcMenu) !== 'undefined' && griidcMenu != null) {
+  const showAdmin = griidcMenu.hasAttribute('show-admin') && griidcMenu.getAttribute('show-admin') === 'true';
+  createRoot(griidcMenu).render(<GriidcMenu mainsite={mainsite} showAdmin={ showAdmin }/>);
+}
 
 global.axios = axios;
 
@@ -37,40 +39,3 @@ global.Routing = Routing;
 global.templateSwitch = templateSwitch;
 
 templateSwitch.setTemplate('GRIIDC');
-
-function hoverIn() {
-  $(this).find('ul').removeClass('sf-hidden');
-  $(this).addClass('sfHover');
-}
-
-function hoverOut() {
-  $(this).find('ul').addClass('sf-hidden');
-  $(this).removeClass('sfHover');
-}
-
-function setContentHeight() {
-  const winHeight = $(window).height();
-  let adminMenuHeight = $('#admin-menu').outerHeight(true);
-  if (adminMenuHeight) {
-    $('body').height($(window).height() - adminMenuHeight);
-  } else {
-    adminMenuHeight = 0;
-  }
-  const headerHeight = $('#header').outerHeight(true);
-  const navHeight = $('#navigation').outerHeight(true);
-  const messagesHeight = $('#page > .messages').length ? $('#page > .messages').outerHeight(true) : 0;
-  const footerHeight = $('#footer').length ? $('#footer').outerHeight(true) : 0;
-
-  const newheight = winHeight
-      - (adminMenuHeight + headerHeight + navHeight + messagesHeight + footerHeight);
-
-  $('.page-pelagos-full #main-wrapper').height(newheight);
-}
-
-$(() => {
-  $('#pelagos-menu-1').hoverIntent(hoverIn, hoverOut, 'li');
-
-  $(window).on('resize', () => {
-    setContentHeight();
-  }).trigger('resize');
-});
diff --git a/composer.json b/composer.json
@@ -25,40 +25,41 @@
         "doctrine/doctrine-fixtures-bundle": "^3.0",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.11",
-        "easycorp/easyadmin-bundle": "^3.5",
+        "easycorp/easyadmin-bundle": "^4.0",
         "easyrdf/easyrdf": "^1.1",
+        "fdekker/log-viewer-bundle": "^1.3",
         "friendsofsymfony/elastica-bundle": "^6.1.0",
-        "friendsofsymfony/jsrouting-bundle": "^2.1",
+        "friendsofsymfony/jsrouting-bundle": "^3.0",
         "friendsofsymfony/rest-bundle": "^3.0",
         "guzzlehttp/guzzle": "^7.6",
         "hidehalo/nanoid-php": "^1.1",
         "jms/serializer-bundle": "^5.0",
         "knplabs/knp-snappy-bundle": "^1.10",
         "maennchen/zipstream-php": "^3.0",
-        "oneup/flysystem-bundle": "^3.5",
+        "oneup/flysystem-bundle": "^4.0",
         "opensoft/doctrine-postgres-types": "^1.2",
         "phayes/geophp": "^1.2",
         "ramsey/uuid": "^4.1",
-        "sensio/framework-extra-bundle": "^6.0",
-        "symfony/asset": "5.4.*",
-        "symfony/console": "5.4.*",
-        "symfony/dotenv": "5.4.*",
+        "symfony/asset": "6.4.*",
+        "symfony/console": "6.4.*",
+        "symfony/doctrine-messenger": "6.4.*",
+        "symfony/dotenv": "6.4.*",
         "symfony/flex": "^1.17",
-        "symfony/form": "5.4.*",
-        "symfony/framework-bundle": "5.4.*",
-        "symfony/ldap": "5.4.*",
-        "symfony/mailer": "5.4.*",
+        "symfony/form": "6.4.*",
+        "symfony/framework-bundle": "6.4.*",
+        "symfony/ldap": "6.4.*",
+        "symfony/mailer": "6.4.*",
         "symfony/maker-bundle": "^1.13",
-        "symfony/messenger": "5.4.*",
+        "symfony/messenger": "6.4.*",
         "symfony/monolog-bundle": "^3.0",
-        "symfony/runtime": "5.4.*",
-        "symfony/security-bundle": "5.4.*",
-        "symfony/templating": "5.4.*",
-        "symfony/translation": "5.4.*",
-        "symfony/twig-bundle": "5.4.*",
-        "symfony/validator": "5.4.*",
+        "symfony/runtime": "6.4.*",
+        "symfony/security-bundle": "6.4.*",
+        "symfony/templating": "6.4.*",
+        "symfony/translation": "6.4.*",
+        "symfony/twig-bundle": "6.4.*",
+        "symfony/validator": "6.4.*",
         "symfony/webpack-encore-bundle": "^2.0",
-        "symfony/yaml": "5.4.*",
+        "symfony/yaml": "6.4.*",
         "twig/extra-bundle": "^2.12|^3.0",
         "twig/twig": "^2.12|^3.0",
         "xenolope/quahog": "^2.1"
@@ -71,13 +72,14 @@
         "phpstan/phpstan-doctrine": "^1.3",
         "phpstan/phpstan-symfony": "^1.2",
         "psalm/plugin-symfony": "^5.0",
+        "rector/rector": "^1.2",
         "squizlabs/php_codesniffer": "^3.4",
-        "symfony/browser-kit": "^5.4",
-        "symfony/css-selector": "^5.4",
-        "symfony/debug-bundle": "^5.4",
-        "symfony/phpunit-bridge": "5.4.*",
-        "symfony/stopwatch": "^5.4",
-        "symfony/web-profiler-bundle": "^5.4",
+        "symfony/browser-kit": "6.4.*",
+        "symfony/css-selector": "6.4.*",
+        "symfony/debug-bundle": "6.4.*",
+        "symfony/phpunit-bridge": "6.4.*",
+        "symfony/stopwatch": "6.4.*",
+        "symfony/web-profiler-bundle": "6.4.*",
         "vimeo/psalm": "^5.0"
     },
     "config": {
@@ -129,7 +131,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "5.4.*"
+            "require": "6.4.*"
         }
     }
 }