From b27dfa186404371aa561549579a8f9a931a15983 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Fri, 18 Oct 2024 05:04:14 +0200 Subject: [PATCH] Add doctrine and world writable patch --- patch/doctrineyamlnodeprecated.patch | 39 ++++++++++++++++++++++++++++ patch/worldwritabledisabled.patch | 24 +++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 patch/doctrineyamlnodeprecated.patch create mode 100644 patch/worldwritabledisabled.patch diff --git a/patch/doctrineyamlnodeprecated.patch b/patch/doctrineyamlnodeprecated.patch new file mode 100644 index 0000000..a9d2bf0 --- /dev/null +++ b/patch/doctrineyamlnodeprecated.patch @@ -0,0 +1,39 @@ +diff -urNp vendor/doctrine/orm/src/Mapping/Driver/SimplifiedYamlDriver.php.orig vendor/doctrine/orm/src/Mapping/Driver/SimplifiedYamlDriver.php +--- vendor/doctrine/orm/src/Mapping/Driver/SimplifiedYamlDriver.php.orig 2024-10-18 04:58:29.978540376 +0200 ++++ vendor/doctrine/orm/src/Mapping/Driver/SimplifiedYamlDriver.php 2024-10-18 05:00:01.399291026 +0200 +@@ -8,10 +8,6 @@ use Doctrine\Persistence\Mapping\Driver\ + + /** + * YamlDriver that additionally looks for mapping information in a global file. +- * +- * @deprecated This class is being removed from the ORM and won't have any replacement +- * +- * @phpstan-ignore class.extendsDeprecatedClass + */ + class SimplifiedYamlDriver extends YamlDriver + { +diff -urNp vendor/doctrine/orm/src/Mapping/Driver/YamlDriver.php.orig vendor/doctrine/orm/src/Mapping/Driver/YamlDriver.php +--- vendor/doctrine/orm/src/Mapping/Driver/YamlDriver.php.orig 2024-10-11 13:47:24.000000000 +0200 ++++ vendor/doctrine/orm/src/Mapping/Driver/YamlDriver.php 2024-10-18 05:01:10.189854517 +0200 +@@ -30,8 +30,6 @@ use function substr; + /** + * The YamlDriver reads the mapping metadata from yaml schema files. + * +- * @deprecated 2.7 This class is being removed from the ORM and won't have any replacement +- * + * @template-extends FileDriver> + */ + class YamlDriver extends FileDriver +@@ -43,12 +41,6 @@ class YamlDriver extends FileDriver + */ + public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENSION) + { +- Deprecation::trigger( +- 'doctrine/orm', +- 'https://github.com/doctrine/orm/issues/8465', +- 'YAML mapping driver is deprecated and will be removed in Doctrine ORM 3.0, please migrate to attribute or XML driver.' +- ); +- + if (! class_exists(Yaml::class)) { + throw new LogicException( + 'The YAML metadata driver cannot be enabled because the "symfony/yaml" library' diff --git a/patch/worldwritabledisabled.patch b/patch/worldwritabledisabled.patch new file mode 100644 index 0000000..2b31734 --- /dev/null +++ b/patch/worldwritabledisabled.patch @@ -0,0 +1,24 @@ +diff -urNp vendor/symfony/runtime/GenericRuntime.php.orig vendor/symfony/runtime/GenericRuntime.php +--- vendor/symfony/runtime/GenericRuntime.php.orig 2024-02-28 08:17:06.517219812 +0100 ++++ vendor/symfony/runtime/GenericRuntime.php 2024-02-28 08:17:10.497255989 +0100 +@@ -69,7 +69,7 @@ class GenericRuntime implements RuntimeI + } + + if ($debug) { +- umask(0000); ++ umask(0022); + $_SERVER[$debugKey] = $_ENV[$debugKey] = '1'; + + if (false !== $errorHandler = ($options['error_handler'] ?? BasicErrorHandler::class)) { +diff -urNp vendor/symfony/filesystem/Filesystem.php.orig vendor/symfony/filesystem/Filesystem.php +--- vendor/symfony/filesystem/Filesystem.php.orig 2024-02-28 08:17:21.597356872 +0100 ++++ vendor/symfony/filesystem/Filesystem.php 2024-02-28 08:17:34.497474117 +0100 +@@ -205,7 +205,7 @@ class Filesystem + * + * @throws IOException When the change fails + */ +- public function chmod(string|iterable $files, int $mode, int $umask = 0000, bool $recursive = false): void ++ public function chmod(string|iterable $files, int $mode, int $umask = 0022, bool $recursive = false): void + { + foreach ($this->toIterable($files) as $file) { + if (!self::box('chmod', $file, $mode & ~$umask)) { -- 2.41.1