From 4800f4d655f0c6ad651fcb81bb819e81d7cf702d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2019 12:52:33 +0000 Subject: [PATCH 1/3] build(deps): bump symfony/http-foundation from 3.4.30 to 3.4.36 Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 3.4.30 to 3.4.36. - [Release notes](https://github.com/symfony/http-foundation/releases) - [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/http-foundation/compare/v3.4.30...v3.4.36) Signed-off-by: dependabot[bot] --- composer.lock | 72 ++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/composer.lock b/composer.lock index 5eefcb50f3..f02d0c12c3 100644 --- a/composer.lock +++ b/composer.lock @@ -392,6 +392,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", + "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, { @@ -2632,8 +2633,8 @@ "authors": [ { "name": "Luís Otávio Cobucci Oblonczyk", - "role": "Developer", - "email": "lcobucci@gmail.com" + "email": "lcobucci@gmail.com", + "role": "Developer" } ], "description": "A simple library to work with JSON Web Token and JSON Web Signature", @@ -3693,28 +3694,28 @@ "authors": [ { "name": "Jim Wigginton", - "role": "Lead Developer", - "email": "terrafrost@php.net" + "email": "terrafrost@php.net", + "role": "Lead Developer" }, { "name": "Patrick Monnerat", - "role": "Developer", - "email": "pm@datasphere.ch" + "email": "pm@datasphere.ch", + "role": "Developer" }, { "name": "Andreas Fischer", - "role": "Developer", - "email": "bantu@phpbb.com" + "email": "bantu@phpbb.com", + "role": "Developer" }, { "name": "Hans-Jürgen Petrich", - "role": "Developer", - "email": "petrich@tronic-media.com" + "email": "petrich@tronic-media.com", + "role": "Developer" }, { "name": "Graham Campbell", - "role": "Developer", - "email": "graham@alt-three.com" + "email": "graham@alt-three.com", + "role": "Developer" } ], "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", @@ -4827,16 +4828,16 @@ }, { "name": "symfony/http-foundation", - "version": "v3.4.30", + "version": "v3.4.36", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "c450706851050ade2e1f30d012d50bb9173f7f3d" + "reference": "d2d0cfe8e319d9df44c4cca570710fcf221d4593" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c450706851050ade2e1f30d012d50bb9173f7f3d", - "reference": "c450706851050ade2e1f30d012d50bb9173f7f3d", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d2d0cfe8e319d9df44c4cca570710fcf221d4593", + "reference": "d2d0cfe8e319d9df44c4cca570710fcf221d4593", "shasum": "" }, "require": { @@ -4877,7 +4878,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-07-23T06:27:47+00:00" + "time": "2019-11-28T12:52:59+00:00" }, { "name": "symfony/http-kernel", @@ -5149,16 +5150,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -5170,7 +5171,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5204,20 +5205,20 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T14:18:11+00:00" }, { "name": "symfony/polyfill-php70", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "54b4c428a0054e254223797d2713c31e08610831" + "reference": "af23c7bb26a73b850840823662dda371484926c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831", - "reference": "54b4c428a0054e254223797d2713c31e08610831", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/af23c7bb26a73b850840823662dda371484926c4", + "reference": "af23c7bb26a73b850840823662dda371484926c4", "shasum": "" }, "require": { @@ -5227,7 +5228,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5263,7 +5264,7 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-php72", @@ -6536,12 +6537,12 @@ "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "99268743b5811b86545d8e396b8d03df120cff50" + "reference": "65bbee93ecc41f8a7d7f909e120c614763079167" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/99268743b5811b86545d8e396b8d03df120cff50", - "reference": "99268743b5811b86545d8e396b8d03df120cff50", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/65bbee93ecc41f8a7d7f909e120c614763079167", + "reference": "65bbee93ecc41f8a7d7f909e120c614763079167", "shasum": "" }, "bin": [ @@ -6572,7 +6573,7 @@ "nginx", "php" ], - "time": "2019-08-08T19:03:02+00:00" + "time": "2019-10-24T16:05:31+00:00" }, { "name": "laravel/homestead", @@ -6691,6 +6692,7 @@ "test", "tests" ], + "abandoned": "friends-of-phpspec/phpspec-code-coverage", "time": "2017-10-17T13:54:43+00:00" }, { @@ -6849,9 +6851,9 @@ "authors": [ { "name": "Markus Malkusch", - "role": "Developer", "email": "markus@malkusch.de", - "homepage": "http://markus.malkusch.de" + "homepage": "http://markus.malkusch.de", + "role": "Developer" } ], "description": "PHP-Mock can mock built-in PHP functions (e.g. time()). PHP-Mock relies on PHP's namespace fallback policy. No further extension is needed.", From 8477fb1a63a593bfb2f33e374e66fad623f72731 Mon Sep 17 00:00:00 2001 From: rowasc Date: Fri, 10 Jan 2020 11:06:31 -0300 Subject: [PATCH 2/3] fix(disablemedia): when we call the formatter for media we call rackspace, and /media is useless --- routes/media.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routes/media.php b/routes/media.php index f7e8e4640c..539af113af 100644 --- a/routes/media.php +++ b/routes/media.php @@ -6,7 +6,8 @@ 'middleware' => ['scope:media', 'expiration'] ], function () use ($router) { // Public access - $router->get('/', 'MediaController@index'); + // Disabled since there is no use for it and it brings rackspace down when we get the real filename of an image + // $router->get('/', 'MediaController@index'); $router->get('/{id}', 'MediaController@show'); // Public can upload media $router->post('/', 'MediaController@store'); From aaee6840f91efeffa8dfd90ab278c32b931793c7 Mon Sep 17 00:00:00 2001 From: rowasc Date: Fri, 10 Jan 2020 11:58:53 -0300 Subject: [PATCH 3/3] fix(media-all): delete test that checks for an actual bug of getting all media, and don't do that instead --- tests/integration/media.feature | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/tests/integration/media.feature b/tests/integration/media.feature index 28523a0839..ec51154e22 100644 --- a/tests/integration/media.feature +++ b/tests/integration/media.feature @@ -78,34 +78,6 @@ Feature: Testing the Media API And the response has a "errors" property Then the guzzle status code should be 404 - @resetFixture - Scenario: Listing all Media - Given that I want to get all "Media" - When I request "/media" - Then the response is JSON - And the response has a "count" property - And the type of the "count" property is "numeric" - And the "count" property equals "4" - Then the guzzle status code should be 200 - - @resetFixture - Scenario: Listing All Media with limit and offset - Given that I want to get all "Media" - And that the request "query string" is: - """ - limit=1&offset=1 - """ - When I request "/media" - Then the response is JSON - And the response has a "count" property - And the type of the "count" property is "numeric" - And the "count" property equals "1" - And the response has a "next" property - And the response has a "prev" property - And the response has a "curr" property - And the "results.0.id" property equals "2" - Then the guzzle status code should be 200 - Scenario: Fail to delete a non existent Media Given that I want to delete a "Media" And that its "id" is "10"