From eed58a2aa72cb29842614207cf07a1b2e7e4b0e5 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 26 Jun 2015 10:47:15 +0200
Subject: php-bartlett-umlwriter: rewrite autoloader

---
 php-bartlett-umlwriter-rpm.patch | 68 +++-------------------------------------
 1 file changed, 5 insertions(+), 63 deletions(-)

(limited to 'php-bartlett-umlwriter-rpm.patch')

diff --git a/php-bartlett-umlwriter-rpm.patch b/php-bartlett-umlwriter-rpm.patch
index 994f79c..458af29 100644
--- a/php-bartlett-umlwriter-rpm.patch
+++ b/php-bartlett-umlwriter-rpm.patch
@@ -1,9 +1,7 @@
 diff -up ./bin/umlwriter.rpm ./bin/umlwriter
---- ./bin/umlwriter.rpm	2015-03-31 11:24:18.000000000 +0200
-+++ ./bin/umlwriter	2015-03-31 11:29:43.000000000 +0200
-@@ -1,24 +1,36 @@
--#!/usr/bin/env php
-+#!/usr/bin/env php
+--- ./bin/umlwriter.rpm	2015-04-02 13:07:20.000000000 +0200
++++ ./bin/umlwriter	2015-06-26 10:34:32.782633902 +0200
+@@ -2,23 +2,14 @@
  <?php
  $appName = 'umlWriter';
  
@@ -18,72 +16,16 @@ diff -up ./bin/umlwriter.rpm ./bin/umlwriter
 -    }
 -}
 -require_once $vendorDir . '/autoload.php';
-+putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite');
- 
+-
  if (PHP_SAPI !== 'cli') {
      return;
  }
  
 +$vendorDir = '/usr/share/php';
-+require_once $vendorDir . '/PhpParser/Autoloader.php';
-+PhpParser\Autoloader::register();
-+
-+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-+require_once $vendorDir . '/SebastianBergmann/Version/autoload.php';
-+
-+use Symfony\Component\ClassLoader\UniversalClassLoader;
-+
-+$loader = new UniversalClassLoader();
-+$loader->registerNamespaces(array(
-+    'Symfony\\Component'                  => $vendorDir,
-+    'Doctrine\\Common'                    => $vendorDir,
-+    'phpDocumentor\\Reflection'           => $vendorDir,
-+    'Seld\\JsonLint'                      => $vendorDir,
-+    'JsonSchema'                          => $vendorDir,
-+    'Bartlett'                            => $vendorDir,
-+    'TokenReflection'                     => $vendorDir,
-+));
-+$loader->useIncludePath(true);
-+$loader->register();
++require_once $vendorDir . '/Bartlett/UmlWriter/autoload.php';
 +
  use Bartlett\UmlWriter\Console\Application;
  
 -$application = new Application($appName, '1.0');
 +$application = new Application($appName, '@package_version@');
  $application->run();
-diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm	2015-03-31 09:46:46.000000000 +0200
-+++ ./tests/bootstrap.php	2015-03-31 11:30:51.000000000 +0200
-@@ -1,6 +1,30 @@
- <?php
- 
- $baseDir   = dirname(__DIR__);
--$vendorDir = $baseDir . '/vendor';
-+$vendorDir = '/usr/share/php';
-+putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite');
- 
--require_once $vendorDir . '/autoload.php';
-+require_once $vendorDir . '/PhpParser/Autoloader.php';
-+PhpParser\Autoloader::register();
-+require_once $vendorDir . '/SebastianBergmann/Version/autoload.php';
-+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-+
-+use Symfony\Component\ClassLoader\UniversalClassLoader;
-+
-+$loader = new UniversalClassLoader();
-+$loader->registerNamespaces(array(
-+    'Symfony\\Component'                  => $vendorDir,
-+    'Doctrine\\Common'                    => $vendorDir,
-+    'phpDocumentor\\Reflection'           => $vendorDir,
-+    'Seld\\JsonLint'                      => $vendorDir,
-+    'JsonSchema'                          => $vendorDir,
-+    'Bartlett\\UmlWriter'                 => $baseDir . '/src',
-+    'Bartlett\\Tests\\UmlWriter'          => $baseDir . '/tests',
-+    'Bartlett'                            => $vendorDir,
-+    'TokenReflection'                     => $vendorDir,
-+));
-+
-+$loader->register();
-+
-+# Class not catched by autoloader
-+require $vendorDir . '/Bartlett/Reflect.php';
-- 
cgit