siwinski pushed to php-ocramius-proxy-manager (master). "Fix autoloader to load all optional pkgs (..more)"

[notifications at fedoraproject.org]

From 9bf95689d6e9231801cc90ecb1c3cca18d499854 Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <siwinski at redhat.com>
Date: Fri, 29 May 2015 23:53:14 -0400
Subject: Fix autoloader to load all optional pkgs

- Some spec cleanup

diff --git a/php-ocramius-proxy-manager.spec b/php-ocramius-proxy-manager.spec
index 6d2d348..5fae2e2 100644
--- a/php-ocramius-proxy-manager.spec
+++ b/php-ocramius-proxy-manager.spec
@@ -24,7 +24,7 @@
 %global zf_max_ver  3.0
 
 # Skip tests for EPEL 6 b/c PHPUnit < 4
-# TODO: Need to get tests running on EPEL 6!
+# TODO: Get tests running on EPEL 6!
 %if 0%{?el6}
 %global with_tests 0
 %else
@@ -36,7 +36,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       1%{?github_release}%{?dist}
+Release:       2%{?github_release}%{?dist}
 Summary:       OOP proxy wrappers utilities
 
 Group:         Development/Libraries
@@ -45,10 +45,10 @@ URL:           http://ocramius.github.io/ProxyManager/
 Source0:       https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
 
 BuildArch:     noarch
-# For autoload generation
+# Autoload generation
 BuildRequires: %{_bindir}/phpab
 %if %{with_tests}
-# For tests
+# Tests
 ## composer.json
 BuildRequires: %{_bindir}/phpunit
 BuildRequires: php(language)                         >= %{php_min_ver}
@@ -97,16 +97,15 @@ Optional:
 : Generate autoloader
 %{_bindir}/phpab --nolower --output src/ProxyManager/autoload.php src/ProxyManager
 
-cat >> src/ProxyManager/autoload.php <<'AUTOLOAD'
+(cat <<'AUTOLOAD'
 
-// TODO: Add Zend autoloaders from their packages when they are available
+// TODO: Add Zend/ZendXml/Ocramius autoloaders from their packages when they are available
 spl_autoload_register(function ($class) {
-    if (0 === strpos($class, 'Zend\\')) {
-        $src = str_replace('\\', '/',  $class) . '.php';
-        @include_once $src;
-    }
+    $src = str_replace('\\', '/',  $class) . '.php';
+    @include_once $src;
 });
 AUTOLOAD
+) | tee -a src/ProxyManager/autoload.php
 
 
 %install
@@ -121,14 +120,15 @@ cp -rp src/* %{buildroot}%{phpdir}/
 
 : Create mock Composer "vendor/autoload.php"
 mkdir vendor
-cat >> vendor/autoload.php <<'AUTOLOAD'
+(cat <<'AUTOLOAD'
 <?php
 require __DIR__ . '/../tests/autoload.php';
 require '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
 AUTOLOAD
+) | tee vendor/autoload.php
 
 : Run tests
-%{_bindir}/phpunit --exclude-group Performance
+%{_bindir}/phpunit -v --exclude-group Performance
 %else
 : Tests skipped
 %endif
@@ -143,5 +143,9 @@ AUTOLOAD
 
 
 %changelog
+* Fri May 29 2015 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.0.0-2
+- Fix autoloader to load all optional pkgs
+- Some spec cleanup
+
 * Sat May 16 2015 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.0.0-1
 - Initial package
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-ocramius-proxy-manager.git/commit/?h=master&id=9bf95689d6e9231801cc90ecb1c3cca18d499854