Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:14:39 +0000 (10:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:14:39 +0000 (10:14 +0200)
1  2 
tine20/Tinebase/Config.php
tine20/composer.lock

@@@ -373,12 -373,12 +373,12 @@@ class Tinebase_Config extends Tinebase_
      /**
       * maintenance mode
       *
-      * @var bool
+      * @var string
       */
      const MAINTENANCE_MODE = 'maintenanceMode';
  
      /**
-      * @var array of strings
+      * @var string
       */
      const FAT_CLIENT_CUSTOM_JS = 'fatClientCustomJS';
      
      const BRANDING_DESCRIPTION = 'branding_description';
  
      /**
+      * @var string
+      */
+     const USE_LOGINNAME_AS_FOLDERNAME = 'useLoginnameAsFoldername';
+     /**
+      * @var string
+      */
+     const VERSION_CHECK = 'versionCheck';
+     /**
       * (non-PHPdoc)
       * @see tine20/Tinebase/Config/Definition::$_properties
       */
                  ),
              ),
              'default'               => array(
 -                self::FEATURE_SHOW_ADVANCED_SEARCH  => false,
 -                self::FEATURE_CONTAINER_CUSTOM_SORT => false,
 -                self::FEATURE_SHOW_ACCOUNT_EMAIL => false,
 +                self::FEATURE_SHOW_ADVANCED_SEARCH  => true,
 +                self::FEATURE_CONTAINER_CUSTOM_SORT => true,
 +                self::FEATURE_SHOW_ACCOUNT_EMAIL    => true,
                  self::FEATURE_REMEMBER_POPUP_SIZE   => true,
              ),
          ),
              'setByAdminModule'      => TRUE,
              'setBySetupModule'      => TRUE,
          ),
+         self::VERSION_CHECK => array(
+             //_('Version check enabled')
+             'label'                 => 'Version check enabled',
+             'description'           => 'Version check enabled',
+             'type'                  => 'bool',
+             'default'               => true,
+             'clientRegistryInclude' => true,
+             'setByAdminModule'      => false,
+             'setBySetupModule'      => false,
+         ),
          self::FAT_CLIENT_CUSTOM_JS => array(
              // NOTE: it's possible to deliver customjs vom vfs by using the tine20:// streamwrapper
              //       tine20://<applicationid>/folders/shared/<containerid>/custom.js
                  'setByAdminModule'      => FALSE,
                  'setBySetupModule'      => FALSE,
          ),
+         self::USE_LOGINNAME_AS_FOLDERNAME => array(
+         //_('Use login name instead of full name')
+             'label'                 => 'Use login name instead of full name',
+         //_('Use login name instead of full name for webdav.')
+             'description'           => 'Use login name instead of full name for webdav.',
+             'type'                  => 'bool',
+             'clientRegistryInclude' => FALSE,
+             'setByAdminModule'      => FALSE,
+             'setBySetupModule'      => FALSE,
+             'default'               => FALSE,
+         ),
      );
      
      /**
diff --combined tine20/composer.lock
@@@ -4,10 -4,61 +4,10 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
          "This file is @generated automatically"
      ],
 -    "hash": "9e806405c526ac27d9109817bedafc15",
 -    "content-hash": "73ab7c882ce6beb2ce883c4fd3acd5ff",
 +    "hash": "b9e525a47efd81f738804919fc63cc00",
 +    "content-hash": "31d0ca0bacde0bcc74b23043535be536",
      "packages": [
          {
 -            "name": "codeplex/phpexcel",
 -            "version": "1.7.8",
 -            "source": {
 -                "type": "git",
 -                "url": "https://github.com/markushausammann/PHPExcel.git",
 -                "reference": "6236b1e1513dda38a68a5ac22bbab5fc2b7942fd"
 -            },
 -            "dist": {
 -                "type": "zip",
 -                "url": "https://api.github.com/repos/markushausammann/PHPExcel/zipball/6236b1e1513dda38a68a5ac22bbab5fc2b7942fd",
 -                "reference": "6236b1e1513dda38a68a5ac22bbab5fc2b7942fd",
 -                "shasum": ""
 -            },
 -            "require": {
 -                "ext-xml": "*",
 -                "php": ">=5.2.0"
 -            },
 -            "type": "library",
 -            "autoload": {
 -                "psr-0": {
 -                    "PHPExcel": ""
 -                }
 -            },
 -            "notification-url": "https://packagist.org/downloads/",
 -            "license": [
 -                "LGPL"
 -            ],
 -            "authors": [
 -                {
 -                    "name": "Maarten Balliauw",
 -                    "homepage": "http://blog.maartenballiauw.be"
 -                },
 -                {
 -                    "name": "Mark Baker"
 -                },
 -                {
 -                    "name": "Erit Tilt"
 -                }
 -            ],
 -            "description": "PHPExcel - OpenXML - Create Excel2007 documents in PHP - Spreadsheet engine",
 -            "homepage": "http://phpexcel.codeplex.com",
 -            "keywords": [
 -                "OpenXML",
 -                "excel",
 -                "php",
 -                "spreadsheet"
 -            ],
 -            "abandoned": "phpoffice/phpexcel",
 -            "time": "2012-11-21 10:55:52"
 -        },
 -        {
              "name": "doctrine/annotations",
              "version": "v1.2.7",
              "source": {
          },
          {
              "name": "doctrine/cache",
 -            "version": "v1.5.4",
 +            "version": "v1.6.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/doctrine/cache.git",
 -                "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136"
 +                "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136",
 -                "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136",
 +                "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
 +                "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
                  "shasum": ""
              },
              "require": {
 -                "php": ">=5.3.2"
 +                "php": "~5.5|~7.0"
              },
              "conflict": {
                  "doctrine/common": ">2.2,<2.4"
              },
              "require-dev": {
 -                "phpunit/phpunit": ">=3.7",
 +                "phpunit/phpunit": "~4.8|~5.0",
                  "predis/predis": "~1.0",
                  "satooshi/php-coveralls": "~0.6"
              },
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "1.5.x-dev"
 +                    "dev-master": "1.6.x-dev"
                  }
              },
              "autoload": {
                  "cache",
                  "caching"
              ],
 -            "time": "2015-12-19 05:03:47"
 +            "time": "2015-12-31 16:37:02"
          },
          {
              "name": "doctrine/collections",
          },
          {
              "name": "doctrine/common",
 -            "version": "v2.5.3",
 +            "version": "v2.6.1",
              "source": {
                  "type": "git",
                  "url": "https://github.com/doctrine/common.git",
 -                "reference": "10f1f19651343f87573129ca970aef1a47a6f29e"
 +                "reference": "a579557bc689580c19fee4e27487a67fe60defc0"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/doctrine/common/zipball/10f1f19651343f87573129ca970aef1a47a6f29e",
 -                "reference": "10f1f19651343f87573129ca970aef1a47a6f29e",
 +                "url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0",
 +                "reference": "a579557bc689580c19fee4e27487a67fe60defc0",
                  "shasum": ""
              },
              "require": {
                  "doctrine/collections": "1.*",
                  "doctrine/inflector": "1.*",
                  "doctrine/lexer": "1.*",
 -                "php": ">=5.3.2"
 +                "php": "~5.5|~7.0"
              },
              "require-dev": {
 -                "phpunit/phpunit": "~3.7"
 +                "phpunit/phpunit": "~4.8|~5.0"
              },
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "2.5.x-dev"
 +                    "dev-master": "2.7.x-dev"
                  }
              },
              "autoload": {
 -                "psr-0": {
 -                    "Doctrine\\Common\\": "lib/"
 +                "psr-4": {
 +                    "Doctrine\\Common\\": "lib/Doctrine/Common"
                  }
              },
              "notification-url": "https://packagist.org/downloads/",
                  "persistence",
                  "spl"
              ],
 -            "time": "2015-12-25 13:10:16"
 +            "time": "2015-12-25 13:18:31"
          },
          {
              "name": "doctrine/dbal",
                  "type": "zip",
                  "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/6f389f0f25b90d0b495308efcfa073981177f0fd",
                  "reference": "6f389f0f25b90d0b495308efcfa073981177f0fd",
 -                "shasum": ""
 +                "shasum": "0038c5991b6c56df465e1e47cbedcd8eb529d15e"
              },
              "require": {
                  "php": ">=5.2"
              "time": "2014-06-02 12:00:27"
          },
          {
 +            "name": "pclzip/pclzip",
 +            "version": "2.8.2",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/ivanlanin/pclzip.git",
 +                "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/ivanlanin/pclzip/zipball/19dd1de9d3f5fc4d7d70175b4c344dee329f45fd",
 +                "reference": "19dd1de9d3f5fc4d7d70175b4c344dee329f45fd",
 +                "shasum": ""
 +            },
 +            "type": "library",
 +            "autoload": {
 +                "classmap": [
 +                    "pclzip.lib.php"
 +                ]
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "LGPL-2.1"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Vincent Blavet"
 +                }
 +            ],
 +            "description": "A PHP library that offers compression and extraction functions for Zip formatted archives",
 +            "homepage": "http://www.phpconcept.net/pclzip",
 +            "keywords": [
 +                "php",
 +                "zip"
 +            ],
 +            "time": "2014-06-05 11:42:24"
 +        },
 +        {
 +            "name": "phpoffice/common",
 +            "version": "v0.2.6",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/PHPOffice/Common.git",
 +                "reference": "c9be70c80637c28c728be78e66aad4878a34f8dd"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/PHPOffice/Common/zipball/c9be70c80637c28c728be78e66aad4878a34f8dd",
 +                "reference": "c9be70c80637c28c728be78e66aad4878a34f8dd",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "pclzip/pclzip": "^2.8",
 +                "php": ">=5.3.0"
 +            },
 +            "require-dev": {
 +                "phpdocumentor/phpdocumentor": "2.*",
 +                "phploc/phploc": "2.*",
 +                "phpmd/phpmd": "2.*",
 +                "phpunit/phpunit": "3.7.*",
 +                "sebastian/phpcpd": "2.*",
 +                "squizlabs/php_codesniffer": "2.*"
 +            },
 +            "type": "library",
 +            "autoload": {
 +                "psr-4": {
 +                    "PhpOffice\\Common\\": "src/Common/"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "LGPL"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Mark Baker"
 +                },
 +                {
 +                    "name": "Franck Lefevre",
 +                    "homepage": "http://rootslabs.net"
 +                }
 +            ],
 +            "description": "PHPOffice Common",
 +            "homepage": "http://phpoffice.github.io",
 +            "keywords": [
 +                "common",
 +                "component",
 +                "office",
 +                "php"
 +            ],
 +            "time": "2016-07-07 17:26:55"
 +        },
 +        {
 +            "name": "phpoffice/phpexcel",
 +            "version": "1.8.1",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/PHPOffice/PHPExcel.git",
 +                "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
 +                "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "ext-xml": "*",
 +                "ext-xmlwriter": "*",
 +                "php": ">=5.2.0"
 +            },
 +            "type": "library",
 +            "autoload": {
 +                "psr-0": {
 +                    "PHPExcel": "Classes/"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "LGPL"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Maarten Balliauw",
 +                    "homepage": "http://blog.maartenballiauw.be"
 +                },
 +                {
 +                    "name": "Mark Baker"
 +                },
 +                {
 +                    "name": "Franck Lefevre",
 +                    "homepage": "http://blog.rootslabs.net"
 +                },
 +                {
 +                    "name": "Erik Tilt"
 +                }
 +            ],
 +            "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
 +            "homepage": "http://phpexcel.codeplex.com",
 +            "keywords": [
 +                "OpenXML",
 +                "excel",
 +                "php",
 +                "spreadsheet",
 +                "xls",
 +                "xlsx"
 +            ],
 +            "time": "2015-05-01 07:00:55"
 +        },
 +        {
              "name": "phpoffice/phpword",
 -            "version": "v0.12.1",
 +            "version": "v0.13.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/PHPOffice/PHPWord.git",
 -                "reference": "38cb04d322007dd522cbdd8ba3cd50ab67ced0db"
 +                "reference": "0a3f873972defb304de4fa2f5f53156558c11a7a"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/38cb04d322007dd522cbdd8ba3cd50ab67ced0db",
 -                "reference": "38cb04d322007dd522cbdd8ba3cd50ab67ced0db",
 +                "url": "https://api.github.com/repos/PHPOffice/PHPWord/zipball/0a3f873972defb304de4fa2f5f53156558c11a7a",
 +                "reference": "0a3f873972defb304de4fa2f5f53156558c11a7a",
                  "shasum": ""
              },
              "require": {
                  "ext-xml": "*",
 -                "php": ">=5.3.3"
 +                "php": ">=5.3.3",
 +                "phpoffice/common": "0.2.*",
 +                "zendframework/zend-escaper": "2.4.*",
 +                "zendframework/zend-stdlib": "2.4.*",
 +                "zendframework/zend-validator": "2.4.*"
              },
              "require-dev": {
                  "dompdf/dompdf": "0.6.*",
                  "phploc/phploc": "2.*",
                  "phpmd/phpmd": "2.*",
                  "phpunit/phpunit": "3.7.*",
 -                "sebastian/phpcpd": "2.*",
                  "squizlabs/php_codesniffer": "1.*",
 -                "tecnick.com/tcpdf": "6.*"
 +                "tecnickcom/tcpdf": "6.*"
              },
              "suggest": {
 -                "dompdf/dompdf": "Used to write PDF",
 -                "ext-gd2": "Used to add images",
 -                "ext-xmlwriter": "Used to write DOCX and ODT",
 -                "ext-xsl": "Used to apply XSL style sheet to main document part of OOXML template",
 -                "ext-zip": "Used to write DOCX and ODT"
 +                "dompdf/dompdf": "Allows writing PDF",
 +                "ext-gd2": "Allows adding images",
 +                "ext-xmlwriter": "Allows writing OOXML and ODF",
 +                "ext-xsl": "Allows applying XSL style sheet to headers, to main document part, and to footers of an OOXML template",
 +                "ext-zip": "Allows writing OOXML and ODF"
              },
              "type": "library",
              "autoload": {
                      "homepage": "http://ru.linkedin.com/pub/roman-syroeshko/34/a53/994/"
                  }
              ],
 -            "description": "PHPWord - A pure PHP library for reading and writing word processing documents (DOCX, ODT, RTF, HTML, PDF)",
 +            "description": "PHPWord - A pure PHP library for reading and writing word processing documents (OOXML, ODF, RTF, HTML, PDF)",
              "homepage": "http://phpoffice.github.io",
              "keywords": [
                  "ISO IEC 29500",
                  "doc",
                  "docx",
                  "html",
 +                "odf",
                  "odt",
                  "office",
                  "pdf",
                  "word",
                  "writer"
              ],
 -            "time": "2015-08-30 14:30:44"
 +            "time": "2016-07-31 08:53:39"
          },
          {
              "name": "sabre/dav",
                  "type": "zip",
                  "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/961546d71c332ab34ad1c5bba7f372c08b388dcf",
                  "reference": "961546d71c332ab34ad1c5bba7f372c08b388dcf",
 -                "shasum": ""
 +                "shasum": "48bc39b88cb0ebaa070553c3233914bd12e290b9"
              },
              "require": {
                  "ext-mbstring": "*",
          },
          {
              "name": "symfony/console",
 -            "version": "v2.8.2",
 +            "version": "v3.1.2",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/console.git",
 -                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d"
 +                "reference": "747154aa69b0f83cd02fc9aa554836dee417631a"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/console/zipball/d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
 -                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
 +                "url": "https://api.github.com/repos/symfony/console/zipball/747154aa69b0f83cd02fc9aa554836dee417631a",
 +                "reference": "747154aa69b0f83cd02fc9aa554836dee417631a",
                  "shasum": ""
              },
              "require": {
 -                "php": ">=5.3.9",
 +                "php": ">=5.5.9",
                  "symfony/polyfill-mbstring": "~1.0"
              },
              "require-dev": {
                  "psr/log": "~1.0",
 -                "symfony/event-dispatcher": "~2.1|~3.0.0",
 -                "symfony/process": "~2.1|~3.0.0"
 +                "symfony/event-dispatcher": "~2.8|~3.0",
 +                "symfony/process": "~2.8|~3.0"
              },
              "suggest": {
                  "psr/log": "For using the console logger",
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "2.8-dev"
 +                    "dev-master": "3.1-dev"
                  }
              },
              "autoload": {
              ],
              "description": "Symfony Console Component",
              "homepage": "https://symfony.com",
 -            "time": "2016-01-14 08:33:16"
 +            "time": "2016-06-29 07:02:31"
          },
          {
              "name": "symfony/polyfill-mbstring",
 -            "version": "v1.0.1",
 +            "version": "v1.2.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/polyfill-mbstring.git",
 -                "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25"
 +                "reference": "dff51f72b0706335131b00a7f49606168c582594"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25",
 -                "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
 +                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
 +                "reference": "dff51f72b0706335131b00a7f49606168c582594",
                  "shasum": ""
              },
              "require": {
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "1.0-dev"
 +                    "dev-master": "1.2-dev"
                  }
              },
              "autoload": {
                  "portable",
                  "shim"
              ],
 -            "time": "2015-11-20 09:19:13"
 +            "time": "2016-05-18 14:26:46"
          },
          {
              "name": "syncroton/syncroton",
-             "version": "1.2.1",
+             "version": "1.2.2",
              "source": {
                  "type": "git",
                  "url": "http://git.syncroton.org/Syncroton",
-                 "reference": "31d151de7cba6fa95ffd34efffd85444ccab0b2d"
+                 "reference": "05ff4ef7b67d7ad92ca21a8b086c5e92e090a365"
              },
              "require": {
                  "php": ">=5.3.0",
          },
          {
              "name": "tine20/composerapploader",
 -            "version": "dev-master",
 +            "version": "1.0.0",
              "source": {
                  "type": "git",
                  "url": "http://git.tine20.org/git/composerapploader",
 -                "reference": "b9e480b6c26f6556ca742e96badfeb1ebd59ecb7"
 +                "reference": "8465fcaa278fb2e10917bd7de71db945300f063d"
              },
              "require": {
                  "composer-plugin-api": ">=1.0.0"
                      "Tine20\\ComposerAppLoader\\": "src/"
                  }
              },
 -            "time": "2016-07-14 11:55:28"
 +            "time": "2016-09-02 09:26:20"
          },
          {
              "name": "zendframework/zend-escaper",
 -            "version": "2.2.10",
 +            "version": "2.4.10",
              "source": {
                  "type": "git",
                  "url": "https://github.com/zendframework/zend-escaper.git",
 -                "reference": "232249785a19b982d86e502d161c90ce13202eed"
 +                "reference": "13f468ff824f3c83018b90aff892a1b3201383a9"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/232249785a19b982d86e502d161c90ce13202eed",
 -                "reference": "232249785a19b982d86e502d161c90ce13202eed",
 +                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/13f468ff824f3c83018b90aff892a1b3201383a9",
 +                "reference": "13f468ff824f3c83018b90aff892a1b3201383a9",
                  "shasum": ""
              },
              "require": {
 -                "php": ">=5.3.3"
 +                "php": ">=5.3.23"
              },
              "require-dev": {
                  "fabpot/php-cs-fixer": "1.7.*",
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "2.2-dev",
 -                    "dev-develop": "2.3-dev"
 +                    "dev-master": "2.4-dev",
 +                    "dev-develop": "2.5-dev"
                  }
              },
              "autoload": {
                  "escaper",
                  "zf2"
              ],
 -            "time": "2014-03-05 17:29:35"
 +            "time": "2015-05-07 14:55:31"
          },
          {
              "name": "zendframework/zend-http",
 -            "version": "2.2.8-p3",
 -            "target-dir": "Zend/Http",
 +            "version": "2.4.10",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/lkneschke/Component_ZendHttp",
 -                "reference": "3a18baa98c6afd5b10c81c90489ad67876ee11cc"
 +                "url": "https://github.com/zendframework/zend-http.git",
 +                "reference": "0456267c3825f3c4b558460e0bffeb4c496e6fb8"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/0456267c3825f3c4b558460e0bffeb4c496e6fb8",
 +                "reference": "0456267c3825f3c4b558460e0bffeb4c496e6fb8",
 +                "shasum": ""
              },
              "require": {
 -                "php": ">=5.3.3",
 -                "zendframework/zend-loader": "2.2.*",
 -                "zendframework/zend-stdlib": "2.2.*",
 -                "zendframework/zend-uri": "2.2.*",
 -                "zendframework/zend-validator": "2.2.*"
 +                "php": ">=5.3.23",
 +                "zendframework/zend-loader": "~2.4.0",
 +                "zendframework/zend-stdlib": "~2.4.0",
 +                "zendframework/zend-uri": "~2.4.0",
 +                "zendframework/zend-validator": "~2.4.0"
 +            },
 +            "require-dev": {
 +                "fabpot/php-cs-fixer": "1.7.*",
 +                "phpunit/phpunit": "~4.0",
 +                "satooshi/php-coveralls": "dev-master",
 +                "zendframework/zend-config": "~2.4.0"
              },
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "2.2-dev",
 -                    "dev-develop": "2.3-dev"
 +                    "dev-master": "2.4-dev",
 +                    "dev-develop": "2.5-dev"
                  }
              },
              "autoload": {
 -                "psr-0": {
 -                    "Zend\\Http\\": ""
 +                "psr-4": {
 +                    "Zend\\Http\\": "src/"
                  }
              },
 +            "notification-url": "https://packagist.org/downloads/",
              "license": [
                  "BSD-3-Clause"
              ],
              "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
 +            "homepage": "https://github.com/zendframework/zend-http",
              "keywords": [
                  "http",
                  "zf2"
              ],
 -            "time": "2014-11-17 08:32:22"
 +            "time": "2015-09-14 16:11:20"
          },
          {
              "name": "zendframework/zend-loader",
 -            "version": "2.2.10",
 +            "version": "2.4.10",
              "source": {
                  "type": "git",
                  "url": "https://github.com/zendframework/zend-loader.git",
 -                "reference": "8d7131b6c063251f99772eab2eba44573497dc25"
 +                "reference": "5e62c44a4d23c4e09d35fcc2a3b109c944dbdc22"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/8d7131b6c063251f99772eab2eba44573497dc25",
 -                "reference": "8d7131b6c063251f99772eab2eba44573497dc25",
 +                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/5e62c44a4d23c4e09d35fcc2a3b109c944dbdc22",
 +                "reference": "5e62c44a4d23c4e09d35fcc2a3b109c944dbdc22",
                  "shasum": ""
              },
              "require": {
 -                "php": ">=5.3.3"
 +                "php": ">=5.3.23"
              },
              "require-dev": {
                  "fabpot/php-cs-fixer": "1.7.*",
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "2.2-dev",
 -                    "dev-develop": "2.3-dev"
 +                    "dev-master": "2.4-dev",
 +                    "dev-develop": "2.5-dev"
                  }
              },
              "autoload": {
                  "loader",
                  "zf2"
              ],
 -            "time": "2014-03-06 17:27:03"
 +            "time": "2015-05-07 14:55:31"
          },
          {
              "name": "zendframework/zend-stdlib",
 -            "version": "2.2.10",
 +            "version": "2.4.10",
              "source": {
                  "type": "git",
                  "url": "https://github.com/zendframework/zend-stdlib.git",
 -                "reference": "b42d784bd142e916058a9d68eeafcc10ff63c12e"
 +                "reference": "d8ecb629a72da9f91bd95c5af006384823560b42"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/b42d784bd142e916058a9d68eeafcc10ff63c12e",
 -                "reference": "b42d784bd142e916058a9d68eeafcc10ff63c12e",
 +                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/d8ecb629a72da9f91bd95c5af006384823560b42",
 +                "reference": "d8ecb629a72da9f91bd95c5af006384823560b42",
                  "shasum": ""
              },
              "require": {
 -                "php": ">=5.3.3"
 +                "php": ">=5.3.23"
              },
              "require-dev": {
                  "fabpot/php-cs-fixer": "1.7.*",
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "2.2-dev",
 -                    "dev-develop": "2.3-dev"
 +                    "dev-master": "2.4-dev",
 +                    "dev-develop": "2.5-dev"
                  }
              },
              "autoload": {
                  "stdlib",
                  "zf2"
              ],
 -            "time": "2014-03-05 17:29:35"
 +            "time": "2015-07-21 13:55:46"
          },
          {
              "name": "zendframework/zend-uri",
 -            "version": "2.2.10",
 +            "version": "2.4.10",
              "source": {
                  "type": "git",
                  "url": "https://github.com/zendframework/zend-uri.git",
 -                "reference": "ee7412a16ddd59d3f0935dfb6f09a889b7d1b561"
 +                "reference": "33512866d20cc4bc54a0c1a6a0bdfcf5088939b3"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/ee7412a16ddd59d3f0935dfb6f09a889b7d1b561",
 -                "reference": "ee7412a16ddd59d3f0935dfb6f09a889b7d1b561",
 +                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/33512866d20cc4bc54a0c1a6a0bdfcf5088939b3",
 +                "reference": "33512866d20cc4bc54a0c1a6a0bdfcf5088939b3",
                  "shasum": ""
              },
              "require": {
 -                "php": ">=5.3.3",
 -                "zendframework/zend-escaper": "self.version",
 -                "zendframework/zend-validator": "self.version"
 +                "php": ">=5.3.23",
 +                "zendframework/zend-escaper": "~2.4.0",
 +                "zendframework/zend-validator": "~2.4.0"
              },
              "require-dev": {
                  "fabpot/php-cs-fixer": "1.7.*",
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "2.2-dev",
 -                    "dev-develop": "2.3-dev"
 +                    "dev-master": "2.4-dev",
 +                    "dev-develop": "2.5-dev"
                  }
              },
              "autoload": {
                  "uri",
                  "zf2"
              ],
 -            "time": "2014-03-05 17:29:35"
 +            "time": "2015-09-14 16:17:10"
          },
          {
              "name": "zendframework/zend-validator",
 -            "version": "2.2.10",
 +            "version": "2.4.10",
              "source": {
                  "type": "git",
                  "url": "https://github.com/zendframework/zend-validator.git",
 -                "reference": "6c5637d535bc2cdaa5c85467490bfb17744c13e6"
 +                "reference": "81415511fe729e6de19a61936313cef43c80d337"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/6c5637d535bc2cdaa5c85467490bfb17744c13e6",
 -                "reference": "6c5637d535bc2cdaa5c85467490bfb17744c13e6",
 +                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/81415511fe729e6de19a61936313cef43c80d337",
 +                "reference": "81415511fe729e6de19a61936313cef43c80d337",
                  "shasum": ""
              },
              "require": {
 -                "php": ">=5.3.3",
 -                "zendframework/zend-stdlib": "self.version"
 +                "php": ">=5.3.23",
 +                "zendframework/zend-stdlib": "~2.4.0"
              },
              "require-dev": {
                  "fabpot/php-cs-fixer": "1.7.*",
                  "phpunit/phpunit": "~4.0",
                  "satooshi/php-coveralls": "dev-master",
 -                "zendframework/zend-db": "self.version",
 -                "zendframework/zend-filter": "self.version",
 -                "zendframework/zend-i18n": "self.version",
 -                "zendframework/zend-math": "self.version",
 -                "zendframework/zend-servicemanager": "self.version",
 -                "zendframework/zend-session": "self.version",
 -                "zendframework/zend-uri": "self.version"
 +                "zendframework/zend-config": "~2.4.0",
 +                "zendframework/zend-db": "~2.4.0",
 +                "zendframework/zend-filter": "~2.4.0",
 +                "zendframework/zend-i18n": "~2.4.0",
 +                "zendframework/zend-math": "~2.4.0",
 +                "zendframework/zend-servicemanager": "~2.4.0",
 +                "zendframework/zend-session": "~2.4.0",
 +                "zendframework/zend-uri": "~2.4.0"
              },
              "suggest": {
                  "zendframework/zend-db": "Zend\\Db component",
              "type": "library",
              "extra": {
                  "branch-alias": {
 -                    "dev-master": "2.2-dev",
 -                    "dev-develop": "2.3-dev"
 +                    "dev-master": "2.4-dev",
 +                    "dev-develop": "2.5-dev"
                  }
              },
              "autoload": {
                  "validator",
                  "zf2"
              ],
 -            "time": "2014-03-05 17:29:35"
 +            "time": "2015-09-08 21:04:17"
          },
          {
              "name": "zendframework/zendframework1",
 -            "version": "1.12.17",
 +            "version": "1.12.20pl1",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/zendframework/zf1.git",
 -                "reference": "9f0bbc8b626bf35030afd766d9a7e506864e8e0b"
 -            },
 -            "dist": {
 -                "type": "zip",
 -                "url": "https://api.github.com/repos/zendframework/zf1/zipball/9f0bbc8b626bf35030afd766d9a7e506864e8e0b",
 -                "reference": "9f0bbc8b626bf35030afd766d9a7e506864e8e0b",
 -                "shasum": ""
 +                "url": "http://git.tine20.org/git/zendframework1",
 +                "reference": "692f69fb10b40f2ecaf27d80d0381a3e1669c148"
              },
              "require": {
 -                "php": ">=5.2.11"
 -            },
 -            "require-dev": {
 -                "phpunit/dbunit": "1.3.*",
 -                "phpunit/phpunit": "3.7.*"
 -            },
 -            "type": "library",
 -            "extra": {
 -                "branch-alias": {
 -                    "dev-master": "1.12.x-dev"
 -                }
 +                "php": ">=5.3.0"
              },
 +            "type": "project",
              "autoload": {
                  "psr-0": {
 -                    "Zend_": "library/"
 +                    "Zend_": [
 +                        "library/"
 +                    ]
                  }
              },
 -            "notification-url": "https://packagist.org/downloads/",
 -            "include-path": [
 -                "library/"
 -            ],
              "license": [
 -                "BSD-3-Clause"
 -            ],
 -            "description": "Zend Framework 1",
 -            "homepage": "http://framework.zend.com/",
 -            "keywords": [
 -                "ZF1",
 -                "framework"
 +                "New BSD License"
              ],
 -            "time": "2015-11-23 15:11:10"
 +            "description": "Metaways Infosystems GmbH - Patched Zendframework1",
 +            "time": "2016-09-09 10:21:17"
          }
      ],
      "packages-dev": [
          {
              "name": "phing/phing",
 -            "version": "2.6.1-p0",
 +            "version": "2.14.0",
              "source": {
                  "type": "git",
 -                "url": "https://github.com/lkneschke/phing",
 -                "reference": "da55aababac4a49b92fbe19a18b53ef0cec905d6"
 +                "url": "https://github.com/phingofficial/phing.git",
 +                "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/phingofficial/phing/zipball/7dd73c83c377623def54b58121f46b4dcb35dd61",
 +                "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61",
 +                "shasum": ""
              },
              "require": {
                  "php": ">=5.2.0"
              },
 +            "require-dev": {
 +                "ext-pdo_sqlite": "*",
 +                "lastcraft/simpletest": "@dev",
 +                "mikey179/vfsstream": "^1.6",
 +                "pdepend/pdepend": "2.x",
 +                "pear/archive_tar": "1.4.x",
 +                "pear/http_request2": "dev-trunk",
 +                "pear/net_growl": "dev-trunk",
 +                "pear/pear-core-minimal": "1.10.1",
 +                "pear/versioncontrol_git": "@dev",
 +                "pear/versioncontrol_svn": "~0.5",
 +                "phpdocumentor/phpdocumentor": "2.x",
 +                "phploc/phploc": "~2.0.6",
 +                "phpmd/phpmd": "~2.2",
 +                "phpunit/phpunit": ">=3.7",
 +                "sebastian/git": "~1.0",
 +                "sebastian/phpcpd": "2.x",
 +                "squizlabs/php_codesniffer": "~2.2",
 +                "symfony/yaml": "~2.7"
 +            },
 +            "suggest": {
 +                "pdepend/pdepend": "PHP version of JDepend",
 +                "pear/archive_tar": "Tar file management class",
 +                "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository",
 +                "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system",
 +                "phpdocumentor/phpdocumentor": "Documentation Generator for PHP",
 +                "phploc/phploc": "A tool for quickly measuring the size of a PHP project",
 +                "phpmd/phpmd": "PHP version of PMD tool",
 +                "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information",
 +                "phpunit/phpunit": "The PHP Unit Testing Framework",
 +                "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code",
 +                "tedivm/jshrink": "Javascript Minifier built in PHP"
 +            },
              "bin": [
                  "bin/phing"
              ],
              "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "2.14.x-dev"
 +                }
 +            },
              "autoload": {
                  "classmap": [
                      "classes/phing/"
                  ]
              },
 +            "notification-url": "https://packagist.org/downloads/",
              "include-path": [
                  "classes"
              ],
              "license": [
 -                "LGPL3"
 +                "LGPL-3.0"
              ],
              "authors": [
                  {
                  },
                  {
                      "name": "Phing Community",
 -                    "homepage": "http://www.phing.info/trac/wiki/Development/Contributors"
 +                    "homepage": "https://www.phing.info/trac/wiki/Development/Contributors"
                  }
              ],
              "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
 -            "homepage": "http://www.phing.info/",
 +            "homepage": "https://www.phing.info/",
              "keywords": [
                  "build",
 +                "phing",
                  "task",
                  "tool"
              ],
 -            "time": "2013-09-28 05:39:01"
 +            "time": "2016-03-10 21:39:23"
          },
          {
              "name": "phpunit/php-code-coverage",
          },
          {
              "name": "phpunit/php-timer",
 -            "version": "1.0.7",
 +            "version": "1.0.8",
              "source": {
                  "type": "git",
                  "url": "https://github.com/sebastianbergmann/php-timer.git",
 -                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
 +                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
 -                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
 +                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
 +                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
                  "shasum": ""
              },
              "require": {
                  "php": ">=5.3.3"
              },
 +            "require-dev": {
 +                "phpunit/phpunit": "~4|~5"
 +            },
              "type": "library",
              "autoload": {
                  "classmap": [
              "keywords": [
                  "timer"
              ],
 -            "time": "2015-06-21 08:01:12"
 +            "time": "2016-05-12 18:03:57"
          },
          {
              "name": "phpunit/php-token-stream",
                  "type": "zip",
                  "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875",
                  "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875",
 -                "shasum": ""
 +                "shasum": "e2798bcae4e0efe50b6529b0389c7620d61685ed"
              },
              "require": {
                  "php": ">=5.3.3",
          },
          {
              "name": "symfony/yaml",
 -            "version": "v2.8.2",
 +            "version": "v2.8.8",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/yaml.git",
 -                "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8"
 +                "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8"
              },
              "dist": {
                  "type": "zip",
 -                "url": "https://api.github.com/repos/symfony/yaml/zipball/34c8a4b51e751e7ea869b8262f883d008a2b81b8",
 -                "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8",
 +                "url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8",
 +                "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8",
                  "shasum": ""
              },
              "require": {
              ],
              "description": "Symfony Yaml Component",
              "homepage": "https://symfony.com",
 -            "time": "2016-01-13 10:28:07"
 +            "time": "2016-06-29 05:29:29"
 +        },
 +        {
 +            "name": "tedivm/jshrink",
 +            "version": "v1.1.0",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/tedious/JShrink.git",
 +                "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/tedious/JShrink/zipball/688527a2e854d7935f24f24c7d5eb1b604742bf9",
 +                "reference": "688527a2e854d7935f24f24c7d5eb1b604742bf9",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": ">=5.3.0"
 +            },
 +            "require-dev": {
 +                "fabpot/php-cs-fixer": "0.4.0",
 +                "phpunit/phpunit": "4.0.*",
 +                "satooshi/php-coveralls": "dev-master"
 +            },
 +            "type": "library",
 +            "autoload": {
 +                "psr-0": {
 +                    "JShrink": "src/"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "BSD-3-Clause"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Robert Hafner",
 +                    "email": "tedivm@tedivm.com"
 +                }
 +            ],
 +            "description": "Javascript Minifier built in PHP",
 +            "homepage": "http://github.com/tedious/JShrink",
 +            "keywords": [
 +                "javascript",
 +                "minifier"
 +            ],
 +            "time": "2015-07-04 07:35:09"
          }
      ],
      "aliases": [
          {
 +            "alias": "1.12.20",
 +            "alias_normalized": "1.12.20.0",
 +            "version": "1.12.20.0-patch1",
 +            "package": "zendframework/zendframework1"
 +        },
 +        {
              "alias": "2.1.313",
              "alias_normalized": "2.1.313.0",
              "version": "3.1.3.0",
              "package": "sabre/vobject"
 -        },
 -        {
 -            "alias": "2.2.8",
 -            "alias_normalized": "2.2.8.0",
 -            "version": "2.2.8.0-patch3",
 -            "package": "zendframework/zend-http"
          }
      ],
      "minimum-stability": "stable",
 -    "stability-flags": {
 -        "tine20/composerapploader": 20
 -    },
 +    "stability-flags": [],
      "prefer-stable": false,
      "prefer-lowest": false,
      "platform": [],