From 3db25dca7a50cea1368851f67938a5b1da393cdf Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 23 Oct 2017 20:54:52 -0700 Subject: [PATCH 1/3] Downgrade doctrine for php5.6 --- composer.json | 4 ++-- composer.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f171f46a2a..65235761ef 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,8 @@ "php": ">=5.6.4", "aws/aws-sdk-php-laravel": "^3.1", "barryvdh/laravel-debugbar": "^2.4", - "doctrine/cache": "^1.6", - "doctrine/common": "^2.7", + "doctrine/cache": "^1.5", + "doctrine/common": "2.7.3", "doctrine/dbal": "v2.5.13", "doctrine/inflector": "1.1.*", "doctrine/instantiator": "1.0.*", diff --git a/composer.lock b/composer.lock index 0def075612..c7b089d2fd 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": "0b0e517d5028f9e5282a8683afeeb28d", + "content-hash": "e61a199c0d0c43ad2fb23424d7e2c9cd", "packages": [ { "name": "aws/aws-sdk-php", From fbf516284c7c7caeab2390d3cbdbd81a12f49f84 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 23 Oct 2017 21:13:39 -0700 Subject: [PATCH 2/3] =?UTF-8?q?One=20more=20time=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 12 ++++++--- composer.lock | 69 +++++++++++++++++++++++++-------------------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/composer.json b/composer.json index 65235761ef..71c1a7e1e0 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,8 @@ "php": ">=5.6.4", "aws/aws-sdk-php-laravel": "^3.1", "barryvdh/laravel-debugbar": "^2.4", - "doctrine/cache": "^1.5", - "doctrine/common": "2.7.3", + "doctrine/cache": "^1.6", + "doctrine/common": "^2.7", "doctrine/dbal": "v2.5.13", "doctrine/inflector": "1.1.*", "doctrine/instantiator": "1.0.*", @@ -18,7 +18,7 @@ "intervention/image": "^2.3", "javiereguiluz/easyslugger": "^1.0", "jenssegers/rollbar": "^1.5", - "laravel/framework": "5.4.*", + "laravel/framework": "5.4.29", "laravel/passport": "^3.0", "laravel/tinker": "^1.0", "laravelcollective/html": "^5.3", @@ -72,6 +72,10 @@ "config": { "preferred-install": "dist", "sort-packages": true, - "optimize-autoloader": true + "optimize-autoloader": true, + "platform": { + "php": "5.6.4" + } } + } diff --git a/composer.lock b/composer.lock index c7b089d2fd..b376ca219f 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": "e61a199c0d0c43ad2fb23424d7e2c9cd", + "content-hash": "a1fc66ea043e149e85b4d708f852adbe", "packages": [ { "name": "aws/aws-sdk-php", @@ -343,21 +343,21 @@ }, { "name": "doctrine/annotations", - "version": "v1.5.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f" + "reference": "54cacc9b81758b14e3ce750f205a393d52339e97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5beebb01b025c94e93686b7a0ed3edae81fe3e7f", - "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97", + "reference": "54cacc9b81758b14e3ce750f205a393d52339e97", "shasum": "" }, "require": { "doctrine/lexer": "1.*", - "php": "^7.1" + "php": "^5.6 || ^7.0" }, "require-dev": { "doctrine/cache": "1.*", @@ -366,7 +366,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -407,41 +407,37 @@ "docblock", "parser" ], - "time": "2017-07-22T10:58:02+00:00" + "time": "2017-02-24T16:22:25+00:00" }, { "name": "doctrine/cache", - "version": "v1.7.1", + "version": "v1.6.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a" + "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a", - "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a", + "url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b", + "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b", "shasum": "" }, "require": { - "php": "~7.1" + "php": "~5.5|~7.0" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "alcaeus/mongo-php-adapter": "^1.1", - "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^5.7", - "predis/predis": "~1.0" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" + "phpunit/phpunit": "~4.8|~5.0", + "predis/predis": "~1.0", + "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -481,24 +477,24 @@ "cache", "caching" ], - "time": "2017-08-25T07:02:50+00:00" + "time": "2017-07-22T12:49:21+00:00" }, { "name": "doctrine/collections", - "version": "v1.5.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf" + "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf", - "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf", + "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba", + "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^5.6 || ^7.0" }, "require-dev": { "doctrine/coding-standard": "~0.1@dev", @@ -548,7 +544,7 @@ "collections", "iterator" ], - "time": "2017-07-22T10:37:32+00:00" + "time": "2017-01-03T10:49:41+00:00" }, { "name": "doctrine/common", @@ -1433,20 +1429,20 @@ }, { "name": "laravel/framework", - "version": "v5.4.36", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9" + "reference": "4f7588c744eb15e49544c99c6ee90d5598b0b50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9", - "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9", + "url": "https://api.github.com/repos/laravel/framework/zipball/4f7588c744eb15e49544c99c6ee90d5598b0b50b", + "reference": "4f7588c744eb15e49544c99c6ee90d5598b0b50b", "shasum": "" }, "require": { - "doctrine/inflector": "~1.1", + "doctrine/inflector": "~1.0", "erusev/parsedown": "~1.6", "ext-mbstring": "*", "ext-openssl": "*", @@ -1558,7 +1554,7 @@ "framework", "laravel" ], - "time": "2017-08-30T09:26:16+00:00" + "time": "2017-07-19T13:26:57+00:00" }, { "name": "laravel/passport", @@ -6432,5 +6428,8 @@ "platform": { "php": ">=5.6.4" }, - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "5.6.4" + } } From c18220069db47398bfe62fb41983c5bd7e34c426 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 23 Oct 2017 21:17:23 -0700 Subject: [PATCH 3/3] Bumped version --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 2973922454..6c2b35e838 100644 --- a/config/version.php +++ b/config/version.php @@ -1,7 +1,7 @@ 'v4.0.14', + 'app_version' => 'v4.0.15', 'build_version' => '339', 'hash_version' => 'g17b2719', - 'full_hash' => 'v4.0.14-339-g17b2719', + 'full_hash' => 'v4.0.15-339-g17b2719', );