Switch user and pack order

Add rapsysair requires on rapsyspack and rapsysuser

diff --git a/composer.json b/composer.json
index 9a7a381ada57ed2736679295138bc98c370cb990..10645927f6e38942dbe67fb8c3cbf205acedfe48 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -64,50 +64,51 @@
         {
             "type": "package",
             "package": {
         {
             "type": "package",
             "package": {

-                "name": "rapsys/userbundle",
+                "name": "rapsys/packbundle",

                 "version": "dev-master",
                 "source": {
                     "type": "git",
                 "version": "dev-master",
                 "source": {
                     "type": "git",

-                    "url": "https://rapsys@git.rapsys.eu/userbundle",
+                    "url": "https://rapsys@git.rapsys.eu/packbundle",

                     "reference": "master"
                 },
                 "autoload": {
                     "psr-4": {
                     "reference": "master"
                 },
                 "autoload": {
                     "psr-4": {

-                        "Rapsys\\UserBundle\\": ""
+                        "Rapsys\\PackBundle\\": ""

                     }
                 },
                 "require": {
                     }
                 },
                 "require": {

-                    "doctrine/doctrine-bundle": "^1.12",
+                    "symfony/asset": "^4.4",

                     "symfony/flex": "^1.5",
                     "symfony/flex": "^1.5",

-                    "symfony/form": "^4.4",

                     "symfony/framework-bundle": "^4.4",
                     "symfony/framework-bundle": "^4.4",

-                    "symfony/security-bundle": "^4.4",
-                    "symfony/validator": "^4.4"
+                    "symfony/process": "^4.4",
+                    "symfony/twig-bundle": "^4.4",
+                    "twig/extensions": "^1.5"

                 }
             }
         },
         {
             "type": "package",
             "package": {
                 }
             }
         },
         {
             "type": "package",
             "package": {

-                "name": "rapsys/packbundle",
+                "name": "rapsys/userbundle",

                 "version": "dev-master",
                 "source": {
                     "type": "git",
                 "version": "dev-master",
                 "source": {
                     "type": "git",

-                    "url": "https://rapsys@git.rapsys.eu/packbundle",
+                    "url": "https://rapsys@git.rapsys.eu/userbundle",

                     "reference": "master"
                 },
                 "autoload": {
                     "psr-4": {
                     "reference": "master"
                 },
                 "autoload": {
                     "psr-4": {

-                        "Rapsys\\PackBundle\\": ""
+                        "Rapsys\\UserBundle\\": ""

                     }
                 },
                 "require": {
                     }
                 },
                 "require": {

-                    "symfony/asset": "^4.4",
+                    "doctrine/doctrine-bundle": "^1.12",
+                    "rapsys/packbundle": "dev-master",

                     "symfony/flex": "^1.5",
                     "symfony/flex": "^1.5",

+                    "symfony/form": "^4.4",

                     "symfony/framework-bundle": "^4.4",
                     "symfony/framework-bundle": "^4.4",

-                    "symfony/process": "^4.4",
-                    "symfony/twig-bundle": "^4.4",
-                    "twig/extensions": "^1.5"
+                    "symfony/security-bundle": "^4.4",
+                    "symfony/validator": "^4.4"

                 }
             }
         },
                 }
             }
         },


@@ -129,6 +130,8 @@
                 "require": {
                     "doctrine/doctrine-bundle": "^1.12",
                     "doctrine/orm": "^2.7",
                 "require": {
                     "doctrine/doctrine-bundle": "^1.12",
                     "doctrine/orm": "^2.7",

+                    "rapsys/userbundle": "dev-master",
+                    "rapsys/packbundle": "dev-master",

                     "fpdf/fpdf": "^1.83.1",
                     "google/apiclient": "^2.9",
                     "symfony/flex": "^1.5",
                     "fpdf/fpdf": "^1.83.1",
                     "google/apiclient": "^2.9",
                     "symfony/flex": "^1.5",