unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob fd48e2ce6c0c97cc6746f051bb572e333f203479 1933 bytes (raw)
name: gnu/packages/patches/php-symfony-phpunit-bridge-getVendors-fix.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
 
From 4b7c29c3e98aa55ea7567a3d496595e539f30cdb Mon Sep 17 00:00:00 2001
From: Nicolas Graves <ngraves@ngraves.fr>
Date: Sun, 22 Oct 2023 16:31:40 +0200
Subject: [PATCH] Deprecation.php: Do not check for composer in getVendors.

---
 DeprecationErrorHandler/Deprecation.php | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/DeprecationErrorHandler/Deprecation.php b/DeprecationErrorHandler/Deprecation.php
index 79cfa0c..b7074f7 100644
--- a/DeprecationErrorHandler/Deprecation.php
+++ b/DeprecationErrorHandler/Deprecation.php
@@ -365,27 +365,8 @@ class Deprecation
             if (class_exists(DebugClassLoader::class, false)) {
                 self::$vendors[] = \dirname((new \ReflectionClass(DebugClassLoader::class))->getFileName());
             }
-            foreach (get_declared_classes() as $class) {
-                if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
-                    $r = new \ReflectionClass($class);
-                    $v = \dirname($r->getFileName(), 2);
-                    if (file_exists($v.'/composer/installed.json')) {
-                        self::$vendors[] = $v;
-                        $loader = require $v.'/autoload.php';
-                        $paths = self::addSourcePathsFromPrefixes(
-                            array_merge($loader->getPrefixes(), $loader->getPrefixesPsr4()),
-                            $paths
-                        );
-                    }
-                }
-            }
-            foreach ($paths as $path) {
-                foreach (self::$vendors as $vendor) {
-                    if (0 !== strpos($path, $vendor)) {
-                        self::$internalPaths[] = $path;
-                    }
-                }
-            }
+            self::$vendors[] = $v;
+            self::$internalPaths[] = $paths;
         }
 
         return self::$vendors;
-- 
2.41.0


debug log:

solving fd48e2ce6c ...
found fd48e2ce6c in https://yhetil.org/guix-patches/20231219140934.22783-72-ngraves@ngraves.fr/

applying [1/1] https://yhetil.org/guix-patches/20231219140934.22783-72-ngraves@ngraves.fr/
diff --git a/gnu/packages/patches/php-symfony-phpunit-bridge-getVendors-fix.patch b/gnu/packages/patches/php-symfony-phpunit-bridge-getVendors-fix.patch
new file mode 100644
index 0000000000..fd48e2ce6c

1:48: trailing whitespace.
 
1:50: trailing whitespace.
-- 
Checking patch gnu/packages/patches/php-symfony-phpunit-bridge-getVendors-fix.patch...
1:52: new blank line at EOF.
+
Applied patch gnu/packages/patches/php-symfony-phpunit-bridge-getVendors-fix.patch cleanly.
warning: 3 lines add whitespace errors.

index at:
100644 fd48e2ce6c0c97cc6746f051bb572e333f203479	gnu/packages/patches/php-symfony-phpunit-bridge-getVendors-fix.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).