diff options
| -rw-r--r-- | mockery-autoload.php | 22 | ||||
| -rw-r--r-- | php-deepend-Mockery.spec | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/mockery-autoload.php b/mockery-autoload.php index 5142be5..910b6c0 100644 --- a/mockery-autoload.php +++ b/mockery-autoload.php @@ -1,18 +1,14 @@ <?php /* Autoloader for mockery/mockery and its dependencies */ -$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'; - } +require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; - $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader(); - $fedoraClassLoader->register(); -} +\Fedora\Autoloader\Autoload::addPsr4('Mockery\\', __DIR__); +\Fedora\Autoloader\Autoload::addClassMap( + array('mockery' => '/../Mockery.php'), + __DIR__ +); +\Fedora\Autoloader\Dependencies::required(array( + '/usr/share/php/Hamcrest/autoload.php', +)); -$fedoraClassLoader->addPrefix('Mockery', dirname(__DIR__)); - -// dependencies -require_once $vendorDir . '/Hamcrest/autoload.php'; diff --git a/php-deepend-Mockery.spec b/php-deepend-Mockery.spec index dbcf3ef..c81e74a 100644 --- a/php-deepend-Mockery.spec +++ b/php-deepend-Mockery.spec @@ -7,14 +7,14 @@ # # Please preserve changelog entries # -%global gh_commit 4db079511a283e5aba1b3c2fb19037c645e70fc2 +%global gh_commit 65d4ca18e15cb02eeb1e5336f884e46b9b905be0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner padraic %global gh_project mockery %global with_tests 0%{!?_without_tests:1} Name: php-deepend-Mockery -Version: 0.9.5 +Version: 0.9.6 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -39,7 +39,7 @@ BuildRequires: php-composer(phpunit/phpunit) >= 4.0 BuildRequires: php(language) >= 5.3.2 BuildRequires: php-composer(hamcrest/hamcrest-php) >= 1.1 # Autoloader -BuildRequires: php-composer(symfony/class-loader) +BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { @@ -54,7 +54,7 @@ Requires: php-pcre Requires: php-spl Requires: php-reflection # Autoloader -Requires: php-composer(symfony/class-loader) +Requires: php-composer(fedora/autoloader) Provides: php-composer(mockery/mockery) = %{version} Provides: php-pear(pear.survivethedeepend.com/Mockery) = %{version} @@ -120,6 +120,10 @@ fi %changelog +* Sat Nov 26 2016 Remi Collet <remi@fedoraproject.org> - 0.9.6-1 +- Update to 0.9.6 +- switch to fedora/autoloader + * Tue Jun 14 2016 Remi Collet <remi@fedoraproject.org> - 0.9.5-1 - Update to 0.9.5 |