gabriel пре 7 година
родитељ
комит
23d5e81139
3 измењених фајлова са 563 додато и 226 уклоњено
  1. 1 1
      .drone.yml
  2. 33 28
      composer.json
  3. 529 197
      composer.lock

+ 1 - 1
.drone.yml

@@ -23,7 +23,7 @@ pipeline:
       - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
-      - composer install -n --no-progress
+      - composer install --no-interaction --no-progress
       - chmod 0777 -R var/logs var/cache var/sessions
       - php bin/console doctrine:schema:update --force -vvv --env=test
       - vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist

+ 33 - 28
composer.json

@@ -28,77 +28,77 @@
             "type": "vcs",
             "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
             "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
+            "url":  "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
+            "url":  "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
+            "url":  "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/OwnerVoter.git",
+	    "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/OwnerVoter.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/RedisBundle.git",
+	    "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/RedisBundle.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/StatsDBundle.git",
+	    "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/StatsDBundle.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/FiberhomeBundle.git",
+			"url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/FiberhomeBundle.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/HuaweiBundle.git",
+			"url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/HuaweiBundle.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/GeoserverBundle.git",
+			"url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/GeoserverBundle.git",
             "options": {
-                "local_pk": "./keys/bitbucket.id_rsa"
+                    "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
@@ -110,7 +110,7 @@
         },
         {
             "type": "vcs",
-            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git"
+            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git"
         },
         {
             "type": "vcs",
@@ -154,7 +154,9 @@
         "ik/statsd-bundle": "dev-master",
         "ik/webservice-bundle": "dev-workflow_update",
         "incenteev/composer-parameter-handler": "^2.0",
-        "jms/serializer-bundle": "^1.1",
+        "jms/serializer": "^1.9.0",
+        "jms/serializer-bundle": "^1.5.0",
+        "kriswallsmith/assetic": "^1.4",
         "opensolutions/oss-snmp": "dev-master",
         "php-amqplib/rabbitmq-bundle": "^1.12",
         "sensio/distribution-bundle": "^5.0.21",
@@ -162,16 +164,18 @@
         "sonata-project/admin-bundle": "dev-bf4681 as 3.23.0",
         "sonata-project/doctrine-orm-admin-bundle": "^3.1",
         "stof/doctrine-extensions-bundle": "^1.2",
+        "symfony/assetic-bundle": "^2.8",
         "symfony/monolog-bundle": "^3.1.0",
         "symfony/polyfill-apcu": "^1.0",
         "symfony/swiftmailer-bundle": "^2.3.10",
         "symfony/symfony": "3.3.*",
         "symfony/web-server-bundle": "^3.3",
-        "twig/twig": "^1.0||^2.0",
+        "twig/extensions": "^1.5",
+        "twig/twig": "^2.0",
         "voryx/restgeneratorbundle": "dev-master"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.5.0",
+        "phpunit/phpunit": "^6.4",
         "sensio/generator-bundle": "^3.0",
         "symfony/phpunit-bridge": "^3.3"
     },
@@ -184,18 +188,19 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
         ],
-        "doctrine-update": "php bin/console doctrine:schema:update --force",
-        "doctrine-migrations": "php bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration",
+	"doctrine-update": "php bin/console doctrine:schema:update --force",
+        "doctrine-migrations":"php bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration",
         "mkdir-dir-cache-sessions-logs": "mkdir -p var/cache var/logs var/sessions",
         "chmod-dir-cache-sessions-logs": "chmod 777 -R var/cache var/logs var/sessions",
         "migration-alert-type": "php bin/console doctrine:migrations:execute 20170627144029 --no-interaction",
         "auto-increment": "php bin/console baseadmin:autoincrement",
+
         "post-install-cmd": [
             "@symfony-scripts",
             "@chmod-dir-cache-sessions-logs",
-            "@doctrine-migrations",
             "@doctrine-update",
-            "@auto-increment"
+            "@doctrine-migrations",
+            "@auto-increment" 
         ],
         "post-update-cmd": [
             "@symfony-scripts",

Разлика између датотеке није приказан због своје велике величине
+ 529 - 197
composer.lock