diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | composer.json | 18 | ||||
| -rwxr-xr-x | php-di-symfony2-bridge-get-source.sh | 2 | ||||
| -rw-r--r-- | php-di-symfony2-bridge.spec | 63 |
4 files changed, 53 insertions, 38 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..e91cb4b --- /dev/null +++ b/composer.json @@ -0,0 +1,18 @@ +{ + "name": "php-di/symfony2-bridge", + "type": "library", + "description": "Integrates PHP-DI to Symfony 2", + "homepage": "https://github.com/PHP-DI/Symfony2-Bridge/", + "license": "MIT", + "autoload": { + "psr-0": { + "DI\\Bridge\\Symfony": "src/", + "UnitTest\\DI\\Bridge\\Symfony": "tests/", + "FunctionalTest\\DI\\Bridge\\Symfony": "tests/" + } + }, + "require": { + "php-di/php-di": "~4.0 || ^5.0", + "symfony/dependency-injection": "~2.0" + } +} diff --git a/php-di-symfony2-bridge-get-source.sh b/php-di-symfony2-bridge-get-source.sh index 061389a..0ec99e2 100755 --- a/php-di-symfony2-bridge-get-source.sh +++ b/php-di-symfony2-bridge-get-source.sh @@ -44,7 +44,7 @@ print "GIT_DIR = $GIT_DIR" TEMP_DIR=$(mktemp --dir) TAR_FILE=$PWD/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz -COMPOSER=$PWD/composer-${VERSION}.json +COMPOSER=$PWD/composer.json pushd $TEMP_DIR print "Cloning git repo..." diff --git a/php-di-symfony2-bridge.spec b/php-di-symfony2-bridge.spec index 50b9275..9582606 100644 --- a/php-di-symfony2-bridge.spec +++ b/php-di-symfony2-bridge.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-di-symfony2-bridge # -# Copyright (c) 2016 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2016-2017 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -32,10 +32,9 @@ Name: %{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 9%{?github_release}%{?dist} Summary: PHP-DI integration with Symfony 2 -Group: Development/Libraries License: MIT URL: http://php-di.org/doc/frameworks/symfony2.html @@ -44,18 +43,19 @@ URL: http://php-di.org/doc/frameworks/symfony2.html Source0: %{name}-%{github_version}-%{github_commit}.tar.gz Source1: %{name}-get-source.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Tests %if %{with_tests} ## composer.json +BuildRequires: php-composer(php-di/php-di) < %{di_max_ver} BuildRequires: php-composer(php-di/php-di) >= %{di_min_ver} BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: php-composer(symfony/dependency-injection) < %{symfony_max_ver} BuildRequires: php-composer(symfony/dependency-injection) >= %{symfony_min_ver} ## phpcompatinfo (computed from version 1.1.0) BuildRequires: php(language) >= 5.3.0 ## Autoloader -BuildRequires: php-composer(symfony/class-loader) +BuildRequires: php-composer(fedora/autoloader) %endif # composer.json @@ -66,7 +66,7 @@ Requires: php-composer(symfony/dependency-injection) < %{symfony_max_ver} # phpcompatinfo (computed from version 1.1.0) Requires: php(language) >= 5.3.0 # Autoloader -Requires: php-composer(symfony/class-loader) +Requires: php-composer(fedora/autoloader) # php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT} Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release} @@ -89,25 +89,17 @@ cat <<'AUTOLOAD' | tee src/DI/Bridge/Symfony/autoload.php * Autoloader for %{name} and its' dependencies * (created by %{name}-%{version}-%{release}). * - * @return \Symfony\Component\ClassLoader\ClassLoader */ -if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) { - if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) { - require_once '%{phpdir}/Symfony/Component/ClassLoader/ClassLoader.php'; - } +require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; - $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader(); - $fedoraClassLoader->register(); -} +\Fedora\Autoloader\Autoload::addPsr4('DI\\Bridge\\Symfony\\', __DIR__); -$fedoraClassLoader->addPrefix('DI\\Bridge\\Symfony\\', dirname(dirname(dirname(__DIR__)))); +\Fedora\Autoloader\Dependencies::required(array( + '%{phpdir}/DI/autoload.php', + '%{phpdir}/Symfony/Component/DependencyInjection/autoload.php', +)); -// Required dependencies -require_once '%{phpdir}/DI/autoload.php'; -require_once '%{phpdir}/Symfony/Component/DependencyInjection/autoload.php'; - -return $fedoraClassLoader; AUTOLOAD @@ -116,8 +108,6 @@ AUTOLOAD %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{phpdir} cp -rp src/* %{buildroot}%{phpdir}/ @@ -127,28 +117,23 @@ cp -rp src/* %{buildroot}%{phpdir}/ : Create tests bootstrap cat <<'BOOTSTRAP' | tee bootstrap.php <?php -$fedoraClassLoader = require '%{buildroot}%{phpdir}/DI/Bridge/Symfony/autoload.php'; -$fedoraClassLoader->addPrefix('FunctionalTest\\DI\\Bridge\\Symfony\\', __DIR__.'/tests'); -$fedoraClassLoader->addPrefix('UnitTest\\DI\\Bridge\\Symfony\\', __DIR__.'/tests'); +require_once '%{buildroot}%{phpdir}/DI/Bridge/Symfony/autoload.php'; +\Fedora\Autoloader\Autoload::addPsr0('FunctionalTest\\DI\\Bridge\\Symfony\\', __DIR__.'/tests'); +\Fedora\Autoloader\Autoload::addPsr0('UnitTest\\DI\\Bridge\\Symfony\\', __DIR__.'/tests'); BOOTSTRAP : Run tests -%{_bindir}/phpunit --verbose --bootstrap bootstrap.php - -if which php70; then - php70 %{_bindir}/phpunit --verbose --bootstrap bootstrap.php || : -fi +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose --bootstrap bootstrap.php + fi +done %else : Tests skipped %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -158,8 +143,12 @@ rm -rf %{buildroot} %changelog -* Thu Jan 7 2016 Remi Collet <remi@remirepo.net> - 1.1.0-1 -- backport for #remirepo +* Wed May 10 2017 Remi Collet <remi@remirepo.net> - 1.1.0-5 +- add max version to build dependencies +- run test suite against PHP SCLs when available + +* Wed May 10 2017 Valentin Collet <valentin@famillecollet.com> - 1.1.0-4 +- Switch to fedora/autoloader * Sun Jan 03 2016 Shawn Iwinski <shawn@iwin.ski> - 1.1.0-1 - Initial package |