summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-12 16:10:35 +0200
committerRemi Collet <remi@remirepo.net>2019-06-12 16:10:35 +0200
commitdef871047241c83453162c9e8cc848803ce4a6e3 (patch)
treec13e4b168ac447e15197e6cd4c0ed88dbfbbac95
parent6f456ccb1a9adb9de7f490c522ee0f6c948562d8 (diff)
v1.1.1 from FedoraHEADmaster
-rw-r--r--composer.json75
-rw-r--r--php-consolidation-log.spec51
2 files changed, 103 insertions, 23 deletions
diff --git a/composer.json b/composer.json
index b6ba001..708e6d9 100644
--- a/composer.json
+++ b/composer.json
@@ -19,17 +19,82 @@
}
},
"require": {
- "php": ">=5.5.0",
- "psr/log": "~1.0",
- "symfony/console": "~2.5|~3.0"
+ "php": ">=5.4.5",
+ "psr/log": "^1.0",
+ "symfony/console": "^2.8|^3|^4"
},
"require-dev": {
- "phpunit/phpunit": "4.*",
- "squizlabs/php_codesniffer": "2.*"
+ "phpunit/phpunit": "^6",
+ "g1a/composer-test-scenarios": "^3",
+ "php-coveralls/php-coveralls": "^1",
+ "squizlabs/php_codesniffer": "^2"
+ },
+ "minimum-stability": "stable",
+ "scripts": {
+ "cs": "phpcs -n --standard=PSR2 src",
+ "cbf": "phpcbf -n --standard=PSR2 src",
+ "unit": "phpunit",
+ "lint": [
+ "find src -name '*.php' -print0 | xargs -0 -n1 php -l",
+ "find tests/src -name '*.php' -print0 | xargs -0 -n1 php -l"
+ ],
+ "test": [
+ "@lint",
+ "@unit",
+ "@cs"
+ ]
},
"extra": {
+ "scenarios": {
+ "symfony4": {
+ "require": {
+ "symfony/console": "^4.0"
+ },
+ "config": {
+ "platform": {
+ "php": "7.1.3"
+ }
+ }
+ },
+ "symfony2": {
+ "require": {
+ "symfony/console": "^2.8"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.36"
+ },
+ "remove": [
+ "php-coveralls/php-coveralls"
+ ],
+ "config": {
+ "platform": {
+ "php": "5.4.8"
+ }
+ }
+ },
+ "phpunit4": {
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.36"
+ },
+ "remove": [
+ "php-coveralls/php-coveralls"
+ ],
+ "config": {
+ "platform": {
+ "php": "5.4.8"
+ }
+ }
+ }
+ },
"branch-alias": {
"dev-master": "1.x-dev"
}
+ },
+ "config": {
+ "optimize-autoloader": true,
+ "sort-packages": true,
+ "platform": {
+ "php": "7.0.8"
+ }
}
}
diff --git a/php-consolidation-log.spec b/php-consolidation-log.spec
index 995534b..ce793c7 100644
--- a/php-consolidation-log.spec
+++ b/php-consolidation-log.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-consolidation-log
#
-# Copyright (c) 2016-2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2019 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -10,24 +10,27 @@
# Please preserve changelog entries
#
-%global github_owner consolidation-org
+%global github_owner consolidation
%global github_name log
-%global github_version 1.0.3
-%global github_commit 74ba81b4edc585616747cc5c5309ce56fec41254
+%global github_version 1.1.1
+%global github_commit b2e887325ee90abc96b0a8b7b474cd9e7c896e3a
%global composer_vendor consolidation
%global composer_project log
-# "php": ">=5.5.0"
-%global php_min_ver 5.5.0
-# "psr/log": "~1.0"
+# "php": ">=5.4.5"
+%global php_min_ver 5.4.5
+# "psr/log": "^1.0"
# NOTE: Min version not 1.0 because autoloader required
%global psr_log_min_ver 1.0.1
%global psr_log_max_ver 2.0
-# "symfony/console": "~2.5|~3.0"
-# NOTE: Min version not 2.5 because autoloader required
-%global symfony_min_ver 2.7.1
+# "symfony/console": "^2.8|^3|^4"
+%global symfony_min_ver 2.8
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%global symfony_max_ver 5.0
+%else
%global symfony_max_ver 4.0
+%endif
# Build using "--without tests" to disable tests
%global with_tests 0%{!?_without_tests:1}
@@ -36,10 +39,9 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 2%{?github_release}%{?dist}
+Release: 1%{?github_release}%{?dist}
Summary: Improved Psr-3 / Psr\\Log logger based on Symfony Console components
-Group: Development/Libraries
License: MIT
URL: https://github.com/%{github_owner}/%{github_name}
Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
@@ -50,23 +52,31 @@ BuildArch: noarch
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
+%else
BuildRequires: php-composer(psr/log) < %{psr_log_max_ver}
BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
BuildRequires: php-composer(symfony/console) < %{symfony_max_ver}
-BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver}
-## phpcompatinfo (computed from version 1.0.3)
-### <none>
+%endif
+## phpcompatinfo (computed from version 1.1.1)
+BuildRequires: php-pcre
## Autoloader
BuildRequires: php-composer(fedora/autoloader)
%endif
# composer.json
Requires: php(language) >= %{php_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
+%else
Requires: php-composer(psr/log) >= %{psr_log_min_ver}
Requires: php-composer(psr/log) < %{psr_log_max_ver}
-Requires: php-composer(symfony/console) >= %{symfony_min_ver}
Requires: php-composer(symfony/console) < %{symfony_max_ver}
-# phpcompatinfo (computed from version 1.0.3)
+%endif
+# phpcompatinfo (computed from version 1.1.1)
## <none>
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -102,6 +112,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::required([
'%{phpdir}/Psr/Log/autoload.php',
[
+ '%{phpdir}/Symfony4/Component/Console/autoload.php',
'%{phpdir}/Symfony3/Component/Console/autoload.php',
'%{phpdir}/Symfony/Component/Console/autoload.php',
],
@@ -126,7 +137,7 @@ BOOTSTRAP
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
-for PHP_EXEC in php php56 php70 php71 php72; do
+for PHP_EXEC in php php71 php72 php73 php74; do
if [ "php" = "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
|| RETURN_CODE=1
@@ -148,6 +159,10 @@ exit $RETURN_CODE
%changelog
+* Sat Jun 01 2019 Shawn Iwinski <shawn@iwin.ski> - 1.1.1-1
+- Update to 1.1.1 (RHBZ #1582690)
+- Add range version dependencies for Fedora >= 27 || RHEL >= 8
+
* Sun Aug 20 2017 Shawn Iwinski <shawn@iwin.ski> - 1.0.3-2
- Add max versions to BuildRequires
- Switch autoloader to fedora/autoloader