summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-01-16 08:26:43 +0100
committerRemi Collet <fedora@famillecollet.com>2015-01-16 08:26:43 +0100
commit3fa513dc60a1e7c18dba94b53c548ae1a0289952 (patch)
treef26fc48906635b8a0e34eb6162a77dfbd4d5eff5
parentf202e459e3a07dbd60b6ee9d0ce11f1d0b108ea9 (diff)
php-ZendFramework2: minor cleanup
-rw-r--r--php-ZendFramework2.spec12
1 files changed, 4 insertions, 8 deletions
diff --git a/php-ZendFramework2.spec b/php-ZendFramework2.spec
index 69296c6..8cb98c2 100644
--- a/php-ZendFramework2.spec
+++ b/php-ZendFramework2.spec
@@ -71,7 +71,7 @@ BuildRequires: php-xmlreader
BuildRequires: php-xmlwriter
BuildRequires: php-zip
BuildRequires: php-zlib
-#BuildRequires: php-composer(ircmaxell/random-lib)
+BuildRequires: php-composer(ircmaxell/random-lib)
BuildRequires: php-composer(mikey179/vfsStream) >= 1.2
%endif
@@ -1877,8 +1877,8 @@ $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->registerNamespace('RandomLib', '/usr/share/php');
+$loader->registerNamespace('SecurityLib', '/usr/share/php');
$loader->useIncludePath(true);
$loader->register();
AUTOLOADER
@@ -1898,8 +1898,6 @@ rm ZendTest/Version/VersionTest.php
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
# Need investigation
@@ -1911,9 +1909,7 @@ rm ZendTest/Session/SaveHandler/DbTableGatewayTest.php
RET=0
for dir in ZendTest/[A-Z]*
-do phpunit \
- -d date.timezone="UTC" \
- $dir || RET=1
+do phpunit $dir || RET=1
done
exit $RET
%endif