#1342 #1343 #1345 #1346 #1349 git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3340 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
parent
27d2713283
commit
652eeb16cb
27 changed files with 994 additions and 204 deletions
246
trunk/composer.lock
generated
246
trunk/composer.lock
generated
|
|
@ -4,8 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "cafcb1290bf2f23646f9d7c96c217f14",
|
||||
"content-hash": "602fab2a074b1ea2fe86866aa42ba50f",
|
||||
"content-hash": "b22f213c1e171369413d747296060a39",
|
||||
"packages": [
|
||||
{
|
||||
"name": "behat/transliterator",
|
||||
|
|
@ -45,7 +44,7 @@
|
|||
"slug",
|
||||
"transliterator"
|
||||
],
|
||||
"time": "2015-09-28 16:26:35"
|
||||
"time": "2015-09-28T16:26:35+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/annotations",
|
||||
|
|
@ -113,7 +112,7 @@
|
|||
"docblock",
|
||||
"parser"
|
||||
],
|
||||
"time": "2016-12-30 15:59:45"
|
||||
"time": "2016-12-30T15:59:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/cache",
|
||||
|
|
@ -183,7 +182,7 @@
|
|||
"cache",
|
||||
"caching"
|
||||
],
|
||||
"time": "2016-10-29 11:16:17"
|
||||
"time": "2016-10-29T11:16:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/collections",
|
||||
|
|
@ -250,7 +249,7 @@
|
|||
"collections",
|
||||
"iterator"
|
||||
],
|
||||
"time": "2017-01-03 10:49:41"
|
||||
"time": "2017-01-03T10:49:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/common",
|
||||
|
|
@ -323,7 +322,7 @@
|
|||
"persistence",
|
||||
"spl"
|
||||
],
|
||||
"time": "2017-01-13 14:02:13"
|
||||
"time": "2017-01-13T14:02:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/dbal",
|
||||
|
|
@ -394,7 +393,7 @@
|
|||
"persistence",
|
||||
"queryobject"
|
||||
],
|
||||
"time": "2017-02-08 12:53:47"
|
||||
"time": "2017-02-08T12:53:47+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/doctrine-bundle",
|
||||
|
|
@ -475,7 +474,7 @@
|
|||
"orm",
|
||||
"persistence"
|
||||
],
|
||||
"time": "2017-01-16 12:01:26"
|
||||
"time": "2017-01-16T12:01:26+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/doctrine-cache-bundle",
|
||||
|
|
@ -563,7 +562,7 @@
|
|||
"cache",
|
||||
"caching"
|
||||
],
|
||||
"time": "2016-01-26 17:28:51"
|
||||
"time": "2016-01-26T17:28:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/doctrine-migrations-bundle",
|
||||
|
|
@ -624,7 +623,7 @@
|
|||
"migrations",
|
||||
"schema"
|
||||
],
|
||||
"time": "2016-12-05 18:36:37"
|
||||
"time": "2016-12-05T18:36:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/inflector",
|
||||
|
|
@ -691,7 +690,7 @@
|
|||
"singularize",
|
||||
"string"
|
||||
],
|
||||
"time": "2015-11-06 14:35:42"
|
||||
"time": "2015-11-06T14:35:42+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/instantiator",
|
||||
|
|
@ -745,7 +744,7 @@
|
|||
"constructor",
|
||||
"instantiate"
|
||||
],
|
||||
"time": "2015-06-14 21:17:01"
|
||||
"time": "2015-06-14T21:17:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/lexer",
|
||||
|
|
@ -799,7 +798,7 @@
|
|||
"lexer",
|
||||
"parser"
|
||||
],
|
||||
"time": "2014-09-09 13:34:57"
|
||||
"time": "2014-09-09T13:34:57+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/migrations",
|
||||
|
|
@ -873,7 +872,7 @@
|
|||
"database",
|
||||
"migrations"
|
||||
],
|
||||
"time": "2016-12-25 22:54:00"
|
||||
"time": "2016-12-25T22:54:00+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/orm",
|
||||
|
|
@ -949,7 +948,7 @@
|
|||
"database",
|
||||
"orm"
|
||||
],
|
||||
"time": "2016-12-18 15:42:34"
|
||||
"time": "2016-12-18T15:42:34+00:00"
|
||||
},
|
||||
{
|
||||
"name": "gedmo/doctrine-extensions",
|
||||
|
|
@ -1028,7 +1027,7 @@
|
|||
"tree",
|
||||
"uploadable"
|
||||
],
|
||||
"time": "2016-12-21 13:46:54"
|
||||
"time": "2016-12-21T13:46:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "incenteev/composer-parameter-handler",
|
||||
|
|
@ -1079,7 +1078,7 @@
|
|||
"keywords": [
|
||||
"parameters management"
|
||||
],
|
||||
"time": "2015-11-10 17:04:01"
|
||||
"time": "2015-11-10T17:04:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "jdorn/sql-formatter",
|
||||
|
|
@ -1129,7 +1128,7 @@
|
|||
"highlight",
|
||||
"sql"
|
||||
],
|
||||
"time": "2014-01-12 16:20:24"
|
||||
"time": "2014-01-12T16:20:24+00:00"
|
||||
},
|
||||
{
|
||||
"name": "kriswallsmith/assetic",
|
||||
|
|
@ -1206,7 +1205,7 @@
|
|||
"compression",
|
||||
"minification"
|
||||
],
|
||||
"time": "2016-11-11 18:43:20"
|
||||
"time": "2016-11-11T18:43:20+00:00"
|
||||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
|
|
@ -1284,7 +1283,7 @@
|
|||
"logging",
|
||||
"psr-3"
|
||||
],
|
||||
"time": "2016-11-26 00:15:39"
|
||||
"time": "2016-11-26T00:15:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "ocramius/package-versions",
|
||||
|
|
@ -1332,7 +1331,7 @@
|
|||
}
|
||||
],
|
||||
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
|
||||
"time": "2016-12-30 09:49:15"
|
||||
"time": "2016-12-30T09:49:15+00:00"
|
||||
},
|
||||
{
|
||||
"name": "ocramius/proxy-manager",
|
||||
|
|
@ -1397,7 +1396,7 @@
|
|||
"proxy pattern",
|
||||
"service proxies"
|
||||
],
|
||||
"time": "2016-11-04 15:53:15"
|
||||
"time": "2016-11-04T15:53:15+00:00"
|
||||
},
|
||||
{
|
||||
"name": "paragonie/random_compat",
|
||||
|
|
@ -1445,31 +1444,7 @@
|
|||
"pseudorandom",
|
||||
"random"
|
||||
],
|
||||
"time": "2016-11-07 23:38:38"
|
||||
},
|
||||
{
|
||||
"name": "pguardiario/phpuri",
|
||||
"version": "1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/monkeysuffrage/phpuri.git",
|
||||
"reference": "ad0a5ec033fe616cfef55578b9c7f2458be8fbfc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/monkeysuffrage/phpuri/zipball/ad0a5ec033fe616cfef55578b9c7f2458be8fbfc",
|
||||
"reference": "ad0a5ec033fe616cfef55578b9c7f2458be8fbfc",
|
||||
"shasum": ""
|
||||
},
|
||||
"type": "project",
|
||||
"autoload": {
|
||||
"files": [
|
||||
"phpuri.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"description": "A php library for converting relative urls to absolute.",
|
||||
"time": "2015-05-24 09:13:17"
|
||||
"time": "2016-11-07T23:38:38+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/cache",
|
||||
|
|
@ -1515,7 +1490,7 @@
|
|||
"psr",
|
||||
"psr-6"
|
||||
],
|
||||
"time": "2016-08-06 20:24:11"
|
||||
"time": "2016-08-06T20:24:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
|
|
@ -1562,7 +1537,7 @@
|
|||
"psr",
|
||||
"psr-3"
|
||||
],
|
||||
"time": "2016-10-10 12:19:37"
|
||||
"time": "2016-10-10T12:19:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sensio/distribution-bundle",
|
||||
|
|
@ -1614,7 +1589,7 @@
|
|||
"configuration",
|
||||
"distribution"
|
||||
],
|
||||
"time": "2017-01-10 14:58:45"
|
||||
"time": "2017-01-10T14:58:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sensio/framework-extra-bundle",
|
||||
|
|
@ -1684,7 +1659,7 @@
|
|||
"annotations",
|
||||
"controllers"
|
||||
],
|
||||
"time": "2017-02-15 06:52:30"
|
||||
"time": "2017-02-15T06:52:30+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sensiolabs/security-checker",
|
||||
|
|
@ -1728,7 +1703,7 @@
|
|||
}
|
||||
],
|
||||
"description": "A security checker for your composer.lock",
|
||||
"time": "2017-02-18 17:53:25"
|
||||
"time": "2017-02-18T17:53:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "stof/doctrine-extensions-bundle",
|
||||
|
|
@ -1789,7 +1764,7 @@
|
|||
"translatable",
|
||||
"tree"
|
||||
],
|
||||
"time": "2016-01-26 23:58:32"
|
||||
"time": "2016-01-26T23:58:32+00:00"
|
||||
},
|
||||
{
|
||||
"name": "swiftmailer/swiftmailer",
|
||||
|
|
@ -1843,7 +1818,7 @@
|
|||
"mail",
|
||||
"mailer"
|
||||
],
|
||||
"time": "2017-02-13 07:52:53"
|
||||
"time": "2017-02-13T07:52:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/assetic-bundle",
|
||||
|
|
@ -1913,7 +1888,7 @@
|
|||
"compression",
|
||||
"minification"
|
||||
],
|
||||
"time": "2016-11-22 11:42:57"
|
||||
"time": "2016-11-22T11:42:57+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/monolog-bundle",
|
||||
|
|
@ -1973,7 +1948,7 @@
|
|||
"log",
|
||||
"logging"
|
||||
],
|
||||
"time": "2017-01-02 19:04:26"
|
||||
"time": "2017-01-02T19:04:26+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-apcu",
|
||||
|
|
@ -2026,7 +2001,7 @@
|
|||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-11-14 01:06:16"
|
||||
"time": "2016-11-14T01:06:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-intl-icu",
|
||||
|
|
@ -2084,7 +2059,7 @@
|
|||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-11-14 01:06:16"
|
||||
"time": "2016-11-14T01:06:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-mbstring",
|
||||
|
|
@ -2143,7 +2118,7 @@
|
|||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-11-14 01:06:16"
|
||||
"time": "2016-11-14T01:06:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php56",
|
||||
|
|
@ -2199,7 +2174,7 @@
|
|||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-11-14 01:06:16"
|
||||
"time": "2016-11-14T01:06:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php70",
|
||||
|
|
@ -2258,7 +2233,7 @@
|
|||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-11-14 01:06:16"
|
||||
"time": "2016-11-14T01:06:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-util",
|
||||
|
|
@ -2310,7 +2285,7 @@
|
|||
"polyfill",
|
||||
"shim"
|
||||
],
|
||||
"time": "2016-11-14 01:06:16"
|
||||
"time": "2016-11-14T01:06:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/swiftmailer-bundle",
|
||||
|
|
@ -2369,7 +2344,7 @@
|
|||
],
|
||||
"description": "Symfony SwiftmailerBundle",
|
||||
"homepage": "http://symfony.com",
|
||||
"time": "2016-12-20 04:44:33"
|
||||
"time": "2016-12-20T04:44:33+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/symfony",
|
||||
|
|
@ -2511,7 +2486,70 @@
|
|||
"keywords": [
|
||||
"framework"
|
||||
],
|
||||
"time": "2017-01-28 02:53:38"
|
||||
"time": "2017-01-28T02:53:38+00:00"
|
||||
},
|
||||
{
|
||||
"name": "tecnickcom/tcpdf",
|
||||
"version": "6.2.12",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/tecnickcom/TCPDF.git",
|
||||
"reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/2f732eaa91b5665274689b1d40b285a7bacdc37f",
|
||||
"reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
"fonts",
|
||||
"config",
|
||||
"include",
|
||||
"tcpdf.php",
|
||||
"tcpdf_parser.php",
|
||||
"tcpdf_import.php",
|
||||
"tcpdf_barcodes_1d.php",
|
||||
"tcpdf_barcodes_2d.php",
|
||||
"include/tcpdf_colors.php",
|
||||
"include/tcpdf_filters.php",
|
||||
"include/tcpdf_font_data.php",
|
||||
"include/tcpdf_fonts.php",
|
||||
"include/tcpdf_images.php",
|
||||
"include/tcpdf_static.php",
|
||||
"include/barcodes/datamatrix.php",
|
||||
"include/barcodes/pdf417.php",
|
||||
"include/barcodes/qrcode.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"LGPLv3"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Nicola Asuni",
|
||||
"email": "info@tecnick.com",
|
||||
"homepage": "http://nicolaasuni.tecnick.com"
|
||||
}
|
||||
],
|
||||
"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
|
||||
"homepage": "http://www.tcpdf.org/",
|
||||
"keywords": [
|
||||
"PDFD32000-2008",
|
||||
"TCPDF",
|
||||
"barcodes",
|
||||
"datamatrix",
|
||||
"pdf",
|
||||
"pdf417",
|
||||
"qrcode"
|
||||
],
|
||||
"time": "2015-09-12T10:08:34+00:00"
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
|
|
@ -2573,7 +2611,51 @@
|
|||
"keywords": [
|
||||
"templating"
|
||||
],
|
||||
"time": "2017-01-11 19:39:01"
|
||||
"time": "2017-01-11T19:39:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "whiteoctober/tcpdf-bundle",
|
||||
"version": "1.0.3",
|
||||
"target-dir": "WhiteOctober/TCPDFBundle",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/whiteoctober/WhiteOctoberTCPDFBundle.git",
|
||||
"reference": "3a705b0f416792351fc531eb086e6f5caf5339a5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/whiteoctober/WhiteOctoberTCPDFBundle/zipball/3a705b0f416792351fc531eb086e6f5caf5339a5",
|
||||
"reference": "3a705b0f416792351fc531eb086e6f5caf5339a5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.2",
|
||||
"symfony/framework-bundle": ">=2.0",
|
||||
"tecnickcom/tcpdf": "*"
|
||||
},
|
||||
"type": "symfony-bundle",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"WhiteOctober\\TCPDFBundle": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Rich Sage",
|
||||
"email": "rich.sage@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A bundle to easily integrate TCPDF into Symfony2",
|
||||
"homepage": "https://github.com/whiteoctober/WhiteOctoberTCPDFBundle",
|
||||
"keywords": [
|
||||
"TCPDF",
|
||||
"pdf"
|
||||
],
|
||||
"time": "2017-05-25T07:39:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "zendframework/zend-code",
|
||||
|
|
@ -2626,7 +2708,7 @@
|
|||
"code",
|
||||
"zf2"
|
||||
],
|
||||
"time": "2016-10-24 13:23:32"
|
||||
"time": "2016-10-24T13:23:32+00:00"
|
||||
},
|
||||
{
|
||||
"name": "zendframework/zend-eventmanager",
|
||||
|
|
@ -2680,10 +2762,34 @@
|
|||
"events",
|
||||
"zf2"
|
||||
],
|
||||
"time": "2016-12-19 21:47:12"
|
||||
"time": "2016-12-19T21:47:12+00:00"
|
||||
}
|
||||
],
|
||||
"packages-dev": [
|
||||
{
|
||||
"name": "pguardiario/phpuri",
|
||||
"version": "1.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/monkeysuffrage/phpuri.git",
|
||||
"reference": "ad0a5ec033fe616cfef55578b9c7f2458be8fbfc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/monkeysuffrage/phpuri/zipball/ad0a5ec033fe616cfef55578b9c7f2458be8fbfc",
|
||||
"reference": "ad0a5ec033fe616cfef55578b9c7f2458be8fbfc",
|
||||
"shasum": ""
|
||||
},
|
||||
"type": "project",
|
||||
"autoload": {
|
||||
"files": [
|
||||
"phpuri.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"description": "A php library for converting relative urls to absolute.",
|
||||
"time": "2015-05-24T09:13:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sensio/generator-bundle",
|
||||
"version": "v3.1.2",
|
||||
|
|
@ -2734,7 +2840,7 @@
|
|||
}
|
||||
],
|
||||
"description": "This bundle generates code for you",
|
||||
"time": "2016-12-05 16:01:19"
|
||||
"time": "2016-12-05T16:01:19+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/phpunit-bridge",
|
||||
|
|
@ -2793,7 +2899,7 @@
|
|||
],
|
||||
"description": "Symfony PHPUnit Bridge",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2017-01-21 17:06:35"
|
||||
"time": "2017-01-21T17:06:35+00:00"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue