Merge pull request #2040 from griidc/release/6.75.0

Release/6.75.0

Author: fightingtexasaggie

.editorconfig

@@ -0,0 +1,17 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{compose.yaml,compose.*.yaml}]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

.env

@@ -16,7 +16,7 @@
 
 ###> symfony/framework-bundle ###
 APP_ENV=dev
-APP_SECRET=7fd781d3c8b25811ddd82260d88cc496
+APP_SECRET=
 ###< symfony/framework-bundle ###
 
 ###> doctrine/doctrine-bundle ###

.env.dev

@@ -0,0 +1,4 @@
+
+###> symfony/framework-bundle ###
+APP_SECRET=e089ced39a20dfb51e3a8cba9c0e8102
+###< symfony/framework-bundle ###

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+# these owners will be requested for
+# review when someone opens a pull request.
+*       @griidc/devs

.github/dependabot.yml

@@ -10,8 +10,6 @@ updates:
       day: "sunday"
       time: "16:00"
       timezone: "America/Chicago"
-    reviewers:
-      - "griidc/devs"
 
   # Maintain dependencies for npm
   - package-ecosystem: "npm"
@@ -21,8 +19,6 @@ updates:
       day: "sunday"
       time: "16:00"
       timezone: "America/Chicago"
-    reviewers:
-      - "griidc/devs"
 
   # Maintain dependencies for Composer
   - package-ecosystem: "composer"
@@ -32,5 +28,3 @@ updates:
       day: "sunday"
       time: "16:00"
       timezone: "America/Chicago"
-    reviewers:
-      - "griidc/devs"

assets/static/js/dataset-submission.js

@@ -237,12 +237,11 @@ $(function() {
         case "upload":
             fileTabs.tabs("option", "active", 0);
             break;
-        case "SFTP":
-            fileTabs.tabs("option", "active", 1);
-            break;
         case "HTTP":
-            fileTabs.tabs("option", "active", 2);
+            fileTabs.tabs("option", "active", 1);
             break;
+        default:
+            fileTabs.tabs("option", "active", 0);
     }
 
     $("#pelagos-content button").button();

assets/static/js/datasetReview.js

@@ -267,12 +267,11 @@ $(document).ready(function(){
         case "upload":
             fileTabs.tabs("option", "active", 0);
             break;
-        case "SFTP":
-            fileTabs.tabs("option", "active", 1);
-            break;
         case "HTTP":
-            fileTabs.tabs("option", "active", 2);
+            fileTabs.tabs("option", "active", 1);
             break;
+        default:
+            fileTabs.tabs("option", "active", 0);
     }
 
     var btnPrevious = $("#btn-previous");

bin/phpunit

@@ -6,9 +6,13 @@ if (!ini_get('date.timezone')) {
 }
 
 if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
-    define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
-    require PHPUNIT_COMPOSER_INSTALL;
-    PHPUnit\TextUI\Command::main();
+    if (PHP_VERSION_ID >= 80000) {
+        require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
+    } else {
+        define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
+        require PHPUNIT_COMPOSER_INSTALL;
+        PHPUnit\TextUI\Command::main();
+    }
 } else {
     if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
         echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";

composer.json

@@ -40,28 +40,27 @@
         "opensoft/doctrine-postgres-types": "^1.2",
         "phayes/geophp": "^1.2",
         "ramsey/uuid": "^4.1",
-        "symfony/asset": "6.4.*",
-        "symfony/console": "6.4.*",
-        "symfony/doctrine-messenger": "6.4.*",
-        "symfony/dotenv": "6.4.*",
+        "symfony/asset": "7.3.*",
+        "symfony/console": "7.3.*",
+        "symfony/doctrine-messenger": "7.3.*",
+        "symfony/dotenv": "7.3.*",
         "symfony/flex": "^2.4",
-        "symfony/form": "6.4.*",
-        "symfony/framework-bundle": "6.4.*",
-        "symfony/ldap": "6.4.*",
-        "symfony/mailer": "6.4.*",
+        "symfony/form": "7.3.*",
+        "symfony/framework-bundle": "7.3.*",
+        "symfony/ldap": "7.3.*",
+        "symfony/mailer": "7.3.*",
         "symfony/maker-bundle": "^1.13",
-        "symfony/messenger": "6.4.*",
+        "symfony/messenger": "7.3.*",
         "symfony/monolog-bundle": "^3.0",
-        "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/runtime": "7.3.*",
+        "symfony/security-bundle": "7.3.*",
+        "symfony/translation": "7.3.*",
+        "symfony/twig-bundle": "7.3.*",
+        "symfony/validator": "7.3.*",
         "symfony/webpack-encore-bundle": "^2.0",
-        "symfony/yaml": "6.4.*",
-        "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0"
+        "symfony/yaml": "7.3.*",
+        "twig/extra-bundle": "^3.0",
+        "twig/twig": "^3.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.13",
@@ -73,13 +72,13 @@
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^1.2",
         "squizlabs/php_codesniffer": "^3.4",
-        "symfony/browser-kit": "6.4.*",
-        "symfony/css-selector": "6.4.*",
-        "symfony/debug-bundle": "6.4.*",
-        "symfony/phpunit-bridge": "7.2.*",
-        "symfony/stopwatch": "6.4.*",
-        "symfony/web-profiler-bundle": "6.4.*",
-        "vimeo/psalm": "^5.0"
+        "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.*",
+        "vimeo/psalm": "^6.0"
     },
     "config": {
         "preferred-install": {
@@ -89,9 +88,6 @@
         "allow-plugins": {
             "symfony/flex": true,
             "symfony/runtime": true
-        },
-        "platform": {
-            "php": "8.3"
         }
     },
     "autoload": {
@@ -133,7 +129,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "6.4.*"
+            "require": "7.3.*"
         }
     }
 }