blob: 40d0ed23cf5f90c79aeb270523151bae027a3d68 (
plain)
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
47
48
49
50
51
|
diff -up ./Bytekit/Autoload.php.rpm ./Bytekit/Autoload.php
--- ./Bytekit/Autoload.php.rpm 2012-08-27 07:04:42.000000000 +0200
+++ ./Bytekit/Autoload.php 2015-06-29 19:22:45.032189615 +0200
@@ -41,16 +41,19 @@
* @since File available since Release 1.0.0
*/
-require_once 'Symfony/Component/Finder/Finder.php';
-require_once 'Symfony/Component/Finder/Glob.php';
-require_once 'Symfony/Component/Finder/Iterator/FilterIterator.php';
-require_once 'Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php';
-require_once 'Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php';
-require_once 'Symfony/Component/Finder/Iterator/FilenameFilterIterator.php';
-require_once 'Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php';
-require_once 'Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php';
-require_once 'Symfony/Component/Finder/SplFileInfo.php';
-require_once 'ezc/Base/base.php';
+$vendorDir = '/usr/share/php';
+// Use Symfony autoloader
+if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
+ if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
+ require_once $vendorDir . '/Symfony/Component/ClassLoader/ClassLoader.php';
+ }
+
+ $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
+ $fedoraClassLoader->register();
+}
+
+/* for symfony/finder */
+$fedoraClassLoader->addPrefix('Symfony\\Component\\', $vendorDir);
spl_autoload_register(
function($class) {
@@ -82,4 +85,5 @@ spl_autoload_register(
}
);
+require_once $vendorDir . '/ezc/Base/base.php';
spl_autoload_register(array('ezcBase', 'autoload'));
diff -up ./bytekit.php.rpm ./bytekit.php
--- ./bytekit.php.rpm 2012-08-27 07:04:42.000000000 +0200
+++ ./bytekit.php 2015-06-29 19:20:55.066655475 +0200
@@ -46,7 +46,7 @@ if (strpos('@php_bin@', '@php_bin') ===
set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path());
}
-require_once 'Bytekit/Autoload.php';
+require_once '/usr/share/php/Bytekit/Autoload.php';
$command = new Bytekit_TextUI_Command;
$command->main();
|