From 739c64554974d1d2d8f356facd9bc54ec1f770b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 07:15:57 +0000 Subject: [PATCH 01/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index c2f2f3b..6fbf326 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -27,7 +27,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages Group: Development/Libraries @@ -127,6 +127,9 @@ exit $SCL_RETURN_CODE %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Dec 27 2016 Shawn Iwinski - 1.2.0-1 - Update to 1.2.0 (RHBZ #1398043) - Use php-composer(fedora/autoloader) From be31e6dd8729ac925f9d64f14cd2425613175815 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 08:23:20 +0000 Subject: [PATCH 02/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 6fbf326..1ba0455 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -27,7 +27,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages Group: Development/Libraries @@ -127,6 +127,9 @@ exit $SCL_RETURN_CODE %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9ed5804c96970c1c3c4fff5a5445a512fd7b6244 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 04:41:49 +0000 Subject: [PATCH 03/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 1ba0455..cdd0916 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -27,7 +27,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 4%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages Group: Development/Libraries @@ -127,6 +127,9 @@ exit $SCL_RETURN_CODE %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From dd10ca1be2229cf800c7924d567f23d7afc0cc8c Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Sun, 22 Apr 2018 18:19:49 -0400 Subject: [PATCH 04/30] Update to 1.3.0 (RHBZ #1539946) - Add get source script - Add composer.json to repo - Update running of tests --- .gitignore | 1 + composer.json | 34 ++++++++++++++ php-webmozart-assert-get-source.sh | 73 ++++++++++++++++++++++++++++++ php-webmozart-assert.spec | 54 ++++++++++++++-------- sources | 2 +- 5 files changed, 144 insertions(+), 20 deletions(-) create mode 100644 composer.json create mode 100755 php-webmozart-assert-get-source.sh diff --git a/.gitignore b/.gitignore index 4edf5c1..9fb7f59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-webmozart-assert-1.1.0-bb2d123231c095735130cc8f6d31385a44c7b308.tar.gz /php-webmozart-assert-1.2.0-2db61e59ff05fe5126d152bd0655c9ea113e550f.tar.gz +/php-webmozart-assert-1.3.0-0df1908962e7a3071564e857d86874dad1ef204a.tar.gz diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..c49e623 --- /dev/null +++ b/composer.json @@ -0,0 +1,34 @@ +{ + "name": "webmozart/assert", + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": ["assert", "check", "validate"], + "license": "MIT", + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Webmozart\\Assert\\Tests\\": "tests/" + } + }, + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + } +} diff --git a/php-webmozart-assert-get-source.sh b/php-webmozart-assert-get-source.sh new file mode 100755 index 0000000..b2ac62b --- /dev/null +++ b/php-webmozart-assert-get-source.sh @@ -0,0 +1,73 @@ +#/bin/sh + +GIT=`which git` +RPM=`which rpm` + +if [ -z "$GIT" ] +then + echo "ERROR: 'git' command not found" 1>&2 + exit 1 +elif [ -z "$RPM" ] +then + echo "ERROR: 'rpm' command not found" 1>&2 + exit 1 +fi + +function print { + echo -e "\e[0;33m>>>>> ${1}\e[0m" +} + +if [ -x "$1" ] +then + SPEC=$1 +else + SPEC=`ls *.spec | head -1` +fi + +SPEC_DIR=`pwd` + +print "SPEC_DIR = $SPEC_DIR" + +NAME=`echo $SPEC | sed 's#\.spec##'` +VERSION=`egrep '%global\s*github_version' $SPEC | awk '{print $3}'` + +print "SPEC = $SPEC" +print "NAME = $NAME" + +GIT_OWNER=`egrep '%global\s*github_owner' $SPEC | awk '{print $3}'` +GIT_NAME=`egrep '%global\s*github_name' $SPEC | awk '{print $3}'` +GIT_COMMIT=`egrep '%global\s*github_commit' $SPEC | awk '{print $3}'` +GIT_REPO=https://github.com/${GIT_OWNER}/${GIT_NAME} +GIT_DIR=`echo $GIT_REPO | sed 's#.*/##'` + +print "GIT_OWNER = $GIT_OWNER" +print "GIT_NAME = $GIT_NAME" +print "GIT_COMMIT = $GIT_COMMIT" +print "GIT_REPO = $GIT_REPO" +print "GIT_DIR = $GIT_DIR" + +TEMP_DIR=$(mktemp --dir) + +pushd $TEMP_DIR + print "Cloning git repo..." + $GIT clone $GIT_REPO + + pushd $GIT_DIR + print "Checking out commit..." + $GIT checkout $GIT_COMMIT + popd + + TAR_DIR=${GIT_NAME}-${GIT_COMMIT} + print "TAR_DIR = $TAR_DIR" + + mv $GIT_DIR $TAR_DIR + + TAR_FILE=${SPEC_DIR}/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz + print "TAR_FILE = $TAR_FILE" + + [ -e $TAR_FILE ] && rm -f $TAR_FILE + tar --exclude-vcs -czf $TAR_FILE $TAR_DIR + chmod 0644 $TAR_FILE +popd + +rm -rf $TEMP_DIR diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index cdd0916..0a5f625 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-webmozart-assert # -# Copyright (c) 2016 Shawn Iwinski +# Copyright (c) 2016,2018 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -11,8 +11,8 @@ %global github_owner webmozart %global github_name assert -%global github_version 1.2.0 -%global github_commit 2db61e59ff05fe5126d152bd0655c9ea113e550f +%global github_version 1.3.0 +%global github_commit 0df1908962e7a3071564e857d86874dad1ef204a %global composer_vendor webmozart %global composer_project assert @@ -27,13 +27,17 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages 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 + +# GitHub export does not include tests. +# Run php-webmozart-assert-get-source.sh to create full source. +Source0: %{name}-%{github_version}-%{github_commit}.tar.gz +Source1: %{name}-get-source.sh BuildArch: noarch # Tests @@ -41,7 +45,7 @@ BuildArch: noarch ## composer.json BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 1.2.0) +## phpcompatinfo (computed from version 1.3.0) BuildRequires: php-ctype BuildRequires: php-mbstring BuildRequires: php-pcre @@ -52,7 +56,7 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from version 1.2.0) +# phpcompatinfo (computed from version 1.3.0) Requires: php-ctype Requires: php-mbstring Requires: php-pcre @@ -88,30 +92,36 @@ cat <<'AUTOLOAD' | tee src/autoload.php */ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr4('Webmozart\\Assert\\', __DIR__); +\Fedora\Autoloader\Dependencies::required(array( + __DIR__.'/Assert.php', +)); AUTOLOAD %install -mkdir -p %{buildroot}%{phpdir}/Webmozart/Assert -cp -rp src/* %{buildroot}%{phpdir}/Webmozart/Assert/ +mkdir -p %{buildroot}%{phpdir}/Webmozart +cp -rp src %{buildroot}%{phpdir}/Webmozart/Assert %check %if %{with_tests} -BOOTSTRAP=%{buildroot}%{phpdir}/Webmozart/Assert/autoload.php +: Create tests bootstrap +cat <<'BOOTSTRAP' | tee bootstrap.php + - 1.3.0-1 +- Update to 1.3.0 (RHBZ #1539946) +- Add get source script +- Add composer.json to repo +- Update running of tests + * Fri Feb 09 2018 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 810473c..f3ee130 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.2.0-2db61e59ff05fe5126d152bd0655c9ea113e550f.tar.gz) = 8426530298c397ca6956302db20db441fb13bffcaf70f1d57232aabc1c65c8b5feb416d6b62f4ee2407f126ff6abab53a64c1c5efdecbe8e6824afe05519993d +SHA512 (php-webmozart-assert-1.3.0-0df1908962e7a3071564e857d86874dad1ef204a.tar.gz) = e7845d8979d6bbbbd0937a20f2322753c06dfec83516b1b7c8e9de95da7b40407f93f152a42dff217eacd9f9b1c0b9a724b46f12b7669afc6ddb819ba7e8f4ad From e790797b3d0b5efb7c836a6681cb1c1bcf0baec7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 22:12:39 +0000 Subject: [PATCH 05/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 0a5f625..7052c5e 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -27,7 +27,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages Group: Development/Libraries @@ -137,6 +137,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Apr 22 2018 Shawn Iwinski - 1.3.0-1 - Update to 1.3.0 (RHBZ #1539946) - Add get source script From 0c44d76c9381871b3683fca683de4122643a68e5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Oct 2018 15:28:47 +0200 Subject: [PATCH 06/30] fix autoloader, use PSR-4 to avoid duplicated definition prepend autoloader to ensure we use current version in tests fix FTBFS #1605449 bootstrap build --- php-webmozart-assert.spec | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 7052c5e..a28efdb 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -9,6 +9,8 @@ # Please preserve changelog entries # +# enable bootstrap when need to provide a new autoloader +%global bootstrap 1 %global github_owner webmozart %global github_name assert %global github_version 1.3.0 @@ -20,8 +22,13 @@ # "php": "^5.3.3 || ^7.0" %global php_min_ver 5.3.3 +%if %{bootstrap} +# Build using "--with tests" to enable tests +%global with_tests 0%{?_with_tests:1} +%else # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} +%endif %{!?phpdir: %global phpdir %{_datadir}/php} @@ -88,13 +95,10 @@ cat <<'AUTOLOAD' | tee src/autoload.php - 1.3.0-2 +- fix autoloader, use PSR-4 to avoid duplicated definition +- prepend autoloader to ensure we use current version in tests +- fix FTBFS #1605449 +- bootstrap build + * Fri Jul 13 2018 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 918f4bc8ff831181be34b81beab69b078ec39258 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Oct 2018 15:44:37 +0200 Subject: [PATCH 07/30] fix autoloader, use PSR-4 to avoid duplicated definition prepend autoloader to ensure we use current version in tests fix FTBFS #1605449 --- php-webmozart-assert.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index a28efdb..4065c35 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -10,7 +10,7 @@ # # enable bootstrap when need to provide a new autoloader -%global bootstrap 1 +%global bootstrap 0 %global github_owner webmozart %global github_name assert %global github_version 1.3.0 @@ -34,7 +34,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages Group: Development/Libraries @@ -143,6 +143,11 @@ exit $RETURN_CODE %changelog +* Fri Oct 19 2018 Remi Collet - 1.3.0-3 +- fix autoloader, use PSR-4 to avoid duplicated definition +- prepend autoloader to ensure we use current version in tests +- fix FTBFS #1605449 + * Fri Oct 19 2018 Remi Collet - 1.3.0-2 - fix autoloader, use PSR-4 to avoid duplicated definition - prepend autoloader to ensure we use current version in tests From 8de40b255095117bbeebd2d5ba7914f1cba3e3f8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:12 +0100 Subject: [PATCH 08/30] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- php-webmozart-assert.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 4065c35..ce7d687 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -37,7 +37,6 @@ Version: %{github_version} Release: 3%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} From 2a57b31c6d7b2fc660b5f3798a1ef02d44f31e30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 03:49:51 +0000 Subject: [PATCH 09/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index ce7d687..eb6c27a 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -34,7 +34,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 4%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -142,6 +142,9 @@ exit $RETURN_CODE %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Oct 19 2018 Remi Collet - 1.3.0-3 - fix autoloader, use PSR-4 to avoid duplicated definition - prepend autoloader to ensure we use current version in tests From d9346faedadb469a2f04540202df14fc566a3b8c Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Sun, 19 May 2019 13:51:36 -0400 Subject: [PATCH 10/30] Update to 1.4.0 --- .gitignore | 1 + composer.json | 19 ++++++++++++------- php-webmozart-assert.spec | 20 +++++++++++++------- sources | 2 +- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 9fb7f59..dd203ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-webmozart-assert-1.1.0-bb2d123231c095735130cc8f6d31385a44c7b308.tar.gz /php-webmozart-assert-1.2.0-2db61e59ff05fe5126d152bd0655c9ea113e550f.tar.gz /php-webmozart-assert-1.3.0-0df1908962e7a3071564e857d86874dad1ef204a.tar.gz +/php-webmozart-assert-1.4.0-83e253c8e0be5b0257b881e1827274667c5c17a9.tar.gz diff --git a/composer.json b/composer.json index c49e623..b6002ef 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,11 @@ { "name": "webmozart/assert", "description": "Assertions to validate method input/output with nice error messages.", - "keywords": ["assert", "check", "validate"], + "keywords": [ + "assert", + "check", + "validate" + ], "license": "MIT", "authors": [ { @@ -10,12 +14,18 @@ } ], "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "phpunit/phpunit": "^4.6", "sebastian/version": "^1.0.1" }, + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -25,10 +35,5 @@ "psr-4": { "Webmozart\\Assert\\Tests\\": "tests/" } - }, - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } } } diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index eb6c27a..66edce7 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-webmozart-assert # -# Copyright (c) 2016,2018 Shawn Iwinski +# Copyright (c) 2016-2019 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -10,11 +10,11 @@ # # enable bootstrap when need to provide a new autoloader -%global bootstrap 0 +%global bootstrap 1 %global github_owner webmozart %global github_name assert -%global github_version 1.3.0 -%global github_commit 0df1908962e7a3071564e857d86874dad1ef204a +%global github_version 1.4.0 +%global github_commit 83e253c8e0be5b0257b881e1827274667c5c17a9 %global composer_vendor webmozart %global composer_project assert @@ -34,7 +34,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -51,10 +51,12 @@ BuildArch: noarch ## composer.json BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 1.3.0) +## phpcompatinfo (computed from version 1.4.0) BuildRequires: php-ctype +BuildRequires: php-filter BuildRequires: php-mbstring BuildRequires: php-pcre +BuildRequires: php-reflection BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -62,8 +64,9 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from version 1.3.0) +# phpcompatinfo (computed from version 1.4.0) Requires: php-ctype +Requires: php-filter Requires: php-mbstring Requires: php-pcre Requires: php-spl @@ -142,6 +145,9 @@ exit $RETURN_CODE %changelog +* Sun May 19 2019 Shawn Iwinski - 1.4.0-1 +- Update to 1.4.0 + * Sat Feb 02 2019 Fedora Release Engineering - 1.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index f3ee130..d22ad0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.3.0-0df1908962e7a3071564e857d86874dad1ef204a.tar.gz) = e7845d8979d6bbbbd0937a20f2322753c06dfec83516b1b7c8e9de95da7b40407f93f152a42dff217eacd9f9b1c0b9a724b46f12b7669afc6ddb819ba7e8f4ad +SHA512 (php-webmozart-assert-1.4.0-83e253c8e0be5b0257b881e1827274667c5c17a9.tar.gz) = db1a5607981a37db50f7803595f05762695076501f5e31ce4ae67f6562646d256d62fbccf2e151fe060026fcfc0144a1fb455ea67ea6fbe90be64f120d3aab42 From 2478b0157e2317e393cf114de838660289491642 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 10:19:06 +0000 Subject: [PATCH 11/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 66edce7..08c30c9 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -34,7 +34,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -145,6 +145,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun May 19 2019 Shawn Iwinski - 1.4.0-1 - Update to 1.4.0 From 487aac8c1f1d3f0367c9280e6dbaab628382b2a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 08:53:59 +0000 Subject: [PATCH 12/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 08c30c9..7928436 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -34,7 +34,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -145,6 +145,9 @@ exit $RETURN_CODE %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 01d7566fd2e80274c3099b1d76f7ec326604f752 Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Sun, 23 Feb 2020 00:45:51 -0500 Subject: [PATCH 13/30] Update to 1.7.0 (RHBZ #1746998) - Disable bootstrap so tests run by default - Conditionally use PHPUnit 7 --- .gitignore | 1 + composer.json | 9 +++------ php-webmozart-assert.spec | 36 ++++++++++++++++++++++++++---------- sources | 2 +- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index dd203ff..17aa45e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-webmozart-assert-1.2.0-2db61e59ff05fe5126d152bd0655c9ea113e550f.tar.gz /php-webmozart-assert-1.3.0-0df1908962e7a3071564e857d86874dad1ef204a.tar.gz /php-webmozart-assert-1.4.0-83e253c8e0be5b0257b881e1827274667c5c17a9.tar.gz +/php-webmozart-assert-1.7.0-aed98a490f9a8f78468232db345ab9cf606cf598.tar.gz diff --git a/composer.json b/composer.json index b6002ef..34350b2 100644 --- a/composer.json +++ b/composer.json @@ -18,13 +18,10 @@ "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" + "phpunit/phpunit": "^4.8.36 || ^7.5.13" }, - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } + "conflict": { + "vimeo/psalm": "<3.6.0" }, "autoload": { "psr-4": { diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 7928436..0f84b1c 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-webmozart-assert # -# Copyright (c) 2016-2019 Shawn Iwinski +# Copyright (c) 2016-2020 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -10,11 +10,12 @@ # # enable bootstrap when need to provide a new autoloader -%global bootstrap 1 +%global bootstrap 0 + %global github_owner webmozart %global github_name assert -%global github_version 1.4.0 -%global github_commit 83e253c8e0be5b0257b881e1827274667c5c17a9 +%global github_version 1.7.0 +%global github_commit aed98a490f9a8f78468232db345ab9cf606cf598 %global composer_vendor webmozart %global composer_project assert @@ -22,6 +23,15 @@ # "php": "^5.3.3 || ^7.0" %global php_min_ver 5.3.3 +# PHPUnit +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 +%global phpunit_require phpunit7 +%global phpunit_exec phpunit7 +%else +%global phpunit_require php-composer(phpunit/phpunit) +%global phpunit_exec phpunit +%endif + %if %{bootstrap} # Build using "--with tests" to enable tests %global with_tests 0%{?_with_tests:1} @@ -34,7 +44,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -50,13 +60,14 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 1.4.0) +BuildRequires: %{phpunit_require} +## phpcompatinfo (computed from version 1.7.0) BuildRequires: php-ctype BuildRequires: php-filter BuildRequires: php-mbstring BuildRequires: php-pcre BuildRequires: php-reflection +BuildRequires: php-simplexml BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -64,7 +75,7 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from version 1.4.0) +# phpcompatinfo (computed from version 1.7.0) Requires: php-ctype Requires: php-filter Requires: php-mbstring @@ -119,8 +130,8 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit) -for PHP_EXEC in php %{?rhel:php54 php55 php56} php70 php71 php72 php73; do +PHPUNIT=$(which %{phpunit_exec}) +for PHP_EXEC in php %{?rhel:php54 php55 php56} php70 php71 php72 php73 php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC \ -d auto_prepend_file=%{buildroot}%{phpdir}/Webmozart/Assert/autoload.php \ @@ -145,6 +156,11 @@ exit $RETURN_CODE %changelog +* Sun Feb 23 2020 Shawn Iwinski - 1.7.0-1 +- Update to 1.7.0 (RHBZ #1746998) +- Disable bootstrap so tests run by default +- Conditionally use PHPUnit 7 + * Thu Jan 30 2020 Fedora Release Engineering - 1.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d22ad0e..ffd4de4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.4.0-83e253c8e0be5b0257b881e1827274667c5c17a9.tar.gz) = db1a5607981a37db50f7803595f05762695076501f5e31ce4ae67f6562646d256d62fbccf2e151fe060026fcfc0144a1fb455ea67ea6fbe90be64f120d3aab42 +SHA512 (php-webmozart-assert-1.7.0-aed98a490f9a8f78468232db345ab9cf606cf598.tar.gz) = ced33674df6c86f86374bb92995b66c04183724fed08b3be1d94d1d4421dabc86fee3268d0790e299a5ca1538c804db68c0264d933468d4d25bbef150be3bce3 From dcc2030ed75954ea5537f27aee11435c9846be8f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Jul 2020 09:57:49 +0200 Subject: [PATCH 14/30] update to 1.9.1 (RHBZ #1825544) --- .gitignore | 1 + composer.json | 8 +++++--- php-webmozart-assert.spec | 13 ++++++++----- sources | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 17aa45e..58ca6a4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-webmozart-assert-1.3.0-0df1908962e7a3071564e857d86874dad1ef204a.tar.gz /php-webmozart-assert-1.4.0-83e253c8e0be5b0257b881e1827274667c5c17a9.tar.gz /php-webmozart-assert-1.7.0-aed98a490f9a8f78468232db345ab9cf606cf598.tar.gz +/php-webmozart-assert-1.9.1-bafc69caeb4d49c39fd0779086c03a3738cbb389.tar.gz diff --git a/composer.json b/composer.json index 34350b2..2e609b6 100644 --- a/composer.json +++ b/composer.json @@ -14,14 +14,15 @@ } ], "require": { - "php": "^5.3.3 || ^7.0", + "php": "^5.3.3 || ^7.0 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" }, "conflict": { - "vimeo/psalm": "<3.6.0" + "vimeo/psalm": "<3.9.1", + "phpstan/phpstan": "<0.12.20" }, "autoload": { "psr-4": { @@ -30,7 +31,8 @@ }, "autoload-dev": { "psr-4": { - "Webmozart\\Assert\\Tests\\": "tests/" + "Webmozart\\Assert\\Tests\\": "tests/", + "Webmozart\\Assert\\Bin\\": "bin/src" } } } diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 0f84b1c..1e5d0aa 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -11,16 +11,15 @@ # enable bootstrap when need to provide a new autoloader %global bootstrap 0 - %global github_owner webmozart %global github_name assert -%global github_version 1.7.0 -%global github_commit aed98a490f9a8f78468232db345ab9cf606cf598 +%global github_version 1.9.1 +%global github_commit bafc69caeb4d49c39fd0779086c03a3738cbb389 %global composer_vendor webmozart %global composer_project assert -# "php": "^5.3.3 || ^7.0" +# "php": "^5.3.3 || ^7.0 || ^8.0" %global php_min_ver 5.3.3 # PHPUnit @@ -126,12 +125,13 @@ cp -rp src %{buildroot}%{phpdir}/Webmozart/Assert cat <<'BOOTSTRAP' | tee bootstrap.php - 1.9.1-1 +- update to 1.9.1 (RHBZ #1825544) + * Sun Feb 23 2020 Shawn Iwinski - 1.7.0-1 - Update to 1.7.0 (RHBZ #1746998) - Disable bootstrap so tests run by default diff --git a/sources b/sources index ffd4de4..13ddbd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.7.0-aed98a490f9a8f78468232db345ab9cf606cf598.tar.gz) = ced33674df6c86f86374bb92995b66c04183724fed08b3be1d94d1d4421dabc86fee3268d0790e299a5ca1538c804db68c0264d933468d4d25bbef150be3bce3 +SHA512 (php-webmozart-assert-1.9.1-bafc69caeb4d49c39fd0779086c03a3738cbb389.tar.gz) = 600a0c861436900ba397a87ae4aeadc0f3ebb17e0e2fc659f0bd229b224bff259fb144b5fb85af965541b6e76956d9f52471f521540f7243a7605212da504437 From 19302ebcc73d198025d2cf740675428b825a34ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 22:22:07 +0000 Subject: [PATCH 15/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 1e5d0aa..447fb45 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -43,7 +43,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -156,6 +156,9 @@ exit $RETURN_CODE %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 21 2020 Remi Collet - 1.9.1-1 - update to 1.9.1 (RHBZ #1825544) From 79721fd3e2943363e4c9d44b88ff721af6964b48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:58:32 +0000 Subject: [PATCH 16/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 447fb45..18e9a0c 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -43,7 +43,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -156,6 +156,9 @@ exit $RETURN_CODE %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6e31ed8ad28d16aed104c6aeaab6278c5a0d4184 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:22:16 +0000 Subject: [PATCH 17/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 18e9a0c..4aa12b9 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -43,7 +43,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 4%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -156,6 +156,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dc5749bd06f23b7670e25e9eb7563924c49d1385 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Sep 2021 08:05:06 +0200 Subject: [PATCH 18/30] v1.10.0 --- .gitignore | 1 + php-webmozart-assert.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 58ca6a4..fe16a78 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /php-webmozart-assert-1.4.0-83e253c8e0be5b0257b881e1827274667c5c17a9.tar.gz /php-webmozart-assert-1.7.0-aed98a490f9a8f78468232db345ab9cf606cf598.tar.gz /php-webmozart-assert-1.9.1-bafc69caeb4d49c39fd0779086c03a3738cbb389.tar.gz +/php-webmozart-assert-1.10.0-6964c76c7804814a842473e0c8fd15bab0f18e25.tar.gz diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 4aa12b9..70d7a8c 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -13,8 +13,8 @@ %global bootstrap 0 %global github_owner webmozart %global github_name assert -%global github_version 1.9.1 -%global github_commit bafc69caeb4d49c39fd0779086c03a3738cbb389 +%global github_version 1.10.0 +%global github_commit 6964c76c7804814a842473e0c8fd15bab0f18e25 %global composer_vendor webmozart %global composer_project assert @@ -43,7 +43,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -131,7 +131,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 PHPUNIT=$(which %{phpunit_exec}) -for PHP_EXEC in php %{?rhel:php54 php55 php56 php70 php71 php72} php73 php74 php80; do +for PHP_EXEC in php73 php74 php80 php81; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC \ -d auto_prepend_file=%{buildroot}%{phpdir}/Webmozart/Assert/autoload.php \ @@ -156,6 +156,9 @@ exit $RETURN_CODE %changelog +* Fri Sep 24 2021 Remi Collet - 1.10.0-1 +- update to 1.10.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 13ddbd3..9a35e9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.9.1-bafc69caeb4d49c39fd0779086c03a3738cbb389.tar.gz) = 600a0c861436900ba397a87ae4aeadc0f3ebb17e0e2fc659f0bd229b224bff259fb144b5fb85af965541b6e76956d9f52471f521540f7243a7605212da504437 +SHA512 (php-webmozart-assert-1.10.0-6964c76c7804814a842473e0c8fd15bab0f18e25.tar.gz) = 6cbee0604486b86e76b78d4c5069dab04ceb609cc114c375c63862979f9bc20f459a24f4b413fff18bd7bf28f2211f19956bcf8f6879f422d4db004e43d90e1b From 5cb27c9e5aba1efb24e4d5a83a86289222c7aa70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 08:44:33 +0000 Subject: [PATCH 19/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 70d7a8c..ed9bdeb 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -43,7 +43,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -156,6 +156,9 @@ exit $RETURN_CODE %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Sep 24 2021 Remi Collet - 1.10.0-1 - update to 1.10.0 From d9f7354b4ac7f0227deef2466f3aa4845d838efc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:38:11 +0000 Subject: [PATCH 20/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index ed9bdeb..e43599d 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -43,7 +43,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -156,6 +156,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 1.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 9de24632a4e0f1eabeec19816d2079a5b7c1af36 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Aug 2022 11:56:44 +0200 Subject: [PATCH 21/30] update to 1.11.0 raise dependency on PHP 7.2 switch to phpunit8 --- .gitignore | 9 ++------- composer.json | 17 +++++++++++------ php-webmozart-assert.spec | 30 +++++++++++++++--------------- sources | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index fe16a78..fa4ebad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -/php-webmozart-assert-1.1.0-bb2d123231c095735130cc8f6d31385a44c7b308.tar.gz -/php-webmozart-assert-1.2.0-2db61e59ff05fe5126d152bd0655c9ea113e550f.tar.gz -/php-webmozart-assert-1.3.0-0df1908962e7a3071564e857d86874dad1ef204a.tar.gz -/php-webmozart-assert-1.4.0-83e253c8e0be5b0257b881e1827274667c5c17a9.tar.gz -/php-webmozart-assert-1.7.0-aed98a490f9a8f78468232db345ab9cf606cf598.tar.gz -/php-webmozart-assert-1.9.1-bafc69caeb4d49c39fd0779086c03a3738cbb389.tar.gz -/php-webmozart-assert-1.10.0-6964c76c7804814a842473e0c8fd15bab0f18e25.tar.gz +clog +/php-webmozart-assert-1.11.0-11cb2199493b2f8a3b53e7f19068fc6aac760991.tar.gz diff --git a/composer.json b/composer.json index 2e609b6..b340452 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,12 @@ { "name": "webmozart/assert", "description": "Assertions to validate method input/output with nice error messages.", + "license": "MIT", "keywords": [ "assert", "check", "validate" ], - "license": "MIT", "authors": [ { "name": "Bernhard Schussek", @@ -14,15 +14,15 @@ } ], "require": { - "php": "^5.3.3 || ^7.0 || ^8.0", - "symfony/polyfill-ctype": "^1.8" + "php": "^7.2 || ^8.0", + "ext-ctype": "*" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" + "phpunit/phpunit": "^8.5.13" }, "conflict": { - "vimeo/psalm": "<3.9.1", - "phpstan/phpstan": "<0.12.20" + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<4.6.1 || 4.6.2" }, "autoload": { "psr-4": { @@ -34,5 +34,10 @@ "Webmozart\\Assert\\Tests\\": "tests/", "Webmozart\\Assert\\Bin\\": "bin/src" } + }, + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } } } diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index e43599d..80d6639 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -13,23 +13,18 @@ %global bootstrap 0 %global github_owner webmozart %global github_name assert -%global github_version 1.10.0 -%global github_commit 6964c76c7804814a842473e0c8fd15bab0f18e25 +%global github_version 1.11.0 +%global github_commit 11cb2199493b2f8a3b53e7f19068fc6aac760991 %global composer_vendor webmozart %global composer_project assert -# "php": "^5.3.3 || ^7.0 || ^8.0" -%global php_min_ver 5.3.3 +# "php": "^7.2 || ^8.0" +%global php_min_ver 7.2 # PHPUnit -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 -%global phpunit_require phpunit7 -%global phpunit_exec phpunit7 -%else -%global phpunit_require php-composer(phpunit/phpunit) -%global phpunit_exec phpunit -%endif +%global phpunit_require phpunit8 +%global phpunit_exec phpunit8 %if %{bootstrap} # Build using "--with tests" to enable tests @@ -43,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -59,9 +54,9 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} +BuildRequires: php-ctype BuildRequires: %{phpunit_require} ## phpcompatinfo (computed from version 1.7.0) -BuildRequires: php-ctype BuildRequires: php-filter BuildRequires: php-mbstring BuildRequires: php-pcre @@ -74,8 +69,8 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from version 1.7.0) Requires: php-ctype +# phpcompatinfo (computed from version 1.7.0) Requires: php-filter Requires: php-mbstring Requires: php-pcre @@ -131,7 +126,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 PHPUNIT=$(which %{phpunit_exec}) -for PHP_EXEC in php73 php74 php80 php81; do +for PHP_EXEC in php74 php80 php81 php82; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC \ -d auto_prepend_file=%{buildroot}%{phpdir}/Webmozart/Assert/autoload.php \ @@ -156,6 +151,11 @@ exit $RETURN_CODE %changelog +* Mon Aug 8 2022 Remi Collet - 1.11.0-1 +- update to 1.11.0 +- raise dependency on PHP 7.2 +- switch to phpunit8 + * Fri Jul 22 2022 Fedora Release Engineering - 1.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 9a35e9d..8dbaeb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.10.0-6964c76c7804814a842473e0c8fd15bab0f18e25.tar.gz) = 6cbee0604486b86e76b78d4c5069dab04ceb609cc114c375c63862979f9bc20f459a24f4b413fff18bd7bf28f2211f19956bcf8f6879f422d4db004e43d90e1b +SHA512 (php-webmozart-assert-1.11.0-11cb2199493b2f8a3b53e7f19068fc6aac760991.tar.gz) = 3af0223d5aeb72b4f83acb22b2b347176a4fc404f109e00ce6caa740908a3fbe0f00179c652b9a58930b8a4a55722bf4a4a77bbc70a098fc2ff6cc0e316a0c05 From 71a7c8ba364bc2887c654ccc455f7396dbc987eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:32:21 +0000 Subject: [PATCH 22/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 80d6639..fabb4aa 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -151,6 +151,9 @@ exit $RETURN_CODE %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Aug 8 2022 Remi Collet - 1.11.0-1 - update to 1.11.0 - raise dependency on PHP 7.2 From 117b6492af3e6aa50a400ef6c9772a6b0eb83573 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:24:21 +0000 Subject: [PATCH 23/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index fabb4aa..3f5899c 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -151,6 +151,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 1.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 15bb7ca81654ebe8dc586ee1d3532495e3bf3e8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:36:18 +0000 Subject: [PATCH 24/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 3f5899c..f441efb 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 4%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -151,6 +151,9 @@ exit $RETURN_CODE %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1.11.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7efc2b0f71b66dc87cb89fcc9661d8725d60feab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:24:01 +0000 Subject: [PATCH 25/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index f441efb..9c1a9db 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 5%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -151,6 +151,9 @@ exit $RETURN_CODE %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.11.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.11.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From bf796e55f056f9f2bfd81ff222f21d58f4da54a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:39:37 +0000 Subject: [PATCH 26/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 9c1a9db..9e8e477 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 5%{?github_release}%{?dist} +Release: 6%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -151,6 +151,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.11.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 1.11.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 943e383d136df44a561b409549203d5e46ea4fbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:57:24 +0000 Subject: [PATCH 27/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 9e8e477..4193ff0 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 6%{?github_release}%{?dist} +Release: 7%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -151,6 +151,9 @@ exit $RETURN_CODE %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.11.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 1.11.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 07b65fe436a6330dce981b209a3b19346ab36ea7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:40:29 +0000 Subject: [PATCH 28/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-webmozart-assert.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 4193ff0..8d813b1 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 7%{?github_release}%{?dist} +Release: 8%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -151,6 +151,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.11.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 1.11.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3b11601ae4f9b2b4dd1e67f18943047096a865d4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Oct 2025 07:22:31 +0200 Subject: [PATCH 29/30] v1.12.0 --- .gitignore | 1 + php-webmozart-assert.spec | 20 ++++++++------------ sources | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index fa4ebad..03acade 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clog /php-webmozart-assert-1.11.0-11cb2199493b2f8a3b53e7f19068fc6aac760991.tar.gz +/php-webmozart-assert-1.12.0-541057574806f942c94662b817a50f63f7345360.tar.gz diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 8d813b1..28ef1f4 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-webmozart-assert # -# Copyright (c) 2016-2020 Shawn Iwinski +# Copyright (c) 2016-2025 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -13,8 +13,8 @@ %global bootstrap 0 %global github_owner webmozart %global github_name assert -%global github_version 1.11.0 -%global github_commit 11cb2199493b2f8a3b53e7f19068fc6aac760991 +%global github_version 1.12.0 +%global github_commit 541057574806f942c94662b817a50f63f7345360 %global composer_vendor webmozart %global composer_project assert @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 8%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Assertions to validate method input/output with nice error messages License: MIT @@ -57,12 +57,8 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-ctype BuildRequires: %{phpunit_require} ## phpcompatinfo (computed from version 1.7.0) -BuildRequires: php-filter BuildRequires: php-mbstring -BuildRequires: php-pcre -BuildRequires: php-reflection BuildRequires: php-simplexml -BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -71,10 +67,7 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= %{php_min_ver} Requires: php-ctype # phpcompatinfo (computed from version 1.7.0) -Requires: php-filter Requires: php-mbstring -Requires: php-pcre -Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -126,7 +119,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 PHPUNIT=$(which %{phpunit_exec}) -for PHP_EXEC in php74 php80 php81 php82; do +for PHP_EXEC in php81 php82 php83 php84 php85; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC \ -d auto_prepend_file=%{buildroot}%{phpdir}/Webmozart/Assert/autoload.php \ @@ -151,6 +144,9 @@ exit $RETURN_CODE %changelog +* Tue Oct 21 2025 Remi Collet - 1.12.0-1 +- update to 1.12.0 + * Fri Jul 25 2025 Fedora Release Engineering - 1.11.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 8dbaeb2..d819468 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.11.0-11cb2199493b2f8a3b53e7f19068fc6aac760991.tar.gz) = 3af0223d5aeb72b4f83acb22b2b347176a4fc404f109e00ce6caa740908a3fbe0f00179c652b9a58930b8a4a55722bf4a4a77bbc70a098fc2ff6cc0e316a0c05 +SHA512 (php-webmozart-assert-1.12.0-541057574806f942c94662b817a50f63f7345360.tar.gz) = 492173cd29533641e834b9fe9292686b2be8e47b417b08c3c05c0c9e700904e47e0a178a6b6a4dbdfb5500843e2ef8b7f4189a5a80dc97af5c4bb94089935c25 From dbd17da65608bc7b57da6af92f079f4e5ad07e8e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Oct 2025 06:36:52 +0100 Subject: [PATCH 30/30] update to 1.12.1 (no change) --- .gitignore | 1 + php-webmozart-assert.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 03acade..b34252a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /php-webmozart-assert-1.11.0-11cb2199493b2f8a3b53e7f19068fc6aac760991.tar.gz /php-webmozart-assert-1.12.0-541057574806f942c94662b817a50f63f7345360.tar.gz +/php-webmozart-assert-1.12.1-9be6926d8b485f55b9229203f962b51ed377ba68.tar.gz diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index 28ef1f4..0616422 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -13,8 +13,8 @@ %global bootstrap 0 %global github_owner webmozart %global github_name assert -%global github_version 1.12.0 -%global github_commit 541057574806f942c94662b817a50f63f7345360 +%global github_version 1.12.1 +%global github_commit 9be6926d8b485f55b9229203f962b51ed377ba68 %global composer_vendor webmozart %global composer_project assert @@ -135,7 +135,6 @@ exit $RETURN_CODE %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json @@ -144,6 +143,9 @@ exit $RETURN_CODE %changelog +* Thu Oct 30 2025 Remi Collet - 1.12.1-1 +- update to 1.12.1 (no change) + * Tue Oct 21 2025 Remi Collet - 1.12.0-1 - update to 1.12.0 diff --git a/sources b/sources index d819468..dc7d3b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-webmozart-assert-1.12.0-541057574806f942c94662b817a50f63f7345360.tar.gz) = 492173cd29533641e834b9fe9292686b2be8e47b417b08c3c05c0c9e700904e47e0a178a6b6a4dbdfb5500843e2ef8b7f4189a5a80dc97af5c4bb94089935c25 +SHA512 (php-webmozart-assert-1.12.1-9be6926d8b485f55b9229203f962b51ed377ba68.tar.gz) = 1d8732643dd50272fbce65adee8fb6511f034021ad9d14e40d437dbb181368934cf4f5f552ae41e4e48a99cd23d570070d00d64a7702eefb578e1cbd38253edc