Просмотр исходного кода

Merge remote-tracking branch 'origin/main' into staging/1.4.4

Jaap Marcus 4 лет назад
Родитель
Сommit
9bcb2cd12a
2 измененных файлов с 398 добавлено и 203 удалено
  1. 5 6
      install/deb/filemanager/filegator/composer.json
  2. 393 197
      install/deb/filemanager/filegator/composer.lock

+ 5 - 6
install/deb/filemanager/filegator/composer.json

@@ -5,11 +5,11 @@
     "type": "project",
     "type": "project",
     "config": {
     "config": {
         "platform": {
         "platform": {
-            "php": "7.1.3"
+            "php": "7.2.5"
         }
         }
     },
     },
     "require": {
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2",
         "monolog/monolog": "^1.24",
         "monolog/monolog": "^1.24",
         "nikic/fast-route": "^1.3",
         "nikic/fast-route": "^1.3",
         "symfony/security-csrf": "^4.4",
         "symfony/security-csrf": "^4.4",
@@ -17,9 +17,8 @@
         "dibi/dibi": "^4.1",
         "dibi/dibi": "^4.1",
         "php-di/php-di": "^6.0",
         "php-di/php-di": "^6.0",
         "rakit/validation": "^1.1",
         "rakit/validation": "^1.1",
-        "league/flysystem": "^1.0",
-        "league/flysystem-ziparchive": "^1.0",
-        "league/flysystem-sftp": "^1.0"
+        "league/flysystem": "^1.1",
+        "league/flysystem-ziparchive": "^1.0"
     },
     },
     "authors": [
     "authors": [
         {
         {
@@ -38,7 +37,7 @@
         }
         }
     },
     },
     "require-dev": {
     "require-dev": {
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^8.0",
         "symfony/var-dumper": "^4.4",
         "symfony/var-dumper": "^4.4",
         "league/flysystem-memory": "^1.0",
         "league/flysystem-memory": "^1.0",
         "phpstan/phpstan": "^0.11.8"
         "phpstan/phpstan": "^0.11.8"

Разница между файлами не показана из-за своего большого размера
+ 393 - 197
install/deb/filemanager/filegator/composer.lock


Некоторые файлы не были показаны из-за большого количества измененных файлов