Merge latest changes from branch 1.0

willhertz · Aug 19, 2019 · 20efa23 · 20efa23
2 parents 5e1a785 + cd34011
commit 20efa23
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 6,621 deletions.
diff --git a/composer.json b/composer.json
@@ -4,25 +4,53 @@
     "type": "project",
     "license": "MIT",
     "require": {
-        "php": "^7.0",
-        "uvdesk/composer-plugin": "^1.0",
-        "symfony/flex": "^1.0",
-        "uvdesk/core-framework": "^1.0",
-        "uvdesk/automation-bundle": "^1.0",
-        "uvdesk/support-center-bundle": "^1.0",
-        "uvdesk/mailbox-component": "^1.0",
-        "uvdesk/extension-framework": "^1.0"
+        "php": "^7.1.3",
+        "ext-ctype": "*",
+        "ext-iconv": "*",
+        "doctrine/doctrine-bundle": "^1.11",
+        "doctrine/doctrine-fixtures-bundle": "^3.2",
+        "doctrine/doctrine-migrations-bundle": "^2.0",
+        "knplabs/knp-paginator-bundle": "^4.0",
+        "sensio/framework-extra-bundle": "^5.1",
+        "symfony/asset": "4.3.*",
+        "symfony/console": "4.3.*",
+        "symfony/dotenv": "4.3.*",
+        "symfony/expression-language": "4.3.*",
+        "symfony/flex": "^1.3.1",
+        "symfony/form": "4.3.*",
+        "symfony/framework-bundle": "4.3.*",
+        "symfony/http-client": "4.3.*",
+        "symfony/intl": "4.3.*",
+        "symfony/monolog-bundle": "^3.1",
+        "symfony/orm-pack": "*",
+        "symfony/process": "4.3.*",
+        "symfony/security-bundle": "4.3.*",
+        "symfony/serializer-pack": "*",
+        "symfony/swiftmailer-bundle": "^3.1",
+        "symfony/translation": "4.3.*",
+        "symfony/twig-bundle": "4.3.*",
+        "symfony/validator": "4.3.*",
+        "symfony/var-dumper": "4.3.*",
+        "symfony/web-link": "4.3.*",
+        "symfony/yaml": "4.3.*",
+        "uvdesk/composer-plugin": "^1.0@dev",
+        "uvdesk/core-framework": "^1.0@dev",
+        "uvdesk/extension-framework": "^1.0@dev",
+        "uvdesk/automation-bundle": "^1.0@dev",
+        "uvdesk/support-center-bundle": "^1.0@dev"
     },
     "require-dev": {
-        "symfony/dotenv": "^3.4",
-        "symfony/var-dumper": "^3.4",
+        "symfony/debug-pack": "*",
         "symfony/maker-bundle": "^1.0",
         "symfony/profiler-pack": "*",
-        "symfony/web-server-bundle": "^3.4"
+        "symfony/test-pack": "*",
+        "symfony/web-server-bundle": "4.3.*"
     },
     "config": {
-        "sort-packages": true,
-        "preferred-install": "dist"
+        "preferred-install": {
+            "*": "dist"
+        },
+        "sort-packages": true
     },
     "autoload": {
         "psr-4": {
@@ -34,10 +62,13 @@
             "App\\Tests\\": "tests/"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
+    "replace": {
+        "paragonie/random_compat": "2.*",
+        "symfony/polyfill-ctype": "*",
+        "symfony/polyfill-iconv": "*",
+        "symfony/polyfill-php71": "*",
+        "symfony/polyfill-php70": "*",
+        "symfony/polyfill-php56": "*"
     },
     "scripts": {
         "post-install-cmd": [
@@ -48,8 +79,12 @@
         ]
     },
     "conflict": {
-        "symfony/symfony": "*",
-        "symfony/website-skeleton": "*"
+        "symfony/symfony": "*"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
     },
     "minimum-stability": "dev"
 }