more specificity on versions, some broke php 7.0 compatibility

This commit is contained in:
Nabeel Shahzad
2017-07-23 19:12:26 -05:00
parent 3a77e442ea
commit 9b4d57f744
2 changed files with 27 additions and 29 deletions

View File

@@ -7,15 +7,15 @@
"type": "project", "type": "project",
"require": { "require": {
"php": ">=7.0", "php": ">=7.0",
"laravel/framework": "5.4.*", "laravel/framework": "v5.4.30",
"barryvdh/laravel-ide-helper": "^2.1", "barryvdh/laravel-ide-helper": "v2.4.0",
"yajra/laravel-datatables-oracle": "~6.0", "yajra/laravel-datatables-oracle": "~6.0",
"infyomlabs/laravel-generator": "dev-master", "infyomlabs/laravel-generator": "dev-master",
"laravelcollective/html": "5.4.x", "laravelcollective/html": "5.4.x",
"infyomlabs/adminlte-templates": "5.3.x-dev", "infyomlabs/adminlte-templates": "5.3.x-dev",
"infyomlabs/swagger-generator": "dev-master", "infyomlabs/swagger-generator": "dev-master",
"jlapp/swaggervel": "dev-master", "jlapp/swaggervel": "dev-master",
"doctrine/dbal": "~2.3", "doctrine/dbal": "v2.5.12",
"zizaco/entrust": "5.2.x-dev", "zizaco/entrust": "5.2.x-dev",
"prettus/l5-repository": "^2.6", "prettus/l5-repository": "^2.6",
"spatie/laravel-pjax": "^1.3", "spatie/laravel-pjax": "^1.3",
@@ -25,7 +25,7 @@
"anlutro/l4-settings": "^0.5.0", "anlutro/l4-settings": "^0.5.0",
"webpatser/laravel-uuid": "^2.0", "webpatser/laravel-uuid": "^2.0",
"chrisbjr/api-guard": "^4.0", "chrisbjr/api-guard": "^4.0",
"spatie/laravel-fractal": "^4.01", "spatie/laravel-fractal": "4.2.0",
"composer/semver": "^1.4", "composer/semver": "^1.4",
"dg/rss-php": "^1.2" "dg/rss-php": "^1.2"
}, },

48
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "2ab8f5fa4fb05e2eddd93396aadd3f94", "content-hash": "df353995f1be07a6967d72cb3b52a7c2",
"packages": [ "packages": [
{ {
"name": "anlutro/l4-settings", "name": "anlutro/l4-settings",
@@ -54,16 +54,16 @@
}, },
{ {
"name": "barryvdh/laravel-ide-helper", "name": "barryvdh/laravel-ide-helper",
"version": "v2.4.1", "version": "v2.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/barryvdh/laravel-ide-helper.git", "url": "https://github.com/barryvdh/laravel-ide-helper.git",
"reference": "2b1273c45e2f8df7a625563e2283a17c14f02ae8" "reference": "87a02ff574f722c685e011f76692ab869ab64f6c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/2b1273c45e2f8df7a625563e2283a17c14f02ae8", "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/87a02ff574f722c685e011f76692ab869ab64f6c",
"reference": "2b1273c45e2f8df7a625563e2283a17c14f02ae8", "reference": "87a02ff574f722c685e011f76692ab869ab64f6c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -123,7 +123,7 @@
"phpstorm", "phpstorm",
"sublime" "sublime"
], ],
"time": "2017-07-16T00:24:12+00:00" "time": "2017-06-16T14:08:59+00:00"
}, },
{ {
"name": "barryvdh/reflection-docblock", "name": "barryvdh/reflection-docblock",
@@ -541,16 +541,16 @@
}, },
{ {
"name": "doctrine/common", "name": "doctrine/common",
"version": "v2.8.0", "version": "v2.7.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/common.git", "url": "https://github.com/doctrine/common.git",
"reference": "ed349f953d443963c590b008b37b864b8a3c4b21" "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/ed349f953d443963c590b008b37b864b8a3c4b21", "url": "https://api.github.com/repos/doctrine/common/zipball/4acb8f89626baafede6ee5475bc5844096eba8a9",
"reference": "ed349f953d443963c590b008b37b864b8a3c4b21", "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -559,15 +559,15 @@
"doctrine/collections": "1.*", "doctrine/collections": "1.*",
"doctrine/inflector": "1.*", "doctrine/inflector": "1.*",
"doctrine/lexer": "1.*", "doctrine/lexer": "1.*",
"php": "~7.1" "php": "~5.6|~7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7" "phpunit/phpunit": "^5.4.6"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.8.x-dev" "dev-master": "2.7.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -610,30 +610,28 @@
"persistence", "persistence",
"spl" "spl"
], ],
"time": "2017-07-22T09:01:43+00:00" "time": "2017-07-22T08:35:12+00:00"
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "v2.6.0", "version": "v2.5.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "498760e55195ccaf08076cb9100a2972ba74c001" "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/498760e55195ccaf08076cb9100a2972ba74c001", "url": "https://api.github.com/repos/doctrine/dbal/zipball/7b9e911f9d8b30d43b96853dab26898c710d8f44",
"reference": "498760e55195ccaf08076cb9100a2972ba74c001", "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/common": "^2.7.1", "doctrine/common": ">=2.4,<2.8-dev",
"ext-pdo": "*", "php": ">=5.3.2"
"php": "^7.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.4.6", "phpunit/phpunit": "4.*",
"phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
"symfony/console": "2.*||^3.0" "symfony/console": "2.*||^3.0"
}, },
"suggest": { "suggest": {
@@ -645,7 +643,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.6.x-dev" "dev-master": "2.5.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -683,7 +681,7 @@
"persistence", "persistence",
"queryobject" "queryobject"
], ],
"time": "2017-07-23T01:02:22+00:00" "time": "2017-02-08T12:53:47+00:00"
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",