From a9ee9bd654b6f8233ba2478276550dd8873c5e44 Mon Sep 17 00:00:00 2001 From: Mostafa Maklad Date: Wed, 30 Aug 2017 23:01:59 +0300 Subject: [PATCH 1/2] add php 7.2 to test and remove helpers from composer --- .travis.yml | 1 + composer.json | 5 +---- composer.lock | 36 ++++++++++++++++++------------------ 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index aceb16a..401f23c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: php php: - 7.1 + - 7.2 matrix: fast_finish: true diff --git a/composer.json b/composer.json index a76f46d..90d8580 100644 --- a/composer.json +++ b/composer.json @@ -47,10 +47,7 @@ "autoload": { "psr-4": { "Maklad\\Permission\\": "src" - }, - "files": [ - "src/helpers.php" - ] + } }, "autoload-dev": { "psr-4": { diff --git a/composer.lock b/composer.lock index b9f031f..87cf235 100644 --- a/composer.lock +++ b/composer.lock @@ -178,16 +178,16 @@ }, { "name": "laravel/framework", - "version": "v5.4.35", + "version": "v5.4.36", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "54aa18a4e8495c4b6902d9665ec9fa4d3a1f3d2e" + "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/54aa18a4e8495c4b6902d9665ec9fa4d3a1f3d2e", - "reference": "54aa18a4e8495c4b6902d9665ec9fa4d3a1f3d2e", + "url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9", + "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9", "shasum": "" }, "require": { @@ -303,7 +303,7 @@ "framework", "laravel" ], - "time": "2017-08-24T12:30:18+00:00" + "time": "2017-08-30T09:26:16+00:00" }, { "name": "league/flysystem", @@ -1755,7 +1755,7 @@ "codeclimate", "coverage" ], - "time": "2017-06-01T13:19:55+00:00" + "time": "2017-06-01 13:19:55" }, { "name": "doctrine/instantiator", @@ -2388,22 +2388,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.2.2", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" + "reference": "86e24012a3139b42a7b71155cfaa325389f00f1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/86e24012a3139b42a7b71155cfaa325389f00f1f", + "reference": "86e24012a3139b42a7b71155cfaa325389f00f1f", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^7.0", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.3.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -2429,20 +2429,20 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-08T06:39:58+00:00" + "time": "2017-08-29T19:37:41+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.3.0", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { @@ -2476,7 +2476,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-06-03T08:32:36+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", From e44c8e8d7365cbfed306751abd6331c3af3b94be Mon Sep 17 00:00:00 2001 From: Mostafa Maklad Date: Wed, 30 Aug 2017 23:30:32 +0300 Subject: [PATCH 2/2] remove test PHP 7.2 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 401f23c..aceb16a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: php php: - 7.1 - - 7.2 matrix: fast_finish: true