|
|
@@ -1397,11 +1397,7 @@
|
|
|
"source": {
|
|
|
"type": "git",
|
|
|
"url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
|
|
|
-<<<<<<< HEAD
|
|
|
- "reference": "c000750a1b6ac7239379b36535f7612f0bbdb367"
|
|
|
-=======
|
|
|
- "reference": "b6ad2dfffe165ea3965973074fc78735770f2f9d"
|
|
|
->>>>>>> 4a9e3a60ec00888d68df80118142644cced15250
|
|
|
+ "reference": "a62ae709daf7f900018c3f56f1e39c36bfbd5e61"
|
|
|
},
|
|
|
"type": "library",
|
|
|
"autoload": {
|
|
|
@@ -1416,11 +1412,7 @@
|
|
|
"bootstrap",
|
|
|
"sonata"
|
|
|
],
|
|
|
-<<<<<<< HEAD
|
|
|
- "time": "2017-08-02 18:09:07"
|
|
|
-=======
|
|
|
- "time": "2017-08-01 17:52:58"
|
|
|
->>>>>>> 4a9e3a60ec00888d68df80118142644cced15250
|
|
|
+ "time": "2017-08-03 18:52:52"
|
|
|
},
|
|
|
{
|
|
|
"name": "ik/device-bundle",
|
|
|
@@ -3076,29 +3068,29 @@
|
|
|
},
|
|
|
{
|
|
|
"name": "phpunit/php-token-stream",
|
|
|
- "version": "1.4.11",
|
|
|
+ "version": "2.0.0",
|
|
|
"source": {
|
|
|
"type": "git",
|
|
|
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
|
|
|
- "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
|
|
|
+ "reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b"
|
|
|
},
|
|
|
"dist": {
|
|
|
"type": "zip",
|
|
|
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
|
|
|
- "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
|
|
|
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ecb0b2cdaa0add708fe6f329ef65ae0c5225130b",
|
|
|
+ "reference": "ecb0b2cdaa0add708fe6f329ef65ae0c5225130b",
|
|
|
"shasum": ""
|
|
|
},
|
|
|
"require": {
|
|
|
"ext-tokenizer": "*",
|
|
|
- "php": ">=5.3.3"
|
|
|
+ "php": "^7.0"
|
|
|
},
|
|
|
"require-dev": {
|
|
|
- "phpunit/phpunit": "~4.2"
|
|
|
+ "phpunit/phpunit": "^6.2.4"
|
|
|
},
|
|
|
"type": "library",
|
|
|
"extra": {
|
|
|
"branch-alias": {
|
|
|
- "dev-master": "1.4-dev"
|
|
|
+ "dev-master": "2.0-dev"
|
|
|
}
|
|
|
},
|
|
|
"autoload": {
|
|
|
@@ -3121,7 +3113,7 @@
|
|
|
"keywords": [
|
|
|
"tokenizer"
|
|
|
],
|
|
|
- "time": "2017-02-27T10:12:30+00:00"
|
|
|
+ "time": "2017-08-03T14:17:41+00:00"
|
|
|
},
|
|
|
{
|
|
|
"name": "phpunit/phpunit",
|
|
|
@@ -4099,16 +4091,16 @@
|
|
|
},
|
|
|
{
|
|
|
"name": "sensiolabs/security-checker",
|
|
|
- "version": "v4.1.2",
|
|
|
+ "version": "v4.1.3",
|
|
|
"source": {
|
|
|
"type": "git",
|
|
|
"url": "https://github.com/sensiolabs/security-checker.git",
|
|
|
- "reference": "9c7bfbc7be32781d39f8e262744f7fb0c410df67"
|
|
|
+ "reference": "7d60f01b9a56dfd152796877d009b1a0578d6ef4"
|
|
|
},
|
|
|
"dist": {
|
|
|
"type": "zip",
|
|
|
- "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/9c7bfbc7be32781d39f8e262744f7fb0c410df67",
|
|
|
- "reference": "9c7bfbc7be32781d39f8e262744f7fb0c410df67",
|
|
|
+ "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/7d60f01b9a56dfd152796877d009b1a0578d6ef4",
|
|
|
+ "reference": "7d60f01b9a56dfd152796877d009b1a0578d6ef4",
|
|
|
"shasum": ""
|
|
|
},
|
|
|
"require": {
|
|
|
@@ -4140,7 +4132,7 @@
|
|
|
}
|
|
|
],
|
|
|
"description": "A security checker for your composer.lock",
|
|
|
- "time": "2017-08-02T07:52:06+00:00"
|
|
|
+ "time": "2017-08-03T12:24:05+00:00"
|
|
|
},
|
|
|
{
|
|
|
"name": "sonata-project/admin-bundle",
|
gabriel