From bd088602d92a3d0f923d60f844db9921e7ef78b4 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Tue, 10 Oct 2017 10:32:59 -0500 Subject: [PATCH] Update deps for Laravel 5.5 --- composer.json | 6 +- composer.lock | 217 ++++++++++++-------------------------------------- 2 files changed, 52 insertions(+), 171 deletions(-) diff --git a/composer.json b/composer.json index 3edf8868..64a3bf6d 100755 --- a/composer.json +++ b/composer.json @@ -12,12 +12,10 @@ "laravel/framework": "v5.5.x", "barryvdh/laravel-ide-helper": "v2.4.x", "yajra/laravel-datatables-oracle": "6.24.1", - "infyomlabs/laravel-generator": "dev-master", + "infyomlabs/laravel-generator": "5.5.x-dev", "php-http/httplug": "v1.1.x", "laravelcollective/html": "5.5.x", - "infyomlabs/adminlte-templates": "5.3.x-dev", - "infyomlabs/swagger-generator": "dev-master", - "jlapp/swaggervel": "dev-master", + "infyomlabs/adminlte-templates": "5.5.x-dev", "doctrine/annotations": "v1.4.x", "doctrine/cache": "v1.6.x", "doctrine/collections": "v1.4.x", diff --git a/composer.lock b/composer.lock index 44a22ed5..ea072cf9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +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" ], - "content-hash": "028f5371996e85ae70e4ab74df3d370e", + "content-hash": "92ed5275472ce37375370175d71fffbc", "packages": [ { "name": "anlutro/l4-settings", @@ -1264,16 +1264,16 @@ }, { "name": "infyomlabs/adminlte-templates", - "version": "5.3.x-dev", + "version": "5.5.x-dev", "source": { "type": "git", "url": "https://github.com/InfyOmLabs/adminlte-templates.git", - "reference": "fb51cd6a234e3110fae8e53533e706058149a06f" + "reference": "61164131a009d1e42f06142340f8efab1e6948a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/InfyOmLabs/adminlte-templates/zipball/fb51cd6a234e3110fae8e53533e706058149a06f", - "reference": "fb51cd6a234e3110fae8e53533e706058149a06f", + "url": "https://api.github.com/repos/InfyOmLabs/adminlte-templates/zipball/61164131a009d1e42f06142340f8efab1e6948a5", + "reference": "61164131a009d1e42f06142340f8efab1e6948a5", "shasum": "" }, "require": { @@ -1281,6 +1281,13 @@ "php": ">=5.5.9" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "\\InfyOm\\AdminLTETemplates\\AdminLTETemplatesServiceProvider" + ] + } + }, "autoload": { "psr-4": { "InfyOm\\AdminLTETemplates\\": "src/" @@ -1305,29 +1312,40 @@ "laravel", "templates" ], - "time": "2017-09-16 04:56:13" + "time": "2017-09-16 05:07:29" }, { "name": "infyomlabs/laravel-generator", - "version": "dev-master", + "version": "5.5.x-dev", "source": { "type": "git", "url": "https://github.com/InfyOmLabs/laravel-generator.git", - "reference": "a2038b2ae6c72987e79e830896cc6d12c06e4ee7" + "reference": "b0cd27100bc89fd155623a9a1994450259992878" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/InfyOmLabs/laravel-generator/zipball/a2038b2ae6c72987e79e830896cc6d12c06e4ee7", - "reference": "a2038b2ae6c72987e79e830896cc6d12c06e4ee7", + "url": "https://api.github.com/repos/InfyOmLabs/laravel-generator/zipball/b0cd27100bc89fd155623a9a1994450259992878", + "reference": "b0cd27100bc89fd155623a9a1994450259992878", "shasum": "" }, "require": { "illuminate/support": "~5.0", - "laracasts/flash": "~2.0", + "laracasts/flash": "~3.0", "php": ">=5.5.9", - "prettus/l5-repository": "~2.1" + "prettus/l5-repository": "~2.6" + }, + "require-dev": { + "mockery/mockery": "~0.9", + "phpunit/phpunit": "~5.0" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "\\InfyOm\\Generator\\InfyOmGeneratorServiceProvider" + ] + } + }, "autoload": { "psr-4": { "InfyOm\\Generator\\": "src/" @@ -1336,7 +1354,7 @@ "src/helpers.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1360,44 +1378,7 @@ "test", "view" ], - "time": "2016-08-18 14:19:50" - }, - { - "name": "infyomlabs/swagger-generator", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/InfyOmLabs/swagger-generator.git", - "reference": "a0d85f22acd100f73515d98901d6f23efc1d2443" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/InfyOmLabs/swagger-generator/zipball/a0d85f22acd100f73515d98901d6f23efc1d2443", - "reference": "a0d85f22acd100f73515d98901d6f23efc1d2443", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mitul Golakiya", - "email": "me@mitul.me" - } - ], - "description": "Swagger Generator for InfyOm Laravel Generator", - "keywords": [ - "generator", - "laravel", - "swagger", - "templates" - ], - "time": "2016-02-14 10:41:03" + "time": "2017-09-16 05:10:47" }, { "name": "jeremeamia/SuperClosure", @@ -1457,63 +1438,18 @@ ], "time": "2016-12-07T09:37:55+00:00" }, - { - "name": "jlapp/swaggervel", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/slampenny/Swaggervel.git", - "reference": "e026d72cacec8b2db8b2510179d73042f5e87bb9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/slampenny/Swaggervel/zipball/e026d72cacec8b2db8b2510179d73042f5e87bb9", - "reference": "e026d72cacec8b2db8b2510179d73042f5e87bb9", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "zircote/swagger-php": "*" - }, - "type": "library", - "autoload": { - "psr-0": { - "Jlapp\\Swaggervel": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "jlapp", - "email": "jordan@jordanlapp.com" - } - ], - "description": "A great way to integrate Swagger into Laravel", - "keywords": [ - "L4", - "api", - "documentation", - "l5", - "laravel", - "swagger" - ], - "time": "2016-01-25 15:38:17" - }, { "name": "laracasts/flash", - "version": "2.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/laracasts/flash.git", - "reference": "03eec812fd6ae948664ff51b4320785f6d15ee5d" + "reference": "10cd420ab63fd0796bf5e1e5b99f87636d2f4333" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laracasts/flash/zipball/03eec812fd6ae948664ff51b4320785f6d15ee5d", - "reference": "03eec812fd6ae948664ff51b4320785f6d15ee5d", + "url": "https://api.github.com/repos/laracasts/flash/zipball/10cd420ab63fd0796bf5e1e5b99f87636d2f4333", + "reference": "10cd420ab63fd0796bf5e1e5b99f87636d2f4333", "shasum": "" }, "require": { @@ -1521,9 +1457,20 @@ "php": ">=5.4.0" }, "require-dev": { - "mockery/mockery": "dev-master" + "mockery/mockery": "dev-master", + "phpunit/phpunit": "^6.1" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Laracasts\\Flash\\FlashServiceProvider" + ], + "aliases": { + "Flash": "Laracasts\\Flash\\Flash" + } + } + }, "autoload": { "psr-0": { "Laracasts\\Flash": "src/" @@ -1532,7 +1479,7 @@ "src/Laracasts/Flash/functions.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1543,7 +1490,7 @@ } ], "description": "Easy flash notifications", - "time": "2016-07-11T20:46:02+00:00" + "time": "2017-06-22T19:01:19+00:00" }, { "name": "laravel/framework", @@ -4944,68 +4891,6 @@ ], "time": "2017-09-13T14:47:08+00:00" }, - { - "name": "zircote/swagger-php", - "version": "2.0.11", - "source": { - "type": "git", - "url": "https://github.com/zircote/swagger-php.git", - "reference": "d010ab67536784f8b578cb4ba7d15c906f3e1a45" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zircote/swagger-php/zipball/d010ab67536784f8b578cb4ba7d15c906f3e1a45", - "reference": "d010ab67536784f8b578cb4ba7d15c906f3e1a45", - "shasum": "" - }, - "require": { - "doctrine/annotations": "*", - "php": ">=5.6", - "symfony/finder": "*" - }, - "require-dev": { - "phpunit/phpunit": ">=4.8 <=5.6", - "squizlabs/php_codesniffer": ">=2.7", - "zendframework/zend-form": "<2.8" - }, - "bin": [ - "bin/swagger" - ], - "type": "library", - "autoload": { - "psr-4": { - "Swagger\\": "src" - }, - "files": [ - "src/functions.php" - ] - }, - "notification-url": "http://packagist.org/downloads/", - "license": [ - "Apache2" - ], - "authors": [ - { - "name": "Robert Allen", - "email": "zircote@gmail.com", - "homepage": "http://www.zircote.com" - }, - { - "name": "Bob Fanger", - "email": "bfanger@gmail.com", - "homepage": "http://bfanger.nl" - } - ], - "description": "Swagger-PHP - Generate interactive documentation for your RESTful API using phpdoc annotations", - "homepage": "https://github.com/zircote/swagger-php/", - "keywords": [ - "api", - "json", - "rest", - "service discovery" - ], - "time": "2017-08-16T08:32:59+00:00" - }, { "name": "zizaco/entrust", "version": "5.2.x-dev", @@ -6529,8 +6414,6 @@ "stability-flags": { "infyomlabs/laravel-generator": 20, "infyomlabs/adminlte-templates": 20, - "infyomlabs/swagger-generator": 20, - "jlapp/swaggervel": 20, "zizaco/entrust": 20, "league/geotools": 0, "makinacorpus/php-bloom": 20