Prechádzať zdrojové kódy

Se agrega el OwnerVoterBundle

Maximiliano Schvindt 8 rokov pred
rodič
commit
8737622a2a
4 zmenil súbory, kde vykonal 37 pridanie a 3 odobranie
  1. 1 0
      app/AppKernel.php
  2. 1 0
      app/config/config.yml
  3. 9 1
      composer.json
  4. 26 2
      composer.lock

+ 1 - 0
app/AppKernel.php

@@ -35,6 +35,7 @@ class AppKernel extends Kernel
             new TemplateBundle\TemplateBundle(),
             new ExtraDataBundle\ExtraDataBundle(),
             new DeviceBundle\DeviceBundle(),
+            new OwnerVoterBundle\OwnerVoterBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

+ 1 - 0
app/config/config.yml

@@ -18,6 +18,7 @@ imports:
     - { resource: "@ExtraDataBundle/Resources/config/services.yml" }
     - { resource: "bundles/ik/device-bundle/parameters.yml" }
     - { resource: "@DeviceBundle/Resources/config/services.yml" }
+    - { resource: "@OwnerVoterBundle/Resources/config/services.yml" }
 
 parameters:
     app_name: ftth

+ 9 - 1
composer.json

@@ -59,6 +59,13 @@
             "options": {
                     "local_pk": "./keys/bitbucket.id_rsa"
             }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+    	    "options": {
+                    "local_pk": "./keys/bitbucket.id_rsa"
+            }
         }
     ],
     "config":{
@@ -90,7 +97,8 @@
         "php-amqplib/rabbitmq-bundle": "^1.12",
         "ik/template-bundle": "dev-master",
         "ik/extra-data-bundle": "dev-master",
-        "ik/device-bundle": "dev-master"
+        "ik/device-bundle": "dev-master",
+        "ik/owner-voter-bundle": "dev-master"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",

+ 26 - 2
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "26eeb076c6624846bb4f12cbfbb04882",
+    "content-hash": "48dd7956d5bc2894952bf9cdcbf16888",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1348,6 +1348,29 @@
             ],
             "time": "2017-04-06 15:40:13"
         },
+        {
+            "name": "ik/owner-voter-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+                "reference": "9ae7b65c59f9cb2216b422744a5e1ffbe429ef29"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "OwnerVoterBundle\\": ""
+                }
+            },
+            "description": "Flowdat 3 Owner Voter Bundle",
+            "keywords": [
+                "Admin Generator",
+                "admin",
+                "bundle",
+                "owner-voter"
+            ],
+            "time": "2017-06-12 15:49:24"
+        },
         {
             "name": "ik/template-bundle",
             "version": "dev-master",
@@ -5505,7 +5528,8 @@
         "ik/workflow-bundle": 20,
         "ik/template-bundle": 20,
         "ik/extra-data-bundle": 20,
-        "ik/device-bundle": 20
+        "ik/device-bundle": 20,
+        "ik/owner-voter-bundle": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,