[php-ZendFramework2] Update to 2.3.2
Remi Collet
remi at fedoraproject.org
Wed Aug 20 11:37:12 UTC 2014
commit 501e719574acde162621e68065b532ca4dc3cdb1
Author: Remi Collet <remi at fedoraproject.org>
Date: Wed Aug 20 13:37:02 2014 +0200
Update to 2.3.2
- tests from github
- run test suite during build
.gitignore | 2 +
php-ZendFramework2.spec | 112 +++++++++++++++++++++++++++++++++++++++++++----
sources | 3 +-
3 files changed, 107 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec6633b..0f5c332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ clog
/ZendFramework-2.2.6.tgz
/ZendFramework-2.2.7.tgz
/ZendFramework-2.3.1.tgz
+/ZendFramework-2.3.2.tgz
+/ZendFramework-tests-2.3.2.tgz
diff --git a/php-ZendFramework2.spec b/php-ZendFramework2.spec
index 75cec01..ebb138d 100644
--- a/php-ZendFramework2.spec
+++ b/php-ZendFramework2.spec
@@ -1,17 +1,21 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%global composer_vendor zendframework
+#global with_tests %{?_with_tests:1}%{!?_with_tests:0}
+%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: php-ZendFramework2
-Version: 2.3.1
-Release: 3%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
Summary: Zend Framework 2
Group: Development/Libraries
License: BSD
URL: http://framework.zend.com
Source0: https://packages.zendframework.com/releases/ZendFramework-%{version}/ZendFramework-%{version}.tgz
-#Source1: https://packages.zendframework.com/releases/ZendFramework-%%{version}/ZendFramework-%%{version}-manual-en.tgz
-#Source2: https://packages.zendframework.com/releases/ZendFramework-%%{version}/ZendFramework-%%{version}-apidoc.tgz
+# git clone https://github.com/zendframework/zf2.git
+# cd zf2 ; git checkout release-2.3.2
+# tar czf ../ZendFramework-tests-2.3.2.tgz tests
+Source1: ZendFramework-tests-%{version}.tgz
# Patch needed for GLPI
# https://bugzilla.redhat.com/1014478
@@ -22,6 +26,48 @@ Source0: https://packages.zendframework.com/releases/ZendFramework-%{version}/
Patch0: %{name}-glpi.patch
BuildArch: noarch
+%if %{with_tests}
+# PHPUnit + autoloader
+BuildRequires: %{_bindir}/phpunit
+BuildRequires: php-composer(symfony/class-loader) >= 2.0
+# required by components
+BuildRequires: php(language) >= 5.3.23
+BuildRequires: php-bcmath
+BuildRequires: php-bz2
+BuildRequires: php-ctype
+BuildRequires: php-curl
+BuildRequires: php-date
+BuildRequires: php-dom
+BuildRequires: php-fileinfo
+BuildRequires: php-filter
+BuildRequires: php-gd
+BuildRequires: php-gmp
+BuildRequires: php-hash
+BuildRequires: php-iconv
+BuildRequires: php-intl
+BuildRequires: php-json
+BuildRequires: php-ldap
+BuildRequires: php-libxml
+BuildRequires: php-mbstring
+BuildRequires: php-mcrypt
+BuildRequires: php-openssl
+BuildRequires: php-pcre
+BuildRequires: php-pdo
+BuildRequires: php-reflection
+BuildRequires: php-session
+BuildRequires: php-simplexml
+BuildRequires: php-soap
+BuildRequires: php-spl
+BuildRequires: php-tidy
+BuildRequires: php-tokenizer
+BuildRequires: php-xml
+BuildRequires: php-xmlreader
+BuildRequires: php-xmlwriter
+BuildRequires: php-zip
+BuildRequires: php-zlib
+#BuildRequires: php-composer(ircmaxell/random-lib)
+BuildRequires: php-composer(mikey179/vfsStream) >= 1.2
+%endif
Requires: php-composer(%{composer_vendor}/zend-authentication) = %{version}
Requires: php-composer(%{composer_vendor}/zend-barcode) = %{version}
@@ -160,9 +206,9 @@ URL: http://framework.zend.com/manual/2.3/en/modules/zend.barcode.intro.htm
Requires: %{name}-common = %{version}-%{release}
# composer.json
Requires: php-composer(%{composer_vendor}/zend-stdlib) = %{version}
+Requires: php-composer(%{composer_vendor}/zend-validator) = %{version}
# composer.json (optional)
Requires: php-composer(%{composer_vendor}/zend-servicemanager) = %{version}
-Requires: php-composer(%{composer_vendor}/zend-validator) = %{version}
# zendframework/zendpdf
# phpcompatinfo (computed from version 2.3.1)
Requires: php-dom
@@ -1074,6 +1120,7 @@ URL: http://framework.zend.com/manual/2.3/en/modules/zend.mvc.intro.html
Requires: %{name}-common = %{version}-%{release}
# composer.json
Requires: php-composer(%{composer_vendor}/zend-eventmanager) = %{version}
+Requires: php-composer(%{composer_vendor}/zend-form) = %{version}
Requires: php-composer(%{composer_vendor}/zend-servicemanager) = %{version}
Requires: php-composer(%{composer_vendor}/zend-stdlib) = %{version}
# composer.json (optional)
@@ -1082,7 +1129,6 @@ Requires: php-composer(%{composer_vendor}/zend-config) = %{version}
Requires: php-composer(%{composer_vendor}/zend-console) = %{version}
Requires: php-composer(%{composer_vendor}/zend-di) = %{version}
Requires: php-composer(%{composer_vendor}/zend-filter) = %{version}
-Requires: php-composer(%{composer_vendor}/zend-form) = %{version}
Requires: php-composer(%{composer_vendor}/zend-http) = %{version}
Requires: php-composer(%{composer_vendor}/zend-i18n) = %{version}
Requires: php-composer(%{composer_vendor}/zend-inputfilter) = %{version}
@@ -1672,8 +1718,9 @@ Requires: php-composer(%{composer_vendor}/zendxml) = %{version}
# composer.json
Requires: php-composer(%{composer_vendor}/zend-http) = %{version}
Requires: php-composer(%{composer_vendor}/zend-math) = %{version}
-Requires: php-composer(%{composer_vendor}/zend-server) = %{version}
+Requires: php-composer(%{composer_vendor}/zend-server) = %{version}
Requires: php-composer(%{composer_vendor}/zend-stdlib) = %{version}
+Requires: php-composer(%{composer_vendor}/zendxml) = %{version}
# phpcompatinfo (computed from version 2.3.1)
Requires: php-date
Requires: php-dom
@@ -1728,7 +1775,7 @@ If the XML document uses ENTITY the library throw an Exception.
%prep
-%setup -q -n ZendFramework-%{version}
+%setup -q -n ZendFramework-%{version} -a 1
%patch0 -p0
@@ -1751,7 +1798,49 @@ ln -s %{name}-common-%{version} %{buildroot}%{_pkgdocdir}
%check
-# No tests provided
+%if %{with_tests}
+cd tests
+# Create autoloader
+cat > _autoload.php <<'AUTOLOADER'
+<?php
+if (!class_exists('Symfony\\Component\\ClassLoader\\UniversalClassLoader', false)) {
+ require_once __DIR__.'/../src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+}
+
+use Symfony\Component\ClassLoader\UniversalClassLoader;
+$loader = new UniversalClassLoader();
+$loader->registerNamespace('Zend', __DIR__.'/../library');
+$loader->registerNamespace('ZendTest', __DIR__);
+$loader->registerNamespace('org\\bovigo\\vfs', '/usr/share/php');
+//$loader->registerNamespace('RandomLib', '/usr/share/php');
+//$loader->registerNamespace('SecurityLib', '/usr/share/php');
+$loader->useIncludePath(true);
+$loader->register();
+AUTOLOADER
+
+# ignore these for now
+rm -r ZendTest/Cache
+rm ZendTest/Console/RequestTest.php
+rm -r ZendTest/Debug
+rm ZendTest/File/Transfer/Adapter/HttpTest.php
+rm ZendTest/Form/View/Helper/FormDateTimeSelectTest.php
+# Date format with microsecond in PHP 5.6
+rm ZendTest/Ldap/Converter/ConverterTest.php
+# Need mongodb server
+rm ZendTest/Session/SaveHandler/MongoDBTest.php
+# Need ircmaxell/random-lib
+rm ZendTest/Math/RandTest.php
+# Strangly fail, lack of date.timezone
+rm ZendTest/Session/SessionManagerTest.php
+
+RET=0
+for dir in ZendTest/[A-Z]*
+do phpunit \
+ -d date.timezone="UTC" \
+ $dir || RET=1
+done
+exit $RET
+%endif
%files
@@ -2330,6 +2419,11 @@ ln -s %{name}-common-%{version} %{buildroot}%{_pkgdocdir}
# ##############################################################################
%changelog
+* Wed Aug 20 2014 Remi Collet <remi at fedoraproject.org> - 2.3.2-1
+- Update to 2.3.2
+- tests from github
+- run test suite during build
+
* Sun Jul 20 2014 Remi Collet <remi at fedoraproject.org> - 2.3.1-3
- composer dependencies
- add missing license
diff --git a/sources b/sources
index 198bc09..2e9418c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-f5f1395ad6938676bb1cedcae3ee20e8 ZendFramework-2.3.1.tgz
+add28b86ff4fe3f63293e59fde8c7569 ZendFramework-2.3.2.tgz
+6ed08a0f412bc006eb3cf645821a66f1 ZendFramework-tests-2.3.2.tgz
More information about the scm-commits
mailing list