...

composer.lock

@@ -524,41 +524,38 @@
         },
         {
             "name": "doctrine/doctrine-bundle",
-            "version": "1.6.7",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrineBundle.git",
-                "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9"
+                "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a01d99bc6c9a6c8a8ace0012690099dd957ce9b9",
-                "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9",
+                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a5b3ba908ba68f3e14e42762a7b940fde65ed7da",
+                "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da",
                 "shasum": ""
             },
             "require": {
                 "doctrine/dbal": "~2.3",
                 "doctrine/doctrine-cache-bundle": "~1.0",
                 "jdorn/sql-formatter": "~1.1",
-                "php": ">=5.5.9",
-                "symfony/console": "~2.7|~3.0",
-                "symfony/dependency-injection": "~2.7|~3.0",
-                "symfony/doctrine-bridge": "~2.7|~3.0",
-                "symfony/framework-bundle": "~2.7|~3.0"
+                "php": ">=5.3.2",
+                "symfony/console": "~2.3|~3.0",
+                "symfony/doctrine-bridge": "~2.2|~3.0",
+                "symfony/framework-bundle": "~2.3|~3.0"
             },
             "require-dev": {
                 "doctrine/orm": "~2.3",
                 "phpunit/phpunit": "~4",
-                "satooshi/php-coveralls": "^1.0",
-                "symfony/phpunit-bridge": "~2.7|~3.0",
-                "symfony/property-info": "~2.8|~3.0",
-                "symfony/validator": "~2.7|~3.0",
-                "symfony/yaml": "~2.7|~3.0",
-                "twig/twig": "~1.10|~2.0"
+                "satooshi/php-coveralls": "~0.6.1",
+                "symfony/validator": "~2.2|~3.0",
+                "symfony/yaml": "~2.2|~3.0",
+                "twig/twig": "~1.10"
             },
             "suggest": {
                 "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
-                "symfony/web-profiler-bundle": "To use the data collector."
+                "symfony/web-profiler-bundle": "to use the data collector"
             },
             "type": "symfony-bundle",
             "extra": {
@@ -601,51 +598,47 @@
                 "orm",
                 "persistence"
             ],
-            "time": "2017-01-16T12:01:26+00:00"
+            "time": "2015-11-04T21:33:02+00:00"
         },
         {
             "name": "doctrine/doctrine-cache-bundle",
-            "version": "1.3.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrineCacheBundle.git",
-                "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504"
+                "reference": "34fce1cd7bc74634fc119f8bf985a137087927d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/18c600a9b82f6454d2e81ca4957cdd56a1cf3504",
-                "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504",
+                "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/34fce1cd7bc74634fc119f8bf985a137087927d2",
+                "reference": "34fce1cd7bc74634fc119f8bf985a137087927d2",
                 "shasum": ""
             },
             "require": {
                 "doctrine/cache": "^1.4.2",
                 "doctrine/inflector": "~1.0",
                 "php": ">=5.3.2",
-                "symfony/doctrine-bridge": "~2.2|~3.0"
+                "symfony/doctrine-bridge": "~2.2|~3.0",
+                "symfony/security-acl": "~2.7|~3.0"
             },
             "require-dev": {
                 "instaclick/coding-standard": "~1.1",
                 "instaclick/object-calisthenics-sniffs": "dev-master",
                 "instaclick/symfony2-coding-standard": "dev-remaster",
                 "phpunit/phpunit": "~4",
-                "predis/predis": "~0.8",
                 "satooshi/php-coveralls": "~0.6.1",
                 "squizlabs/php_codesniffer": "~1.5",
                 "symfony/console": "~2.2|~3.0",
                 "symfony/finder": "~2.2|~3.0",
                 "symfony/framework-bundle": "~2.2|~3.0",
                 "symfony/phpunit-bridge": "~2.7|~3.0",
-                "symfony/security-acl": "~2.3|~3.0",
                 "symfony/validator": "~2.2|~3.0",
                 "symfony/yaml": "~2.2|~3.0"
             },
-            "suggest": {
-                "symfony/security-acl": "For using this bundle to cache ACLs"
-            },
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
@@ -689,7 +682,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2016-01-26T17:28:51+00:00"
+            "time": "2015-11-04T17:07:43+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -1335,7 +1328,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "e23812da25460ad4fa03a21b8ce8fc679bed9b65"
+                "reference": "c1bb4186bc6d3559c21ce54ed407283f69df7ed5"
             },
             "require": {
                 "ext-curl": "*",
@@ -1348,7 +1341,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-04-19 15:34:35"
+            "time": "2017-04-19 18:03:31"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1356,7 +1349,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "996c1b6a41a5bcb83c639786d8fcc55249a0b822"
+                "reference": "ac76bdb2eb02671401d1979dea3569e9444a6ed6"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1386,7 +1379,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-04-19 19:03:43"
+            "time": "2017-04-21 15:18:50"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -1656,21 +1649,21 @@
         },
         {
             "name": "jms/serializer-bundle",
-            "version": "1.4.0",
+            "version": "1.2.1",
             "target-dir": "JMS/SerializerBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
-                "reference": "fdd73dbc8642940084deda2a96fa5db62d0f2384"
+                "reference": "4c6af116ff93d071c6086963798ca1ff8c1384df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/fdd73dbc8642940084deda2a96fa5db62d0f2384",
-                "reference": "fdd73dbc8642940084deda2a96fa5db62d0f2384",
+                "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/4c6af116ff93d071c6086963798ca1ff8c1384df",
+                "reference": "4c6af116ff93d071c6086963798ca1ff8c1384df",
                 "shasum": ""
             },
             "require": {
-                "jms/serializer": "^1.6",
+                "jms/serializer": "^1.5",
                 "php": ">=5.4.0",
                 "phpoption/phpoption": "^1.1.0",
                 "symfony/framework-bundle": "~2.3|~3.0"
@@ -1697,7 +1690,7 @@
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -1724,7 +1717,7 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2017-04-10T12:31:39+00:00"
+            "time": "2017-03-13T17:02:39+00:00"
         },
         {
             "name": "knplabs/knp-menu",
@@ -2815,24 +2808,24 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.5.7",
+            "version": "5.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3f67cee782c9abfaee5e32fd2f57cdd54bc257ba"
+                "reference": "c7b3e1dcc1d183f26d5ba282881fe65c2cbb5b2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3f67cee782c9abfaee5e32fd2f57cdd54bc257ba",
-                "reference": "3f67cee782c9abfaee5e32fd2f57cdd54bc257ba",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c7b3e1dcc1d183f26d5ba282881fe65c2cbb5b2b",
+                "reference": "c7b3e1dcc1d183f26d5ba282881fe65c2cbb5b2b",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
                 "myclabs/deep-copy": "~1.3",
                 "php": "^5.6 || ^7.0",
                 "phpspec/prophecy": "^1.3.1",
@@ -2854,12 +2847,7 @@
             "conflict": {
                 "phpdocumentor/reflection-docblock": "3.0.2"
             },
-            "require-dev": {
-                "ext-pdo": "*"
-            },
             "suggest": {
-                "ext-tidy": "*",
-                "ext-xdebug": "*",
                 "phpunit/php-invoker": "~1.1"
             },
             "bin": [
@@ -2894,7 +2882,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-10-03T13:04:15+00:00"
+            "time": "2016-08-05T04:49:02+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -3563,16 +3551,16 @@
         },
         {
             "name": "sensio/distribution-bundle",
-            "version": "v5.0.18",
+            "version": "v5.0.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
-                "reference": "17846680901003d26d823c2e3ac9228702837916"
+                "reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/17846680901003d26d823c2e3ac9228702837916",
-                "reference": "17846680901003d26d823c2e3ac9228702837916",
+                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/7bc47dcfdbde6d567e1a834577d1c04ddb970281",
+                "reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281",
                 "shasum": ""
             },
             "require": {
@@ -3611,7 +3599,7 @@
                 "configuration",
                 "distribution"
             ],
-            "time": "2017-01-10T14:58:45+00:00"
+            "time": "2016-10-08T18:50:33+00:00"
         },
         {
             "name": "sensio/framework-extra-bundle",
@@ -3685,35 +3673,33 @@
         },
         {
             "name": "sensio/generator-bundle",
-            "version": "v3.1.4",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
-                "reference": "37f9f4e165b033fb76cc2320838321cc57140e65"
+                "reference": "f5f60fc84fdef91333c67f29b00a271cfbcf1ccb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/37f9f4e165b033fb76cc2320838321cc57140e65",
-                "reference": "37f9f4e165b033fb76cc2320838321cc57140e65",
+                "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/f5f60fc84fdef91333c67f29b00a271cfbcf1ccb",
+                "reference": "f5f60fc84fdef91333c67f29b00a271cfbcf1ccb",
                 "shasum": ""
             },
             "require": {
                 "symfony/console": "~2.7|~3.0",
                 "symfony/framework-bundle": "~2.7|~3.0",
                 "symfony/process": "~2.7|~3.0",
-                "symfony/yaml": "~2.7|~3.0",
-                "twig/twig": "^1.28.2|^2.0"
+                "symfony/yaml": "~2.7|~3.0"
             },
             "require-dev": {
                 "doctrine/orm": "~2.4",
                 "symfony/doctrine-bridge": "~2.7|~3.0",
-                "symfony/filesystem": "~2.7|~3.0",
-                "symfony/phpunit-bridge": "^3.3"
+                "twig/twig": "~1.18"
             },
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -3735,7 +3721,7 @@
                 }
             ],
             "description": "This bundle generates code for you",
-            "time": "2017-03-15T01:02:10+00:00"
+            "time": "2015-11-10T13:25:32+00:00"
         },
         {
             "name": "sensiolabs/security-checker",
@@ -3784,16 +3770,16 @@
         },
         {
             "name": "sonata-project/admin-bundle",
-            "version": "3.16.0",
+            "version": "3.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataAdminBundle.git",
-                "reference": "9ef795ae04735900280bc1ba96b9ffe93032dec3"
+                "reference": "a06c89c300a246cd1e13ad687d2389a53e8c0d8b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/9ef795ae04735900280bc1ba96b9ffe93032dec3",
-                "reference": "9ef795ae04735900280bc1ba96b9ffe93032dec3",
+                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/a06c89c300a246cd1e13ad687d2389a53e8c0d8b",
+                "reference": "a06c89c300a246cd1e13ad687d2389a53e8c0d8b",
                 "shasum": ""
             },
             "require": {
@@ -3803,7 +3789,7 @@
                 "php": "^5.3 || ^7.0",
                 "sonata-project/block-bundle": "^3.2",
                 "sonata-project/core-bundle": "^3.1",
-                "sonata-project/exporter": "^1.7",
+                "sonata-project/exporter": "^1.0",
                 "symfony/class-loader": "^2.3 || ^3.0",
                 "symfony/config": "^2.3.9 || ^3.0",
                 "symfony/console": "^2.3 || ^3.0",
@@ -3823,13 +3809,11 @@
                 "twig/twig": "^1.28 || ^2.0"
             },
             "conflict": {
-                "jms/di-extra-bundle": "<1.7.0",
-                "sonata-project/exporter": "1.6.0"
+                "jms/di-extra-bundle": "<1.7.0"
             },
             "require-dev": {
                 "jms/di-extra-bundle": "^1.7",
                 "jms/translation-bundle": "^1.2",
-                "matthiasnoback/symfony-dependency-injection-test": "^0.1 || ^1.0",
                 "sensio/generator-bundle": "^2.3 || ^3.0",
                 "sllh/php-cs-fixer-styleci-bridge": "^2.0",
                 "sonata-project/intl-bundle": "^2.2.4",
@@ -3879,7 +3863,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-03-31T09:23:02+00:00"
+            "time": "2017-01-31T10:13:36+00:00"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -4157,16 +4141,16 @@
         },
         {
             "name": "sonata-project/doctrine-orm-admin-bundle",
-            "version": "3.1.4",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataDoctrineORMAdminBundle.git",
-                "reference": "894083c0eb0c3cba284c841a6dd9b551671f5cdc"
+                "reference": "5a6819928f947cb7e5a8d288ad83f8131bab4875"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataDoctrineORMAdminBundle/zipball/894083c0eb0c3cba284c841a6dd9b551671f5cdc",
-                "reference": "894083c0eb0c3cba284c841a6dd9b551671f5cdc",
+                "url": "https://api.github.com/repos/sonata-project/SonataDoctrineORMAdminBundle/zipball/5a6819928f947cb7e5a8d288ad83f8131bab4875",
+                "reference": "5a6819928f947cb7e5a8d288ad83f8131bab4875",
                 "shasum": ""
             },
             "require": {
@@ -4187,7 +4171,7 @@
             },
             "require-dev": {
                 "knplabs/knp-menu-bundle": "^2.1.1",
-                "simplethings/entity-audit-bundle": "0.1 - 0.9 || ^1.0",
+                "simplethings/entity-audit-bundle": "0.1 - 0.9",
                 "sllh/php-cs-fixer-styleci-bridge": "^2.0",
                 "symfony/phpunit-bridge": "^2.7 || ^3.0"
             },
@@ -4232,7 +4216,7 @@
                 "generator",
                 "sonata"
             ],
-            "time": "2017-03-23T12:35:00+00:00"
+            "time": "2016-09-12T11:55:27+00:00"
         },
         {
             "name": "sonata-project/exporter",
@@ -4366,16 +4350,16 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.4.6",
+            "version": "v5.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
+                "reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
-                "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4",
+                "reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4",
                 "shasum": ""
             },
             "require": {
@@ -4416,20 +4400,20 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2017-02-13T07:52:53+00:00"
+            "time": "2017-04-20T17:32:18+00:00"
         },
         {
             "name": "symfony/monolog-bundle",
-            "version": "v3.1.0",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/monolog-bundle.git",
-                "reference": "6f96c7dbb6b2ef70b307a1a6f897153cbca3da47"
+                "reference": "804425dfceec0097bf3e5dea3a73d91e055686be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/6f96c7dbb6b2ef70b307a1a6f897153cbca3da47",
-                "reference": "6f96c7dbb6b2ef70b307a1a6f897153cbca3da47",
+                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/804425dfceec0097bf3e5dea3a73d91e055686be",
+                "reference": "804425dfceec0097bf3e5dea3a73d91e055686be",
                 "shasum": ""
             },
             "require": {
@@ -4476,20 +4460,20 @@
                 "log",
                 "logging"
             ],
-            "time": "2017-03-26T11:55:59+00:00"
+            "time": "2017-01-03T12:32:45+00:00"
         },
         {
             "name": "symfony/polyfill-apcu",
-            "version": "v1.3.0",
+            "version": "v1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "5d4474f447403c3348e37b70acc2b95475b7befa"
+                "reference": "d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa",
-                "reference": "5d4474f447403c3348e37b70acc2b95475b7befa",
+                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c",
+                "reference": "d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c",
                 "shasum": ""
             },
             "require": {
@@ -4498,12 +4482,15 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.1-dev"
                 }
             },
             "autoload": {
                 "files": [
                     "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4529,7 +4516,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2016-01-20T09:13:37+00:00"
         },
         {
             "name": "symfony/polyfill-intl-icu",
@@ -4878,30 +4865,28 @@
         },
         {
             "name": "symfony/swiftmailer-bundle",
-            "version": "v2.5.4",
+            "version": "v2.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/swiftmailer-bundle.git",
-                "reference": "8ab32ce31a7156621fb92e0466586186beb89759"
+                "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/8ab32ce31a7156621fb92e0466586186beb89759",
-                "reference": "8ab32ce31a7156621fb92e0466586186beb89759",
+                "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
+                "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2",
                 "swiftmailer/swiftmailer": ">=4.2.0,~5.0",
-                "symfony/config": "~2.7|~3.0",
-                "symfony/dependency-injection": "~2.7|~3.0",
-                "symfony/http-kernel": "~2.7|~3.0"
+                "symfony/config": "~2.3|~3.0",
+                "symfony/dependency-injection": "~2.3|~3.0",
+                "symfony/http-kernel": "~2.3|~3.0",
+                "symfony/yaml": "~2.3|~3.0"
             },
             "require-dev": {
-                "symfony/console": "~2.7|~3.0",
-                "symfony/framework-bundle": "~2.7|~3.0",
-                "symfony/phpunit-bridge": "~2.7|~3.0",
-                "symfony/yaml": "~2.7|~3.0"
+                "symfony/phpunit-bridge": "~2.7|~3.0"
             },
             "suggest": {
                 "psr/log": "Allows logging"
@@ -4909,7 +4894,7 @@
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.3-dev"
                 }
             },
             "autoload": {
@@ -4933,20 +4918,20 @@
             ],
             "description": "Symfony SwiftmailerBundle",
             "homepage": "http://symfony.com",
-            "time": "2017-03-21T21:47:36+00:00"
+            "time": "2016-01-14T10:25:38+00:00"
         },
         {
             "name": "symfony/symfony",
-            "version": "v3.2.7",
+            "version": "v3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "1631040ea8fc5e0e405c00d35cbf2c0b7b555f64"
+                "reference": "b96a144bc875684f3338f697687147a2696d73eb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/1631040ea8fc5e0e405c00d35cbf2c0b7b555f64",
-                "reference": "1631040ea8fc5e0e405c00d35cbf2c0b7b555f64",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/b96a144bc875684f3338f697687147a2696d73eb",
+                "reference": "b96a144bc875684f3338f697687147a2696d73eb",
                 "shasum": ""
             },
             "require": {
@@ -4963,8 +4948,7 @@
             },
             "conflict": {
                 "phpdocumentor/reflection-docblock": "<3.0",
-                "phpdocumentor/type-resolver": "<0.2.0",
-                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+                "phpdocumentor/type-resolver": "<0.2.0"
             },
             "provide": {
                 "psr/cache-implementation": "1.0"
@@ -5030,7 +5014,6 @@
                 "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
                 "phpdocumentor/reflection-docblock": "^3.0",
                 "predis/predis": "~1.0",
-                "sensio/framework-extra-bundle": "^3.0.2",
                 "symfony/phpunit-bridge": "~3.2",
                 "symfony/polyfill-apcu": "~1.1",
                 "symfony/security-acl": "~2.8|~3.0"
@@ -5077,7 +5060,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2017-04-05T12:52:29+00:00"
+            "time": "2016-11-30T08:46:24+00:00"
         },
         {
             "name": "twig/extensions",
@@ -5133,16 +5116,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.33.1",
+            "version": "v1.33.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "a87f959f4b691da66aada267a2dfdb260d0bb58a"
+                "reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/a87f959f4b691da66aada267a2dfdb260d0bb58a",
-                "reference": "a87f959f4b691da66aada267a2dfdb260d0bb58a",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/dd6ca96227917e1e85b41c7c3cc6507b411e0927",
+                "reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927",
                 "shasum": ""
             },
             "require": {
@@ -5191,7 +5174,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2017-04-18T21:43:11+00:00"
+            "time": "2017-04-20T17:39:48+00:00"
         },
         {
             "name": "voryx/restgeneratorbundle",
@@ -5383,35 +5366,28 @@
     "packages-dev": [
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v3.2.7",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "9103d17dd57c512a3a027bb5628f6701464d6fef"
+                "reference": "9329a6fdf1fde3dfed50478f78500a8dc395190c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/9103d17dd57c512a3a027bb5628f6701464d6fef",
-                "reference": "9103d17dd57c512a3a027bb5628f6701464d6fef",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/9329a6fdf1fde3dfed50478f78500a8dc395190c",
+                "reference": "9329a6fdf1fde3dfed50478f78500a8dc395190c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
-            },
-            "conflict": {
-                "phpunit/phpunit": ">=6.0"
+                "php": ">=5.5.9"
             },
             "suggest": {
-                "ext-zip": "Zip support is required when using bin/simple-phpunit",
                 "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
             },
-            "bin": [
-                "bin/simple-phpunit"
-            ],
             "type": "symfony-bridge",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -5441,7 +5417,7 @@
             ],
             "description": "Symfony PHPUnit Bridge",
             "homepage": "https://symfony.com",
-            "time": "2017-03-09T12:58:16+00:00"
+            "time": "2015-11-28T09:12:47+00:00"
         }
     ],
     "aliases": [],
@@ -5455,7 +5431,7 @@
         "ik/template-bundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": false,
+    "prefer-lowest": true,
     "platform": {
         "php": ">=5.5.9"
     },

src/FTTHBundle/Admin/NodeAdmin.php

@@ -8,7 +8,7 @@ use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
 
-class NodeAdmin extends BaseAdmin
+class NAPAdmin extends BaseAdmin
 {
     /**
      * @param DatagridMapper $datagridMapper
@@ -27,6 +27,8 @@ class NodeAdmin extends BaseAdmin
     {
         $listMapper
             ->add('name')
+            ->add('parent')
+            ->add('onus')
             ->add('_action', null, array(
                 'actions' => array(
                     'show' => array(),
@@ -44,6 +46,7 @@ class NodeAdmin extends BaseAdmin
     {
         $formMapper
             ->add('name')
+            ->add('parent')
         ;
     }
 
@@ -54,6 +57,8 @@ class NodeAdmin extends BaseAdmin
     {
         $showMapper
             ->add('name')
+            ->add('parent')
+            ->add('onus')
         ;
     }
 }

src/FTTHBundle/Admin/OLTAdmin.php

@@ -37,6 +37,7 @@ class OLTAdmin extends BaseAdmin
             ->add('snmpCommunity')
             ->add('sshUser')
             ->add('sshPass')
+            ->add('workflow')
             ->add('currentState','string', array('template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'))
             ->add('_action', null, array(
                 'actions' => array(
@@ -61,6 +62,7 @@ class OLTAdmin extends BaseAdmin
             ->add('snmpCommunity')
             ->add('sshUser')
             ->add('sshPass')
+            ->add('workflow')
         ;
     }
 

src/FTTHBundle/Admin/ONUAdmin.php

@@ -20,7 +20,7 @@ class ONUAdmin extends BaseAdmin
             ->add('clientId')
             ->add('ponSerialNumber')
             ->add('profile')
-            ->add('node')
+            ->add('nap')
             ->add('model')
             ->add('serialNumber')
             ->add('mac')
@@ -34,13 +34,13 @@ class ONUAdmin extends BaseAdmin
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
-	        ->add('clientId')
+            ->add('clientId')
             ->add('ip')
             ->add('mac')
             ->add('serialNumber')
             ->add('ponSerialNumber')
             ->add('profile')
-            ->add('node')
+            ->add('nap')
             ->add('model')
             ->add('olt')
             ->add('workflow')
@@ -62,14 +62,15 @@ class ONUAdmin extends BaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
-	        ->add('clientId')
+            ->add('clientId')
             ->add('ponSerialNumber')
             ->add('profile')
-            ->add('node')
+            ->add('nap')    
             ->add('model')
             ->add('serialNumber')
             ->add('mac')
             ->add('olt')
+            ->add('workflow')
          
         ;
     }
@@ -81,15 +82,15 @@ class ONUAdmin extends BaseAdmin
     {
         $showMapper
             ->add('id')
-	        ->add('clientId')
+            ->add('clientId')
             ->add('ponSerialNumber')
             ->add('profile')
-            ->add('node')
+            ->add('nap')
             ->add('model')
             ->add('serialNumber')
             ->add('mac')
             ->add('olt')
-            ->add('model.workflow')
+            ->add('workflow')
             ->add('currentState')
             ->add('log','string', array('template' => 'FTTHBundle:ONU:show_log.html.twig'))
         ;

src/FTTHBundle/Admin/ONUModelAdmin.php

@@ -17,7 +17,6 @@ class ONUModelAdmin extends BaseAdmin
     {
         $datagridMapper
             ->add('name')
-            ->add('workflow')
         ;
     }
 
@@ -28,7 +27,6 @@ class ONUModelAdmin extends BaseAdmin
     {
         $listMapper
             ->add('name')
-            ->add('workflow')
             ->add('_action', null, array(
                 'actions' => array(
                     'show' => array(),
@@ -46,7 +44,6 @@ class ONUModelAdmin extends BaseAdmin
     {
         $formMapper
             ->add('name')
-            ->add('workflow')
         ;
     }
 
@@ -57,7 +54,6 @@ class ONUModelAdmin extends BaseAdmin
     {
         $showMapper
             ->add('name')
-            ->add('workflow')
         ;
     }
 }

src/FTTHBundle/Entity/Node.php

@@ -9,11 +9,11 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table
  * @ORM\Entity
  */
-class Node
+class NAP
 {
 
     use ONUTrait;
-    
+
     /**
      * @var int
      *
@@ -30,12 +30,18 @@ class Node
      * @Assert\NotNull
      */
     private $name;
-    
+
     /**
-     * @ORM\OneToMany(targetEntity="ONU", mappedBy="node")
+     * @ORM\ManyToOne(targetEntity="NAP")
+     */
+    protected $parent;
+        
+    /**
+     * @ORM\OneToMany(targetEntity="ONU", mappedBy="nap")
      */
     protected $onus;
-    
+
+     
     /**
      * @return string
      */
@@ -74,4 +80,24 @@ class Node
         return $this->name;
     }
 
+    /**
+     * @return NAP
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * @param NAP $parent
+     * 
+     * @return $this
+     */
+    public function setParent($parent = null)
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
 }

src/FTTHBundle/Entity/OLT.php

@@ -5,6 +5,7 @@ namespace FTTHBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Workflow\Exception\ExceptionInterface;
 
 /**
  * @ORM\Entity
@@ -93,6 +94,12 @@ class OLT
      */
     protected $transitionState = 'success';
 
+    /**
+     * @ORM\ManyToOne(targetEntity="\WorkflowBundle\Entity\Workflow", fetch="EXTRA_LAZY")
+     * @ORM\JoinColumn(name="workflow_id", referencedColumnName="id", onDelete="SET NULL")
+     */
+    protected $workflow;
+
     
     /**
      * @return string
@@ -273,28 +280,48 @@ class OLT
         return $this;
     }
 
-    public function getWorkflow() 
+    /**
+     * @return Workflow
+     */
+    public function getWorkflow()
+    {
+        return $this->workflow;
+    }
+
+    /**
+     * @param Workflow $workflow
+     * @return $this
+     */
+    public function setWorkflow($workflow)
+    {
+        $this->workflow = $workflow;
+        
+        return $this;
+    }
+
+    public function getWorkflowType() 
     {
-        $workflow = $this->getWorkflowObject();
+        $workflow = $this->getWorkflow();
 
         if($workflow) {
-            return $workflow->getName();
+            return $workflow->getType();
         }
-
+        
         return null;
     }
     
-    public function getWorkflowType() 
+    public function getWorkflowName() 
     {
-        $workflow = $this->getWorkflowObject();
+        $workflow = $this->getWorkflow();
 
         if($workflow) {
-            return $workflow->getType();
+            return $workflow->getName();
         }
         
         return null;
     }
 
+    /* Va a quedar deprecate */
     public function getWorkflowObject() 
     {
         if($this->model) {
@@ -304,7 +331,7 @@ class OLT
             }
         }
 
-        return null;
+        return $this->workflow;
     }
 
     /**
@@ -351,4 +378,25 @@ class OLT
     {
         return "transition_state";
     }
+
+    // Para coincider entre estos workflow servidos por servicio y aquellos levantados por ABM
+    public function getServiceWorkflow() {
+        global $kernel;
+        $registry = $kernel->getContainer()->get('workflow.registry');
+
+        $workflow_name = null;
+        $workflow = $this->getWorkflow();
+        if($workflow) {
+            $workflow_name = $workflow->getName();
+        }
+
+        try {
+            $workflow = $registry->get($this,$workflow_name);
+        } catch (ExceptionInterface $e) {
+            $kernel->getContainer()->get('session')->getFlashBag()->add('danger', $kernel->getContainer()->get('translator')->trans('Incorrect Workflow',array(),'FTTHBundle'));
+            return null;
+        }
+
+        return $workflow;
+    }
 }

src/FTTHBundle/Entity/ONU.php

@@ -7,6 +7,7 @@ use Gedmo\Mapping\Annotation as Gedmo;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Validator\Constraints as Assert;
 use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
+use Symfony\Component\Workflow\Exception\ExceptionInterface;
 
 /**
  * ONU
@@ -102,11 +103,11 @@ class ONU
      * @ORM\JoinColumn(name="model_id", referencedColumnName="id", onDelete="SET NULL")
      */
     protected $model;
-    
+        
     /**
-     * @ORM\ManyToOne(targetEntity="Node", inversedBy="onus", fetch="EXTRA_LAZY")
+     * @ORM\ManyToOne(targetEntity="NAP", inversedBy="onus", fetch="EXTRA_LAZY")
      */
-    protected $node;
+    protected $nap;
     
     /**
      * @ORM\ManyToOne(targetEntity="Profile", inversedBy="onus", fetch="EXTRA_LAZY")
@@ -120,6 +121,12 @@ class ONU
      */
     protected $tenancyId = 1;
 
+     /**
+     * @ORM\ManyToOne(targetEntity="\WorkflowBundle\Entity\Workflow", fetch="EXTRA_LAZY")
+     * @ORM\JoinColumn(name="workflow_id", referencedColumnName="id", onDelete="SET NULL")
+     */
+    protected $workflow;
+
     
     /**
      * @return string
@@ -390,22 +397,23 @@ class ONU
         
         return $this;
     }
-
+    
     /**
-     * @return Node
+     * @return NAP
      */
-    public function getNode()
+    public function getNap()
     {
-        return $this->node;
+        return $this->nap;
     }
 
     /**
-     * @param Node $node
+     * @param NAP $nap
+     * 
      * @return $this
      */
-    public function setNode($node)
+    public function setNap($nap)
     {
-        $this->node = $node;
+        $this->nap = $nap;
         
         return $this;
     }
@@ -437,29 +445,48 @@ class ONU
     public function getTenancyId()
     {
         return $this->tenancyId;
-    } 
+    }
+
+    /**
+     * @return Workflow
+     */
+    public function getWorkflow()
+    {
+        return $this->workflow;
+    }
 
-    public function getWorkflow() 
+    /**
+     * @param Workflow $workflow
+     * @return $this
+     */
+    public function setWorkflow($workflow)
     {
-        $workflow = $this->getWorkflowObject();
+        $this->workflow = $workflow;
+        
+        return $this;
+    }
+
+    public function getWorkflowType() 
+    {
+        $workflow = $this->getWorkflow();
 
         if($workflow) {
-            return $workflow->getName();
+            return $workflow->getType();
         }
-
+        
         return null;
     }
     
-    public function getWorkflowType() 
+    public function getWorkflowName() 
     {
-        $workflow = $this->getWorkflowObject();
+        $workflow = $this->getWorkflow();
 
         if($workflow) {
-            return $workflow->getType();
+            return $workflow->getName();
         }
         
         return null;
-    }
+    } 
 
     public function getLog() 
     {
@@ -472,16 +499,10 @@ class ONU
         return implode("\n",$out);
     }
 
+    /* Va a quedar deprecate */
     public function getWorkflowObject() 
     {
-        if($this->model) {
-            $model = $this->model;
-            if($model->getWorkflow()) {
-                return $model->getWorkflow();
-            }
-        }
-
-        return null;
+        return $this->workflow;
     }
 
     /**  
@@ -491,7 +512,7 @@ class ONU
     {
         $this->currentState = null;
         
-        $workflow = $this->getWorkflowObject();
+        $workflow = $this->getWorkflow();
 
         if($workflow) {
             $this->currentState = $workflow->getInitialPlace($this);
@@ -513,7 +534,19 @@ class ONU
     public function getServiceWorkflow() {
         global $kernel;
         $registry = $kernel->getContainer()->get('workflow.registry');
-        $workflow = $registry->get($this,$this->getWorkflow());
+
+        $workflow_name = null;
+        $workflow = $this->getWorkflow();
+        if($workflow) {
+            $workflow_name = $workflow->getName();
+        }
+
+        try {
+            $workflow = $registry->get($this,$workflow_name);
+        } catch (ExceptionInterface $e) {
+            $kernel->getContainer()->get('session')->getFlashBag()->add('danger', $kernel->getContainer()->get('translator')->trans('Incorrect Workflow',array(),'FTTHBundle'));
+            return null;
+        }
 
         return $workflow;
     }

src/FTTHBundle/Entity/ONUModel.php

@@ -36,12 +36,6 @@ class ONUModel
      */
     protected $onus;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="\WorkflowBundle\Entity\Workflow", fetch="EXTRA_LAZY")
-     * @ORM\JoinColumn(name="workflow_id", referencedColumnName="id", onDelete="SET NULL")
-     */
-    protected $workflow;
-
     /**
      * @return string
      */
@@ -80,24 +74,5 @@ class ONUModel
         return $this->name;
     }
 
-    /**
-     * @return ONUModel
-     */
-    public function getWorkflow()
-    {
-        return $this->workflow;
-    }
-
-    /**
-     * @param Workflow $workflow
-     * @return $this
-     */
-    public function setWorkflow($workflow)
-    {
-        $this->workflow = $workflow;
-        
-        return $this;
-    }
-    
 }
 

src/FTTHBundle/Resources/config/services.yml

@@ -31,14 +31,6 @@ services:
         calls:    
             - [setTranslationDomain, [FTTHBundle]]
 
-    ftth.admin.node:
-        class: FTTHBundle\Admin\NodeAdmin
-        arguments: [~, FTTHBundle\Entity\Node, SonataAdminBundle:CRUD]
-        tags:
-            - { name: sonata.admin, manager_type: orm, group: FTTH, label: Node, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
-            - [setTranslationDomain, [FTTHBundle]]
-
     ftth.admin.profile:
         class: FTTHBundle\Admin\ProfileAdmin
         arguments: [~, FTTHBundle\Entity\Profile, SonataAdminBundle:CRUD]
@@ -46,3 +38,11 @@ services:
             - { name: sonata.admin, manager_type: orm, group: FTTH, label: Profile, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
         calls:    
             - [setTranslationDomain, [FTTHBundle]]
+
+    ftth.admin.nap:
+        class: FTTHBundle\Admin\NAPAdmin
+        arguments: [~, FTTHBundle\Entity\NAP, SonataAdminBundle:CRUD]
+        tags:
+            - { name: sonata.admin, manager_type: orm, group: FTTH, label: NAP, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+        calls:    
+            - [setTranslationDomain, [FTTHBundle]]

src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

@@ -3,8 +3,9 @@ ONU: ONU
 OLT: OLT
 OLTModel: Modelo OLT
 ONUModel: Modelo ONU
-Node: Nodo
+NAP: NAP
 Profile: Perfil
+
 filter:
     label_id: Id
     label_ip: Ip
@@ -27,13 +28,14 @@ filter:
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
     label_model: Modelo
-    label_node: Nodo
     label_profile: Perfil
     label_upload: Upload
     label_download: Download
     label_workflow: Workflow
     label_log: Log
     label_model_workflow: Workflow
+    label_props: Propiedades
+    label_nap: NAP
 breadcrumb:
     link_o_n_u_list: Listado ONU
     link_o_n_u_create: Crear ONU
@@ -47,12 +49,13 @@ breadcrumb:
     link_o_n_u_model_list: Listado Modelo ONU
     link_o_n_u_model_create: Crear Modelo ONU
     link_o_n_u_model_delete: Eliminar Modelo ONU
-    link_node_list: Listado Nodos
-    link_node_create: Crear Nodo
-    link_node_delete: Eliminar Nodo
+    link_n_a_p_list: Listado NAP
+    link_n_a_p_create: Crear NAP
+    link_n_a_p_delete: Eliminar NAP
     link_profile_list: Listado Perfiles
     link_profile_create: Crear Perfil
     link_profile_delete: Eliminar Perfil
+    
 form:
     label_id: Id
     label_ip: Ip
@@ -75,13 +78,15 @@ form:
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
     label_model: Modelo
-    label_node: Nodo
     label_profile: Perfil
     label_upload: Upload
     label_download: Download
     label_workflow: Workflow
     label_log: Log
     label_model_workflow: Workflow
+    label_props: Propiedades
+    label_parent: Padre
+    label_nap: NAP
 list:
     label_id: Id
     label_ip: Ip
@@ -104,13 +109,16 @@ list:
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
     label_model: Modelo
-    label_node: Nodo
     label_profile: Perfil
     label_upload: Upload
     label_download: Download
     label_workflow: Workflow
     label_log: Log
     label_model_workflow: Workflow
+    label_props: Propiedades
+    label_parent: Padre
+    label_nap: NAP
+    label_onus: ONUs
 show:
     label_id: Id
     label_ip: Ip
@@ -133,13 +141,17 @@ show:
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
     label_model: Modelo
-    label_node: Nodo
     label_profile: Perfil
     label_upload: Upload
     label_download: Download
     label_workflow: Workflow
     label_log: Log
     label_model_workflow: Workflow
+    label_props: Propiedades
+    label_parent: Padre
+    label_nap: NAP
+    label_onus: ONUs
 Incorrect State: Estado erróneo
 Undefined State: Estado no definido
-Undefined Workflow: Workflow no definido
+Undefined Workflow: Workflow no definido
+Incorrect Workflow: El workflow no existe o no es compatible con este objeto

var/SymfonyRequirements.php

@@ -780,11 +780,7 @@ class SymfonyRequirements extends RequirementCollection
     {
         $size = ini_get('realpath_cache_size');
         $size = trim($size);
-        $unit = '';
-        if (!ctype_digit($size)) {
-            $unit = strtolower(substr($size, -1, 1));
-            $size = (int) substr($size, 0, -1);
-        }
+        $unit = strtolower(substr($size, -1, 1));
         switch ($unit) {
             case 'g':
                 return $size * 1024 * 1024 * 1024;

web/config.php

@@ -270,7 +270,7 @@ $hasMinorProblems = (bool) count($minorProblems);
             }
             .sf-reset ul a,
             .sf-reset ul a:hover {
-                background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAICAYAAAAx8TU7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFdJREFUeNpiYACBjjOhDEiACSggCKTLgXQ5TJARqhIkcReIKxgqTGYxwvV0nDEGkmeAOIwJySiQ4HsgvseIpGo3ELsCtZ9lRDIvDCiwhwHJPEFkJwEEGACq6hdnax8y1AAAAABJRU5ErkJggg==) no-repeat right 7px;
+                background: url(../images/blue-arrow.png) no-repeat right 6px;
                 padding-right: 10px;
             }
             .sf-reset ul, ol {