Przeglądaj źródła

composer update

Luciano Andrade 7 lat temu
rodzic
commit
f902383689
3 zmienionych plików z 21 dodań i 22 usunięć
  1. 0 1
      app/config/config.yml
  2. 9 4
      composer.json
  3. 12 17
      composer.lock

+ 0 - 1
app/config/config.yml

@@ -40,7 +40,6 @@ framework:
     templating:
     templating:
         engines: ['twig']
         engines: ['twig']
     default_locale:  "%locale%"
     default_locale:  "%locale%"
-    trusted_hosts:   ~
     session:
     session:
         name: ftth_session
         name: ftth_session
         # http://symfony.com/doc/current/reference/configuration/framework.html#handler-id
         # http://symfony.com/doc/current/reference/configuration/framework.html#handler-id

+ 9 - 4
composer.json

@@ -105,7 +105,13 @@
             "options": {
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
             }
-        }
+        },
+	{
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/3erPartyFlowdat3/SonataAdminBundle.git",
+            "name": "ik-sonata"
+	}
+
     ],
     ],
     "config": {
     "config": {
         "secure-http": false,
         "secure-http": false,
@@ -141,7 +147,7 @@
         "php-amqplib/rabbitmq-bundle": "^1.12",
         "php-amqplib/rabbitmq-bundle": "^1.12",
         "sensio/distribution-bundle": "^5.0",
         "sensio/distribution-bundle": "^5.0",
         "sensio/framework-extra-bundle": "^3.0.2",
         "sensio/framework-extra-bundle": "^3.0.2",
-        "sonata-project/admin-bundle": "^3.23",
+        "sonata-project/admin-bundle": "dev-bf4681",
         "sonata-project/doctrine-orm-admin-bundle": "^3.1",
         "sonata-project/doctrine-orm-admin-bundle": "^3.1",
         "stof/doctrine-extensions-bundle": "^1.2",
         "stof/doctrine-extensions-bundle": "^1.2",
         "symfony/monolog-bundle": "^3.1.0",
         "symfony/monolog-bundle": "^3.1.0",
@@ -217,7 +223,6 @@
             {
             {
                 "file": "app/config/bundles/ik/audit-bundle/parameters.yml"
                 "file": "app/config/bundles/ik/audit-bundle/parameters.yml"
             }
             }
-        ],
-        "branch-alias": null
+        ]
     }
     }
 }
 }

+ 12 - 17
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
         "This file is @generated automatically"
     ],
     ],
-    "content-hash": "e8a773d4bc78024791c3ebb60507b0db",
+    "content-hash": "861b800b14490bc5fcc9d1b9a88c8c4e",
     "packages": [
     "packages": [
         {
         {
             "name": "behat/transliterator",
             "name": "behat/transliterator",
@@ -3055,17 +3055,11 @@
         },
         },
         {
         {
             "name": "sonata-project/admin-bundle",
             "name": "sonata-project/admin-bundle",
-            "version": "3.23.0",
+            "version": "dev-bf4681",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
-                "url": "https://github.com/sonata-project/SonataAdminBundle.git",
-                "reference": "edbc6b755df5abae8b562eba2fdae6e7855cfdcc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://satis.infra.flowdat.com/dist/sonata-project/admin-bundle/sonata-project-admin-bundle-edbc6b755df5abae8b562eba2fdae6e7855cfdcc-zip-343ce4.zip",
-                "reference": "edbc6b755df5abae8b562eba2fdae6e7855cfdcc",
-                "shasum": "35d5281854385aa45ff2e618b7344c537c6427be"
+                "url": "ssh://git@gogs.infra.flowdat.com:222/3erPartyFlowdat3/SonataAdminBundle.git",
+                "reference": "8b49d8dc3f8b428bb0b64b3ed3f91919d7bc4ba1"
             },
             },
             "require": {
             "require": {
                 "doctrine/common": "^2.2",
                 "doctrine/common": "^2.2",
@@ -3116,7 +3110,8 @@
             "type": "symfony-bundle",
             "type": "symfony-bundle",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "3.x-dev"
+                    "dev-master": "3.x-dev",
+                    "dev-bf4681": "3.x-dev"
                 }
                 }
             },
             },
             "autoload": {
             "autoload": {
@@ -3127,19 +3122,18 @@
                     "Tests/"
                     "Tests/"
                 ]
                 ]
             },
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
             "license": [
                 "MIT"
                 "MIT"
             ],
             ],
             "authors": [
             "authors": [
-                {
-                    "name": "Sonata Community",
-                    "homepage": "https://github.com/sonata-project/SonataAdminBundle/contributors"
-                },
                 {
                 {
                     "name": "Thomas Rabaix",
                     "name": "Thomas Rabaix",
                     "email": "thomas.rabaix@sonata-project.org",
                     "email": "thomas.rabaix@sonata-project.org",
                     "homepage": "https://sonata-project.org"
                     "homepage": "https://sonata-project.org"
+                },
+                {
+                    "name": "Sonata Community",
+                    "homepage": "https://github.com/sonata-project/SonataAdminBundle/contributors"
                 }
                 }
             ],
             ],
             "description": "The missing Symfony Admin Generator",
             "description": "The missing Symfony Admin Generator",
@@ -3150,7 +3144,7 @@
                 "bootstrap",
                 "bootstrap",
                 "sonata"
                 "sonata"
             ],
             ],
-            "time": "2017-09-01T14:15:32+00:00"
+            "time": "2017-10-04T12:16:04+00:00"
         },
         },
         {
         {
             "name": "sonata-project/block-bundle",
             "name": "sonata-project/block-bundle",
@@ -5666,6 +5660,7 @@
         "ik/template-bundle": 20,
         "ik/template-bundle": 20,
         "ik/webservice-bundle": 20,
         "ik/webservice-bundle": 20,
         "ik/workflow-bundle": 20,
         "ik/workflow-bundle": 20,
+        "sonata-project/admin-bundle": 20,
         "voryx/restgeneratorbundle": 20
         "voryx/restgeneratorbundle": 20
     },
     },
     "prefer-stable": false,
     "prefer-stable": false,