From f519456c16fb4bfdf99841977dfefdc71db824bd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 2 Jul 2016 11:55:14 +0200 Subject: php-zendframework-zend-loader: load container-interop and psr/http-message when present --- php-zendframework-zend-loader-autoload.php | 9 +++++++++ php-zendframework-zend-loader.spec | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/php-zendframework-zend-loader-autoload.php b/php-zendframework-zend-loader-autoload.php index e5b7d43..e69359d 100644 --- a/php-zendframework-zend-loader-autoload.php +++ b/php-zendframework-zend-loader-autoload.php @@ -24,4 +24,13 @@ if (defined('RPM_BUILDROOT')) { foreach(glob(__DIR__ . '/*-autoload.php') as $dep) { require_once $dep; } +// Common optional dependencies +foreach ([ + '/usr/share/php/Psr/Http/Message/autoload.php', + '/usr/share/php/Interop/Container/autoload.php', +] as $dep) { + if (file_exists($dep)) { + require_once($dep); + } +} diff --git a/php-zendframework-zend-loader.spec b/php-zendframework-zend-loader.spec index d461731..ae1c070 100644 --- a/php-zendframework-zend-loader.spec +++ b/php-zendframework-zend-loader.spec @@ -16,7 +16,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -100,6 +100,9 @@ rm -rf %{buildroot} %changelog +* Sat Jul 2 2016 Remi Collet - 2.5.1-4 +- load container-interop and psr/http-message when present + * Mon May 2 2016 Remi Collet - 2.5.1-3 - load dependencies out of Zend namespaces -- cgit