summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json11
-rw-r--r--php-doctrine-common.spec42
2 files changed, 25 insertions, 28 deletions
diff --git a/composer.json b/composer.json
index 7729b16..2b285d5 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
{"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
],
"require": {
- "php": "~5.6|~7.0",
+ "php": "~7.1",
"doctrine/inflector": "1.*",
"doctrine/cache": "1.*",
"doctrine/collections": "1.*",
@@ -21,16 +21,21 @@
"doctrine/annotations": "1.*"
},
"require-dev": {
- "phpunit/phpunit": "^5.4.6"
+ "phpunit/phpunit": "^5.7"
},
"autoload": {
"psr-4": {
"Doctrine\\Common\\": "lib/Doctrine/Common"
}
},
+ "autoload-dev": {
+ "psr-4": {
+ "Doctrine\\Tests\\": "tests/Doctrine/Tests"
+ }
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.7.x-dev"
+ "dev-master": "2.8.x-dev"
}
}
}
diff --git a/php-doctrine-common.spec b/php-doctrine-common.spec
index 1c7f28d..baa21fd 100644
--- a/php-doctrine-common.spec
+++ b/php-doctrine-common.spec
@@ -12,14 +12,14 @@
%global github_owner doctrine
%global github_name common
-%global github_version 2.7.3
-%global github_commit 4acb8f89626baafede6ee5475bc5844096eba8a9
+%global github_version 2.8.1
+%global github_commit f68c297ce6455e8fd794aa8ffaf9fa458f6ade66
%global composer_vendor doctrine
%global composer_project common
-# "php": "~5.6|~7.0"
-%global php_min_ver 5.6
+# "php": "~7.1"
+%global php_min_ver 7.1
# "doctrine/annotations": "1.*"
# NOTE: Min version not 1.0 because autoloader required
%global doctrine_annotations_min_ver 1.2.6
@@ -34,11 +34,11 @@
%global doctrine_collections_max_ver 2.0
# "doctrine/inflector": "1.*"
# NOTE: Min version not 1.0 because autoloader required
-%global doctrine_inflector_min_ver 1.0.1-4
+%global doctrine_inflector_min_ver 1.0.1
%global doctrine_inflector_max_ver 2.0
# "doctrine/lexer": "1.*"
# NOTE: Min version not 1.0 because autoloader required
-%global doctrine_lexer_min_ver 1.0.1-4
+%global doctrine_lexer_min_ver 1.0.1
%global doctrine_lexer_max_ver 2.0
# Build using "--without tests" to disable tests
@@ -49,7 +49,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Epoch: 1
Version: %{github_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Common library for Doctrine projects
Group: Development/Libraries
@@ -82,13 +82,11 @@ BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
BuildRequires: php-composer(doctrine/collections) < %{doctrine_collections_max_ver}
BuildRequires: php-composer(doctrine/collections) >= %{doctrine_collections_min_ver}
BuildRequires: php-composer(doctrine/inflector) < %{doctrine_inflector_max_ver}
-#BuildRequires: php-composer(doctrine/inflector) >= %%{doctrine_inflector_min_ver}
-BuildRequires: php-doctrine-inflector >= %{doctrine_inflector_min_ver}
+BuildRequires: php-composer(doctrine/inflector) >= %{doctrine_inflector_min_ver}
BuildRequires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}
-#BuildRequires: php-composer(doctrine/lexer) >= %%{doctrine_lexer_min_ver}
-BuildRequires: php-doctrine-lexer >= %{doctrine_lexer_min_ver}
+BuildRequires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver}
%endif
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: php-composer(phpunit/phpunit) >= 5.7
## phpcompatinfo (computed from version 2.8.1)
BuildRequires: php-date
BuildRequires: php-pcre
@@ -114,11 +112,9 @@ Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
Requires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver}
Requires: php-composer(doctrine/collections) >= %{doctrine_collections_min_ver}
Requires: php-composer(doctrine/collections) < %{doctrine_collections_max_ver}
-#Requires: php-composer(doctrine/inflector) >= %%{doctrine_inflector_min_ver}
-Requires: php-doctrine-inflector >= %{doctrine_inflector_min_ver}
+Requires: php-composer(doctrine/inflector) >= %{doctrine_inflector_min_ver}
Requires: php-composer(doctrine/inflector) < %{doctrine_inflector_max_ver}
-#Requires: php-composer(doctrine/lexer) >= %%{doctrine_lexer_min_ver}
-Requires: php-doctrine-lexer >= %{doctrine_lexer_min_ver}
+Requires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver}
Requires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}
%endif
# phpcompatinfo (computed from version 2.8.1)
@@ -189,19 +185,11 @@ cp -rp lib/* %{buildroot}%{phpdir}/
sed "s#require.*autoload.*#require_once '%{buildroot}%{phpdir}/Doctrine/Common/autoload.php';#" \
-i tests/Doctrine/Tests/TestInit.php
-%if 1
-: PHPUnit greater than 3.7
-# Non-static method PHPUnit_Framework_MockObject_Generator::getMock() should not
-# be called statically, assuming $this from incompatible context
-sed -e 's/function testGetManagerForAliasedClass/function SKIP_testGetManagerForAliasedClass/' \
- -e 's/function testGetManagerForClass/function SKIP_testGetManagerForClass/' \
- -i tests/Doctrine/Tests/Common/Persistence/ManagerRegistryTest.php
-%endif
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" %{?rhel:php54 php55 php56} php70 php71 php72; do
+for PHP_EXEC in "" php71 php72 php73; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1
fi
@@ -226,6 +214,10 @@ exit $RETURN_CODE
%changelog
+* Wed Oct 17 2018 Remi Collet <remi@remirepo.net> - 2.8.1-1
+- update to 2.8.1
+- raise dependency on PHP 7.1
+
* Mon Apr 23 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 1:2.7.3-2
- Fix PHP dependency version for downgrade