Requires cli for online test

[packages/composer.git] / composer.spec

diff --git a/composer.spec b/composer.spec
index 100b9961475ce04eecf7b8595b250f61ca573014..a3b4bb62838bf545053c3b671c36363df71b9c46 100644 (file)
--- a/composer.spec
+++ b/composer.spec
@@ -1,34 +1,39 @@
 #
 # Conditional build:
-%bcond_without tests           # build with tests
+%bcond_with    tests           # build with tests
+%bcond_without online          # online self-test
+
+%if 0%{?_pld_builder:1}
+%undefine      with_online
+%endif
 
 %define                php_min_version 5.3.4
-%include       /usr/lib/rpm/macros.php
 Summary:       Dependency Manager for PHP
 Name:          composer
-Version:       1.2.2
+Version:       1.10.26
 Release:       1
 License:       MIT
 Group:         Development/Languages/PHP
 Source0:       https://github.com/composer/composer/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 2cdaba60950b7e5fe8061f2585dbe6f6
+# Source0-md5: 170c36246e52522e17540a6aaee57d8c
 Source2:       https://raw.githubusercontent.com/iArren/%{name}-bash-completion/86a8129/composer
 # Source2-md5: cdeebf0a0da1fd07d0fd886d0461642e
 Source3:       autoload.php
 Patch0:                autoload.patch
 Patch1:                update-memory-limit.patch
 Patch2:                svn-ignore-externals.patch
-URL:           http://www.getcomposer.org/
+URL:           https://getcomposer.org/
 BuildRequires: php-devel
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.673
-%if %{with tests}
 # instead of filling duplicate deps for running tests,
 # update composer version that have neccessary runtime dependencies
-BuildRequires: composer >= 1.1.0
+BuildRequires: composer >= 1.7.0
+%{?with_online:BuildRequires:  %{php_name}-cli}
+%if %{with tests}
 BuildRequires: git-core
 BuildRequires: phpab
-BuildRequires: phpunit
+BuildRequires: phpunit >= 4.8
 %endif
 Requires:      php(core) >= %{php_min_version}
 Requires:      php(ctype)
@@ -37,6 +42,7 @@ Requires:     php(filter)
 Requires:      php(hash)
 Requires:      php(json)
 Requires:      php(openssl)
+Requires:      php(pcntl)
 Requires:      php(pcre)
 Requires:      php(phar)
 Requires:      php(posix)
@@ -46,16 +52,18 @@ Requires:   php(zip)
 Requires:      php(zlib)
 Requires:      php-composer-ca-bundle >= 1.0.2
 Requires:      php-composer-semver >= 1.0.0
-Requires:      php-composer-spdx-licenses >= 1.0.0
-Requires:      php-justinrainbow-json-schema >= 1.6
-Requires:      php-psr-Log >= 1.0
-Requires:      php-seld-cli-prompt >= 1.0.0
+Requires:      php-composer-spdx-licenses >= 1.2
+Requires:      php-composer-xdebug-handler >= 1.1
+Requires:      php-justinrainbow-json-schema >= 3.0
+Requires:      php-psr-log >= 1.0
 Requires:      php-seld-jsonlint >= 1.4
 Requires:      php-seld-phar-utils >= 1.0.0
 Requires:      php-symfony2-ClassLoader >= 2.7.7
 Requires:      php-symfony2-Console >= 2.7.7
+Requires:      php-symfony2-Filesystem >= 2.7.7
 Requires:      php-symfony2-Finder >= 2.7.7
 Requires:      php-symfony2-Process >= 2.7.7
+Requires:      unzip
 Suggests:      bash-completion-%{name}
 Suggests:      git-core
 Suggests:      mercurial
@@ -105,28 +113,12 @@ ln -s src/Composer/res
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
-# needs newer phpunit:
-# missing method PHPUnit_Framework_MockObject_Builder_InvocationMocker::willReturn()
-rm tests/Composer/Test/ApplicationTest.php
-rm tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
-rm tests/Composer/Test/IO/ConsoleIOTest.php
-rm tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php
-rm tests/Composer/Test/Package/RootAliasPackageTest.php
-rm tests/Composer/Test/Package/Version/VersionGuesserTest.php
-rm tests/Composer/Test/Repository/ComposerRepositoryTest.php
-rm tests/Composer/Test/Repository/Vcs/GitBitbucketDriverTest.php
-rm tests/Composer/Test/Util/GitHubTest.php
-rm tests/Composer/Test/Util/GitLabTest.php
-# method PHPUnit_Framework_MockObject_Builder_InvocationMocker::withConsecutive()
-rm tests/Composer/Test/Util/BitbucketTest.php
-# Call to undefined method Composer\Test\Repository\Vcs\GitLabDriverTest::prophesize()
-rm tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php
-# Mocked method does not exist.
-rm tests/Composer/Test/Installer/LibraryInstallerTest.php
-# Uncaught Error: Call to undefined method Mock_InputInterface_0ced1568::method()
-rm tests/Composer/Test/Command/RunScriptCommandTest.php
-
 %build
+%if %{with online}
+# always run self-test
+%{__php} ./bin/composer diagnose
+%endif
+
 %if %{with tests}
 phpab -n -o src/bootstrap.php -e '*/Fixtures/*' src/ tests/
 echo "require 'src/Composer/autoload.php';" >> src/bootstrap.php