Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 13:26:15 +0000 (15:26 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 13:26:15 +0000 (15:26 +0200)
Change-Id: Ic2a6cd03dd6fa9a64cfad7ef99d49acb266b1830

1  2 
tine20/composer.lock

                  "sequence",
                  "set"
              ],
 -            "time": "2013-01-23 15:16:14"
 +            "time": "2014-03-11 13:46:42"
          },
          {
-             "name": "phpdocumentor/fileset",
-             "version": "1.0.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/Fileset.git",
-                 "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/Fileset/zipball/bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0",
-                 "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": ">=5.3.3",
-                 "symfony/finder": "~2.1"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "~3.7"
-             },
-             "type": "library",
-             "autoload": {
-                 "psr-0": {
-                     "phpDocumentor": [
-                         "src/",
-                         "tests/unit/"
-                     ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Fileset component for collecting a set of files given directories and file paths",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "files",
-                 "fileset",
-                 "phpdoc"
-             ],
-             "time": "2013-08-06 21:07:42"
-         },
-         {
-             "name": "phpdocumentor/graphviz",
-             "version": "1.0.3",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/GraphViz.git",
-                 "reference": "aa243118c8a055fc853c02802e8503c5435862f7"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/GraphViz/zipball/aa243118c8a055fc853c02802e8503c5435862f7",
-                 "reference": "aa243118c8a055fc853c02802e8503c5435862f7",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": ">=5.3.3"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "~3.7"
-             },
-             "type": "library",
-             "autoload": {
-                 "psr-0": {
-                     "phpDocumentor": [
-                         "src/",
-                         "tests/unit"
-                     ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "authors": [
-                 {
-                     "name": "Mike van Riel",
-                     "email": "mike.vanriel@naenius.com"
-                 }
-             ],
-             "time": "2014-07-19 06:52:59"
-         },
-         {
-             "name": "phpdocumentor/phpdocumentor",
-             "version": "v2.1.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/phpDocumentor2.git",
-                 "reference": "c8ef5f86510b0864ce272efc4917b63c4fbb1849"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor2/zipball/c8ef5f86510b0864ce272efc4917b63c4fbb1849",
-                 "reference": "c8ef5f86510b0864ce272efc4917b63c4fbb1849",
-                 "shasum": ""
-             },
-             "require": {
-                 "cilex/cilex": "~1.0",
-                 "dflydev/markdown": "~1.0",
-                 "jms/serializer": "~0.12",
-                 "monolog/monolog": "~1.6",
-                 "php": ">=5.3.3",
-                 "phpdocumentor/fileset": "~1.0",
-                 "phpdocumentor/graphviz": "~1.0",
-                 "phpdocumentor/reflection": "~1.0",
-                 "phpdocumentor/reflection-docblock": "~2.0",
-                 "phpdocumentor/template-abstract": "~1.2",
-                 "phpdocumentor/template-checkstyle": "~1.2",
-                 "phpdocumentor/template-clean": "~1.0",
-                 "phpdocumentor/template-new-black": "~1.3",
-                 "phpdocumentor/template-old-ocean": "~1.3",
-                 "phpdocumentor/template-responsive": "~1.3",
-                 "phpdocumentor/template-responsive-twig": "~1.2",
-                 "phpdocumentor/template-xml": "~1.0",
-                 "phpdocumentor/template-zend": "~1.3",
-                 "symfony/config": "~2.3",
-                 "symfony/event-dispatcher": "~2.1",
-                 "symfony/stopwatch": "~2.3",
-                 "symfony/validator": "~2.2",
-                 "twig/twig": "~1.3",
-                 "zendframework/zend-cache": "2.*",
-                 "zendframework/zend-config": "2.*",
-                 "zendframework/zend-filter": "2.*",
-                 "zendframework/zend-i18n": "2.*",
-                 "zendframework/zend-serializer": "2.*",
-                 "zendframework/zend-servicemanager": "2.*",
-                 "zendframework/zend-stdlib": "2.*"
-             },
-             "require-dev": {
-                 "behat/behat": "~2.4",
-                 "mikey179/vfsstream": "~1.2",
-                 "mockery/mockery": ">=0.8.0",
-                 "phpunit/phpunit": "~3.7",
-                 "squizlabs/php_codesniffer": "~1.4"
-             },
-             "bin": [
-                 "bin/phpdoc.php"
-             ],
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
-                     "dev-master": "2.1-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-0": {
-                     "phpDocumentor": [
-                         "src/",
-                         "tests/unit/"
-                     ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Documentation Generator for PHP",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "api",
-                 "application",
-                 "dga",
-                 "documentation",
-                 "phpdoc"
-             ],
-             "time": "2013-10-14 17:46:58"
-         },
-         {
-             "name": "phpdocumentor/reflection",
-             "version": "1.0.7",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/Reflection.git",
-                 "reference": "fc40c3f604ac2287eb5c314174d5109b2c699372"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/fc40c3f604ac2287eb5c314174d5109b2c699372",
-                 "reference": "fc40c3f604ac2287eb5c314174d5109b2c699372",
-                 "shasum": ""
-             },
-             "require": {
-                 "nikic/php-parser": "~0.9.4",
-                 "php": ">=5.3.3",
-                 "phpdocumentor/reflection-docblock": "~2.0",
-                 "psr/log": "~1.0"
-             },
-             "require-dev": {
-                 "behat/behat": "~2.4",
-                 "mockery/mockery": "~0.8",
-                 "phpunit/phpunit": "~4.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
-                     "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-0": {
-                     "phpDocumentor": [
-                         "src/",
-                         "tests/unit/",
-                         "tests/mocks/"
-                     ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Reflection library to do Static Analysis for PHP Projects",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "phpDocumentor",
-                 "phpdoc",
-                 "reflection",
-                 "static analysis"
-             ],
-             "time": "2014-11-14 11:43:04"
-         },
-         {
-             "name": "phpdocumentor/reflection-docblock",
-             "version": "2.0.4",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                 "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                 "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": ">=5.3.3"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "~4.0"
-             },
-             "suggest": {
-                 "dflydev/markdown": "~1.0",
-                 "erusev/parsedown": "~1.0"
-             },
-             "type": "library",
-             "extra": {
-                 "branch-alias": {
-                     "dev-master": "2.0.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-0": {
-                     "phpDocumentor": [
-                         "src/"
-                     ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "authors": [
-                 {
-                     "name": "Mike van Riel",
-                     "email": "mike.vanriel@naenius.com"
-                 }
-             ],
-             "time": "2015-02-03 12:10:50"
-         },
-         {
-             "name": "phpdocumentor/template-abstract",
-             "version": "1.2.2",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/template.abstract.git",
-                 "reference": "df1d11cf11cf5da433789e2be07f4d2d6e51aaca"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/template.abstract/zipball/df1d11cf11cf5da433789e2be07f4d2d6e51aaca",
-                 "reference": "df1d11cf11cf5da433789e2be07f4d2d6e51aaca",
-                 "shasum": ""
-             },
-             "require": {
-                 "phpdocumentor/unified-asset-installer": "~1.1"
-             },
-             "type": "phpdocumentor-template",
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Simple bright template for phpDocumentor",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "documentation",
-                 "phpdoc",
-                 "template"
-             ],
-             "abandoned": true,
-             "time": "2014-06-04 19:32:56"
-         },
-         {
-             "name": "phpdocumentor/template-checkstyle",
-             "version": "1.2.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/template.checkstyle.git",
-                 "reference": "cfa86d19327b0d762332787ff2dda0d55226a2e2"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/template.checkstyle/zipball/cfa86d19327b0d762332787ff2dda0d55226a2e2",
-                 "reference": "cfa86d19327b0d762332787ff2dda0d55226a2e2",
-                 "shasum": ""
-             },
-             "require": {
-                 "phpdocumentor/unified-asset-installer": "~1.1"
-             },
-             "type": "phpdocumentor-template",
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Checkstyle XML output template for phpDocumentor2",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "documentation",
-                 "phpdoc",
-                 "template"
-             ],
-             "abandoned": true,
-             "time": "2014-08-17 19:32:38"
-         },
-         {
-             "name": "phpdocumentor/template-clean",
-             "version": "1.0.6",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/template.clean.git",
-                 "reference": "6fc0f7f6c55c1f94ac5b1c6fccde7aac77755e45"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/template.clean/zipball/6fc0f7f6c55c1f94ac5b1c6fccde7aac77755e45",
-                 "reference": "6fc0f7f6c55c1f94ac5b1c6fccde7aac77755e45",
-                 "shasum": ""
-             },
-             "require": {
-                 "phpdocumentor/unified-asset-installer": "~1.1"
-             },
-             "type": "phpdocumentor-template",
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "A clean, responsive modern template for phpDocumentor for Twig aimed at usability",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "documentation",
-                 "phpdoc",
-                 "responsive",
-                 "template"
-             ],
-             "abandoned": true,
-             "time": "2014-08-15 21:45:34"
-         },
-         {
-             "name": "phpdocumentor/template-new-black",
-             "version": "1.3.2",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/template.new_black.git",
-                 "reference": "d98f84633b94b279582735aecd91015c1e191d98"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/template.new_black/zipball/d98f84633b94b279582735aecd91015c1e191d98",
-                 "reference": "d98f84633b94b279582735aecd91015c1e191d98",
-                 "shasum": ""
-             },
-             "require": {
-                 "phpdocumentor/template-abstract": "1.*",
-                 "phpdocumentor/unified-asset-installer": "~1.1"
-             },
-             "type": "phpdocumentor-template",
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Web 2.0 template with dark sidebar for phpDocumentor",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "documentation",
-                 "phpdoc",
-                 "template"
-             ],
-             "abandoned": true,
-             "time": "2014-06-27 17:00:31"
-         },
-         {
-             "name": "phpdocumentor/template-old-ocean",
-             "version": "1.3.2",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/template.old_ocean.git",
-                 "reference": "2fdb786038351c0ec88633d4e2aa103e4bbb8655"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/template.old_ocean/zipball/2fdb786038351c0ec88633d4e2aa103e4bbb8655",
-                 "reference": "2fdb786038351c0ec88633d4e2aa103e4bbb8655",
-                 "shasum": ""
-             },
-             "require": {
-                 "phpdocumentor/unified-asset-installer": "~1.1"
-             },
-             "type": "phpdocumentor-template",
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Blue template with high contrast for the foreground",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "documentation",
-                 "phpdoc",
-                 "template"
-             ],
-             "abandoned": true,
-             "time": "2014-06-27 16:59:35"
-         },
-         {
-             "name": "phpdocumentor/template-responsive",
-             "version": "1.3.5",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/template.responsive.git",
-                 "reference": "949e742f350f70fc8ec7c945b3cf0070a4e1825e"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/template.responsive/zipball/949e742f350f70fc8ec7c945b3cf0070a4e1825e",
-                 "reference": "949e742f350f70fc8ec7c945b3cf0070a4e1825e",
-                 "shasum": ""
-             },
-             "require": {
-                 "phpdocumentor/unified-asset-installer": "~1.1"
-             },
-             "type": "phpdocumentor-template",
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Responsive modern template for phpDocumentor",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "documentation",
-                 "phpdoc",
-                 "template"
-             ],
-             "abandoned": true,
-             "time": "2014-08-05 20:47:53"
-         },
-         {
-             "name": "phpdocumentor/template-responsive-twig",
-             "version": "1.2.5",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/template.responsive-twig.git",
-                 "reference": "493e204be607583efd2d75f1728cd5210e23cf96"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/template.responsive-twig/zipball/493e204be607583efd2d75f1728cd5210e23cf96",
-                 "reference": "493e204be607583efd2d75f1728cd5210e23cf96",
-                 "shasum": ""
-             },
-             "require": {
-                 "phpdocumentor/unified-asset-installer": "~1.1"
-             },
-             "type": "phpdocumentor-template",
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Responsive modern template for phpDocumentor for Twig",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "documentation",
-                 "phpdoc",
-                 "template"
-             ],
-             "abandoned": true,
-             "time": "2014-07-30 20:00:37"
-         },
-         {
-             "name": "phpdocumentor/template-xml",
-             "version": "1.2.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/mvriel/template.xml.git",
-                 "reference": "a372713be8ee99b16497e2580592e474ff51190c"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/mvriel/template.xml/zipball/a372713be8ee99b16497e2580592e474ff51190c",
-                 "reference": "a372713be8ee99b16497e2580592e474ff51190c",
-                 "shasum": ""
-             },
-             "require": {
-                 "phpdocumentor/unified-asset-installer": "~1.1"
-             },
-             "type": "phpdocumentor-template",
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Generates an XML representation of the project's structure",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "documentation",
-                 "phpdoc",
-                 "template"
-             ],
-             "abandoned": true,
-             "time": "2013-08-01 20:23:32"
-         },
-         {
-             "name": "phpdocumentor/template-zend",
-             "version": "1.3.2",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/template.zend.git",
-                 "reference": "75913288bfd73d3bf4c1b1179c3963f3431e7a9d"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/template.zend/zipball/75913288bfd73d3bf4c1b1179c3963f3431e7a9d",
-                 "reference": "75913288bfd73d3bf4c1b1179c3963f3431e7a9d",
-                 "shasum": ""
-             },
-             "require": {
-                 "ext-xsl": "*",
-                 "phpdocumentor/template-abstract": "1.*",
-                 "phpdocumentor/unified-asset-installer": "~1.1"
-             },
-             "type": "phpdocumentor-template",
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Official Zend Framework Template for phpDocumentor2",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "ZendFramework",
-                 "documentation",
-                 "phpdoc",
-                 "template",
-                 "zend",
-                 "zf"
-             ],
-             "abandoned": true,
-             "time": "2013-12-05 08:51:57"
-         },
-         {
-             "name": "phpdocumentor/unified-asset-installer",
-             "version": "1.1.2",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/phpDocumentor/UnifiedAssetInstaller.git",
-                 "reference": "241fb036268cd9da7d76da3db66e3eda66259c52"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/phpDocumentor/UnifiedAssetInstaller/zipball/241fb036268cd9da7d76da3db66e3eda66259c52",
-                 "reference": "241fb036268cd9da7d76da3db66e3eda66259c52",
-                 "shasum": ""
-             },
-             "require": {
-                 "composer-plugin-api": "1.0.0"
-             },
-             "require-dev": {
-                 "composer/composer": "~1.0@dev",
-                 "phpunit/phpunit": "~3.7"
-             },
-             "type": "composer-installer",
-             "extra": {
-                 "class": "\\phpDocumentor\\Composer\\UnifiedAssetInstaller"
-             },
-             "autoload": {
-                 "psr-0": {
-                     "phpDocumentor\\Composer": [
-                         "src/",
-                         "test/unit/"
-                     ]
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "license": [
-                 "MIT"
-             ],
-             "description": "Asset installer for phpDocumentor",
-             "homepage": "http://www.phpdoc.org",
-             "keywords": [
-                 "assets",
-                 "installer",
-                 "plugins",
-                 "templates"
-             ],
-             "time": "2013-09-09 06:13:02"
-         },
-         {
              "name": "phpoption/phpoption",
 -            "version": "1.3.0",
 +            "version": "1.5.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/schmittjoh/php-option.git",