From 6063b4dbf47f05a1e7cabd2dcb6b7dfab7686d3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:06:06 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump phpstan/phpstan from 1.11.9 to 1.11.10 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.11.9 to 1.11.10. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.12.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.11.9...1.11.10) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 561a72a1bf9..dafc3264ed3 100644 --- a/composer.json +++ b/composer.json @@ -112,7 +112,7 @@ "friends-of-behat/mink-extension": "2.7.5", "php-parallel-lint/php-var-dump-check": "^0.5", "phpstan/extension-installer": "1.4.1", - "phpstan/phpstan": "1.11.9", + "phpstan/phpstan": "1.11.10", "phpstan/phpstan-doctrine": "1.4.8", "phpstan/phpstan-phpunit": "1.4.0", "phpstan/phpstan-symfony": "1.4.6", diff --git a/composer.lock b/composer.lock index 72825155497..773eb81f7da 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6a1bee53be73baeb1f620d2338945495", + "content-hash": "430e9c40ef822d84d43fce7b87cac9fe", "packages": [ { "name": "aws/aws-crt-php", @@ -8677,16 +8677,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.11.9", + "version": "1.11.10", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "e370bcddadaede0c1716338b262346f40d296f82" + "reference": "640410b32995914bde3eed26fa89552f9c2c082f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e370bcddadaede0c1716338b262346f40d296f82", - "reference": "e370bcddadaede0c1716338b262346f40d296f82", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/640410b32995914bde3eed26fa89552f9c2c082f", + "reference": "640410b32995914bde3eed26fa89552f9c2c082f", "shasum": "" }, "require": { @@ -8731,7 +8731,7 @@ "type": "github" } ], - "time": "2024-08-01T16:25:18+00:00" + "time": "2024-08-08T09:02:50+00:00" }, { "name": "phpstan/phpstan-doctrine", From 3b5b86699ba008ef73553675beecb056e8c08777 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 19 Aug 2024 15:55:28 +0200 Subject: [PATCH 2/2] fix: Show correct filepath in error if export file could not be opened --- engine/Shopware/Controllers/Backend/Export.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/Shopware/Controllers/Backend/Export.php b/engine/Shopware/Controllers/Backend/Export.php index d75f6f8e226..8a6b2202378 100644 --- a/engine/Shopware/Controllers/Backend/Export.php +++ b/engine/Shopware/Controllers/Backend/Export.php @@ -123,9 +123,8 @@ public function getWhitelistedCSRFActions() private function generateExport($output) { $outputHandle = fopen($output, 'w'); - - if (!\is_resource($outputHandle)) { - throw new RuntimeException(sprintf('Output file %s can not be opened', $outputHandle)); + if ($outputHandle === false) { + throw new RuntimeException(sprintf('Output file %s can not be opened', $output)); } $this->export->sSmarty = $this->View()->Engine();