diff --git a/composer.json b/composer.json old mode 100755 new mode 100644 index 56a0a3c9d..2e316999f --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "type": "project", "require": { "laravel/framework": "5.2.14", - "maatwebsite/excel": "2.1.1", + "maatwebsite/excel": "2.1.30", "laravelcollective/html": "5.2", "kris/laravel-form-builder": "1.6.31", "laravelcollective/bus": "5.2", diff --git a/composer.lock b/composer.lock index 31d8eb718..2075880f9 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "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#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f1517c8ebf94e588d0eff86c39d91d96", + "content-hash": "9831e7fd3b94d3be387f3ee1ced355de", "packages": [ { "name": "aws/aws-sdk-php", @@ -669,12 +669,12 @@ "source": { "type": "git", "url": "https://github.com/heybigname/backup-manager.git", - "reference": "054c21a1290852667a891d5a6892c627f27771ae" + "reference": "8588f393e16cac4561ff492c9bb876ddc4041684" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heybigname/backup-manager/zipball/054c21a1290852667a891d5a6892c627f27771ae", - "reference": "054c21a1290852667a891d5a6892c627f27771ae", + "url": "https://api.github.com/repos/heybigname/backup-manager/zipball/8588f393e16cac4561ff492c9bb876ddc4041684", + "reference": "8588f393e16cac4561ff492c9bb876ddc4041684", "shasum": "" }, "require": { @@ -731,7 +731,7 @@ ], "description": "Database backup manager for dumping to and restoring databases from S3, Dropbox, FTP, and SFTP.", "abandoned": "backup-manager/backup-manager", - "time": "2015-03-05T10:46:08+00:00" + "time": "2015-06-17T13:10:34+00:00" }, { "name": "intervention/image", @@ -1395,45 +1395,55 @@ }, { "name": "maatwebsite/excel", - "version": "v2.1.1", + "version": "2.1.30", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "4c89f4cb1d30090a256530e1dce0ed3765eca7fa" + "reference": "f5540c4ba3ac50cebd98b09ca42e61f926ef299f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/4c89f4cb1d30090a256530e1dce0ed3765eca7fa", - "reference": "4c89f4cb1d30090a256530e1dce0ed3765eca7fa", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/f5540c4ba3ac50cebd98b09ca42e61f926ef299f", + "reference": "f5540c4ba3ac50cebd98b09ca42e61f926ef299f", "shasum": "" }, "require": { - "illuminate/cache": "5.0.*|5.1.*|5.2.*", - "illuminate/config": "5.0.*|5.1.*|5.2.*", - "illuminate/filesystem": "5.0.*|5.1.*|5.2.*", - "illuminate/support": "5.0.*|5.1.*|5.2.*", + "illuminate/cache": "^5.0", + "illuminate/config": "^5.0", + "illuminate/filesystem": "^5.0", + "illuminate/support": "^5.0", + "jeremeamia/superclosure": "^2.3", "nesbot/carbon": "~1.0", "php": ">=5.5", - "phpoffice/phpexcel": "1.8.*", - "tijsverkoyen/css-to-inline-styles": "~1.5" + "phpoffice/phpexcel": "^1.8.1", + "tijsverkoyen/css-to-inline-styles": "~2.0" }, "require-dev": { - "mockery/mockery": "~0.9", - "orchestra/testbench": "3.1.*", + "mockery/mockery": "~1.0", + "orchestra/testbench": "3.1.*|3.2.*|3.3.*|3.4.*|3.5.*|3.6.*", "phpseclib/phpseclib": "~1.0", "phpunit/phpunit": "~4.0" }, "suggest": { - "illuminate/http": "5.0.*|5.1.*|5.2.*", - "illuminate/queue": "5.0.*|5.1.*|5.2.*", - "illuminate/routing": "5.0.*|5.1.*|5.2.*", - "illuminate/view": "5.0.*|5.1.*|5.2.*" + "illuminate/http": "^5.0", + "illuminate/queue": "^5.0", + "illuminate/routing": "^5.0", + "illuminate/view": "^5.0" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Maatwebsite\\Excel\\ExcelServiceProvider" + ], + "aliases": { + "Excel": "Maatwebsite\\Excel\\Facades\\Excel" + } + } + }, "autoload": { "classmap": [ - "src/Maatwebsite/Excel", - "tests/TestCase.php" + "src/Maatwebsite/Excel" ], "psr-0": { "Maatwebsite\\Excel\\": "src/" @@ -1441,7 +1451,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "MIT" ], "authors": [ { @@ -1449,7 +1459,7 @@ "email": "patrick@maatwebsite.nl" } ], - "description": "An eloquent way of importing and exporting Excel and CSV in Laravel 4 with the power of PHPExcel", + "description": "Supercharged Excel exports in Laravel", "keywords": [ "PHPExcel", "batch", @@ -1459,7 +1469,7 @@ "import", "laravel" ], - "time": "2015-12-15T20:14:50+00:00" + "time": "2018-09-04T19:00:09+00:00" }, { "name": "monolog/monolog", @@ -1585,35 +1595,40 @@ }, { "name": "nesbot/carbon", - "version": "1.22.1", + "version": "1.37.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc" + "reference": "5be4fdf97076a685b23efdedfc2b73ad0c5eab70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/5be4fdf97076a685b23efdedfc2b73ad0c5eab70", + "reference": "5be4fdf97076a685b23efdedfc2b73ad0c5eab70", "shasum": "" }, "require": { - "php": ">=5.3.0", - "symfony/translation": "~2.6 || ~3.0" + "php": ">=5.3.9", + "symfony/translation": "~2.6 || ~3.0 || ~4.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2", - "phpunit/phpunit": "~4.0 || ~5.0" + "phpunit/phpunit": "^4.8.35 || ^5.7" + }, + "suggest": { + "friendsofphp/php-cs-fixer": "Needed for the `composer phpcs` command. Allow to automatically fix code style.", + "phpstan/phpstan": "Needed for the `composer phpstan` command. Allow to detect potential errors." }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.23-dev" + "laravel": { + "providers": [ + "Carbon\\Laravel\\ServiceProvider" + ] } }, "autoload": { "psr-4": { - "Carbon\\": "src/Carbon/" + "": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1634,7 +1649,7 @@ "datetime", "time" ], - "time": "2017-01-16T07:55:07+00:00" + "time": "2019-04-19T10:27:42+00:00" }, { "name": "nikic/php-parser", @@ -1737,22 +1752,26 @@ }, { "name": "phpoffice/phpexcel", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/PHPOffice/PHPExcel.git", - "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32" + "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32", - "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32", + "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/1441011fb7ecdd8cc689878f54f8b58a6805f870", + "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870", "shasum": "" }, "require": { + "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "php": ">=5.2.0" + "php": "^5.2|^7.0" + }, + "require-dev": { + "squizlabs/php_codesniffer": "2.*" }, "type": "library", "autoload": { @@ -1762,7 +1781,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL" + "LGPL-2.1" ], "authors": [ { @@ -1770,18 +1789,19 @@ "homepage": "http://blog.maartenballiauw.be" }, { - "name": "Mark Baker" + "name": "Erik Tilt" }, { "name": "Franck Lefevre", - "homepage": "http://blog.rootslabs.net" + "homepage": "http://rootslabs.net" }, { - "name": "Erik Tilt" + "name": "Mark Baker", + "homepage": "http://markbakeruk.net" } ], "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", - "homepage": "http://phpexcel.codeplex.com", + "homepage": "https://github.com/PHPOffice/PHPExcel", "keywords": [ "OpenXML", "excel", @@ -1790,7 +1810,8 @@ "xls", "xlsx" ], - "time": "2015-05-01T07:00:55+00:00" + "abandoned": "phpoffice/phpspreadsheet", + "time": "2018-11-22T23:07:24+00:00" }, { "name": "phpseclib/phpseclib", @@ -2799,16 +2820,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.6.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", "shasum": "" }, "require": { @@ -2820,7 +2841,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.11-dev" } }, "autoload": { @@ -2854,7 +2875,7 @@ "portable", "shim" ], - "time": "2017-10-11T12:05:26+00:00" + "time": "2019-02-06T07:57:58+00:00" }, { "name": "symfony/polyfill-php56", @@ -3303,29 +3324,29 @@ }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "1.5.5", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "9753fc340726e327e4d48b7c0604f85475ae0bc3" + "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/9753fc340726e327e4d48b7c0604f85475ae0bc3", - "reference": "9753fc340726e327e4d48b7c0604f85475ae0bc3", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", + "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", "shasum": "" }, "require": { - "php": ">=5.3.0", - "symfony/css-selector": "~2.1|~3.0" + "php": "^5.5 || ^7.0", + "symfony/css-selector": "^2.7 || ^3.0 || ^4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { @@ -3335,7 +3356,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD" + "BSD-3-Clause" ], "authors": [ { @@ -3346,7 +3367,7 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "time": "2015-12-08T16:14:14+00:00" + "time": "2017-11-27T11:13:29+00:00" }, { "name": "vlucas/phpdotenv", @@ -3509,12 +3530,12 @@ "version": "0.14.0", "source": { "type": "git", - "url": "https://github.com/brianium/paratest.git", + "url": "https://github.com/paratestphp/paratest.git", "reference": "dddcfa8510da7aae9616ba1738ebf630d9e84aa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brianium/paratest/zipball/dddcfa8510da7aae9616ba1738ebf630d9e84aa4", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/dddcfa8510da7aae9616ba1738ebf630d9e84aa4", "reference": "dddcfa8510da7aae9616ba1738ebf630d9e84aa4", "shasum": "" }, @@ -3920,8 +3941,7 @@ "authors": [ { "name": "Chris Boulton", - "homepage": "http://github.com/chrisboulton", - "role": "Original developer" + "homepage": "http://github.com/chrisboulton" } ], "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).", @@ -4442,6 +4462,7 @@ "mock", "xunit" ], + "abandoned": true, "time": "2015-10-02T06:51:40+00:00" }, {