summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json19
-rw-r--r--php-zendframework-zend-ldap.spec14
2 files changed, 19 insertions, 14 deletions
diff --git a/composer.json b/composer.json
index 5d1a796..b2ea496 100644
--- a/composer.json
+++ b/composer.json
@@ -20,9 +20,10 @@
"zendframework/zend-config": "^2.5",
"zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
"zendframework/zend-stdlib": "^2.7 || ^3.0",
- "fabpot/php-cs-fixer": "1.7.*",
"phpunit/PHPUnit": "^4.5",
- "php-mock/php-mock-phpunit": "~0.3"
+ "php-mock/php-mock-phpunit": "~0.3",
+ "zendframework/zend-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^4.6"
},
"suggest": {
"zendframework/zend-eventmanager": "Zend\\EventManager component"
@@ -31,8 +32,8 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev",
- "dev-develop": "2.6-dev"
+ "dev-master": "2.8-dev",
+ "dev-develop": "2.9-dev"
}
},
"autoload-dev": {
@@ -45,10 +46,10 @@
"@cs-check",
"@test"
],
- "upload-coverage": "coveralls -v",
- "cs-check": "php-cs-fixer --version && php-cs-fixer fix -v --diff --dry-run",
- "cs-fix": "php-cs-fixer fix -v",
- "test": "phpunit",
- "test-coverage": "phpunit --coverage-clover clover.xml"
+ "cs-check": "phpcs",
+ "cs-fix": "phpcbf",
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+ "upload-coverage": "coveralls -v"
}
}
diff --git a/php-zendframework-zend-ldap.spec b/php-zendframework-zend-ldap.spec
index 838313f..d800f4f 100644
--- a/php-zendframework-zend-ldap.spec
+++ b/php-zendframework-zend-ldap.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 14c5b862899ad8bb6cd02c567f394ec5dadc039d
+%global gh_commit a9284a7440e17ce0ba697670bb4db1baf2340acd
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-ldap
@@ -20,7 +20,7 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.7.1
+Version: 2.8.0
Release: 1%{?dist}
Summary: Zend Framework %{library} component
@@ -47,14 +47,15 @@ BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5
# "zendframework/zend-config": "^2.5",
# "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
# "zendframework/zend-stdlib": "^2.7 || ^3.0",
-# "fabpot/php-cs-fixer": "1.7.*",
# "phpunit/PHPUnit": "^4.5",
-# "php-mock/php-mock-phpunit": "~0.3"
+# "php-mock/php-mock-phpunit": "~0.3",
+# "zendframework/zend-coding-standard": "~1.0.0",
+# "phpunit/phpunit": "^4.6"
BuildRequires: php-composer(%{gh_owner}/zend-config) >= 2.5
BuildRequires: php-composer(%{gh_owner}/zend-eventmanager) >= 2.6.3
BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7
-BuildRequires: php-composer(phpunit/phpunit) >= 4.5
BuildRequires: php-composer(php-mock/php-mock-phpunit) >= 0.3
+BuildRequires: php-composer(phpunit/phpunit) >= 4.6
# Autoloader
BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5
%endif
@@ -151,6 +152,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Mar 7 2017 Remi Collet <remi@remirepo.net> - 2.8.0-1
+- Update to 2.8.0
+
* Wed May 25 2016 Remi Collet <remi@fedoraproject.org> - 2.7.1-1
- update to 2.7.1